From bcc7279d39ef359c6830e6dfe4075631aaf3d6af Mon Sep 17 00:00:00 2001
From: Alibek <musicchannel0p@gmail.com>
Date: Sat, 2 Mar 2024 02:07:30 +0600
Subject: [PATCH] fixed few bugs

---
 src/app/[locale]/about-us/AboutUs.scss      | 16 ++++++++++++++++
 src/app/[locale]/about-us/page.tsx          | 14 +++++---------
 src/app/[locale]/globals.scss               |  5 +----
 src/app/[locale]/layout.tsx                 |  2 +-
 src/features/BreadCrumbs/BreadCrumbs.tsx    |  4 ++--
 src/shared/config/authConfig.ts             | 16 +++++++---------
 src/widgets/Navbar/NavAuth/NavAuth.tsx      |  2 ++
 src/widgets/forms/SignUpForm/SignUpForm.tsx |  4 +---
 yarn.lock                                   |  7 ++-----
 9 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/src/app/[locale]/about-us/AboutUs.scss b/src/app/[locale]/about-us/AboutUs.scss
index 8e4b882..4524a83 100644
--- a/src/app/[locale]/about-us/AboutUs.scss
+++ b/src/app/[locale]/about-us/AboutUs.scss
@@ -36,6 +36,22 @@
       line-height: 34px;
       color: rgb(62, 50, 50);
     }
+
+    ul {
+      display: flex;
+      flex-direction: column;
+      gap: 20px;
+      li {
+        font-size: 20px;
+        font-weight: 400;
+        line-height: 34px;
+        color: rgb(62, 50, 50);
+      }
+    }
+  }
+
+  &__author {
+    margin-top: 30px;
   }
 }
 
