This repository was archived by the owner on Aug 19, 2023. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 3
GH-91 About us gallery #91
Open
CitralFlo
wants to merge
28
commits into
master
Choose a base branch
from
about-us-gallery
base: master
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 9 commits
Commits
Show all changes
28 commits
Select commit
Hold shift + click to select a range
6ffbe8e
Initial Commit
CitralFlo 734f8df
Fix media querry in About.vue, add responsibility to the site. Set up…
CitralFlo 0c54bba
Clean up code
CitralFlo a94b4d5
Typo correction
CitralFlo 1d518bb
Switch type of images to .webp, follow path change in code
CitralFlo 0f78409
Cleanup previous section, set on longer descriptions and entertainmen…
CitralFlo 40e461e
Update all files to current version, use standard css styling set in …
CitralFlo bd49b12
Set 'active' value as a parent component props to fix double click is…
CitralFlo e41ce10
Change icons to match standard
CitralFlo ba42516
Add small description to section, add emoji to match eng lang
CitralFlo 5be40f3
Update src/lang/pl.json
CitralFlo da9ff21
Update src/lang/en.json
CitralFlo 36ff4ff
Update src/lang/en.json
CitralFlo ef4df92
Update src/lang/pl.json
CitralFlo f63cf19
Update src/lang/en.json
CitralFlo d58e65d
Update src/lang/en.json
CitralFlo e84414a
Update src/lang/pl.json
CitralFlo a13d0b1
Update src/lang/pl.json
CitralFlo af94345
Quick fix of title & description colorway
CitralFlo bceef83
Fix Rollczi's request, change raports-screenshot.webp to better match…
CitralFlo 03c3174
Change description to better match our organisation.
CitralFlo 99c1064
small fix
CitralFlo bfeff64
Fixes in discord and Our work section
CitralFlo e06edb1
Add description-box to match styling. Resize images to match differen…
CitralFlo 2d1b20c
Update styling
CitralFlo 3831a50
Update styling
CitralFlo 0158d65
Update styling
CitralFlo 3fe538f
Fix size of gallery
CitralFlo 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
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.
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.
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.
This file contains hidden or 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 |
---|---|---|
@@ -1,88 +1,103 @@ | ||
<template> | ||
<section id="about"> | ||
<div class="card-ab"> | ||
<div class="row"> | ||
<div class="col-lg-6 col-md-12"> | ||
<h1> {{ $t("message.about.title") }}</h1> | ||
<p>{{ $t("message.about.p1") }}</p> | ||
|
||
<p>{{ $t("message.about.p2") }}</p> | ||
|
||
<p>{{ $t("message.about.p3") }}</p> | ||
|
||
</div> | ||
<div class="intellij-container col-lg-6 col-md-12"> | ||
<img alt="intellij" class="intellij" src="/assets/img/header/about/eternalcore-intellij.webp"> | ||
</div> | ||
</div> | ||
<h1 class="title">{{ $t("message.about-us.title") }}</h1> | ||
<font-awesome-icon icon="fa-solid fa-dinosaur"/> | ||
<div class="gallery"> | ||
<Gallery | ||
v-for="(item, index) in items" | ||
:key="index" | ||
:title="$t('message.about-us.title' + (index + 1))" | ||
:description="$t('message.about-us.desc' + (index + 1))" | ||
:icon="item.icon" | ||
:image="item.image" | ||
:isActive="item.isActive" | ||
@toggle-active="handleToggleActive(index)" | ||
|
||
/> | ||
</div> | ||
</section> | ||
</template> | ||
|
||
<script> | ||
|
||
import Gallery from "@/components/about/components/Gallery.vue"; | ||
|
||
export default { | ||
name: "about", | ||
components: {Gallery}, | ||
data() { | ||
return { | ||
items: [ | ||
{ | ||
icon: "/assets/img/about/people-icon.webp", | ||
image: "/assets/img/about/raports-screenshot.webp", | ||
isActive: false | ||
}, | ||
{ | ||
icon: "/assets/img/about/repositories-icon.webp", | ||
image: "/assets/img/about/repos-screenshot.webp", | ||
isActive: false | ||
}, | ||
{ | ||
icon: "/assets/img/about/discord-icon.webp", | ||
image: "/assets/img/about/discord-screenshot.webp", | ||
isActive: false | ||
}, | ||
{ | ||
icon: "/assets/img/about/gamepad-icon.webp", | ||
image: "/assets/img/about/games-screenshot.webp", | ||
isActive: false | ||
} | ||
] | ||
}; | ||
}, | ||
methods: { | ||
handleToggleActive(index) { | ||
this.items.forEach((item, i) => { | ||
if (i === index) { | ||
item.isActive = !item.isActive; | ||
} else { | ||
item.isActive = false; | ||
} | ||
}); | ||
} | ||
} | ||
}; | ||
</script> | ||
|
||
<style> | ||
@media only screen and (max-width: 1000px) { | ||
#about { | ||
padding: 0 7% 3% 8%; | ||
} | ||
|
||
.card-ab { | ||
border-radius: 12px; | ||
padding: 15% 15% 4% 10%; | ||
} | ||
|
||
.card-ab h1 { | ||
border-left: 5px solid var(--black); | ||
} | ||
|
||
.card-ab p { | ||
margin-top: 8%; | ||
} | ||
} | ||
|
||
.card-ab { | ||
border-radius: 12px; | ||
padding: 5% 5%; | ||
|
||
background: rgb(63, 94, 251); | ||
background: -moz-linear-gradient(90deg, rgba(63, 94, 251, 1) 0%, rgba(252, 70, 107, 1) 100%); | ||
background: -webkit-linear-gradient(90deg, rgba(63, 94, 251, 1) 0%, rgba(252, 70, 107, 1) 100%); | ||
background: linear-gradient(90deg, rgba(63, 94, 251, 1) 0%, rgba(252, 70, 107, 1) 100%); | ||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#3f5efb", endColorstr="#fc466b", GradientType=1); | ||
.title { | ||
color: var(--white); | ||
} | ||
|
||
.card-ab h1 { | ||
font-weight: 800; | ||
border-left: 5px solid var(--white); | ||
} | ||
|
||
.card-ab p { | ||
margin-top: 6%; | ||
.gallery { | ||
display: flex; | ||
flex-direction: row; | ||
justify-content: center; | ||
align-items: center; | ||
padding: 5px; | ||
overflow: hidden; | ||
width: 100%; | ||
} | ||
|
||
#about { | ||
padding: 0 12% 3% 12%; | ||
} | ||
|
||
.intellij-container { | ||
display: flex; | ||
align-items: center; | ||
justify-content: center; | ||
margin-top: 10px !important; | ||
} | ||
|
||
@media only screen and (max-width: 1000px) { | ||
#about { | ||
padding: 0 7% 3% 8%; | ||
} | ||
|
||
.intellij { | ||
box-shadow: var(--black) 0 0 15px; | ||
width: 100%; | ||
border-radius: 15px; | ||
.gallery { | ||
display: flex; | ||
flex-direction: column; | ||
justify-content: center; | ||
align-items: center; | ||
padding: 5px; | ||
overflow: hidden; | ||
width: 100%; | ||
} | ||
} | ||
|
||
</style> |
This file contains hidden or 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,189 @@ | ||
<template> | ||
<div class="gallery-section" @click="toggleActive" :class="isActive ? 'active' : '' " | ||
:style="{ backgroundImage: 'url(' + image + ')' }"> | ||
<div class="shadow"></div> | ||
<div class="icon" :class="isActive ? 'active' : '' "> | ||
<img :src="icon" alt="Gallery Image" class="gallery-icon"/> | ||
</div> | ||
<div class="description" :class="isActive ? 'active' : '' "> | ||
<h1>{{ title }}</h1> | ||
<p class="text">{{ description }}</p> | ||
</div> | ||
</div> | ||
</template> | ||
|
||
<script> | ||
export default { | ||
name: "Gallery", | ||
props: { | ||
key: Number, | ||
title: "", | ||
description: "", | ||
icon: String, | ||
image: String, | ||
isActive: Boolean | ||
}, | ||
methods: { | ||
toggleActive() { | ||
this.$emit('toggle-active', this.key); | ||
} | ||
} | ||
/* | ||
let activeElements = document.querySelectorAll('.active'); | ||
Rollczi marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
//if this element is active remove class only from this element | ||
if (this.isActive) { | ||
console.log('method #1'); | ||
this.isActive = !this.isActive; | ||
console.log("activated"); | ||
} | ||
//if this element is not active remove class from all active elements and then add class to this element | ||
else { | ||
console.log('method #2'); | ||
activeElements.forEach((el) => { | ||
el.classList.remove('active'); | ||
console.log("deactivated"); | ||
}); | ||
this.isActive = !this.isActive; | ||
console.log("activated"); | ||
} | ||
} | ||
} | ||
*/ | ||
}; | ||
</script> | ||
|
||
<style scoped> | ||
.gallery-section { | ||
position: relative; | ||
width: 15%; | ||
overflow: hidden; | ||
max-height: 70vh; | ||
height: 700px; | ||
display: flex; | ||
flex-direction: row; | ||
align-items: stretch; | ||
background-repeat: no-repeat; | ||
background-size: auto 120%; | ||
background-position: center; | ||
border: 5px solid var(--light-gray); | ||
cursor: pointer; | ||
min-width: 150px; | ||
margin: 10px; | ||
padding: 10px; | ||
transition: .5s cubic-bezier(0.05, 0.61, 0.41, 0.95) all; | ||
} | ||
.gallery-section.active { | ||
flex-grow: 10000; | ||
transform: scale(1); | ||
max-width: 1000px; | ||
margin: 0; | ||
border-radius: 40px; | ||
background-size: auto 100%; | ||
} | ||
.gallery-section:not(.active) { | ||
flex-grow: 1; | ||
max-width: 100px; | ||
border-radius: 30px; | ||
} | ||
.icon { | ||
align-items: center; | ||
top: 80%; | ||
left: 17%; | ||
z-index: 3; | ||
width: 80px; | ||
height: 80px; | ||
background: transparent; | ||
border-radius: 50%; | ||
border: var(--primary-dark-gray) 4px solid; | ||
padding: 5px; | ||
position: relative; | ||
} | ||
.icon.active { | ||
display: none; | ||
opacity: 0; | ||
} | ||
.gallery-icon { | ||
width: 60%; | ||
height: auto; | ||
z-index: 3; | ||
filter: brightness(0) invert(0.40); | ||
position: absolute; /* position the gallery-icon absolutely */ | ||
top: 50%; /* position it at 50% from the top of the parent div */ | ||
left: 50%; /* position it at 50% from the left of the parent div */ | ||
transform: translate(-50%, -50%); /* center it precisely by translating it -50% from both top and left */ | ||
align-items: center; | ||
justify-content: center; | ||
} | ||
.description { | ||
display: none; | ||
z-index: 3; | ||
width: 100%; | ||
} | ||
.description.active { | ||
display: block; | ||
z-index: 3; | ||
position: absolute; | ||
bottom: 0; | ||
left: 0; | ||
color: var(--white-gray); | ||
padding: 10px; | ||
background: var(--primary-dark-gray); | ||
Rollczi marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
} | ||
Rollczi marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
.shadow { | ||
position: absolute; | ||
bottom: 0; | ||
left: 0; | ||
right: 0; | ||
height: 120px; | ||
transition: .5s cubic-bezier(0.05, 0.61, 0.41, 0.95); | ||
} | ||
@media only screen and (max-width: 1000px) { | ||
.gallery-section { | ||
width: 100%; | ||
height: 70vh; | ||
margin: 10px; | ||
align-items: center; | ||
justify-content: center; | ||
max-width: max-content; | ||
flex-grow: inherit; | ||
} | ||
.icon { | ||
display: none; | ||
} | ||
.description { | ||
display: block; | ||
z-index: 3; | ||
position: absolute; | ||
bottom: 0; | ||
left: 0; | ||
color: var(--white-gray); | ||
padding: 10px; | ||
background: var(--primary-dark-gray); | ||
} | ||
.gallery-section:not(.active) { | ||
flex-grow: inherit; | ||
max-width: none; | ||
border-radius: 30px; | ||
} | ||
} | ||
</style> |
This file contains hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.