-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Implement/aboutpage #30
Open
ajaggoe
wants to merge
18
commits into
main
Choose a base branch
from
implement/aboutpage
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
a069c2a
added about us page + link to about us
ajaggoe 56dfd7f
Merge branch 'implement/homepage' of https://github.com/AreaFiftyLAN/…
ajaggoe bd14fa3
added link to home in header + changed fontsize and padding
ajaggoe 79155b5
added image scroller draft template
ajaggoe 1b4f895
Merge branch 'main' of https://github.com/AreaFiftyLAN/areafiftylan i…
ajaggoe 26ed9ab
added filler images for image scroller
ajaggoe 5b4c8ff
made automatic image scroller with css, now hardcoded animation
ajaggoe dc7f5dc
add image scroller to about us page with images and very important in…
ajaggoe 017a493
removed pause on hover + added comments
ajaggoe bf0100d
clean up
ajaggoe 4359e52
bit more cleanup of useless code
ajaggoe 09bd188
most of the requested changes
ajaggoe 2450f5f
Merge branch 'main' of https://github.com/AreaFiftyLAN/areafiftylan i…
ajaggoe 7769867
fixed: image aspect ratio on image scroller
ajaggoe 7b8d036
fixed wrong width previous commit
ajaggoe 85c0fc2
changed design ImageScroll
ajaggoe 4eb70fc
merge main
ajaggoe 834ce01
fixed bug in header + changed some variable numbers
ajaggoe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,75 @@ | ||
<template> | ||
<div> | ||
<h2 class="image_scroller_title">{{ title }}</h2> | ||
<div class="container"> | ||
<div v-for="i in images" :key="i" class="image_container"> | ||
ajaggoe marked this conversation as resolved.
Show resolved
Hide resolved
|
||
<NuxtImg :src="i" /> | ||
</div> | ||
<div class="image_container"> | ||
ArdyZ marked this conversation as resolved.
Show resolved
Hide resolved
|
||
<NuxtImg :src="images[0]" /> | ||
</div> | ||
<div class="image_container"> | ||
<NuxtImg :src="images[1]" /> | ||
</div> | ||
</div> | ||
</div> | ||
</template> | ||
|
||
<script setup lang="ts"> | ||
interface Props { | ||
title: string; | ||
images: string[]; | ||
} | ||
|
||
defineProps<Props>(); | ||
</script> | ||
|
||
<style lang="scss" scoped> | ||
//how much scroll should scale with # of images, 100% is width of 1 image | ||
@keyframes scroll { | ||
0% { | ||
transform: translateX(0); | ||
} | ||
100% { | ||
transform: translateX(calc(-100% * 3)); | ||
} | ||
} | ||
// pause scroll on hover | ||
// .container:hover .image_container { | ||
// animation-play-state: paused; | ||
// } | ||
.container { | ||
display: flex; | ||
height: 80%; | ||
width: auto; | ||
flex-direction: row; | ||
padding-bottom: var(--indent-xl); | ||
justify-content: left; | ||
overflow-x: hidden; | ||
z-index: 2; | ||
} | ||
.container .image_container { | ||
animation: scroll 35s linear infinite; //animation time, should scale with # of images | ||
width: 1200px; | ||
height: auto; | ||
} | ||
|
||
img { | ||
height: 800px; | ||
max-height: 85vh; | ||
min-height: 400px; | ||
width: auto; | ||
} | ||
|
||
.image_scroller_title { | ||
display: block; | ||
margin-bottom: var(--indent-s); | ||
text-align: center; | ||
margin-top: var(--indent-s); | ||
} | ||
|
||
.content { | ||
background: var(--theme-color); | ||
flex-grow: 1; | ||
} | ||
</style> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
<template> | ||
<div> | ||
<TextImage image="/Images/Gamers.jpg" :inverse="false"> | ||
<h1 style="padding-top: 48px">Who are we?</h1> | ||
<p> | ||
The LANcie is the committee that organises AreaFiftyLAN each | ||
year. It's our job to make sure everything goes to plan and that | ||
all potential problems are taken care of. We don't bite, so | ||
don't hesitate to contact us with a good story, some questions | ||
or just a casual conversation about gaming. We're always open to | ||
feedback and fun ideas. We hope to see you at the event! If you | ||
have any questions or are interested in sponsoring the event, | ||
please send an email with our contact form. | ||
</p> | ||
</TextImage> | ||
<SponsorBanner :sponsors="sponsors"> | ||
<p>PLACEHOLDER</p> | ||
</SponsorBanner> | ||
<ImageScroll title="Oud LAN" :images="images"></ImageScroll> | ||
</div> | ||
</template> | ||
|
||
<script setup lang="ts"> | ||
const sponsors = [ | ||
{ | ||
title: "Presented by", | ||
sponsors: ["/Images/chlogo.png", "/Images/chlogo.png"], | ||
}, | ||
{ | ||
title: "Sponsored by", | ||
sponsors: ["/Images/chlogo.png", "/Images/chlogo.png"], | ||
}, | ||
]; | ||
|
||
const images = ["/Images/lan1.jpg", "/Images/lan2.jpg", "/Images/lan3.jpg"]; | ||
</script> |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The title is sometimes not that well visible. Maybe add a background with 0.5 ocupacity. See the login page for an example.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That is true. I have added two implementations of the slightly opaque background, both of which in the theme color. One more in the style of the login page and the other as a small box around the title. I am in favor of the former, but this is a design change we should probably decide on together
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I think the best option is to have the second image (Box around the title), however put it in the bottom right corner. @MaritRadder what do you think?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think something like this:
Is best. I updated the design accordingly. I did it quite fast so padding and stuff is not very accurate.