Merge branch 'develop' into 'feature/yasi_delet_signup_check_login'

package.json

@@ -16,7 +16,7 @@
     "@mui/icons-material": "^5.11.16",
     "@mui/lab": "^5.0.0-alpha.152",
     "@mui/material": "^5.12.0",
-    "@witel/webapp-builder": "^1.1.0",
+    "@witel/webapp-builder": "^1.2.1",
     "axios": "^1.4.0",
     "colord": "^2.9.3",
     "eslint": "8.36.0",

public/locales/fa/app.json

@@ -5,6 +5,7 @@
   "first_page": "خوش آمدید",
   "powered_by_witel": "توسعه یافته توسط وایتل",
   "login": "ورود",
+  "today": "امروز",
   "pending": "درحال اجرا...",
   "login_user_panel": "ورود به پنل کاربران",
   "register_navy": "ثبت نام اعضای ناوگان",

src/core/components/GlobalHead.jsx

@@ -39,14 +39,6 @@ const GlobalHead = () => {
             />
             <link
                 rel="icon"
-                type="image/svg"
-                sizes="32x32"
-                href="/icons/favicon.png"
-            />
-            <link
-                rel="icon"
-                type="image/svg"
-                sizes="16x16"
                 href="/icons/favicon.png"
             />
         </Head>

src/core/data/sidebarMenu.js

@@ -20,7 +20,7 @@ const sidebarMenu = [
             route: "/dashboard/navgan/add-request-loan",
             icon: <DataSaverOnIcon sx={{width: 'inherit', height: 'inherit'}}/>,
             selected: false,
-            permission: "can_request_a_new_loan"
+            permission: "can_request_navgan_loan"
         },
         {
             key: "sidebar.followUp-loan",

src/layouts/dashboard.jsx

@@ -3,16 +3,20 @@ import headerProfileItems from "@/core/data/headerProfileItems";
 import sidebarMenu from "@/core/data/sidebarMenu";
 import {GET_SIDEBAR_NOTIFICATION} from "@/core/data/apiRoutes";
 import UserInfo from "@/middlewares/UserInfo";
+import {useTranslations} from "next-intl";
+import moment from "jalali-moment";
 
 const DashboardLayout = (props) => {
     const {user} = useUser()
     const middlewaresProps = props.middlewaresProps || {}
+    const t = useTranslations()
     return (
         <>
             <DashboardLayoutPure
                 middlewares={{list: [UserInfo], props: {...middlewaresProps,loginUrl:'/login'}}}
                 user_introduction={user.phone_number}
                 headerProfileItems={headerProfileItems}
+                headerSubtitle={`${t('today')} ${moment().locale('fa').format('LL')}`}
                 sidebarMenu={sidebarMenu}
                 urlNotification={GET_SIDEBAR_NOTIFICATION}
                 BC_segmentsToRemove={['navgan']}

src/pages/dashboard/navgan/add-request-loan/index.jsx

@@ -15,7 +15,7 @@ export async function getServerSideProps({req, locale}) {
             title: "LoanRequest.loan_request_page",
             isBot,
             locale,
-            layout: {name: 'DashboardLayout'}
+            layout: {name: 'DashboardLayout', permissions: ["can_request_navgan_loan"]}
         },
     };
 }