Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fr-about #687

Open
wants to merge 2 commits into
base: gql
Choose a base branch
from
Open

fr-about #687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d01756
set up connection to airtable to collect member info, about page done…
arhum-k Mar 1, 2024
4ffbe2e
fixed carousel + added current contributors/alumni
arhum-k Mar 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,19 @@
"prod": "serve -s build -p 3000"
},
"dependencies": {
"airtable": "^0.12.2",
"bt": "^0.0.1",
arhum-k marked this conversation as resolved.
Show resolved Hide resolved
"classnames": "^2.5.1",
"iconoir-react": "^7.3.0",
"glider": "^0.1.0",
"iconoir-react": "^7.4.0",
"moment": "^2.30.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-glider": "^4.0.2",
"react-multi-carousel": "^2.8.4",
"react-router": "^6.21.3",
"react-router-dom": "^6.21.3"
"react-router-dom": "^6.21.3",
"swiper": "^11.0.7"
},
"devDependencies": {
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
Expand All @@ -36,8 +42,9 @@
"eslint": "^8.56.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.5",
"g-sheets-api": "^2.2.0",
"prettier": "^3.2.4",
"sass": "^1.70.0",
"sass": "^1.71.1",
"typescript": "^5.3.3",
"vite": "^5.0.12"
}
Expand Down
Binary file added frontend/public/images/christina_janet.jpeg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/images/jemma.jpeg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/images/michaels.jpeg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/images/retreat.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/images/retreat_silly.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/images/will.jpeg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/images/zoom.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
315 changes: 315 additions & 0 deletions frontend/src/app/About/About.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,315 @@
//undefined stuff that was in main branch
$bt-navbar-height: 58px;
$bt-light-text: #8A8A8A;
$bt-base-text: #383838;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have Tailwind colors defined as CSS variables in the src/main.scss file.

You can reference CSS variables like so:

color: var(--slate-500);

$bt-light-grey: #A0A0A0;



.about {
padding-top: $bt-navbar-height;

.aboutOurTeam {
text-align: center;

margin-top: 48px;
margin-bottom: 48px;

h1 {
margin-bottom: 8px;
font-weight: bold;
}

p {
color: $bt-light-text;
line-height: 1.75;
width: 500px;
margin-bottom: 16px;

@media (max-width: 768px) {
width: 300px;
}
}
}

.group {
display: flex;
justify-content: center;
width: 100%;
position: relative;
overflow: hidden;

.aboutCarousel {
/* Make the width of the flexbox equal the sum of the width of its items */
display: inline-flex;
flex-direction: row;
justify-content: center;

&.aboutCarouselSlideLeft {
transition: transform 1s ease;
transform: translateX(-20%);
}

&.aboutCarouselSlideRight {
transition: transform 1s ease;
transform: translateX(20%);
}

.aboutCarouselItem {
display: none;
transition: filter 1s ease, transform 1s ease;

>img {
max-width: 100%; // Ensure image does not exceed the container width
height: auto; // Maintain aspect ratio
object-fit: cover; // Cover the container fully
}

&.aboutCarouselActive {
display: block;
transform: translateX(0) scale(0.9);
filter: brightness(0.35);
}

&.aboutCarouselActivePrev {
@extend .aboutCarouselActive;
order: 0;
}

&.aboutCarouselActiveFirst {
@extend .aboutCarouselActive;
order: 1;
}

&.aboutCarouselActiveSecond {
@extend .aboutCarouselActive;
order: 2;
transform: scale(1);
filter: brightness(1);
}

&.aboutCarouselActiveThird {
@extend .aboutCarouselActive;
order: 3;
}

&.aboutCarouselActiveNext {
@extend .aboutCarouselActive;
order: 4;
}

&.focusIn {
transform: scale(1);
filter: brightness(1);
}

&.focusOut {
transform: scale(0.9);
filter: brightness(0.35);
}

>img {
border-radius: 3px;
width: 100%;
height: 100%;
object-fit: cover;
}

@media (min-width: 1024px) {
height: 400px;
width: 711px;
}


@media (min-width: 768px) and (max-width: 1023) {
height: 300px;
width: 533px;
}

@media (max-width: 767px) {
height: 200px;
width: 356px;
}
}

// remove scroll bar
-ms-overflow-style: none;
/* Internet Explorer 10+ */
scrollbar-width: none;
/* Firefox */
}

.aboutCarouselArrow {
position: absolute;

top: calc(50% - 24px);

display: grid;
place-items: center;

height: 48px;
width: 48px;

border: none;

border-radius: 50%;

background-color: rgba(white, 0.75);

transition: background-color 0.15s ease-in-out;

color: #383838;

&:hover {
background-color: white;
}
}

.aboutCarouselNext {
@extend .aboutCarouselArrow;

right: calc(15% - 48px);
}

.aboutCarouselPrev {
@extend .aboutCarouselArrow;

left: calc(15% - 48px);
}
}



// remove scroll bar
.group::-webkit-scrollbar {
/* Safari and Chrome */
display: none;
}

.values {

margin-bottom: 80px;

@media (min-width: 1024px) {
width: 900px;
}


@media (max-width: 767px) {
width: 400px;
}

>h5 {

margin-bottom: 40px;
text-align: center;

font-weight: bold;
font-size: 24px;


@media (max-width: 768px) {
// Mobile
font-size: 20px;
}
}

.valueCol {
margin-bottom: 20px;

display: flex;
flex-direction: row;

@media (max-width: 767px) {
flex-direction: column;

>div:not(:last-child) {
margin-bottom: 20px; // For horizontal layout
// margin-bottom: 10px; // For vertical layout, comment out the margin-right
}
}

.value {
height: 100%;
padding: 0 20px;
width: 600px;

.valueContent {
height: 100%;
border-radius: 4px;
border: solid 2px #6d6a7238;
padding: 20px 10px;

display: flex;
flex-direction: column;
align-items: center;

>h6 {
font-size: 18px;
font-weight: bold;
margin: 20px 0 10px;
}

>p {
text-align: center;
width: 95%;
line-height: 1.75;
color: #8a8a8a;
}
}
}
}
}

// should move somewhere else???
.releasesHeadingButton {
justify-content: center;
margin-top: 20px;
margin-bottom: 64px;

input {
overflow: visible;
margin-right: 10px;
border: solid 1px #cfcfcf;
text-indent: 10px;
color: $bt-base-text;
border-radius: 4px;
width: 280px;

&::placeholder {
color: $bt-light-grey;
}
}
}

.joinPic {
width: 800px;
margin-bottom: 28px;

@media (max-width: 768px) {
// Mobile
width: 95%;
}
}


.navLink {
background-color: #e1e1e16b;
}

display: flex;
flex-direction: column;
align-items: center;

.title {
font-weight: bold;
color: $bt-base-text;
font-size: 24px;

@media (max-width: 768px) {
// Mobile
font-size: 30px;
}

}
}
Loading
Loading