diff --git a/src/components/dashboard/change-password/index.jsx b/src/components/dashboard/change-password/index.jsx index b6337d4..a30cca6 100644 --- a/src/components/dashboard/change-password/index.jsx +++ b/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 ( diff --git a/src/components/dashboard/commercial-chief/index.jsx b/src/components/dashboard/commercial-chief/index.jsx index 546bd73..e05868e 100644 --- a/src/components/dashboard/commercial-chief/index.jsx +++ b/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(); diff --git a/src/components/dashboard/development-assistant/index.jsx b/src/components/dashboard/development-assistant/index.jsx index 2c09de2..388fbc7 100644 --- a/src/components/dashboard/development-assistant/index.jsx +++ b/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(); diff --git a/src/components/dashboard/edit-profile/index.jsx b/src/components/dashboard/edit-profile/index.jsx index 3018aa3..f458154 100644 --- a/src/components/dashboard/edit-profile/index.jsx +++ b/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(); diff --git a/src/components/dashboard/expert-management/index.jsx b/src/components/dashboard/expert-management/index.jsx index a69a550..736fe33 100644 --- a/src/components/dashboard/expert-management/index.jsx +++ b/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(); diff --git a/src/components/dashboard/first/index.jsx b/src/components/dashboard/first/index.jsx index d78e9a3..de8835c 100644 --- a/src/components/dashboard/first/index.jsx +++ b/src/components/dashboard/first/index.jsx @@ -1,4 +1,5 @@ -import DashboardLayouts from "@/layouts/dashboardLayouts"; +import DashboardLayouts from "@/components/layouts/Dashboard"; + const DashboardFirstComponent = () => { return diff --git a/src/components/dashboard/inspector-expert/index.jsx b/src/components/dashboard/inspector-expert/index.jsx index 137775f..4c10b12 100644 --- a/src/components/dashboard/inspector-expert/index.jsx +++ b/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(); diff --git a/src/components/dashboard/machinary-office/index.jsx b/src/components/dashboard/machinary-office/index.jsx index 2dfbbb1..8062aec 100644 --- a/src/components/dashboard/machinary-office/index.jsx +++ b/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(); diff --git a/src/components/dashboard/navgan-loan-management/index.jsx b/src/components/dashboard/navgan-loan-management/index.jsx index 3664ccb..95df361 100644 --- a/src/components/dashboard/navgan-loan-management/index.jsx +++ b/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(); diff --git a/src/components/dashboard/navgan-province-manager/index.jsx b/src/components/dashboard/navgan-province-manager/index.jsx index 4ca0e0b..222c691 100644 --- a/src/components/dashboard/navgan-province-manager/index.jsx +++ b/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(); diff --git a/src/components/dashboard/passenger-boss/index.jsx b/src/components/dashboard/passenger-boss/index.jsx index 392cac3..7715c2e 100644 --- a/src/components/dashboard/passenger-boss/index.jsx +++ b/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(); diff --git a/src/components/dashboard/passenger-office/index.jsx b/src/components/dashboard/passenger-office/index.jsx index 7d9e39a..5a27d79 100644 --- a/src/components/dashboard/passenger-office/index.jsx +++ b/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(); diff --git a/src/components/dashboard/province-head-expert/index.jsx b/src/components/dashboard/province-head-expert/index.jsx index a647af9..c820963 100644 --- a/src/components/dashboard/province-head-expert/index.jsx +++ b/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(); diff --git a/src/components/dashboard/refahi-loan-management/index.jsx b/src/components/dashboard/refahi-loan-management/index.jsx index 3125654..c218197 100644 --- a/src/components/dashboard/refahi-loan-management/index.jsx +++ b/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(); diff --git a/src/components/dashboard/refahi-province-manager/index.jsx b/src/components/dashboard/refahi-province-manager/index.jsx index b7c13ce..3570ce6 100644 --- a/src/components/dashboard/refahi-province-manager/index.jsx +++ b/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(); diff --git a/src/components/dashboard/role-management/index.jsx b/src/components/dashboard/role-management/index.jsx index 5d55575..ca963aa 100644 --- a/src/components/dashboard/role-management/index.jsx +++ b/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(); diff --git a/src/components/dashboard/transportation-assistance/index.jsx b/src/components/dashboard/transportation-assistance/index.jsx index 0786159..f5df64d 100644 --- a/src/components/dashboard/transportation-assistance/index.jsx +++ b/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(); diff --git a/src/components/dashboard/user-management/index.jsx b/src/components/dashboard/user-management/index.jsx index ddf9099..fb5f7e8 100644 --- a/src/components/dashboard/user-management/index.jsx +++ b/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(); diff --git a/src/layouts/dashboardLayouts/breadcrumbs/BreadcrumbItem.jsx b/src/components/layouts/Dashboard/Breadcrumbs/BreadcrumbItem.jsx similarity index 100% rename from src/layouts/dashboardLayouts/breadcrumbs/BreadcrumbItem.jsx rename to src/components/layouts/Dashboard/Breadcrumbs/BreadcrumbItem.jsx diff --git a/src/layouts/dashboardLayouts/breadcrumbs/index.jsx b/src/components/layouts/Dashboard/Breadcrumbs/index.jsx similarity index 100% rename from src/layouts/dashboardLayouts/breadcrumbs/index.jsx rename to src/components/layouts/Dashboard/Breadcrumbs/index.jsx diff --git a/src/layouts/dashboardLayouts/header/ProfileData.jsx b/src/components/layouts/Dashboard/Header/ProfileData.jsx similarity index 100% rename from src/layouts/dashboardLayouts/header/ProfileData.jsx rename to src/components/layouts/Dashboard/Header/ProfileData.jsx diff --git a/src/layouts/dashboardLayouts/header/ProfileMenu.jsx b/src/components/layouts/Dashboard/Header/ProfileMenu.jsx similarity index 100% rename from src/layouts/dashboardLayouts/header/ProfileMenu.jsx rename to src/components/layouts/Dashboard/Header/ProfileMenu.jsx diff --git a/src/layouts/dashboardLayouts/header/ProfileOptionLogOut.jsx b/src/components/layouts/Dashboard/Header/ProfileOptionLogOut.jsx similarity index 100% rename from src/layouts/dashboardLayouts/header/ProfileOptionLogOut.jsx rename to src/components/layouts/Dashboard/Header/ProfileOptionLogOut.jsx diff --git a/src/layouts/dashboardLayouts/header/ProfileOptions.jsx b/src/components/layouts/Dashboard/Header/ProfileOptions.jsx similarity index 100% rename from src/layouts/dashboardLayouts/header/ProfileOptions.jsx rename to src/components/layouts/Dashboard/Header/ProfileOptions.jsx diff --git a/src/layouts/dashboardLayouts/header/index.jsx b/src/components/layouts/Dashboard/Header/index.jsx similarity index 100% rename from src/layouts/dashboardLayouts/header/index.jsx rename to src/components/layouts/Dashboard/Header/index.jsx diff --git a/src/layouts/dashboardLayouts/sidebar/SidebarDrawer.jsx b/src/components/layouts/Dashboard/Sidebar/SidebarDrawer.jsx similarity index 100% rename from src/layouts/dashboardLayouts/sidebar/SidebarDrawer.jsx rename to src/components/layouts/Dashboard/Sidebar/SidebarDrawer.jsx diff --git a/src/layouts/dashboardLayouts/sidebar/SidebarList.jsx b/src/components/layouts/Dashboard/Sidebar/SidebarList.jsx similarity index 100% rename from src/layouts/dashboardLayouts/sidebar/SidebarList.jsx rename to src/components/layouts/Dashboard/Sidebar/SidebarList.jsx diff --git a/src/layouts/dashboardLayouts/sidebar/SidebarListItem.jsx b/src/components/layouts/Dashboard/Sidebar/SidebarListItem.jsx similarity index 100% rename from src/layouts/dashboardLayouts/sidebar/SidebarListItem.jsx rename to src/components/layouts/Dashboard/Sidebar/SidebarListItem.jsx diff --git a/src/layouts/dashboardLayouts/sidebar/SidebarListSubItem.jsx b/src/components/layouts/Dashboard/Sidebar/SidebarListSubItem.jsx similarity index 100% rename from src/layouts/dashboardLayouts/sidebar/SidebarListSubItem.jsx rename to src/components/layouts/Dashboard/Sidebar/SidebarListSubItem.jsx diff --git a/src/layouts/dashboardLayouts/sidebar/index.jsx b/src/components/layouts/Dashboard/Sidebar/index.jsx similarity index 100% rename from src/layouts/dashboardLayouts/sidebar/index.jsx rename to src/components/layouts/Dashboard/Sidebar/index.jsx diff --git a/src/layouts/dashboardLayouts/index.jsx b/src/components/layouts/Dashboard/index.jsx similarity index 96% rename from src/layouts/dashboardLayouts/index.jsx rename to src/components/layouts/Dashboard/index.jsx index fae51d2..8001aff 100644 --- a/src/layouts/dashboardLayouts/index.jsx +++ b/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; diff --git a/src/layouts/DashboardLayout.jsx b/src/layouts/DashboardLayout.jsx new file mode 100644 index 0000000..149f4f4 --- /dev/null +++ b/src/layouts/DashboardLayout.jsx @@ -0,0 +1,12 @@ +import WithAuthMiddleware from "@/middlewares/WithAuth"; +import Dashboard from "@/components/layouts/Dashboard"; + +const DashboardLayout = (props) => { + return ( + + + + ); +}; + +export default DashboardLayout; \ No newline at end of file