From 6e9012af6bf974b3e351b92fdfcaa03225728498 Mon Sep 17 00:00:00 2001
From: Amirhossein Mahmoodi <amir.mahmoodi74@gmail.com>
Date: Mon, 31 Jul 2023 17:12:22 +0330
Subject: [PATCH 1/3] fixed title pages

---
 src/pages/_app.jsx                            | 2 ++
 src/pages/dashboard/index.jsx                 | 3 +--
 src/pages/dashboard/loan-follow-up/index.jsx  | 3 +--
 src/pages/dashboard/loan-request/index.jsx    | 3 +--
 src/pages/index.jsx                           | 3 +--
 src/pages/login.jsx                           | 3 +--
 src/pages/register/index.jsx                  | 3 +--
 src/pages/register/navy/index.jsx             | 3 +--
 src/pages/register/welfare-services/index.jsx | 3 +--
 9 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/pages/_app.jsx b/src/pages/_app.jsx
index 573bef2..85b03cd 100644
--- 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} />
diff --git a/src/pages/dashboard/index.jsx b/src/pages/dashboard/index.jsx
index 83bbb7c..af824d5 100644
--- 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,
         },
     };
diff --git a/src/pages/dashboard/loan-follow-up/index.jsx b/src/pages/dashboard/loan-follow-up/index.jsx
index aae94d1..1fbea74 100644
--- a/src/pages/dashboard/loan-follow-up/index.jsx
+++ b/src/pages/dashboard/loan-follow-up/index.jsx
@@ -1,12 +1,10 @@
 import DashboardLoanFollowUpComponent from "@/components/dashboard/loan-follow-up";
