LFFE-7 Merge branch 'feature/LFFE-7_dashboard_layout' into 'develop'

src/components/dashboard/change-password/index.jsx

@@ -1,7 +1,7 @@
 import CenterLayout from "@/layouts/CenterLayout";
-import DashboardLayouts from "@/layouts/dashboardLayouts";
 import {Container} from "@mui/material";
 import ChangePasswordForm from "@/components/dashboard/change-password/change-password-form";
+import DashboardLayouts from "@/components/layouts/Dashboard";
 
 const DashboardChangePasswordComponent = () => {
     return (

src/components/dashboard/commercial-chief/index.jsx

@@ -1,4 +1,3 @@
-import DashboardLayouts from "@/layouts/dashboardLayouts";
 import {Box, Typography} from "@mui/material";
 import {useMemo} from "react";
 import {GET_COMMERCIAL_CHIEF} from "@/core/data/apiRoutes";
@@ -7,6 +6,7 @@ import TableRowActions from "./TableRowActions";
 import moment from "jalali-moment";
 import DataTable from "@/core/components/DataTable";
 import MuiDatePicker from "@/core/components/MuiDatePicker";
+import DashboardLayouts from "@/components/layouts/Dashboard";
 
 function DashboardCommercialChiefComponent() {
     const t = useTranslations();

src/components/dashboard/development-assistant/index.jsx

@@ -1,4 +1,3 @@
-import DashboardLayouts from "@/layouts/dashboardLayouts";
 import {Box, Typography} from "@mui/material";
 import {useMemo} from "react";
 import {GET_DEVELOPMENT_ASSISTANT} from "@/core/data/apiRoutes";
@@ -7,6 +6,7 @@ import TableRowActions from "./TableRowActions";
 import moment from "jalali-moment";
 import DataTable from "@/core/components/DataTable";
 import MuiDatePicker from "@/core/components/MuiDatePicker";
+import DashboardLayouts from "@/components/layouts/Dashboard";
 
 function DashboardDevelopmentAssistantComponent() {
     const t = useTranslations();

src/components/dashboard/edit-profile/index.jsx

@@ -1,6 +1,5 @@
 import StyledForm from "@/core/components/StyledForm";
 import CenterLayout from "@/layouts/CenterLayout";
-import DashboardLayouts from "@/layouts/dashboardLayouts";
 import useUser from "@/lib/app/hooks/useUser";
 import {Box, Container, Grid, Paper, Stack, TextField, Typography,} from "@mui/material";
 import * as Yup from "yup";
@@ -12,6 +11,7 @@ import {UPDATE_AVATAR} from "@/core/data/apiRoutes";
 import useDirection from "@/lib/app/hooks/useDirection";
 import Notifications from "@/core/components/notifications";
 import ImageResizer from "@/core/components/ImageConvertor";
+import DashboardLayouts from "@/components/layouts/Dashboard";
 
 const DashboardEditProfile = () => {
     const t = useTranslations();

src/components/dashboard/expert-management/index.jsx

@@ -1,4 +1,3 @@
-import DashboardLayouts from "@/layouts/dashboardLayouts";
 import {Box, Typography} from "@mui/material";
 import {useMemo} from "react";
 import {GET_EXPERT_MANAGEMENT} from "@/core/data/apiRoutes";
@@ -8,6 +7,7 @@ import DataTable from "@/core/components/DataTable";
 import TableToolbar from "@/components/dashboard/expert-management/TableToolbar";
 import moment from "jalali-moment";
 import MuiDatePicker from "@/core/components/MuiDatePicker";
+import DashboardLayouts from "@/components/layouts/Dashboard";
 
 function DashboardExpertManagementComponent() {
     const t = useTranslations();

src/components/dashboard/first/index.jsx

@@ -1,4 +1,5 @@
-import DashboardLayouts from "@/layouts/dashboardLayouts";
+import DashboardLayouts from "@/components/layouts/Dashboard";
+
 
 const DashboardFirstComponent = () => {
     return <DashboardLayouts></DashboardLayouts>

src/components/dashboard/inspector-expert/index.jsx

@@ -1,4 +1,3 @@
-import DashboardLayouts from "@/layouts/dashboardLayouts";
 import {Box, Typography} from "@mui/material";
 import {useMemo} from "react";
 import {GET_INSPECTOR_EXPERT} from "@/core/data/apiRoutes";
@@ -7,6 +6,7 @@ import TableRowActions from "./TableRowActions";
 import moment from "jalali-moment";
 import DataTable from "@/core/components/DataTable";
 import MuiDatePicker from "@/core/components/MuiDatePicker";
+import DashboardLayouts from "@/components/layouts/Dashboard";
 
 function DashboardInspectorExpertComponent() {
     const t = useTranslations();

src/components/dashboard/machinary-office/index.jsx

@@ -1,4 +1,3 @@
-import DashboardLayouts from "@/layouts/dashboardLayouts";
 import {Box, Typography} from "@mui/material";
 import {useMemo} from "react";
 import {GET_MACHINARY_OFFICE} from "@/core/data/apiRoutes";
@@ -7,6 +6,7 @@ import TableRowActions from "./TableRowActions";
 import moment from "jalali-moment";
 import DataTable from "@/core/components/DataTable";
 import MuiDatePicker from "@/core/components/MuiDatePicker";
+import DashboardLayouts from "@/components/layouts/Dashboard";
 
 function DashboardMachinaryOfficeComponent() {
     const t = useTranslations();

src/components/dashboard/navgan-loan-management/index.jsx

@@ -1,4 +1,3 @@
-import DashboardLayouts from "@/layouts/dashboardLayouts";
 import {Box, Typography} from "@mui/material";
 import {useMemo} from "react";
 import {GET_LOAN_MANAGEMENT_NAVGAN} from "@/core/data/apiRoutes";
@@ -7,6 +6,7 @@ import TableRowActions from "./TableRowActions";
 import DataTable from "@/core/components/DataTable";
 import moment from "jalali-moment";
 import MuiDatePicker from "@/core/components/MuiDatePicker";
+import DashboardLayouts from "@/components/layouts/Dashboard";
 
 function DashboardNavganLoanManagementComponent() {
     const t = useTranslations();

src/components/dashboard/navgan-province-manager/index.jsx

@@ -1,4 +1,3 @@
-import DashboardLayouts from "@/layouts/dashboardLayouts";
 import {Box, Typography} from "@mui/material";
 import {useMemo} from "react";
 import {GET_NAVGAN_PROVINCE_MANAGER} from "@/core/data/apiRoutes";
@@ -7,6 +6,7 @@ import TableRowActions from "./TableRowActions";
 import moment from "jalali-moment";
 import DataTable from "@/core/components/DataTable";
 import MuiDatePicker from "@/core/components/MuiDatePicker";
+import DashboardLayouts from "@/components/layouts/Dashboard";
 
 function DashboardNavganProvinceManagerComponent() {
     const t = useTranslations();

src/components/dashboard/passenger-boss/index.jsx

@@ -1,4 +1,3 @@
-import DashboardLayouts from "@/layouts/dashboardLayouts";
 import {Box, Typography} from "@mui/material";
 import {useMemo} from "react";
 import {GET_PASSENGER_BOSS} from "@/core/data/apiRoutes";
@@ -7,6 +6,7 @@ import TableRowActions from "./TableRowActions";
 import moment from "jalali-moment";
 import DataTable from "@/core/components/DataTable";
 import MuiDatePicker from "@/core/components/MuiDatePicker";
+import DashboardLayouts from "@/components/layouts/Dashboard";
 
 function DashboardPassengerOfficeComponent() {
     const t = useTranslations();

src/components/dashboard/passenger-office/index.jsx

@@ -1,4 +1,3 @@
-import DashboardLayouts from "@/layouts/dashboardLayouts";
 import {Box, Typography} from "@mui/material";
 import {useMemo} from "react";
 import {GET_PASSENGER_OFFICE} from "@/core/data/apiRoutes";
@@ -7,6 +6,7 @@ import TableRowActions from "./TableRowActions";
 import moment from "jalali-moment";
 import DataTable from "@/core/components/DataTable";
 import MuiDatePicker from "@/core/components/MuiDatePicker";
+import DashboardLayouts from "@/components/layouts/Dashboard";
 
 function DashboardPassengerOfficeComponent() {
     const t = useTranslations();

src/components/dashboard/province-head-expert/index.jsx

@@ -1,4 +1,3 @@
-import DashboardLayouts from "@/layouts/dashboardLayouts";
 import {Box, Typography} from "@mui/material";
 import {useMemo} from "react";
 import {GET_PROVINCE_HEAD_EXPERT} from "@/core/data/apiRoutes";
@@ -7,6 +6,7 @@ import moment from "jalali-moment";
 import DataTable from "@/core/components/DataTable";
 import TableRowActions from "./TableRowActions"
 import MuiDatePicker from "@/core/components/MuiDatePicker";
+import DashboardLayouts from "@/components/layouts/Dashboard";
 
 function DashboardProvinceHeadExpertComponent() {
     const t = useTranslations();

src/components/dashboard/refahi-loan-management/index.jsx

@@ -1,4 +1,3 @@
-import DashboardLayouts from "@/layouts/dashboardLayouts";
 import {Box, Typography} from "@mui/material";
 import {useMemo} from "react";
 import {GET_LOAN_MANAGEMENT_REFAHI} from "@/core/data/apiRoutes";
@@ -7,6 +6,7 @@ import TableRowActions from "./TableRowActions";
 import DataTable from "@/core/components/DataTable";
 import moment from "jalali-moment";
 import MuiDatePicker from "@/core/components/MuiDatePicker";
+import DashboardLayouts from "@/components/layouts/Dashboard";
 
 function DashboardRefahiLoanManagementComponent() {
     const t = useTranslations();

src/components/dashboard/refahi-province-manager/index.jsx

@@ -1,4 +1,3 @@
-import DashboardLayouts from "@/layouts/dashboardLayouts";
 import {Box, Typography} from "@mui/material";
 import {useMemo} from "react";
 import {GET_REFAHI_PROVINCE_MANAGER} from "@/core/data/apiRoutes";
@@ -7,6 +6,7 @@ import TableRowActions from "./TableRowActions";
 import moment from "jalali-moment";
 import DataTable from "@/core/components/DataTable";
 import MuiDatePicker from "@/core/components/MuiDatePicker";
+import DashboardLayouts from "@/components/layouts/Dashboard";
 
 function DashboardRefahiProvinceManagerComponent() {
     const t = useTranslations();

src/components/dashboard/role-management/index.jsx

@@ -1,4 +1,3 @@
-import DashboardLayouts from "@/layouts/dashboardLayouts";
 import {Box, Typography} from "@mui/material";
 import {useMemo} from "react";
 import {GET_ROLE_MANAGEMENT} from "@/core/data/apiRoutes";
@@ -8,6 +7,7 @@ import moment from "jalali-moment";
 import MuiDatePicker from "@/core/components/MuiDatePicker";
 import TableToolbar from "@/components/dashboard/role-management/TableToolbar";
 import TableRowActions from "./TableRowActions"
+import DashboardLayouts from "@/components/layouts/Dashboard";
 
 function DashboardRoleManagementComponent() {
     const t = useTranslations();

src/components/dashboard/transportation-assistance/index.jsx

@@ -1,4 +1,3 @@
-import DashboardLayouts from "@/layouts/dashboardLayouts";
 import {Box, Typography} from "@mui/material";
 import {useMemo} from "react";
 import {GET_TRANSPORTATION_ASSISTANCE} from "@/core/data/apiRoutes";
@@ -7,6 +6,7 @@ import TableRowActions from "./TableRowActions";
 import moment from "jalali-moment";
 import DataTable from "@/core/components/DataTable";
 import MuiDatePicker from "@/core/components/MuiDatePicker";
+import DashboardLayouts from "@/components/layouts/Dashboard";
 
 function DashboardTransportationAssistanceComponent() {
     const t = useTranslations();

src/components/dashboard/user-management/index.jsx

@@ -1,4 +1,3 @@
-import DashboardLayouts from "@/layouts/dashboardLayouts";
 import {Box, FormControl, FormHelperText, IconButton, MenuItem, Select, Stack, Typography} from "@mui/material";
 import {useMemo} from "react";
 import {GET_USER_MANAGEMENT} from "@/core/data/apiRoutes";
@@ -9,6 +8,7 @@ import MuiDatePicker from "@/core/components/MuiDatePicker";
 import TableToolbar from "@/components/dashboard/user-management/TableToolbar";
 import TableRowActions from "./TableRowActions"
 import ClearIcon from "@mui/icons-material/Clear";
+import DashboardLayouts from "@/components/layouts/Dashboard";
 
 function DashboardUserManagementComponent() {
     const t = useTranslations();

src/components/layouts/Dashboard/index.jsx

@@ -1,9 +1,9 @@
 import {useState} from "react";
-import FullPageLayout from "../FullPageLayout";
 import Header from "./header";
 import Sidebar from "./sidebar";
 import {Toolbar} from "@mui/material";
 import BreadCrumbs from "./breadcrumbs";
+import FullPageLayout from "@/layouts/FullPageLayout";
 
 const drawerWidth = 240;
 

src/layouts/DashboardLayout.jsx

@@ -0,0 +1,12 @@
+import WithAuthMiddleware from "@/middlewares/WithAuth";
+import Dashboard from "@/components/layouts/Dashboard";
+
+const DashboardLayout = (props) => {
+    return (
+        <WithAuthMiddleware>
+            <Dashboard {...props}/>
+        </WithAuthMiddleware>
+    );
+};
+
+export default DashboardLayout;