loan/user-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/coreBugs' into 'develop'

Browse Source 
Feature/core bugs

See merge request witel3/loan-facilities-user!19
This commit is contained in:
AmirHossein Mahmoodi
2023-08-01 06:08:19 +00:00
parent a869363aba 94bfa0c83f
commit 868306a5d5
11 changed files with 17 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/layouts/AppLayout.jsx
View File

@@ -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}
</>
);

2
src/pages/_app.jsx
View File

@@ -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} />

8
src/pages/_document.jsx
View File

@@ -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;
}

3
src/pages/dashboard/index.jsx
View File

@@ -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,
},
};

3
src/pages/dashboard/loan-follow-up/index.jsx
View File

@@ -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,
},
};

3
src/pages/dashboard/loan-request/index.jsx
View File

@@ -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,
},
};

3
src/pages/index.jsx
View File

@@ -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,
},
};

7
src/pages/login.jsx
View File

@@ -1,18 +1,12 @@
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";
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_page"/>
<LoginComponent/>
{directionApp === "rtl" ? <ToastContainer rtl/> : <ToastContainer ltr/>}
</WithoutAuthMiddleware>
);
}
@@ -22,6 +16,7 @@ export async function getServerSideProps({req, locale}) {
return {
props: {
messages: (await import(`&/locales/${locale}/app.json`)).default,
title: "Titles.title_login_page",
isBot,
},
};

7
src/pages/register/index.jsx
View File

@@ -1,18 +1,12 @@
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";
import {ToastContainer} from "react-toastify";
import useDirection from "@/lib/app/hooks/useDirection";
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 +16,7 @@ export async function getServerSideProps({req, locale}) {
return {
props: {
messages: (await import(`&/locales/${locale}/app.json`)).default,
title: "Titles.title_register_page",
isBot,
},
};

7
src/pages/register/navy/index.jsx
View File

@@ -1,18 +1,12 @@
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";
import {ToastContainer} from "react-toastify";
import useDirection from "@/lib/app/hooks/useDirection";
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 +16,7 @@ export async function getServerSideProps({req, locale}) {
return {
props: {
messages: (await import(`&/locales/${locale}/app.json`)).default,
title: "Titles.title_register_navy_page",
isBot,
},
};

7
src/pages/register/welfare-services/index.jsx
View File

@@ -1,18 +1,12 @@
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";
import {ToastContainer} from "react-toastify";
import useDirection from "@/lib/app/hooks/useDirection";
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 +16,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,
},
};