Skip to content

Feature/ganeshkumar321/fe mobile formatting #14

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
ganeshkumar321 merged 3 commits into from
Nov 27, 2024
Merged

Feature/ganeshkumar321/fe mobile formatting #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ae3ede
mobile formatting for the about page
ganeshkumar321 Nov 14, 2024
b6fb499
Merge remote-tracking branch 'origin/main' into feature/ganeshkumar32…
ganeshkumar321 Nov 20, 2024
ac332c3
Merge remote-tracking branch 'origin/main' into feature/ganeshkumar32…
ganeshkumar321 Nov 27, 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
14 changes: 12 additions & 2 deletions frontend/src/components/About/About.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,20 @@ const About = () => {
item
sm={4}
lg={3}
sx={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}
sx={{width: '100%', display: 'flex', alignItems: 'center', justifyContent: { xs: 'center', sm: 'flex-start' }}}
>
<motion.div
ref={ref}
initial={{ x: -100, opacity: 0 }}
animate={isInView ? { x: 0, opacity: 1 } : {}}
transition={{ type: 'spring', stiffness: 50, damping: 20, mass: 1, delay: 0.2 }}
style={{
width: '100%',
display: 'flex',
justifyContent: 'center'
}}
>
<img src={books} alt="img" style={{ width: '80%' }} />
<img src={books} alt="img" style={{ width: '80%'}} />
</motion.div>
</Grid>
<Grid item sm={5} lg={5}>
Expand Down Expand Up @@ -175,6 +180,11 @@ const About = () => {
initial={{ x: 100, opacity: 0 }}
animate={isInView ? { x: 0, opacity: 1 } : {}}
transition={{ type: 'spring', stiffness: 50, damping: 20, mass: 1, delay: 0.6 }}
style={{
width: '100%',
display: 'flex',
justifyContent: 'center'
}}
>
<img src={lightBulb} alt="img" />
</motion.div>
Expand Down
164 changes: 96 additions & 68 deletions frontend/src/components/About/HowToJoin.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,82 +16,110 @@ const HowtoJoin = () => {
const ref1 = useRef(null);

useEffect(() => {
const currentRef = ref1.current; // Copy ref1 to a local variable

const observer = new IntersectionObserver(
([entry]) => {
if (entry.isIntersecting) {
setIsInView1(true);
observer.disconnect(); // Disconnect after first trigger
}
},
{
threshold: 0.1, // Adjust this value as needed
}
);

if (currentRef) {
observer.observe(currentRef);
}

return () => {
const currentRef = ref1.current;

const observer = new IntersectionObserver(
([entry]) => {
if (entry.isIntersecting) {
setIsInView1(true);
observer.disconnect();
}
},
{
threshold: 0.1,
}
);

if (currentRef) {
observer.unobserve(currentRef); // Use the local variable for cleanup
observer.observe(currentRef);
}
};

return () => {
if (currentRef) {
observer.unobserve(currentRef);
}
};
}, [ref1]);

return (
<motion.div
ref={ref1}
initial={{ x: 100, opacity: 0 }}
animate={isInView1 ? { x: 0, opacity: 1 } : {}}
transition={{ type: 'spring', stiffness: 50, damping: 20, mass: 1, delay: 0.6 }}
>
<Container maxWidth="xl" sx={styles.body}>
<Box sx={{ maxWidth: '90%', margin: '0 auto' }}>
<Grid
container
justifyContent="center"
mt={12}
mb={12}
direction={isSmallScreen ? 'column-reverse' : 'row'}
>
<Grid item sm={7} pl={{ lg: '8%' }}>
<Box sx={{ color: 'white', textAlign: { md: 'left', sm: 'left', xs: 'center' } }}>
<h1>How do I join?</h1>
</Box>
<Box sx={{ color: 'white', textAlign: { lg: 'left', sm: 'left', xs: 'center' } }}>
<p style={{ color: 'white', fontSize: 'clamp(15px, 3vw, 20px)' }}>
To become a general member, simply sign up with your UCSD email!
</p>
<p style={{ color: 'white', fontSize: 'clamp(15px, 3vw, 20px)' }}>
Do you want to be a part of the internal team? Become a member and follow us
on our socials to be notified of when board applications open on a rolling
basis.
</p>
<Box
sx={{
marginLeft: '-2%',
display: 'flex',
justifyContent: { xs: 'center', sm: 'left' },
}}
<Container disableGutters sx={{ width: '100%', backgroundColor: 'rgba(0,0,0,0.8)', marginTop: { xs: '15%', sm: '10%', md: '5%' }}}>
<Grid
container
spacing={2}
sx={{
padding: { xs: '6% 4%', sm: '4% 6%', md: '5% 5%' },
justifyContent: 'center',
alignItems: 'center'
}}
>
<Grid item xs={12} sm={7} order={{ xs: 1, sm: 2 }}>
<motion.div
ref={ref1}
initial={{ opacity: 0 }}
animate={isInView1 ? { opacity: 1 } : {}}
transition={{ duration: 1 }}
>
<Button
size="large"
text="Become a Member ->"
onClick={() => navigate('/membership')}
/>
</Box>
</Box>
<Box
sx={{
...styles.mainTitleTop,
textAlign: 'center',
fontSize: 'clamp(32px, 8vw, 65px)',
marginBottom: '3%'
}}
>
How do I join?
</Box>
<p style={{
color: 'white',
fontSize: 'clamp(15px, 3vw, 20px)',
margin: '0 auto',
maxWidth: '800px'
}}>
To become a general member, simply sign up with your UCSD email!
</p>
<p style={{
color: 'white',
fontSize: 'clamp(15px, 3vw, 20px)',
margin: '20px auto',
maxWidth: '800px'
}}>
Do you want to be a part of the internal team? Become a member and follow us on our socials to be notified of when board applications open on a rolling basis.
</p>
<Box sx={{ display: 'flex', justifyContent: 'center', marginTop: '30px' }}>
<Button
text="Become a Member ->"
onClick={() => navigate('/membership')}
/>
</Box>
</motion.div>
</Grid>
<Grid item sm={5} pl={{ lg: '2%' }} pr={{ lg: '8%' }}>
<ImageWithBoxShadow src={about3} alt="img" />
<Grid item xs={12} sm={5} sx={{ textAlign: 'center' }}>
<Box sx={{
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
height: '100%',
width: '100%',
maxWidth: { xs: '100%', sm: '400px' }, // Added maxWidth constraint
margin: '0 auto'
}}>
<Box sx={{
width: '100%',
height: 'auto',
position: 'relative',
'& > *': { // This targets the ImageWithBoxShadow component
width: '100% !important',
height: 'auto !important',
maxWidth: '100%',
objectFit: 'contain'
}
}}>
<ImageWithBoxShadow src={about3} alt="img" />
</Box>
</Box>
</Grid>
</Grid>
</Box>
</Container>
</motion.div>
</Grid>
</Container>
);
};

Expand Down