CRM/Frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
AmirHossein Mahmoodi
2023-10-07 10:35:27 +00:00
parent a3eb7acf13 96e8d92208
commit 8a925c5b0b
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/dashboard/change-password/index.jsx
View File

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

6
src/components/dashboard/edit-profile/index.jsx
View File

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

4
src/components/dashboard/first/index.jsx
View File

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

4
src/layouts/DashboardLayout.jsx
View File

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