Skip to content

migrate returninguser to mui #1764

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
JackHaeg merged 4 commits into from
May 15, 2025
Merged

migrate returninguser to mui #1764

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4369a9f
migrate returninguser to mui
angela-lee1 Sep 27, 2024
984295a
update branch
angela-lee1 Mar 24, 2025
95eeb24
Merge branch 'development' into update-to-mui-returninguser
JackHaeg May 13, 2025
2df4412
Merge branch 'development' into update-to-mui-returninguser
JackHaeg May 15, 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
56 changes: 42 additions & 14 deletions client/src/pages/ReturningUser.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,50 @@
import React, { useState } from 'react';

import ReadyEvents from '../components/ReadyEvents';
import { Box, Typography } from '@mui/material';

const ReturningUser = (props) => {
const [returningUser] = useState(true);
const [returningUser] = useState(true);

return (
<div className="flex-container">
<div className="returning">
<div className="returning-headers">
<h3>Welcome Back!</h3>
<h4>We're happy to see you</h4>
<ReadyEvents returningUser={returningUser}/>
</div>
</div>
</div>
)
return (
<Box
sx={{
display: 'flex',
flexDirection: 'column',
height: '100%',
width: '100%',
}}
>
<Box>
<Typography
variant="h3"
sx={{
fontSize: '39.2px',
fontWeight: 900,
textTransform: 'uppercase',
letterSpacing: '-0.7px',
fontFamily:
'"alisoregular", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif',
}}
>
Welcome Back!
</Typography>
<Typography
variant="h4"
sx={{
fontSize: '28px',
fontWeight: 800,
textTransform: 'uppercase',
letterSpacing: '-0.7px',
fontFamily:
'"alisoregular", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif',
}}
>
We're happy to see you
</Typography>
<ReadyEvents returningUser={returningUser} />
</Box>
</Box>
);
};

export default ReturningUser;

Loading