Skip to content

feat: replace deprecated #504

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
Shchepotin merged 1 commit into from
Dec 28, 2024
Merged

feat: replace deprecated #504

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
2 changes: 1 addition & 1 deletion .hygen/generate/resource/create/page-content.ejs.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ to: src/app/[language]/admin-panel/<%= h.inflection.transform(name, ['pluralize'
import Button from "@mui/material/Button";
import { useForm, FormProvider, useFormState } from "react-hook-form";
import Container from "@mui/material/Container";
import Grid from "@mui/material/Grid";
import Grid from "@mui/material/Grid2";
import Typography from "@mui/material/Typography";
import FormTextInput from "@/components/form/text-input/form-text-input";
import * as yup from "yup";
Expand Down
12 changes: 6 additions & 6 deletions .hygen/generate/resource/page-content.ejs.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { RoleEnum } from "@/services/api/types/role";
import withPageRequiredAuth from "@/services/auth/with-page-required-auth";
import { useTranslation } from "@/services/i18n/client";
import Container from "@mui/material/Container";
import Grid from "@mui/material/Grid";
import Grid from "@mui/material/Grid2";
import Typography from "@mui/material/Typography";
import { useCallback, useMemo, useRef, useState } from "react";
import { useGet<%= h.inflection.transform(name, ['pluralize']) %>Query, <%= h.inflection.camelize(h.inflection.pluralize(name), true) %>QueryKeys } from "./queries/queries";
Expand Down Expand Up @@ -190,12 +190,12 @@ function <%= h.inflection.transform(name, ['pluralize']) %>() {
return (
<Container maxWidth="xl">
<Grid container spacing={3} pt={3}>
<Grid container item spacing={3} xs={12}>
<Grid item xs>
<Grid container size={{ xs: 12 }} spacing={3}>
<Grid size="grow">
<Typography variant="h3">{t("title")}</Typography>
</Grid>
<Grid container item xs="auto" wrap="nowrap" spacing={2}>
<Grid item xs="auto">
<Grid container size="auto" wrap="nowrap" spacing={2}>
<Grid size="auto">
<Button
variant="contained"
LinkComponent={Link}
Expand All @@ -208,7 +208,7 @@ function <%= h.inflection.transform(name, ['pluralize']) %>() {
</Grid>
</Grid>

<Grid item xs={12} mb={2}>
<Grid size={{ xs: 12 }} mb={2}>
<TableVirtuoso
useWindowScroll
data={tableData}
Expand Down
4 changes: 2 additions & 2 deletions src/app/[language]/admin-panel/page-content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { RoleEnum } from "@/services/api/types/role";
import withPageRequiredAuth from "@/services/auth/with-page-required-auth";
import { useTranslation } from "@/services/i18n/client";
import Container from "@mui/material/Container";
import Grid from "@mui/material/Grid";
import Grid from "@mui/material/Grid2";
import Typography from "@mui/material/Typography";

function AdminPanel() {
Expand All @@ -13,7 +13,7 @@ function AdminPanel() {
return (
<Container maxWidth="md">
<Grid container spacing={3} wrap="nowrap" pt={3}>
<Grid item>
<Grid>
<Typography variant="h3" gutterBottom>
{t("title")}
</Typography>
Expand Down
20 changes: 10 additions & 10 deletions src/app/[language]/admin-panel/users/create/page-content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import Button from "@mui/material/Button";
import { useForm, FormProvider, useFormState } from "react-hook-form";
import Container from "@mui/material/Container";
import Grid from "@mui/material/Grid";
import Grid from "@mui/material/Grid2";
import Typography from "@mui/material/Typography";
import FormTextInput from "@/components/form/text-input/form-text-input";
import * as yup from "yup";
Expand Down Expand Up @@ -151,19 +151,19 @@ function FormCreateUser() {
<Container maxWidth="xs">
<form onSubmit={onSubmit} autoComplete="create-new-user">
<Grid container spacing={2} mb={3} mt={3}>
<Grid item xs={12}>
<Grid size={{ xs: 12 }}>
<Typography variant="h6">
{t("admin-panel-users-create:title")}
</Typography>
</Grid>
<Grid item xs={12}>
<Grid size={{ xs: 12 }}>
<FormAvatarInput<CreateUserFormData>
name="photo"
testId="photo"
/>
</Grid>

<Grid item xs={12}>
<Grid size={{ xs: 12 }}>
<FormTextInput<CreateUserFormData>
name="email"
testId="new-user-email"
Expand All @@ -172,7 +172,7 @@ function FormCreateUser() {
/>
</Grid>

<Grid item xs={12}>
<Grid size={{ xs: 12 }}>
<FormTextInput<CreateUserFormData>
name="password"
type="password"
Expand All @@ -182,7 +182,7 @@ function FormCreateUser() {
/>
</Grid>

<Grid item xs={12}>
<Grid size={{ xs: 12 }}>
<FormTextInput<CreateUserFormData>
name="passwordConfirmation"
testId="new-user-password-confirmation"
Expand All @@ -193,23 +193,23 @@ function FormCreateUser() {
/>
</Grid>

<Grid item xs={12}>
<Grid size={{ xs: 12 }}>
<FormTextInput<CreateUserFormData>
name="firstName"
testId="first-name"
label={t("admin-panel-users-create:inputs.firstName.label")}
/>
</Grid>

<Grid item xs={12}>
<Grid size={{ xs: 12 }}>
<FormTextInput<CreateUserFormData>
name="lastName"
testId="last-name"
label={t("admin-panel-users-create:inputs.lastName.label")}
/>
</Grid>

<Grid item xs={12}>
<Grid size={{ xs: 12 }}>
<FormSelectInput<CreateUserFormData, Pick<Role, "id">>
name="role"
testId="role"
Expand All @@ -229,7 +229,7 @@ function FormCreateUser() {
/>
</Grid>

<Grid item xs={12}>
<Grid size={{ xs: 12 }}>
<CreateUserFormActions />
<Box ml={1} component="span">
<Button
Expand Down
24 changes: 12 additions & 12 deletions src/app/[language]/admin-panel/users/edit/[id]/page-content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import Button from "@mui/material/Button";
import { useForm, FormProvider, useFormState } from "react-hook-form";
import Container from "@mui/material/Container";
import Grid from "@mui/material/Grid";
import Grid from "@mui/material/Grid2";
import Typography from "@mui/material/Typography";
import FormTextInput from "@/components/form/text-input/form-text-input";
import * as yup from "yup";
Expand Down Expand Up @@ -204,40 +204,40 @@ function FormEditUser() {
<Container maxWidth="xs">
<form onSubmit={onSubmit}>
<Grid container spacing={2} mb={3} mt={3}>
<Grid item xs={12}>
<Grid size={{ xs: 12 }}>
<Typography variant="h6">
{t("admin-panel-users-edit:title1")}
</Typography>
</Grid>
<Grid item xs={12}>
<Grid size={{ xs: 12 }}>
<FormAvatarInput<EditUserFormData> name="photo" testId="photo" />
</Grid>

<Grid item xs={12}>
<Grid size={{ xs: 12 }}>
<FormTextInput<EditUserFormData>
name="email"
testId="email"
label={t("admin-panel-users-edit:inputs.email.label")}
/>
</Grid>

<Grid item xs={12}>
<Grid size={{ xs: 12 }}>
<FormTextInput<EditUserFormData>
name="firstName"
testId="first-name"
label={t("admin-panel-users-edit:inputs.firstName.label")}
/>
</Grid>

<Grid item xs={12}>
<Grid size={{ xs: 12 }}>
<FormTextInput<EditUserFormData>
name="lastName"
testId="last-name"
label={t("admin-panel-users-edit:inputs.lastName.label")}
/>
</Grid>

<Grid item xs={12}>
<Grid size={{ xs: 12 }}>
<FormSelectInput<EditUserFormData, Pick<Role, "id">>
name="role"
testId="role"
Expand All @@ -257,7 +257,7 @@ function FormEditUser() {
/>
</Grid>

<Grid item xs={12}>
<Grid size={{ xs: 12 }}>
<EditUserFormActions />
<Box ml={1} component="span">
<Button
Expand Down Expand Up @@ -326,21 +326,21 @@ function FormChangePasswordUser() {
<Container maxWidth="xs">
<form onSubmit={onSubmit}>
<Grid container spacing={2} mb={3} mt={3}>
<Grid item xs={12}>
<Grid size={{ xs: 12 }}>
<Typography variant="h6">
{t("admin-panel-users-edit:title2")}
</Typography>
</Grid>

<Grid item xs={12}>
<Grid size={{ xs: 12 }}>
<FormTextInput<ChangeUserPasswordFormData>
name="password"
type="password"
label={t("admin-panel-users-edit:inputs.password.label")}
/>
</Grid>

<Grid item xs={12}>
<Grid size={{ xs: 12 }}>
<FormTextInput<ChangeUserPasswordFormData>
name="passwordConfirmation"
label={t(
Expand All @@ -350,7 +350,7 @@ function FormChangePasswordUser() {
/>
</Grid>

<Grid item xs={12}>
<Grid size={{ xs: 12 }}>
<ChangePasswordUserFormActions />
<Box ml={1} component="span">
<Button
Expand Down
14 changes: 7 additions & 7 deletions src/app/[language]/admin-panel/users/page-content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { RoleEnum } from "@/services/api/types/role";
import withPageRequiredAuth from "@/services/auth/with-page-required-auth";
import { useTranslation } from "@/services/i18n/client";
import Container from "@mui/material/Container";
import Grid from "@mui/material/Grid";
import Grid from "@mui/material/Grid2";
import Typography from "@mui/material/Typography";
import {
PropsWithChildren,
Expand Down Expand Up @@ -297,17 +297,17 @@ function Users() {
return (
<Container maxWidth="xl">
<Grid container spacing={3} pt={3}>
<Grid container item spacing={3} xs={12}>
<Grid item xs>
<Grid container spacing={3} size={{ xs: 12 }}>
<Grid size="grow">
<Typography variant="h3">
{tUsers("admin-panel-users:title")}
</Typography>
</Grid>
<Grid container item xs="auto" wrap="nowrap" spacing={2}>
<Grid item xs="auto">
<Grid container size="auto" wrap="nowrap" spacing={2}>
<Grid size="auto">
<UserFilter />
</Grid>
<Grid item xs="auto">
<Grid size="auto">
<Button
variant="contained"
LinkComponent={Link}
Expand All @@ -320,7 +320,7 @@ function Users() {
</Grid>
</Grid>

<Grid item xs={12} mb={2}>
<Grid size={{ xs: 12 }} mb={2}>
<TableVirtuoso
style={{ height: 500 }}
data={result}
Expand Down
6 changes: 3 additions & 3 deletions src/app/[language]/admin-panel/users/user-filter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Role, RoleEnum } from "@/services/api/types/role";
import { useTranslation } from "@/services/i18n/client";
import Button from "@mui/material/Button";
import Container from "@mui/material/Container";
import Grid from "@mui/material/Grid";
import Grid from "@mui/material/Grid2";
import Popover from "@mui/material/Popover";
import { useRouter, useSearchParams } from "next/navigation";
import { useEffect, useState } from "react";
Expand Down Expand Up @@ -76,7 +76,7 @@ function UserFilter() {
})}
>
<Grid container spacing={2} mb={3} mt={3}>
<Grid item xs={12}>
<Grid size={{ xs: 12 }}>
<FormMultipleSelectInput<UserFilterFormData, Pick<Role, "id">>
name="roles"
testId="roles"
Expand Down Expand Up @@ -106,7 +106,7 @@ function UserFilter() {
}
/>
</Grid>
<Grid item xs={12}>
<Grid size={{ xs: 12 }}>
<Button variant="contained" type="submit">
{t("admin-panel-users:filter.actions.apply")}
</Button>
Expand Down
4 changes: 2 additions & 2 deletions src/app/[language]/confirm-email/page-content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { useAuthConfirmEmailService } from "@/services/api/services/auth";
import { useRouter } from "next/navigation";
import { useSnackbar } from "notistack";
import Container from "@mui/material/Container";
import Grid from "@mui/material/Grid";
import Grid from "@mui/material/Grid2";
import HTTP_CODES_ENUM from "@/services/api/types/http-codes";
import { useTranslation } from "@/services/i18n/client";

Expand Down Expand Up @@ -47,7 +47,7 @@ export default function ConfirmEmail() {
return (
<Container maxWidth="sm">
<Grid container>
<Grid item xs={12}>
<Grid size={{ xs: 12 }}>
<Box
sx={{
display: "flex",
Expand Down
4 changes: 2 additions & 2 deletions src/app/[language]/confirm-new-email/page-content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
import { useRouter } from "next/navigation";
import { useSnackbar } from "notistack";
import Container from "@mui/material/Container";
import Grid from "@mui/material/Grid";
import Grid from "@mui/material/Grid2";
import HTTP_CODES_ENUM from "@/services/api/types/http-codes";
import { useTranslation } from "@/services/i18n/client";
import useAuthActions from "@/services/auth/use-auth-actions";
Expand Down Expand Up @@ -76,7 +76,7 @@ export default function ConfirmNewEmail() {
return (
<Container maxWidth="sm">
<Grid container>
<Grid item xs={12}>
<Grid size={{ xs: 12 }}>
<Box
sx={{
display: "flex",
Expand Down
8 changes: 4 additions & 4 deletions src/app/[language]/forgot-password/page-content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import withPageRequiredGuest from "@/services/auth/with-page-required-guest";
import { useForm, FormProvider, useFormState } from "react-hook-form";
import { useAuthForgotPasswordService } from "@/services/api/services/auth";
import Container from "@mui/material/Container";
import Grid from "@mui/material/Grid";
import Grid from "@mui/material/Grid2";
import Typography from "@mui/material/Typography";
import FormTextInput from "@/components/form/text-input/form-text-input";
import * as yup from "yup";
Expand Down Expand Up @@ -90,10 +90,10 @@ function Form() {
<Container maxWidth="xs">
<form onSubmit={onSubmit}>
<Grid container spacing={2} mb={2}>
<Grid item xs={12} mt={3}>
<Grid size={{ xs: 12 }} mt={3}>
<Typography variant="h6">{t("forgot-password:title")}</Typography>
</Grid>
<Grid item xs={12}>
<Grid size={{ xs: 12 }}>
<FormTextInput<ForgotPasswordFormData>
name="email"
label={t("forgot-password:inputs.email.label")}
Expand All @@ -102,7 +102,7 @@ function Form() {
/>
</Grid>

<Grid item xs={12}>
<Grid size={{ xs: 12 }}>
<FormActions />
</Grid>
</Grid>
Expand Down
Loading
Loading