From cbe1efc11a0b8b7c3d9ea23235d294b7dbf95315 Mon Sep 17 00:00:00 2001 From: Mohammad Jalali Date: Sun, 23 Jul 2023 16:27:46 +0330 Subject: [PATCH 1/3] app layout chewcking bot and language app --- src/layouts/AppLayout.jsx | 44 ++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/src/layouts/AppLayout.jsx b/src/layouts/AppLayout.jsx index 2f7988e..a12796d 100644 --- a/src/layouts/AppLayout.jsx +++ b/src/layouts/AppLayout.jsx @@ -6,20 +6,36 @@ import NextNProgress from "nextjs-progressbar"; import { useEffect } from "react"; function AppLayout({ children, isBot }) { - const { setLoadingPage } = useLoading(); - const { token, isAuth } = useUser(); - useEffect(() => { - if (token) { - if (isAuth) { - setLoadingPage(false); - return; - } - setLoadingPage(true); - return; - } - setLoadingPage(false); - return; - }, [token, isAuth]); + const { languageIsReady } = useLanguage(); + const { setLoadingPage } = useLoading(); + const { userChangedLanguage, token, isAuth } = useUser(); + useEffect(() => { + if (languageIsReady) { + if (token) { + if (isAuth) { + if (userChangedLanguage) { + setLoadingPage(true); + return; + } + setLoadingPage(false); + return; + } + setLoadingPage(true); + return; + } + setLoadingPage(false); + return; + } + setLoadingPage(true); + }, [languageIsReady, token, isAuth, userChangedLanguage]); + + if (!isBot) { + if (userChangedLanguage) return; + if (!languageIsReady) return; + } + + + return ( <> From 37a108ce0e9aeca6b4bee4fadb48227386f09d5e Mon Sep 17 00:00:00 2001 From: Mohammad Jalali Date: Sun, 23 Jul 2023 16:28:04 +0330 Subject: [PATCH 2/3] app layout chewcking bot and language app --- src/layouts/AppLayout.jsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/layouts/AppLayout.jsx b/src/layouts/AppLayout.jsx index a12796d..f660a25 100644 --- a/src/layouts/AppLayout.jsx +++ b/src/layouts/AppLayout.jsx @@ -34,9 +34,6 @@ function AppLayout({ children, isBot }) { if (!languageIsReady) return; } - - - return ( <> From 3021bde999c46d5c94bd36589d68e66c817fe318 Mon Sep 17 00:00:00 2001 From: Mohammad Jalali Date: Sun, 23 Jul 2023 16:47:49 +0330 Subject: [PATCH 3/3] app layout change --- src/layouts/AppLayout.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/layouts/AppLayout.jsx b/src/layouts/AppLayout.jsx index f660a25..4845f6d 100644 --- a/src/layouts/AppLayout.jsx +++ b/src/layouts/AppLayout.jsx @@ -1,4 +1,5 @@ import theme from "@/core/utils/theme"; +import useLanguage from "@/lib/app/hooks/useLanguage"; import useLoading from "@/lib/app/hooks/useLoading"; import useUser from "@/lib/app/hooks/useUser"; import Head from "next/head";