Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/mui_datepicker_component

public/locales/fa/app.json

@@ -40,8 +40,7 @@
     "link_routing_back_to": "بازگشت به",
     "link_routing_previuos_page": "صفحه قبل",
     "link_routing_main_page": "صفحه اصلی",
-    "error_message_required": "اجباری!",
-    "button_make_account": "ایجاد حساب"
+    "error_message_required": "اجباری!"
   },
   "dashboard": {
     "dashboard_page": "داشبورد"

src/components/login-expert/index.jsx

@@ -9,7 +9,6 @@ import FullPageLayout from "@/layouts/FullPageLayout";
 import useDirection from "@/lib/app/hooks/useDirection";
 import useUser from "@/lib/app/hooks/useUser";
 import LoginIcon from "@mui/icons-material/Login";
-import PersonAddIcon from "@mui/icons-material/PersonAdd";
 import {
   Box,
   Button,
@@ -28,7 +27,7 @@ import * as Yup from "yup";
 
 const LoginComponent = () => {
   const t = useTranslations();
-  const { directionApp } = useDirection();
+  // const { directionApp } = useDirection();  // should delete because we dont have direction anymore
   const { setToken } = useUser(); // pass token to set token
 
   // gettin url query
@@ -123,20 +122,10 @@ const LoginComponent = () => {
                           justifyContent: "space-between",
                         }}
                       >
-                        <LinkRouting href={"/register-navy"}>
-                          <Button
-                            type="submit"
-                            variant="outlined"
-                            size="small"
-                            endIcon={<PersonAddIcon />}
-                            disabled={props.isSubmitting ? true : false}
-                          >
-                            {t("LoginPage.button_make_account")}
-                          </Button>
-                        </LinkRouting>
                         <Button
                           type="submit"
                           variant="contained"
+                          fullWidth
                           size="medium"
                           endIcon={<LoginIcon />}
                           disabled={props.isSubmitting ? true : false}

src/core/data/sidebarMenu.jsx

@@ -1,6 +1,9 @@
 import SpaceDashboardIcon from "@mui/icons-material/SpaceDashboard";
-import BookmarkAddedIcon from "@mui/icons-material/BookmarkAdded";
-import DataSaverOnIcon from "@mui/icons-material/DataSaverOn";
+import DirectionsCarFilledIcon from "@mui/icons-material/DirectionsCarFilled";
+import AirlineSeatReclineNormalIcon from "@mui/icons-material/AirlineSeatReclineNormal";
+import DirectionsRailwayIcon from "@mui/icons-material/DirectionsRailway";
+import AssignmentIndIcon from "@mui/icons-material/AssignmentInd";
+import DesktopWindowsIcon from "@mui/icons-material/DesktopWindows";
 
 const sidebarMenu = [
   [
@@ -11,6 +14,46 @@ const sidebarMenu = [
       icon: <SpaceDashboardIcon />,
       selected: false,
     },
+    {
+      key: "sidebar.passenger-office",
+      type: "page",
+      route: "/dashboard/passenger-office",
+      icon: <AirlineSeatReclineNormalIcon />,
+      selected: false,
+      role: "passenger-office",
+    },
+    {
+      key: "sidebar.machinary-office",
+      type: "page",
+      route: "/dashboard/machinary-office",
+      icon: <DirectionsCarFilledIcon />,
+      selected: false,
+      role: "machinary-office",
+    },
+    {
+      key: "sidebar.passenger-boss",
+      type: "page",
+      route: "/dashboard/passenger-boss",
+      icon: <AssignmentIndIcon />,
+      selected: false,
+      role: "passenger-boss",
+    },
+    {
+      key: "sidebar.transportation-assistance",
+      type: "page",
+      route: "/dashboard/transportation-assistance",
+      icon: <DirectionsRailwayIcon />,
+      selected: false,
+      role: "transportation-assistance",
+    },
+    {
+      key: "sidebar.master",
+      type: "page",
+      route: "/dashboard/master",
+      icon: <DesktopWindowsIcon />,
+      selected: false,
+      role: "master",
+    },
   ],
 ];