Skip to content

fixed some frontend mobile issues #17

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
nikhilitis merged 1 commit into from
Jan 15, 2025
Merged

fixed some frontend mobile issues #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion frontend/src/components/About/About.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ const About = () => {
>
WHAT DO WE DO?
</h1>
<Grid container sx={{ marginTop: '10%', display: 'flex', justifyContent: 'center' }}>
<Grid container sx={{ marginTop: '10%', display: 'flex', justifyContent: { xs: 'center', sm: 'flex-start' } }}>
<Grid
item
sm={4}
Expand All @@ -112,6 +112,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.2 }}
style={{
width: '100%',
display: 'flex',
justifyContent: 'center'
}}
>
<img src={books} alt="img" style={{ width: '80%' }} />
</motion.div>
Expand Down
167 changes: 99 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 @@ -5,7 +5,7 @@ import { Container, Box, Grid, createTheme, useMediaQuery } from '@mui/material'
import { aboutStyles } from './styles';
import about3 from '../../images/aboutpage/about_3.jpg';
import { ImageWithBoxShadow } from '../Opportunities/Opportunities';
import { motion } from "framer-motion"
import { motion } from "framer-motion";

const HowtoJoin = () => {
const navigate = useNavigate();
Expand All @@ -16,82 +16,113 @@ 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%',
<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'
}}
>
{/* Image Section - Now placed first */}
<Grid item xs={12} sm={5}>
<Box sx={{
display: 'flex',
justifyContent: { xs: 'center', sm: 'left' },
}}
>
<Button
size="large"
text="Become a Member ->"
onClick={() => navigate('/membership')}
/>
justifyContent: 'center',
alignItems: 'center',
height: '100%',
width: '100%',
maxWidth: { xs: '100%', sm: '400px' },
margin: '0 auto'
}}>
<Box sx={{
width: '100%',
height: 'auto',
position: 'relative',
'& > *': {
width: '100% !important',
height: 'auto !important',
maxWidth: '100%',
objectFit: 'contain'
}
}}>
<ImageWithBoxShadow src={about3} alt="img" />
</Box>
</Box>
</Box>
</Grid>
<Grid item sm={5} pl={{ lg: '2%' }} pr={{ lg: '8%' }}>
<ImageWithBoxShadow src={about3} alt="img" />

{/* Text Section */}
<Grid item xs={12} sm={7}>
<motion.div
ref={ref1}
initial={{ opacity: 0 }}
animate={isInView1 ? { opacity: 1 } : {}}
transition={{ duration: 1 }}
>
<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>
</Box>
</Container>
</motion.div>
</Grid>
</Container>
);
};

Expand Down