Merge branch 'feature/coreBugs' into 'develop'

Feature/core bugs See merge request witel3/loan-facilities-expert!60
2023-08-01 06:45:30 +00:00
parent b85a4c03c1 f7a3ec3e2b
commit a384abf5ac
14 changed files with 20 additions and 36 deletions
--- a/src/layouts/AppLayout.jsx
+++ b/src/layouts/AppLayout.jsx
@@ -5,11 +5,16 @@ import useUser from "@/lib/app/hooks/useUser";
 import Head from "next/head";
 import NextNProgress from "nextjs-progressbar";
 import {useEffect} from "react";
+import {ToastContainer} from "react-toastify";
+import useDirection from "@/lib/app/hooks/useDirection";
+import "react-toastify/dist/ReactToastify.css";

 function AppLayout({children, isBot}) {
    const {languageIsReady} = useLanguage();
    const {setLoadingPage} = useLoading();
    const {userChangedLanguage, token, isAuth} = useUser();
+    const {directionApp} = useDirection();
+
    useEffect(() => {
        if (languageIsReady) {
            if (token) {
@@ -91,6 +96,7 @@ function AppLayout({children, isBot}) {
                color={theme.palette.secondary.dark}
                options={{showSpinner: false}}
            />
+            {directionApp === "rtl" ? <ToastContainer rtl/> : <ToastContainer ltr/>}
            {children}
        </>
    );
--- a/src/layouts/dashboardLayouts/index.jsx
+++ b/src/layouts/dashboardLayouts/index.jsx
@@ -4,14 +4,10 @@ import Header from "./header";
 import Sidebar from "./sidebar";
 import {Toolbar} from "@mui/material";
 import BreadCrumbs from "./breadcrumbs";
-import {ToastContainer} from "react-toastify";
-import "react-toastify/dist/ReactToastify.css";
-import useDirection from "@/lib/app/hooks/useDirection";

 const drawerWidth = 240;

 const DashboardLayouts = (props) => {
-    const {directionApp} = useDirection();
    const {window} = props;
    const [mobileOpen, setMobileOpen] = useState(false);
    const container =
@@ -42,7 +38,6 @@ const DashboardLayouts = (props) => {
                    {props.children}
                </FullPageLayout>
            </FullPageLayout>
-            {directionApp === "rtl" ? <ToastContainer rtl/> : <ToastContainer ltr/>}
        </FullPageLayout>
    );
 };
--- a/src/pages/_app.jsx
+++ b/src/pages/_app.jsx
@@ -6,6 +6,7 @@ import {LoadingProvider} from "@/lib/app/contexts/loading";
 import {UserProvider} from "@/lib/app/contexts/user";
 import "moment/locale/fa";
 import {NextIntlProvider} from "next-intl";
+import TitlePage from "@/core/components/TitlePage";

 const App = ({Component, pageProps}) => {
    return (
@@ -14,6 +15,7 @@ const App = ({Component, pageProps}) => {
                <LanguageProvider>
                    <NextIntlProvider messages={pageProps.messages}>
                        <MuiLayout isBot={pageProps.isBot}>
+                            <TitlePage text={pageProps.title}/>
                            <LoadingProvider>
                                <AppLayout isBot={pageProps.isBot}>
                                    <Component {...pageProps} />
--- a/src/pages/_document.jsx
+++ b/src/pages/_document.jsx
@@ -1,4 +1,4 @@
-import {createEmotionCacheLtr} from "@/core/utils/createEmotionCache";
+import {createEmotionCacheRtl} from "@/core/utils/createEmotionCache";
 import theme from "@/core/utils/theme";
 import createEmotionServer from "@emotion/server/create-instance";
 import Document, {Head, Html, Main, NextScript} from "next/document";
@@ -13,10 +13,6 @@ export default function MyDocument(props) {
                <meta name="emotion-insertion-point" content=""/>
                <link rel="shortcut icon" href="/icons/favicon.ico"/>
                <link rel="manifest" href="/manifest.json"/>
-                <link
-                    rel="stylesheet"
-                    href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"
-                />
                {emotionStyleTags}
            </Head>
            <body>
@@ -32,7 +28,7 @@ MyDocument.getInitialProps = async (ctx) => {
    let cache;
    switch (ctx.locale) {
        case "fa":
-            cache = createEmotionCacheLtr();
+            cache = createEmotionCacheRtl();
            break;
    }

--- a/src/pages/dashboard/change-password/index.jsx
+++ b/src/pages/dashboard/change-password/index.jsx
@@ -1,12 +1,10 @@
 import DashboardChangePasswordComponent from "@/components/dashboard/change-password";
-import TitlePage from "@/core/components/TitlePage";
 import WithAuthMiddleware from "@/middlewares/WithAuth";
 import {parse} from "next-useragent";

 export default function LoanFollowUp() {
    return (
        <WithAuthMiddleware>
-            <TitlePage text="Dashboard.change_password"/>
            <DashboardChangePasswordComponent/>
        </WithAuthMiddleware>
    );
@@ -17,6 +15,7 @@ export async function getServerSideProps({req, locale}) {
    return {
        props: {
            messages: (await import(`&/locales/${locale}/app.json`)).default,
+            title: "Dashboard.change_password",
            isBot,
        },
    };
--- a/src/pages/dashboard/edit-profile/index.jsx
+++ b/src/pages/dashboard/edit-profile/index.jsx
@@ -1,12 +1,10 @@
 import DashboardEditProfile from "@/components/dashboard/edit-profile";
-import TitlePage from "@/core/components/TitlePage";
 import WithAuthMiddleware from "@/middlewares/WithAuth";
 import {parse} from "next-useragent";

 export default function LoanFollowUp() {
    return (
        <WithAuthMiddleware>
-            <TitlePage text="Dashboard.edit_profile"/>
            <DashboardEditProfile/>
        </WithAuthMiddleware>
    );
@@ -17,6 +15,7 @@ export async function getServerSideProps({req, locale}) {
    return {
        props: {
            messages: (await import(`&/locales/${locale}/app.json`)).default,
+            title: "Dashboard.edit_profile",
            isBot,
        },
    };
--- a/src/pages/dashboard/index.jsx
+++ b/src/pages/dashboard/index.jsx
@@ -1,12 +1,10 @@
 import DashboardFirstComponent from "@/components/dashboard/first";
-import TitlePage from "@/core/components/TitlePage";
 import WithAuthMiddleware from "@/middlewares/WithAuth";
 import {parse} from "next-useragent";

 export default function Dashboard() {
    return (
        <WithAuthMiddleware>
-            <TitlePage text="Dashboard.dashboard_page"/>
            <DashboardFirstComponent/>
        </WithAuthMiddleware>
    );
@@ -17,6 +15,7 @@ export async function getServerSideProps({req, locale}) {
    return {
        props: {
            messages: (await import(`&/locales/${locale}/app.json`)).default,
+            title: "Dashboard.dashboard_page",
            isBot,
        },
    };
--- a/src/pages/dashboard/machinary-expert/index.jsx
+++ b/src/pages/dashboard/machinary-expert/index.jsx
@@ -1,5 +1,4 @@
 import DashboardMachinaryOfficeComponent from "@/components/dashboard/machinary-office";
-import TitlePage from "@/core/components/TitlePage";
 import RolePermission from "@/middlewares/RolePermission";
 import WithAuthMiddleware from "@/middlewares/WithAuth";
 import {parse} from "next-useragent";
@@ -9,7 +8,6 @@ export default function PassengerOffice() {
    return (
        <WithAuthMiddleware>
            <RolePermission requiredPermissions={requiredPermissions}>
-                <TitlePage text="Dashboard.machinary_office_page"/>
                <DashboardMachinaryOfficeComponent/>
            </RolePermission>
        </WithAuthMiddleware>
@@ -21,6 +19,7 @@ export async function getServerSideProps({req, locale}) {
    return {
        props: {
            messages: (await import(`&/locales/${locale}/app.json`)).default,
+            title: "Dashboard.machinary_office_page",
            isBot,
        },
    };
--- a/src/pages/dashboard/passenger-boss/index.jsx
+++ b/src/pages/dashboard/passenger-boss/index.jsx
@@ -1,5 +1,4 @@
 import DashboardPassengerBossComponent from "@/components/dashboard/passenger-boss";
-import TitlePage from "@/core/components/TitlePage";
 import RolePermission from "@/middlewares/RolePermission";
 import WithAuthMiddleware from "@/middlewares/WithAuth";
 import {parse} from "next-useragent";
@@ -9,7 +8,6 @@ export default function PassengerBoss() {
    return (
        <WithAuthMiddleware>
            <RolePermission requiredPermissions={requiredPermissions}>
-                <TitlePage text="Dashboard.passenger_boss_page"/>
                <DashboardPassengerBossComponent/>
            </RolePermission>
        </WithAuthMiddleware>
@@ -21,6 +19,7 @@ export async function getServerSideProps({req, locale}) {
    return {
        props: {
            messages: (await import(`&/locales/${locale}/app.json`)).default,
+            title: "Dashboard.passenger_boss_page",
            isBot,
        },
    };
--- a/src/pages/dashboard/passenger-office-chief/index.jsx
+++ b/src/pages/dashboard/passenger-office-chief/index.jsx
@@ -1,5 +1,4 @@
 import DashboardPassengerOfficeComponent from "@/components/dashboard/passenger-office";
-import TitlePage from "@/core/components/TitlePage";
 import RolePermission from "@/middlewares/RolePermission";
 import WithAuthMiddleware from "@/middlewares/WithAuth";
 import {parse} from "next-useragent";
@@ -9,7 +8,6 @@ export default function PassengerOffice() {
    return (
        <WithAuthMiddleware>
            <RolePermission requiredPermissions={requiredPermissions}>
-                <TitlePage text="Dashboard.passenger_office_page"/>
                <DashboardPassengerOfficeComponent/>
            </RolePermission>
        </WithAuthMiddleware>
@@ -21,6 +19,7 @@ export async function getServerSideProps({req, locale}) {
    return {
        props: {
            messages: (await import(`&/locales/${locale}/app.json`)).default,
+            title: "Dashboard.passenger_office_page",
            isBot,
        },
    };
--- a/src/pages/dashboard/province-manager/index.jsx
+++ b/src/pages/dashboard/province-manager/index.jsx
@@ -1,5 +1,4 @@
 import DashboardProvinceManagerComponent from "@/components/dashboard/province-manager";
-import TitlePage from "@/core/components/TitlePage";
 import RolePermission from "@/middlewares/RolePermission";
 import WithAuthMiddleware from "@/middlewares/WithAuth";
 import {parse} from "next-useragent";
@@ -9,7 +8,6 @@ export default function PassengerOffice() {
    return (
        <WithAuthMiddleware>
            <RolePermission requiredPermissions={requiredPermissions}>
-                <TitlePage text="Dashboard.province_manager_page"/>
                <DashboardProvinceManagerComponent/>
            </RolePermission>
        </WithAuthMiddleware>
@@ -21,6 +19,7 @@ export async function getServerSideProps({req, locale}) {
    return {
        props: {
            messages: (await import(`&/locales/${locale}/app.json`)).default,
+            title: "Dashboard.province_manager_page",
            isBot,
        },
    };
--- a/src/pages/dashboard/transportation-assistant/index.jsx
+++ b/src/pages/dashboard/transportation-assistant/index.jsx
@@ -1,5 +1,4 @@
 import DashboardTransportationAssistanceComponent from "@/components/dashboard/transportation-assistance";
-import TitlePage from "@/core/components/TitlePage";
 import RolePermission from "@/middlewares/RolePermission";
 import WithAuthMiddleware from "@/middlewares/WithAuth";
 import {parse} from "next-useragent";
@@ -9,7 +8,6 @@ export default function TransportationAssistance() {
    return (
        <WithAuthMiddleware>
            <RolePermission requiredPermissions={requiredPermissions}>
-                <TitlePage text="Dashboard.transportation_assistance"/>
                <DashboardTransportationAssistanceComponent/>
            </RolePermission>
        </WithAuthMiddleware>
@@ -21,6 +19,7 @@ export async function getServerSideProps({req, locale}) {
    return {
        props: {
            messages: (await import(`&/locales/${locale}/app.json`)).default,
+            title: "Dashboard.transportation_assistance",
            isBot,
        },
    };
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -1,11 +1,9 @@
 import FirstComponent from "@/components/first";
-import TitlePage from "@/core/components/TitlePage";
 import {parse} from "next-useragent";

 export default function Home() {
    return (
        <>
-            <TitlePage text="first_page"/>
            <FirstComponent/>
        </>
    );
@@ -16,6 +14,7 @@ export async function getServerSideProps({req, locale}) {
    return {
        props: {
            messages: (await import(`&/locales/${locale}/app.json`)).default,
+            title: "first_page",
            isBot,
        },
    };
--- a/src/pages/login-expert.jsx
+++ b/src/pages/login-expert.jsx
@@ -1,18 +1,11 @@
 import LoginComponent from "@/components/login-expert";
-import TitlePage from "@/core/components/TitlePage";
 import WithoutAuthMiddleware from "@/middlewares/WithoutAuth";
 import {parse} from "next-useragent";
-import "react-toastify/dist/ReactToastify.css";
-import {ToastContainer} from "react-toastify";
-import useDirection from "@/lib/app/hooks/useDirection";

 export default function Login() {
-    const {directionApp} = useDirection();
    return (
        <WithoutAuthMiddleware>
-            <TitlePage text="Titles.title_login_expert_page"/>
            <LoginComponent/>
-            {directionApp === "rtl" ? <ToastContainer rtl/> : <ToastContainer ltr/>}
        </WithoutAuthMiddleware>
    );
 }
@@ -22,6 +15,7 @@ export async function getServerSideProps({req, locale}) {
    return {
        props: {
            messages: (await import(`&/locales/${locale}/app.json`)).default,
+            title: "Titles.title_login_expert_page",
            isBot,
        },
    };