diff --git a/src/app/[locale]/about-us/page.tsx b/src/app/[locale]/about-us/page.tsx
index 671a80b..9ed59b9 100644
--- a/src/app/[locale]/about-us/page.tsx
+++ b/src/app/[locale]/about-us/page.tsx
@@ -22,38 +22,34 @@ const AboutUs = () => {
         alt="Header Image"
       />
       <div className="about-us__descriptions">
-        <p>
+        <h3>
           Transparency International-Кыргызстан - филиал международной
           организации Transparency International в Кыргызской
           Республике.
-        </p>
-        <h4>Миссия ТИ-Кыргызстан</h4>
+        </h3>
+        <h3>Миссия ТИ-Кыргызстан</h3>
         <p>
           Продвижение эффективной общественной политики и надлежащего
           управления в целях предотвращения коррупции и усиления
           демократии в стране.{" "}
         </p>
-        <h4>Цели и приоритеты ТИ-Кыргызстан:</h4>
+        <h3>Цели и приоритеты ТИ-Кыргызстан:</h3>
         <ul>
           <li>
-            {" "}
             - антикоррупционное просвещение населения, повышение
             общественного осознания значимости и важности борьбы с
             коррупцией в Кыргызстане;
           </li>
           <li>
-            {" "}
             - организация изучения практики и теории борьбы с
             коррупцией и участия в ней структур гражданского общества
             в Кыргызстане и других странах;
           </li>
           <li>
-            {" "}
             - содействие гражданам и организациям в реализации их
             конституционных прав и свобод;
           </li>
           <li>
-            {" "}
             - преимущественная ориентация на международный опыт
             уменьшения коррупции, освоение его технологий, ресурсов, а
             также включение структур гражданского общества в
@@ -61,7 +57,7 @@ const AboutUs = () => {
           </li>
         </ul>
       </div>
-      <p>
+      <p className="about-us__author">
         Photo By Mzximvs VdB from Brussels, belgium - Road to
         Issyk-Kul (south shore), CC BY-SA 2.0
       </p>
diff --git a/src/app/[locale]/globals.scss b/src/app/[locale]/globals.scss
index cae662b..1ebd0de 100644
--- a/src/app/[locale]/globals.scss
+++ b/src/app/[locale]/globals.scss
@@ -4,10 +4,7 @@
   box-sizing: border-box;
   padding: 0;
   margin: 0;
-  font-family: system-ui, -apple-system, BlinkMacSystemFont,
-    "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans",
-    "Helvetica Neue", sans-serif;
-  // font-family: "Tilda Sans";
+  font-family: "Tilda Sans";
 }
 
 button,
diff --git a/src/app/[locale]/layout.tsx b/src/app/[locale]/layout.tsx
index 95ab16d..2c463f6 100644
--- a/src/app/[locale]/layout.tsx
+++ b/src/app/[locale]/layout.tsx
@@ -1,7 +1,7 @@
 import type { Metadata } from "next";
 import "./globals.scss";
 import "./App.scss";
-// import "@/shared/fonts/fonts.scss";
+import "@/shared/fonts/fonts.scss";
 import Navbar from "@/widgets/Navbar/Navbar";
 import Footer from "@/widgets/Footer/Footer";
 import { NextIntlClientProvider, useMessages } from "next-intl";
diff --git a/src/features/BreadCrumbs/BreadCrumbs.tsx b/src/features/BreadCrumbs/BreadCrumbs.tsx
index 841bee2..6026d07 100644
--- a/src/features/BreadCrumbs/BreadCrumbs.tsx
+++ b/src/features/BreadCrumbs/BreadCrumbs.tsx
@@ -49,9 +49,9 @@ const BreadCrumbs: React.FC<IBreadcrumbsProps> = ({
           return <span key={route}>{tRoutes[route]}</span>;
         } else {
           return route === "report" ? (
-            <span>{tRoutes[route]}</span>
+            <span key={route}>{tRoutes[route]}</span>
           ) : (
-            <Link href={`/${route}`}>
+            <Link key={route} href={`/${route}`}>
               {tRoutes[route]}
               <Image src={chevron} alt="Chevron Right Icon" />
             </Link>
diff --git a/src/shared/config/authConfig.ts b/src/shared/config/authConfig.ts
index 28d8638..f4ad5f4 100644
--- a/src/shared/config/authConfig.ts
+++ b/src/shared/config/authConfig.ts
@@ -19,18 +19,20 @@ const verifyToken = async (access_token: string) => {
 };
 
 const refreshToken = async (token: JWT): Promise<JWT> => {
-  const data = {
-    refresh: token.refresh_token,
-  };
   // const date = new Date().toLocaleTimeString();
   // const expire = new Date(token.expires_in).toLocaleTimeString();
 
   const verify = await verifyToken(token.access_token);
 
-  if (verify)
+  if (verify) {
     return {
       ...token,
     };
+  }
+
+  const data = {
+    refresh: token.refresh_token,
+  };
 
   const response = await apiInstance.post<IRefresh>(
     "/users/refresh/",
@@ -114,13 +116,9 @@ export const authConfig: AuthOptions = {
 
       return true;
     },
-    async jwt({ token, user, account }) {
+    async jwt({ token, user }) {
       if (user) return { ...token, ...user };
 
-      if (token.exp) {
-        return token;
-      }
-
       return refreshToken(token);
     },
 
diff --git a/src/widgets/Navbar/NavAuth/NavAuth.tsx b/src/widgets/Navbar/NavAuth/NavAuth.tsx
index c110263..b503b06 100644
--- a/src/widgets/Navbar/NavAuth/NavAuth.tsx
+++ b/src/widgets/Navbar/NavAuth/NavAuth.tsx
@@ -15,7 +15,9 @@ const NavAuth: React.FC<INavAuthProps> = ({
 }: INavAuthProps) => {
   const t = useTranslations("navigation");
   const session = useSession();
+
   const auth = session.status === "authenticated" ? true : false;
+
   const pathname = usePathname();
   return (
     <>
diff --git a/src/widgets/forms/SignUpForm/SignUpForm.tsx b/src/widgets/forms/SignUpForm/SignUpForm.tsx
index a1f3098..d4ef92b 100644
--- a/src/widgets/forms/SignUpForm/SignUpForm.tsx
+++ b/src/widgets/forms/SignUpForm/SignUpForm.tsx
@@ -100,7 +100,7 @@ const SignUpForm = () => {
       }
     } catch (error: unknown) {
       if (error instanceof AxiosError) {
-        if (error.response?.status === 401) {
+        if ([401, 400].includes(error.response?.status as number)) {
           setError("Такой пользователь уже существует");
         } else if (
           error.response?.status.toString().slice(0, 1) === "5"
@@ -147,9 +147,7 @@ const SignUpForm = () => {
           {loader ? <Loader /> : "Войти"}
         </button>
 
-        {/*
         <GoogleButton />
-  */}
       </div>
     </form>
   );
diff --git a/yarn.lock b/yarn.lock
index 9eff929..726cf08 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1962,7 +1962,6 @@ next-auth@^4.24.5:
     preact-render-to-string "^5.1.19"
     uuid "^8.3.2"
 
-<<<<<<< HEAD
 next-intl@^3.9.0:
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/next-intl/-/next-intl-3.9.0.tgz#8b891c18c1759eb24cd9cf4ab72aee85227e6e7f"
@@ -1972,10 +1971,7 @@ next-intl@^3.9.0:
     negotiator "^0.6.3"
     use-intl "^3.9.0"
 
-next@14.1.0:
-=======
 next@^14.1.0:
->>>>>>> d1440f3907ca91b29db2977f043e44f54993aeb1
   version "14.1.0"
   resolved "https://registry.npmjs.org/next/-/next-14.1.0.tgz"
   integrity sha512-wlzrsbfeSU48YQBjZhDzOwhWhGsy+uQycR8bHAOt1LY1bn3zZEcDyHQOEoN3aWzQ8LHCAJ1nqrWCc9XF2+O45Q==
@@ -2412,7 +2408,7 @@ set-function-name@^2.0.0, set-function-name@^2.0.1:
 
 sharp@^0.33.2:
   version "0.33.2"
-  resolved "https://registry.npmjs.org/sharp/-/sharp-0.33.2.tgz"
+  resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.33.2.tgz#fcd52f2c70effa8a02160b1bfd989a3de55f2dfb"
   integrity sha512-WlYOPyyPDiiM07j/UO+E720ju6gtNtHjEGg5vovUk1Lgxyjm2LFO+37Nt/UI3MMh2l6hxTWQWi7qk3cXJTutcQ==
   dependencies:
     color "^4.2.3"
@@ -2488,6 +2484,7 @@ streamsearch@^1.1.0:
   integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==
 
 "string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0:
+  name string-width-cjs
   version "4.2.3"
   resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==