Skip to content

Commit c82b2d3

Browse files
ShchepotinShchepotin
committed
feat: replace deprecated
1 parent 6e60ca1 commit c82b2d3

File tree

20 files changed

+156
-147
lines changed

20 files changed

+156
-147
lines changed

‎.hygen/generate/resource/create/page-content.ejs.t‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ to: src/app/[language]/admin-panel/<%= h.inflection.transform(name, ['pluralize'
66
import Button from "@mui/material/Button";
77
import { useForm, FormProvider, useFormState } from "react-hook-form";
88
import Container from "@mui/material/Container";
9-
import Grid from "@mui/material/Grid";
9+
import Grid from "@mui/material/Grid2";
1010
import Typography from "@mui/material/Typography";
1111
import FormTextInput from "@/components/form/text-input/form-text-input";
1212
import * as yup from "yup";

‎.hygen/generate/resource/page-content.ejs.t‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { RoleEnum } from "@/services/api/types/role";
77
import withPageRequiredAuth from "@/services/auth/with-page-required-auth";
88
import { useTranslation } from "@/services/i18n/client";
99
import Container from "@mui/material/Container";
10-
import Grid from "@mui/material/Grid";
10+
import Grid from "@mui/material/Grid2";
1111
import Typography from "@mui/material/Typography";
1212
import { useCallback, useMemo, useRef, useState } from "react";
1313
import { useGet<%= h.inflection.transform(name, ['pluralize']) %>Query, <%= h.inflection.camelize(h.inflection.pluralize(name), true) %>QueryKeys } from "./queries/queries";
@@ -190,12 +190,12 @@ function <%= h.inflection.transform(name, ['pluralize']) %>() {
190190
return (
191191
<Container maxWidth="xl">
192192
<Grid container spacing={3} pt={3}>
193-
<Grid container item spacing={3} xs={12}>
194-
<Grid item xs>
193+
<Grid container size={{ xs: 12 }} spacing={3}>
194+
<Grid size="grow">
195195
<Typography variant="h3">{t("title")}</Typography>
196196
</Grid>
197-
<Grid container item xs="auto" wrap="nowrap" spacing={2}>
198-
<Grid item xs="auto">
197+
<Grid container size="auto" wrap="nowrap" spacing={2}>
198+
<Grid size="auto">
199199
<Button
200200
variant="contained"
201201
LinkComponent={Link}
@@ -208,7 +208,7 @@ function <%= h.inflection.transform(name, ['pluralize']) %>() {
208208
</Grid>
209209
</Grid>
210210

211-
<Grid item xs={12} mb={2}>
211+
<Grid size={{ xs: 12 }} mb={2}>
212212
<TableVirtuoso
213213
useWindowScroll
214214
data={tableData}

‎src/app/[language]/admin-panel/page-content.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { RoleEnum } from "@/services/api/types/role";
44
import withPageRequiredAuth from "@/services/auth/with-page-required-auth";
55
import { useTranslation } from "@/services/i18n/client";
66
import Container from "@mui/material/Container";
7-
import Grid from "@mui/material/Grid";
7+
import Grid from "@mui/material/Grid2";
88
import Typography from "@mui/material/Typography";
99

1010
function AdminPanel() {
@@ -13,7 +13,7 @@ function AdminPanel() {
1313
return (
1414
<Container maxWidth="md">
1515
<Grid container spacing={3} wrap="nowrap" pt={3}>
16-
<Grid item>
16+
<Grid>
1717
<Typography variant="h3" gutterBottom>
1818
{t("title")}
1919
</Typography>

‎src/app/[language]/admin-panel/users/create/page-content.tsx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import Button from "@mui/material/Button";
44
import { useForm, FormProvider, useFormState } from "react-hook-form";
55
import Container from "@mui/material/Container";
6-
import Grid from "@mui/material/Grid";
6+
import Grid from "@mui/material/Grid2";
77
import Typography from "@mui/material/Typography";
88
import FormTextInput from "@/components/form/text-input/form-text-input";
99
import * as yup from "yup";
@@ -151,19 +151,19 @@ function FormCreateUser() {
151151
<Container maxWidth="xs">
152152
<form onSubmit={onSubmit} autoComplete="create-new-user">
153153
<Grid container spacing={2} mb={3} mt={3}>
154-
<Grid item xs={12}>
154+
<Grid size={{ xs: 12 }}>
155155
<Typography variant="h6">
156156
{t("admin-panel-users-create:title")}
157157
</Typography>
158158
</Grid>
159-
<Grid item xs={12}>
159+
<Grid size={{ xs: 12 }}>
160160
<FormAvatarInput<CreateUserFormData>
161161
name="photo"
162162
testId="photo"
163163
/>
164164
</Grid>
165165

166-
<Grid item xs={12}>
166+
<Grid size={{ xs: 12 }}>
167167
<FormTextInput<CreateUserFormData>
168168
name="email"
169169
testId="new-user-email"
@@ -172,7 +172,7 @@ function FormCreateUser() {
172172
/>
173173
</Grid>
174174

175-
<Grid item xs={12}>
175+
<Grid size={{ xs: 12 }}>
176176
<FormTextInput<CreateUserFormData>
177177
name="password"
178178
type="password"
@@ -182,7 +182,7 @@ function FormCreateUser() {
182182
/>
183183
</Grid>
184184

185-
<Grid item xs={12}>
185+
<Grid size={{ xs: 12 }}>
186186
<FormTextInput<CreateUserFormData>
187187
name="passwordConfirmation"
188188
testId="new-user-password-confirmation"
@@ -193,23 +193,23 @@ function FormCreateUser() {
193193
/>
194194
</Grid>
195195

196-
<Grid item xs={12}>
196+
<Grid size={{ xs: 12 }}>
197197
<FormTextInput<CreateUserFormData>
198198
name="firstName"
199199
testId="first-name"
200200
label={t("admin-panel-users-create:inputs.firstName.label")}
201201
/>
202202
</Grid>
203203

204-
<Grid item xs={12}>
204+
<Grid size={{ xs: 12 }}>
205205
<FormTextInput<CreateUserFormData>
206206
name="lastName"
207207
testId="last-name"
208208
label={t("admin-panel-users-create:inputs.lastName.label")}
209209
/>
210210
</Grid>
211211

212-
<Grid item xs={12}>
212+
<Grid size={{ xs: 12 }}>
213213
<FormSelectInput<CreateUserFormData, Pick<Role, "id">>
214214
name="role"
215215
testId="role"
@@ -229,7 +229,7 @@ function FormCreateUser() {
229229
/>
230230
</Grid>
231231

232-
<Grid item xs={12}>
232+
<Grid size={{ xs: 12 }}>
233233
<CreateUserFormActions />
234234
<Box ml={1} component="span">
235235
<Button

‎src/app/[language]/admin-panel/users/edit/[id]/page-content.tsx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import Button from "@mui/material/Button";
44
import { useForm, FormProvider, useFormState } from "react-hook-form";
55
import Container from "@mui/material/Container";
6-
import Grid from "@mui/material/Grid";
6+
import Grid from "@mui/material/Grid2";
77
import Typography from "@mui/material/Typography";
88
import FormTextInput from "@/components/form/text-input/form-text-input";
99
import * as yup from "yup";
@@ -204,40 +204,40 @@ function FormEditUser() {
204204
<Container maxWidth="xs">
205205
<form onSubmit={onSubmit}>
206206
<Grid container spacing={2} mb={3} mt={3}>
207-
<Grid item xs={12}>
207+
<Grid size={{ xs: 12 }}>
208208
<Typography variant="h6">
209209
{t("admin-panel-users-edit:title1")}
210210
</Typography>
211211
</Grid>
212-
<Grid item xs={12}>
212+
<Grid size={{ xs: 12 }}>
213213
<FormAvatarInput<EditUserFormData> name="photo" testId="photo" />
214214
</Grid>
215215

216-
<Grid item xs={12}>
216+
<Grid size={{ xs: 12 }}>
217217
<FormTextInput<EditUserFormData>
218218
name="email"
219219
testId="email"
220220
label={t("admin-panel-users-edit:inputs.email.label")}
221221
/>
222222
</Grid>
223223

224-
<Grid item xs={12}>
224+
<Grid size={{ xs: 12 }}>
225225
<FormTextInput<EditUserFormData>
226226
name="firstName"
227227
testId="first-name"
228228
label={t("admin-panel-users-edit:inputs.firstName.label")}
229229
/>
230230
</Grid>
231231

232-
<Grid item xs={12}>
232+
<Grid size={{ xs: 12 }}>
233233
<FormTextInput<EditUserFormData>
234234
name="lastName"
235235
testId="last-name"
236236
label={t("admin-panel-users-edit:inputs.lastName.label")}
237237
/>
238238
</Grid>
239239

240-
<Grid item xs={12}>
240+
<Grid size={{ xs: 12 }}>
241241
<FormSelectInput<EditUserFormData, Pick<Role, "id">>
242242
name="role"
243243
testId="role"
@@ -257,7 +257,7 @@ function FormEditUser() {
257257
/>
258258
</Grid>
259259

260-
<Grid item xs={12}>
260+
<Grid size={{ xs: 12 }}>
261261
<EditUserFormActions />
262262
<Box ml={1} component="span">
263263
<Button
@@ -326,21 +326,21 @@ function FormChangePasswordUser() {
326326
<Container maxWidth="xs">
327327
<form onSubmit={onSubmit}>
328328
<Grid container spacing={2} mb={3} mt={3}>
329-
<Grid item xs={12}>
329+
<Grid size={{ xs: 12 }}>
330330
<Typography variant="h6">
331331
{t("admin-panel-users-edit:title2")}
332332
</Typography>
333333
</Grid>
334334

335-
<Grid item xs={12}>
335+
<Grid size={{ xs: 12 }}>
336336
<FormTextInput<ChangeUserPasswordFormData>
337337
name="password"
338338
type="password"
339339
label={t("admin-panel-users-edit:inputs.password.label")}
340340
/>
341341
</Grid>
342342

343-
<Grid item xs={12}>
343+
<Grid size={{ xs: 12 }}>
344344
<FormTextInput<ChangeUserPasswordFormData>
345345
name="passwordConfirmation"
346346
label={t(
@@ -350,7 +350,7 @@ function FormChangePasswordUser() {
350350
/>
351351
</Grid>
352352

353-
<Grid item xs={12}>
353+
<Grid size={{ xs: 12 }}>
354354
<ChangePasswordUserFormActions />
355355
<Box ml={1} component="span">
356356
<Button

‎src/app/[language]/admin-panel/users/page-content.tsx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { RoleEnum } from "@/services/api/types/role";
44
import withPageRequiredAuth from "@/services/auth/with-page-required-auth";
55
import { useTranslation } from "@/services/i18n/client";
66
import Container from "@mui/material/Container";
7-
import Grid from "@mui/material/Grid";
7+
import Grid from "@mui/material/Grid2";
88
import Typography from "@mui/material/Typography";
99
import {
1010
PropsWithChildren,
@@ -297,17 +297,17 @@ function Users() {
297297
return (
298298
<Container maxWidth="xl">
299299
<Grid container spacing={3} pt={3}>
300-
<Grid container item spacing={3} xs={12}>
301-
<Grid item xs>
300+
<Grid container spacing={3} size={{ xs: 12 }}>
301+
<Grid size="grow">
302302
<Typography variant="h3">
303303
{tUsers("admin-panel-users:title")}
304304
</Typography>
305305
</Grid>
306-
<Grid container item xs="auto" wrap="nowrap" spacing={2}>
307-
<Grid item xs="auto">
306+
<Grid container size="auto" wrap="nowrap" spacing={2}>
307+
<Grid size="auto">
308308
<UserFilter />
309309
</Grid>
310-
<Grid item xs="auto">
310+
<Grid size="auto">
311311
<Button
312312
variant="contained"
313313
LinkComponent={Link}
@@ -320,7 +320,7 @@ function Users() {
320320
</Grid>
321321
</Grid>
322322

323-
<Grid item xs={12} mb={2}>
323+
<Grid size={{ xs: 12 }} mb={2}>
324324
<TableVirtuoso
325325
style={{ height: 500 }}
326326
data={result}

‎src/app/[language]/admin-panel/users/user-filter.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Role, RoleEnum } from "@/services/api/types/role";
55
import { useTranslation } from "@/services/i18n/client";
66
import Button from "@mui/material/Button";
77
import Container from "@mui/material/Container";
8-
import Grid from "@mui/material/Grid";
8+
import Grid from "@mui/material/Grid2";
99
import Popover from "@mui/material/Popover";
1010
import { useRouter, useSearchParams } from "next/navigation";
1111
import { useEffect, useState } from "react";
@@ -76,7 +76,7 @@ function UserFilter() {
7676
})}
7777
>
7878
<Grid container spacing={2} mb={3} mt={3}>
79-
<Grid item xs={12}>
79+
<Grid size={{ xs: 12 }}>
8080
<FormMultipleSelectInput<UserFilterFormData, Pick<Role, "id">>
8181
name="roles"
8282
testId="roles"
@@ -106,7 +106,7 @@ function UserFilter() {
106106
}
107107
/>
108108
</Grid>
109-
<Grid item xs={12}>
109+
<Grid size={{ xs: 12 }}>
110110
<Button variant="contained" type="submit">
111111
{t("admin-panel-users:filter.actions.apply")}
112112
</Button>

‎src/app/[language]/confirm-email/page-content.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { useAuthConfirmEmailService } from "@/services/api/services/auth";
77
import { useRouter } from "next/navigation";
88
import { useSnackbar } from "notistack";
99
import Container from "@mui/material/Container";
10-
import Grid from "@mui/material/Grid";
10+
import Grid from "@mui/material/Grid2";
1111
import HTTP_CODES_ENUM from "@/services/api/types/http-codes";
1212
import { useTranslation } from "@/services/i18n/client";
1313

@@ -47,7 +47,7 @@ export default function ConfirmEmail() {
4747
return (
4848
<Container maxWidth="sm">
4949
<Grid container>
50-
<Grid item xs={12}>
50+
<Grid size={{ xs: 12 }}>
5151
<Box
5252
sx={{
5353
display: "flex",

‎src/app/[language]/confirm-new-email/page-content.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
import { useRouter } from "next/navigation";
1111
import { useSnackbar } from "notistack";
1212
import Container from "@mui/material/Container";
13-
import Grid from "@mui/material/Grid";
13+
import Grid from "@mui/material/Grid2";
1414
import HTTP_CODES_ENUM from "@/services/api/types/http-codes";
1515
import { useTranslation } from "@/services/i18n/client";
1616
import useAuthActions from "@/services/auth/use-auth-actions";
@@ -76,7 +76,7 @@ export default function ConfirmNewEmail() {
7676
return (
7777
<Container maxWidth="sm">
7878
<Grid container>
79-
<Grid item xs={12}>
79+
<Grid size={{ xs: 12 }}>
8080
<Box
8181
sx={{
8282
display: "flex",

‎src/app/[language]/forgot-password/page-content.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import withPageRequiredGuest from "@/services/auth/with-page-required-guest";
44
import { useForm, FormProvider, useFormState } from "react-hook-form";
55
import { useAuthForgotPasswordService } from "@/services/api/services/auth";
66
import Container from "@mui/material/Container";
7-
import Grid from "@mui/material/Grid";
7+
import Grid from "@mui/material/Grid2";
88
import Typography from "@mui/material/Typography";
99
import FormTextInput from "@/components/form/text-input/form-text-input";
1010
import * as yup from "yup";
@@ -90,10 +90,10 @@ function Form() {
9090
<Container maxWidth="xs">
9191
<form onSubmit={onSubmit}>
9292
<Grid container spacing={2} mb={2}>
93-
<Grid item xs={12} mt={3}>
93+
<Grid size={{ xs: 12 }} mt={3}>
9494
<Typography variant="h6">{t("forgot-password:title")}</Typography>
9595
</Grid>
96-
<Grid item xs={12}>
96+
<Grid size={{ xs: 12 }}>
9797
<FormTextInput<ForgotPasswordFormData>
9898
name="email"
9999
label={t("forgot-password:inputs.email.label")}
@@ -102,7 +102,7 @@ function Form() {
102102
/>
103103
</Grid>
104104

105-
<Grid item xs={12}>
105+
<Grid size={{ xs: 12 }}>
106106
<FormActions />
107107
</Grid>
108108
</Grid>

0 commit comments

Comments
 (0)