Skip to content

Commit 3c162f5

Browse files
dannyprikazdannyprikaz
authored
Merge branch 'development' into authToMui
2 parents 173284d + 189fb23 commit 3c162f5

File tree

6 files changed

+79
-40
lines changed

6 files changed

+79
-40
lines changed

‎client/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"react-hook-form": "^7.44.3",
3131
"react-router-dom": "^5.1.2",
3232
"validator": "^13.7.0",
33-
"vite": "^4.5.5",
33+
"vite": "^4.5.6",
3434
"vite-plugin-svgr": "^3.2.0"
3535
},
3636
"scripts": {

‎client/src/components/Form.jsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Form.jsx contains several unused components, including abstractions for button and form elements.
2+
// They are not currently being used in the codebase.
3+
14
import React from "react";
25

36
import "../sass/Form.scss";

‎client/src/components/manageProjects/editableMeeting.jsx‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React, { useState } from 'react';
22
import EventForm from './eventForm';
3+
import { Box, Button } from '@mui/material';
34
import '../../sass/ManageProjects.scss';
45

56
const EditableMeeting = ({
@@ -49,8 +50,8 @@ const EditableMeeting = ({
4950
formValues={formValues}
5051
formErrors={formErrors}
5152
>
52-
<div>
53-
<button
53+
<Box>
54+
<Button
5455
type="button"
5556
className="create-form-button"
5657
onClick={handleEventUpdate(
@@ -61,22 +62,22 @@ const EditableMeeting = ({
6162
)}
6263
>
6364
UPDATE
64-
</button>
65-
<button
65+
</Button>
66+
<Button
6667
type="button"
6768
className="create-form-button"
6869
onClick={handleResetEvent(eventId)}
6970
>
7071
RESET
71-
</button>
72-
<button
72+
</Button>
73+
<Button
7374
type="button"
7475
className="create-form-button"
7576
onClick={handleEventDelete(eventId)}
7677
>
7778
DELETE
78-
</button>
79-
</div>
79+
</Button>
80+
</Box>
8081
</EventForm>
8182
);
8283
};

‎client/src/components/presentational/upcomingEvent.jsx‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,34 @@ import React from "react";
22
import { ReactComponent as ClockIcon } from "../../svg/Icon_Clock.svg";
33
import { ReactComponent as LocationIcon } from "../../svg/Icon_Location.svg";
44
import { Link } from "react-router-dom";
5+
import { Box, Typography } from "@mui/material";
56

67
import moment from "moment";
78

89
const upcomingEvent = (props) => {
910
return props.nextEvent[0] ? (
10-
<div className="warning-event">
11-
<div className="warning-event-headers">
12-
<p className="event-name">{props.nextEvent[0].name}</p>
13-
<div className="event-info-wrapper">
11+
<Box className="warning-event">
12+
<Box className="warning-event-headers">
13+
<Typography className="event-name">{props.nextEvent[0].name}</Typography>
14+
<Box className="event-info-wrapper">
1415
<ClockIcon />
15-
<p className="event-info">
16+
<Typography className="event-info" sx={{ margin: '0px 0px 0px 12px' }}>
1617
{moment(props.nextEvent[0].date).format(
1718
"ddd, MMM D @ h:mm a"
1819
)}
19-
</p>
20-
</div>
20+
</Typography>
21+
</Box>
2122
{props.nextEvent[0].location.city !== "" &&
22-
<div className="event-info-wrapper">
23+
<Box className="event-info-wrapper">
2324
<LocationIcon />
24-
<p className="event-info">
25+
<Typography className="event-info" sx={{ margin: '0px 0px 0px 12px' }}>
2526
{props.nextEvent[0].location.city},{" "}
2627
{props.nextEvent[0].location.state}
27-
</p>
28-
</div>
28+
</Typography>
29+
</Box>
2930
}
30-
</div>
31-
<div className="warning-event-toggle">
31+
</Box>
32+
<Box className="warning-event-toggle">
3233
{props.nextEvent[0] && props.isCheckInReady === false ? (
3334
<Link
3435
to={`/events/${props.nextEvent[0]._id}`}
@@ -50,10 +51,10 @@ const upcomingEvent = (props) => {
5051
CLOSE CHECK-IN
5152
</Link>
5253
)}
53-
</div>
54-
</div>
54+
</Box>
55+
</Box>
5556
) : (
56-
<div>No events coming up!</div>
57+
<Box>No events coming up!</Box>
5758
);
5859
};
5960
export default upcomingEvent;

‎client/src/pages/UserProfile.jsx‎

Lines changed: 45 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,65 @@ import UserTable from '../components/presentational/profile/UserTable';
44
import UserEvents from '../components/presentational/profile/UserEvents';
55
import UserTeams from '../components/presentational/profile/UserTeams';
66
import { UserProvider, UserContext } from '../context/userContext';
7+
import { Box, Typography, Grid } from '@mui/material';
78

89
const UserProfile = (props) => (
910
<UserProvider>
10-
<div>
11-
<div className="profile__header">
12-
<h3 className="profile__title">My Profile</h3>
13-
</div>
11+
<Box>
12+
<Box style={{ backgroundColor: '#bad3ff' }}>
13+
<Typography
14+
variant="h3"
15+
component="h3"
16+
style={{
17+
fontSize: '24px',
18+
fontFamily: 'Source Code Pro, monospace',
19+
padding: '5px 23.4844px',
20+
fontWeight: 800,
21+
}}
22+
>
23+
My Profile
24+
</Typography>
25+
</Box>
1426
<UserContext.Consumer>
1527
{({ user, removeOption }) => (
1628
<UserTable context={{ user, removeOption }} />
1729
)}
1830
</UserContext.Consumer>
19-
<div className="profile__header">
20-
<h3 className="profile__subtitle">My Upcoming Events</h3>
21-
</div>
31+
<Box style={{ backgroundColor: '#bad3ff' }}>
32+
<Typography
33+
variant="h4"
34+
component="h4"
35+
style={{
36+
fontSize: '18.4px',
37+
fontFamily: 'Source Code Pro, monospace',
38+
padding: '5px 23.4844px',
39+
fontWeight: 800,
40+
}}
41+
>
42+
My Upcoming Events
43+
</Typography>
44+
</Box>
2245
<UserContext.Consumer>
2346
{({ events }) => <UserEvents context={{ events }} />}
2447
</UserContext.Consumer>
25-
<div className="profile__header">
26-
<h3 className="profile__subtitle">My Teams</h3>
27-
</div>
48+
<Box style={{ backgroundColor: '#bad3ff' }}>
49+
<Typography
50+
variant="h4"
51+
component="h4"
52+
style={{
53+
fontSize: '18.4px',
54+
fontFamily: 'Source Code Pro, monospace',
55+
padding: '5px 23.4844px',
56+
fontWeight: 800,
57+
}}
58+
>
59+
My Teams
60+
</Typography>
61+
</Box>
2862
<UserContext.Consumer>
2963
{({ teams }) => <UserTeams context={{ teams }} />}
3064
</UserContext.Consumer>
31-
</div>
65+
</Box>
3266
</UserProvider>
3367
);
3468

‎client/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5050,10 +5050,10 @@ vite-plugin-svgr@^3.2.0:
50505050
"@svgr/core" "^8.1.0"
50515051
"@svgr/plugin-jsx" "^8.1.0"
50525052

5053-
vite@^4.5.5:
5054-
version "4.5.5"
5055-
resolved "https://registry.yarnpkg.com/vite/-/vite-4.5.5.tgz#639b9feca5c0a3bfe3c60cb630ef28bf219d742e"
5056-
integrity sha512-ifW3Lb2sMdX+WU91s3R0FyQlAyLxOzCSCP37ujw0+r5POeHPwe6udWVIElKQq8gk3t7b8rkmvqC6IHBpCff4GQ==
5053+
vite@^4.5.6:
5054+
version "4.5.6"
5055+
resolved "https://registry.yarnpkg.com/vite/-/vite-4.5.6.tgz#48bbd97fe06e8241df2e625b31c581707e10b57d"
5056+
integrity sha512-ElBNuVvJKslxcfY2gMmae5IjaKGqCYGicCNZ+8R56sAznobeE3pI9ctzI17cBS/6OJh5YuQNMSN4BP4dRjugBg==
50575057
dependencies:
50585058
esbuild "^0.18.10"
50595059
postcss "^8.4.27"

0 commit comments

Comments
 (0)