Skip to content

Fixed about page spacing and design of game view to match Figma design #860

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

Merged
nrakhshan merged 4 commits into from
Jun 28, 2025
Merged

Fixed about page spacing and design of game view to match Figma design #860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e773b13
Fixed about page spacing and design of game view to match Figma design
Ablahgad Jun 27, 2025
a527b63
Merge branch 'dev' of github.com:Ablahgad/orientation-website into dev
Ablahgad Jun 27, 2025
bd005b7
Fixed exec team info spacing and design to better match Figma
Ablahgad Jun 28, 2025
4da851a
Capitalization error in image name
Ablahgad Jun 28, 2025
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
83 changes: 80 additions & 3 deletions client/src/pages/About/About.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useState } from 'react';
import { React, useState, useRef } from 'react';
import './About.scss';
//import { Carousel } from 'react-responsive-carousel';
//import "react-responsive-carousel/lib/styles/carousel.min.css";
Expand Down Expand Up @@ -28,6 +28,9 @@ import { instagramAccounts } from '../../util/instagramAccounts';
// import PropTypes from 'prop-types';
import { LazyLoadImage } from 'react-lazy-load-image-component';

import placeholder from '../../assets/logo/main-logo-2T5.png';
import { get } from 'lodash';

const PageAbout = () => {
return (
<>
Expand Down Expand Up @@ -80,6 +83,7 @@ const AboutUsSection = () => {
);
})}
</div>

</div>
</Header>
);
Expand Down Expand Up @@ -128,10 +132,83 @@ const VCSection = () => {
};

const AboutUsExecTeam = () => {
const [displayGame, setDisplayGame] = useState(true);
const [execIndex, setExecIndex] = useState(0);

const getNextExec = () => {
// Consider implementing randomization
shake();
setTimeout(() => {
setExecIndex((execIndex + 1) % (execInfo.vcs.length + execInfo.ocs.length));
}, 2000);
};

const machineRef = useRef(null);
const shake = () => {
const el = machineRef.current;
if (!el) return;

el.classList.add('shake-animation');

el.addEventListener(
'animationend',
() => {
el.classList.remove('shake-animation');
},
{ once: true },
);
};

return (
<>
<OCSection />
<VCSection />
<button onClick={() => setDisplayGame(!displayGame)} className="exec-display-toggle">
{displayGame ? 'Display in Regular View' : 'Display in Game View!'}
</button>
{displayGame ? (
<div className="exec-game-container">
<button onClick={getNextExec} ref={machineRef}>
<LazyLoadImage
src={placeholder}
alt="exec-game-machine"
className="exec-game-machine"
/>
</button>
{execIndex < execInfo.ocs.length ? (
<div className="aboutus-oc-grid-container">
<ExecProfile
key={execInfo.ocs[execIndex].name}
className="oc-grid-item"
image={execInfo.ocs[execIndex].image}
name={execInfo.ocs[execIndex].name}
role={execInfo.ocs[execIndex].role}
discipline={execInfo.ocs[execIndex].discipline}
roleDescription={execInfo.ocs[execIndex].description}
exec={true}
/>
</div>
) : (
<div className="aboutus-vc-grid-container">
{execInfo.vcs[execIndex - execInfo.ocs.length] && (
<ExecProfile
key={execInfo.vcs[execIndex - execInfo.ocs.length].name}
className="vc-grid-item"
image={execInfo.vcs[execIndex - execInfo.ocs.length].image}
name={execInfo.vcs[execIndex - execInfo.ocs.length].name}
role={execInfo.vcs[execIndex - execInfo.ocs.length].role}
discipline={execInfo.vcs[execIndex - execInfo.ocs.length].discipline}
roleDescription={execInfo.vcs[execIndex - execInfo.ocs.length].description}
exec={true}
/>
)}
</div>
)}
</div>
) : (
<>
<OCSection />
<VCSection />
</>
)}
</>
);
};
Expand Down
89 changes: 89 additions & 0 deletions client/src/pages/About/About.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@
align-items: center;
padding: 25px 10px 10px 10px;
}

.exec-title {
text-align: center;
font-size: 48px;
Expand All @@ -171,6 +172,94 @@
}
}

.exec-display-toggle {
display: block;
margin: 0 auto;
padding: 12px;
text-align: center;
background-color: var(--bg-primary);
color: var(--text-primary);
font-family: 'Staatliches', sans-serif;
border-radius: 100px;
width: 200px;
height: auto;
font-size: 20px;
cursor: url('../../assets/cursor/pointer.png'), auto !important;
margin-bottom: 20px;

@include devices(tablet) {
width: 150px;
height: 40px;
font-size: 18px;
}
}

.exec-game-container {
display: flex;
align-items: center;
width: 100%;
height: auto;

@include devices(tablet) {
width: 85vw;
margin-bottom: 10px;
}
}

.exec-game-machine {
width: 30%;
height: auto;
margin-bottom: 20px;
border-radius: 10px;
object-fit: contain;

@include devices(tablet) {
width: 30vw;
height: auto;
margin-bottom: 10px;
}
}

@keyframes shake {
0% {
transform: translate(1px, 1px) rotate(0deg);
}
10% {
transform: translate(-1px, -2px) rotate(-1deg);
}
20% {
transform: translate(-3px, 0px) rotate(1deg);
}
30% {
transform: translate(3px, 2px) rotate(0deg);
}
40% {
transform: translate(1px, -1px) rotate(1deg);
}
50% {
transform: translate(-1px, 2px) rotate(-1deg);
}
60% {
transform: translate(-3px, 1px) rotate(0deg);
}
70% {
transform: translate(3px, 1px) rotate(-1deg);
}
80% {
transform: translate(-1px, -1px) rotate(1deg);
}
90% {
transform: translate(1px, 2px) rotate(0deg);
}
100% {
transform: translate(1px, -2px) rotate(-1deg);
}
}

.shake-animation {
animation: shake 2s;
}

// VC GRID
.aboutus-oc-grid-container {
display: grid;
Expand Down