CFE-23 Merge branch 'bugfix/CFE-23_fixed_change_password_bugs' into 'develop'

This commit is contained in:
AmirHossein Mahmoodi
2023-10-07 10:35:27 +00:00
4 changed files with 10 additions and 10 deletions

View File

@@ -1,18 +1,18 @@
import CenterLayout from "@/layouts/CenterLayout";
import DashboardLayouts from "@/layouts/dashboardLayouts";
import DashboardLayout from "@/layouts/DashboardLayout";
import {Container} from "@mui/material";
import ChangePasswordForm from "@/components/dashboard/change-password/change-password-form";
const DashboardChangePasswordComponent = () => {
return (
<DashboardLayouts>
<DashboardLayout>
<CenterLayout>
<Container maxWidth="sm">
<ChangePasswordForm />
</Container>
</CenterLayout>
</DashboardLayouts>
</DashboardLayout>
);
};
export default DashboardChangePasswordComponent;

View File

@@ -1,6 +1,6 @@
import StyledForm from "@/core/components/StyledForm";
import CenterLayout from "@/layouts/CenterLayout";
import DashboardLayouts from "@/layouts/DashboardLayout";
import DashboardLayout from "@/layouts/DashboardLayout";
import useUser from "@/lib/app/hooks/useUser";
import {Box, Container, Grid, Paper, Stack, TextField, Typography,} from "@mui/material";
import * as Yup from "yup";
@@ -54,7 +54,7 @@ const DashboardEditProfile = () => {
const validationSchema = Yup.object().shape({});
return (
<DashboardLayouts>
<DashboardLayout>
<CenterLayout>
<Container maxWidth="sm">
<Formik
@@ -216,7 +216,7 @@ const DashboardEditProfile = () => {
</Formik>
</Container>
</CenterLayout>
</DashboardLayouts>
</DashboardLayout>
);
};

View File

@@ -1,7 +1,7 @@
import DashboardLayouts from "@/layouts/DashboardLayout";
import DashboardLayout from "@/layouts/DashboardLayout";
const DashboardFirstComponent = () => {
return <DashboardLayouts></DashboardLayouts>;
return <DashboardLayout></DashboardLayout>;
};
export default DashboardFirstComponent;

View File

@@ -1,7 +1,7 @@
import CallWidget from "src/components/layouts/Dashboard/CallWidget";
import Dashboard from "src/components/layouts/Dashboard";
const DashboardLayouts = (props) => {
const DashboardLayout = (props) => {
return (
<>
@@ -11,4 +11,4 @@ const DashboardLayouts = (props) => {
);
};
export default DashboardLayouts;
export default DashboardLayout;