Skip to content

Commit bc4cde7

Browse files
junjun107cursoragent
junjun107
and
cursoragent
committed
Address MUI v7 review feedback for layout, types, and cleanup.
Restore nested Grid widths, type the admin Data Grid row, drop unused MUI packages, and apply remaining v7 API/style nits from review. Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent a7e3ab0 commit bc4cde7

16 files changed

Lines changed: 339 additions & 193 deletions

File tree

‎client/package-lock.json‎

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client/package.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
"@mapbox/geo-viewport": "^0.4.1",
2424
"@mui/icons-material": "^7.0.0",
2525
"@mui/material": "^7.0.0",
26-
"@mui/system": "^7.0.0",
27-
"@mui/utils": "^7.0.0",
2826
"@mui/x-data-grid": "^7.29.9",
2927
"@mui/x-date-pickers": "^7.29.4",
3028
"@testing-library/dom": "^10.4.0",
@@ -87,7 +85,7 @@
8785
"vite-tsconfig-paths": "^5.0.1"
8886
},
8987
"overrides": {
90-
"react-is": "18.3.1",
88+
"react-is": "18.3.1",
9189
"react-scripts": {
9290
"nth-check": "^2.1.1",
9391
"postcss": "^8.4.33",

‎client/src/components/Account/Profile.tsx‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,9 @@ export default function Profile() {
8484
size={{
8585
xs: 4,
8686
sm: 3,
87-
md: 2
88-
}}>
87+
md: 2,
88+
}}
89+
>
8990
<Typography variant="h4" component="h4" color={headingText}>
9091
First Name
9192
</Typography>
@@ -94,8 +95,9 @@ export default function Profile() {
9495
size={{
9596
xs: 8,
9697
sm: 9,
97-
md: 10
98-
}}>
98+
md: 10,
99+
}}
100+
>
99101
{!fields.firstName ? (
100102
<Typography variant="h4" component="h4" color={bodyText}>
101103
{user.firstName}
@@ -138,8 +140,9 @@ export default function Profile() {
138140
size={{
139141
xs: 4,
140142
sm: 3,
141-
md: 2
142-
}}>
143+
md: 2,
144+
}}
145+
>
143146
<Typography variant="h4" component="h4" color={headingText}>
144147
Last Name
145148
</Typography>
@@ -148,8 +151,9 @@ export default function Profile() {
148151
size={{
149152
xs: 8,
150153
sm: 9,
151-
md: 10
152-
}}>
154+
md: 10,
155+
}}
156+
>
153157
{!fields.lastName ? (
154158
<Typography variant="h4" component="h4" color={bodyText}>
155159
{user.lastName}
@@ -192,8 +196,9 @@ export default function Profile() {
192196
size={{
193197
xs: 4,
194198
sm: 3,
195-
md: 2
196-
}}>
199+
md: 2,
200+
}}
201+
>
197202
<Typography variant="h4" component="h4" color={headingText}>
198203
Email
199204
</Typography>
@@ -202,8 +207,9 @@ export default function Profile() {
202207
size={{
203208
xs: 8,
204209
sm: 9,
205-
md: 10
206-
}}>
210+
md: 10,
211+
}}
212+
>
207213
{!fields.emailID ? (
208214
<Typography variant="h4" component="h4" color={bodyText}>
209215
{user.email}

‎client/src/components/Admin/OpenTimeForm.tsx‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,9 @@ const OpenTimeForm = ({
128128
<Grid
129129
size={{
130130
xs: 8,
131-
sm: 2
132-
}}>
131+
sm: 2,
132+
}}
133+
>
133134
<FormControl variant="outlined" fullWidth>
134135
<Select
135136
id="interval-select"
@@ -170,8 +171,9 @@ const OpenTimeForm = ({
170171
<Grid
171172
size={{
172173
xs: 8,
173-
sm: 2
174-
}}>
174+
sm: 2,
175+
}}
176+
>
175177
<FormControl variant="outlined" fullWidth>
176178
<Select
177179
labelId="open-days-select-id"
@@ -215,8 +217,9 @@ const OpenTimeForm = ({
215217
<Grid
216218
size={{
217219
xs: 8,
218-
sm: 3
219-
}}>
220+
sm: 3,
221+
}}
222+
>
220223
<DesktopTimePicker
221224
value={
222225
hour.open ? dayjs(hour.open, "HH:mm:ss") : null
@@ -268,8 +271,9 @@ const OpenTimeForm = ({
268271
<Grid
269272
size={{
270273
xs: 8,
271-
sm: 3
272-
}}>
274+
sm: 3,
275+
}}
276+
>
273277
<DesktopTimePicker
274278
value={
275279
hour.close
@@ -361,8 +365,9 @@ const OpenTimeForm = ({
361365
sx={{ display: "flex", alignItems: "center" }}
362366
size={{
363367
xs: 2,
364-
sm: 1
365-
}}>
368+
sm: 1,
369+
}}
370+
>
366371
<IconButton
367372
icon="cancel"
368373
color="error"
@@ -375,8 +380,9 @@ const OpenTimeForm = ({
375380
sx={{ display: "flex", alignItems: "center" }}
376381
size={{
377382
xs: 2,
378-
sm: 1
379-
}}>
383+
sm: 1,
384+
}}
385+
>
380386
<IconButton
381387
icon="copy"
382388
color="primary"

‎client/src/components/Admin/OrganizationEdit/BusinessHours.tsx‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import Label from "../ui/Label";
55
import Textarea from "../ui/Textarea";
66
import { OrganizationSectionWithSetFieldTouchedProps } from "types/Organization";
77

8-
interface BusinessHoursProps extends OrganizationSectionWithSetFieldTouchedProps {
8+
interface BusinessHoursProps
9+
extends OrganizationSectionWithSetFieldTouchedProps {
910
confirmationErrors?: Record<string, string>;
1011
}
1112

@@ -35,19 +36,25 @@ export default function BusinessHours({
3536
}}
3637
>
3738
<FormControlLabel
38-
componentsProps={{
39+
slotProps={{
3940
typography: {
4041
sx: {
41-
color: confirmationErrors["confirmedHours"] ? "error.main" : "inherit",
42-
}
43-
}
42+
color: confirmationErrors["confirmedHours"]
43+
? "error.main"
44+
: "inherit",
45+
},
46+
},
4447
}}
4548
control={
4649
<Checkbox
4750
name="confirmedHours"
4851
value={values.confirmedHours}
4952
checked={values.confirmedHours}
50-
sx={{ color: confirmationErrors["confirmedHours"] ? "error.main" : "inherit" }}
53+
sx={{
54+
color: confirmationErrors["confirmedHours"]
55+
? "error.main"
56+
: "inherit",
57+
}}
5158
onChange={() =>
5259
setFieldValue("confirmedHours", !values.confirmedHours)
5360
}

‎client/src/components/Admin/OrganizationEdit/ContactDetails.tsx‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ export default function ContactDetails({
3737
<Grid
3838
size={{
3939
sm: 6,
40-
xs: 12
41-
}}>
40+
xs: 12,
41+
}}
42+
>
4243
<div>
4344
<Label
4445
id="instagram"
@@ -61,8 +62,9 @@ export default function ContactDetails({
6162
<Grid
6263
size={{
6364
sm: 6,
64-
xs: 12
65-
}}>
65+
xs: 12,
66+
}}
67+
>
6668
<div>
6769
<Label
6870
id="facebook"
@@ -85,8 +87,9 @@ export default function ContactDetails({
8587
<Grid
8688
size={{
8789
sm: 6,
88-
xs: 12
89-
}}>
90+
xs: 12,
91+
}}
92+
>
9093
<div>
9194
<Label
9295
id="twitter-label"
@@ -109,8 +112,9 @@ export default function ContactDetails({
109112
<Grid
110113
size={{
111114
sm: 6,
112-
xs: 12
113-
}}>
115+
xs: 12,
116+
}}
117+
>
114118
<div>
115119
<Label
116120
id="pinterest"
@@ -133,8 +137,9 @@ export default function ContactDetails({
133137
<Grid
134138
size={{
135139
sm: 6,
136-
xs: 12
137-
}}>
140+
xs: 12,
141+
}}
142+
>
138143
<div>
139144
<Label
140145
id="linkedin"

‎client/src/components/Admin/OrganizationEdit/Donations.tsx‎

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ export default function Donations({
2424
<Grid
2525
size={{
2626
xs: 12,
27-
sm: 6
28-
}}>
27+
sm: 6,
28+
}}
29+
>
2930
<div>
3031
<Label
3132
id="donationContactName"
@@ -52,8 +53,9 @@ export default function Donations({
5253
<Grid
5354
size={{
5455
xs: 12,
55-
sm: 6
56-
}}>
56+
sm: 6,
57+
}}
58+
>
5759
<div>
5860
<Label
5961
id="donationContactPhone"
@@ -80,8 +82,9 @@ export default function Donations({
8082
<Grid
8183
size={{
8284
xs: 12,
83-
sm: 6
84-
}}>
85+
sm: 6,
86+
}}
87+
>
8588
<div>
8689
<Label
8790
id="donationContactEmail"
@@ -108,8 +111,9 @@ export default function Donations({
108111
<Grid
109112
size={{
110113
xs: 12,
111-
sm: 6
112-
}}>
114+
sm: 6,
115+
}}
116+
>
113117
<div>
114118
<Label
115119
id="donationSchedule"
@@ -153,8 +157,9 @@ export default function Donations({
153157
<Grid
154158
size={{
155159
xs: 12,
156-
sm: 4
157-
}}>
160+
sm: 4,
161+
}}
162+
>
158163
<Tooltip title="Check if organization can accept frozen food">
159164
<FormControlLabel
160165
control={
@@ -178,8 +183,9 @@ export default function Donations({
178183
<Grid
179184
size={{
180185
xs: 12,
181-
sm: 4
182-
}}>
186+
sm: 4,
187+
}}
188+
>
183189
<Tooltip title="Check if organization can accept refrigerated food">
184190
<FormControlLabel
185191
control={
@@ -203,8 +209,9 @@ export default function Donations({
203209
<Grid
204210
size={{
205211
xs: 12,
206-
sm: 4
207-
}}>
212+
sm: 4,
213+
}}
214+
>
208215
<Tooltip title="Check if organization can accept perishables">
209216
<FormControlLabel
210217
control={
@@ -229,8 +236,9 @@ export default function Donations({
229236
<Grid
230237
size={{
231238
xs: 12,
232-
sm: 6
233-
}}>
239+
sm: 6,
240+
}}
241+
>
234242
<div>
235243
<Label
236244
id="donationDeliveryInstructions"
@@ -259,8 +267,9 @@ export default function Donations({
259267
<Grid
260268
size={{
261269
xs: 12,
262-
sm: 6
263-
}}>
270+
sm: 6,
271+
}}
272+
>
264273
<div>
265274
<Label
266275
id="donationNotes"

0 commit comments

Comments
 (0)