-import TitlePage from "@/core/components/TitlePage";
 import WithAuthMiddleware from "@/middlewares/WithAuth";
 import {parse} from "next-useragent";
 
 export default function LoanFollowUp() {
     return (
         <WithAuthMiddleware>
-            <TitlePage text="LoanFollowUp.loan_follow_up_page"/>
             <DashboardLoanFollowUpComponent/>
         </WithAuthMiddleware>
     );
@@ -17,6 +15,7 @@ export async function getServerSideProps({req, locale}) {
     return {
         props: {
             messages: (await import(`&/locales/${locale}/app.json`)).default,
+            title: "LoanFollowUp.loan_follow_up_page",
             isBot,
         },
     };
diff --git a/src/pages/dashboard/loan-request/index.jsx b/src/pages/dashboard/loan-request/index.jsx
index f6d2579..8519fca 100644
--- a/src/pages/dashboard/loan-request/index.jsx
+++ b/src/pages/dashboard/loan-request/index.jsx
@@ -1,12 +1,10 @@
 import DashboardLoanRequestComponent from "@/components/dashboard/loan-request";
-import TitlePage from "@/core/components/TitlePage";
 import WithAuthMiddleware from "@/middlewares/WithAuth";
 import {parse} from "next-useragent";
 
 export default function LoanRequest() {
     return (
         <WithAuthMiddleware>
-            <TitlePage text="LoanFollowUp.loan_follow_up_page"/>
             <DashboardLoanRequestComponent/>
         </WithAuthMiddleware>
     );
@@ -17,6 +15,7 @@ export async function getServerSideProps({req, locale}) {
     return {
         props: {
             messages: (await import(`&/locales/${locale}/app.json`)).default,
+            title: "LoanRequest.loan_request_page",
             isBot,
         },
     };
diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 82c1f58..2e146c6 100644
--- 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,
         },
     };
diff --git a/src/pages/login.jsx b/src/pages/login.jsx
index b5b7fea..63baea0 100644
--- a/src/pages/login.jsx
+++ b/src/pages/login.jsx
@@ -1,5 +1,4 @@
 import LoginComponent from "@/components/login";
-import TitlePage from "@/core/components/TitlePage";
 import WithoutAuthMiddleware from "@/middlewares/WithoutAuth";
 import {parse} from "next-useragent";
 import "react-toastify/dist/ReactToastify.css";
@@ -10,7 +9,6 @@ export default function Login() {
     const {directionApp} = useDirection();
     return (
         <WithoutAuthMiddleware>
-            <TitlePage text="Titles.title_login_page"/>
             <LoginComponent/>
             {directionApp === "rtl" ? <ToastContainer rtl/> : <ToastContainer ltr/>}
         </WithoutAuthMiddleware>
@@ -22,6 +20,7 @@ export async function getServerSideProps({req, locale}) {
     return {
         props: {
             messages: (await import(`&/locales/${locale}/app.json`)).default,
+            title: "Titles.title_login_page",
             isBot,
         },
     };
diff --git a/src/pages/register/index.jsx b/src/pages/register/index.jsx
index 3afa761..3d2bfe9 100644
--- a/src/pages/register/index.jsx
+++ b/src/pages/register/index.jsx
@@ -1,5 +1,4 @@
 import RegisterComponent from "@/components/register";
-import TitlePage from "@/core/components/TitlePage";
 import WithoutAuthMiddleware from "@/middlewares/WithoutAuth";
 import {parse} from "next-useragent";
 import "react-toastify/dist/ReactToastify.css";
@@ -10,7 +9,6 @@ export default function Register() {
     const {directionApp} = useDirection();
     return (
         <WithoutAuthMiddleware>
-            <TitlePage text="Titles.title_register_page"/>
             <RegisterComponent/>
             {directionApp === "rtl" ? <ToastContainer rtl/> : <ToastContainer ltr/>}
         </WithoutAuthMiddleware>
@@ -22,6 +20,7 @@ export async function getServerSideProps({req, locale}) {
     return {
         props: {
             messages: (await import(`&/locales/${locale}/app.json`)).default,
+            title: "Titles.title_register_page",
             isBot,
         },
     };
diff --git a/src/pages/register/navy/index.jsx b/src/pages/register/navy/index.jsx
index 3d18b18..df5a84f 100644
--- a/src/pages/register/navy/index.jsx
+++ b/src/pages/register/navy/index.jsx
@@ -1,5 +1,4 @@
 import NavyComponent from "@/components/register/navy";
-import TitlePage from "@/core/components/TitlePage";
 import WithoutAuthMiddleware from "@/middlewares/WithoutAuth";
 import {parse} from "next-useragent";
 import "react-toastify/dist/ReactToastify.css";
@@ -10,7 +9,6 @@ export default function Register() {
     const {directionApp} = useDirection();
     return (
         <WithoutAuthMiddleware>
-            <TitlePage text="Titles.title_register_navy_page"/>
             <NavyComponent/>
             {directionApp === "rtl" ? <ToastContainer rtl/> : <ToastContainer ltr/>}
         </WithoutAuthMiddleware>
@@ -22,6 +20,7 @@ export async function getServerSideProps({req, locale}) {
     return {
         props: {
             messages: (await import(`&/locales/${locale}/app.json`)).default,
+            title: "Titles.title_register_navy_page",
             isBot,
         },
     };
diff --git a/src/pages/register/welfare-services/index.jsx b/src/pages/register/welfare-services/index.jsx
index 68732c3..2212717 100644
--- a/src/pages/register/welfare-services/index.jsx
+++ b/src/pages/register/welfare-services/index.jsx
@@ -1,5 +1,4 @@
 import WelfareServicesComponent from "@/components/register/welfare-services";
-import TitlePage from "@/core/components/TitlePage";
 import WithoutAuthMiddleware from "@/middlewares/WithoutAuth";
 import {parse} from "next-useragent";
 import "react-toastify/dist/ReactToastify.css";
@@ -10,7 +9,6 @@ export default function Register() {
     const {directionApp} = useDirection();
     return (
         <WithoutAuthMiddleware>
-            <TitlePage text="Titles.title_register_welfare_services_page"/>
             <WelfareServicesComponent/>
             {directionApp === "rtl" ? <ToastContainer rtl/> : <ToastContainer ltr/>}
         </WithoutAuthMiddleware>
@@ -22,6 +20,7 @@ export async function getServerSideProps({req, locale}) {
     return {
         props: {
             messages: (await import(`&/locales/${locale}/app.json`)).default,
+            title: "Titles.title_register_welfare_services_page",
             isBot,
         },
     };

From 131f80b0b5adbba1477d9d02165f3b6ac8eeec73 Mon Sep 17 00:00:00 2001
From: Amirhossein Mahmoodi <amir.mahmoodi74@gmail.com>
Date: Tue, 1 Aug 2023 09:17:46 +0330
Subject: [PATCH 2/3] fixed _document page

---
 src/pages/_document.jsx | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/pages/_document.jsx b/src/pages/_document.jsx
index f71303f..c9c28bb 100644
--- 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;
     }
 

From 94bfa0c83f25e8042d30182e23a0d5a88050f4ad Mon Sep 17 00:00:00 2001
From: Amirhossein Mahmoodi <amir.mahmoodi74@gmail.com>
Date: Tue, 1 Aug 2023 09:22:22 +0330
Subject: [PATCH 3/3] fixed ToastContainer

---
 src/layouts/AppLayout.jsx                     | 5 +++++
 src/pages/login.jsx                           | 4 ----
 src/pages/register/index.jsx                  | 4 ----
 src/pages/register/navy/index.jsx             | 4 ----
 src/pages/register/welfare-services/index.jsx | 4 ----
 5 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/layouts/AppLayout.jsx b/src/layouts/AppLayout.jsx
index d2c5da5..1f160cf 100644
--- a/src/layouts/AppLayout.jsx
+++ b/src/layouts/AppLayout.jsx
@@ -5,11 +5,15 @@ 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";
 
 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 +95,7 @@ function AppLayout({children, isBot}) {
                 color={theme.palette.secondary.dark}
                 options={{showSpinner: false}}
             />
+            {directionApp === "rtl" ? <ToastContainer rtl/> : <ToastContainer ltr/>}
             {children}
         </>
     );
diff --git a/src/pages/login.jsx b/src/pages/login.jsx
index 63baea0..b9ba800 100644
--- a/src/pages/login.jsx
+++ b/src/pages/login.jsx
@@ -2,15 +2,11 @@ import LoginComponent from "@/components/login";
 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>
             <LoginComponent/>
-            {directionApp === "rtl" ? <ToastContainer rtl/> : <ToastContainer ltr/>}
         </WithoutAuthMiddleware>
     );
 }
diff --git a/src/pages/register/index.jsx b/src/pages/register/index.jsx
index 3d2bfe9..d1160e2 100644
--- a/src/pages/register/index.jsx
+++ b/src/pages/register/index.jsx
@@ -2,15 +2,11 @@ import RegisterComponent from "@/components/register";
 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 Register() {
-    const {directionApp} = useDirection();
     return (
         <WithoutAuthMiddleware>
             <RegisterComponent/>
-            {directionApp === "rtl" ? <ToastContainer rtl/> : <ToastContainer ltr/>}
         </WithoutAuthMiddleware>
     );
 }
diff --git a/src/pages/register/navy/index.jsx b/src/pages/register/navy/index.jsx
index df5a84f..b4ac8fe 100644
--- a/src/pages/register/navy/index.jsx
+++ b/src/pages/register/navy/index.jsx
@@ -2,15 +2,11 @@ import NavyComponent from "@/components/register/navy";
 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 Register() {
-    const {directionApp} = useDirection();
     return (
         <WithoutAuthMiddleware>
             <NavyComponent/>
-            {directionApp === "rtl" ? <ToastContainer rtl/> : <ToastContainer ltr/>}
         </WithoutAuthMiddleware>
     );
 }
diff --git a/src/pages/register/welfare-services/index.jsx b/src/pages/register/welfare-services/index.jsx
index 2212717..01a0042 100644
--- a/src/pages/register/welfare-services/index.jsx
+++ b/src/pages/register/welfare-services/index.jsx
@@ -2,15 +2,11 @@ import WelfareServicesComponent from "@/components/register/welfare-services";
 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 Register() {
-    const {directionApp} = useDirection();
     return (
         <WithoutAuthMiddleware>
             <WelfareServicesComponent/>
-            {directionApp === "rtl" ? <ToastContainer rtl/> : <ToastContainer ltr/>}
         </WithoutAuthMiddleware>
     );
 }