From a4ef589ca9dd57ee9e68ab14c724a9e89114606b Mon Sep 17 00:00:00 2001
From: "salar.sali" <salar.sali97@gmail.com>
Date: Fri, 11 Nov 2022 05:03:34 -0500
Subject: [PATCH 1/4] The translation in burger component resolved

---
 src/components/Burger.tsx | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/components/Burger.tsx b/src/components/Burger.tsx
index 99b9e67..269379c 100644
--- a/src/components/Burger.tsx
+++ b/src/components/Burger.tsx
@@ -21,10 +21,12 @@ import { ReactComponent as SVGFile } from "assets/svg/file.svg";
 import { ReactComponent as SVGEye } from "assets/svg/eye.svg";
 import { ReactComponent as SVGArrowUp } from "assets/svg/arrow-up.svg";
 import { ReactComponent as SVGCaretDown } from "assets/svg/caret-down.svg";
+import { useTranslation } from "react-i18next";
 
 type Props = React.ComponentPropsWithoutRef<"div">;
 
 const Burger = (props: Props) => {
+  const { t, i18n } = useTranslation();
   return (
     <div {...props}>
       <Menu as="div" className="relative inline-block text-left z-30">
@@ -46,13 +48,15 @@ const Burger = (props: Props) => {
           leaveTo="transform opacity-0 scale-95"
         >
           <Menu.Items
-            className="origin-top-right absolute right-0 mt-5 w-44 rounded-md 
+            className="origin-top-right absolute right-0 mt-5 w-48 rounded-md 
           shadow-lg bg-white ring-1 ring-black ring-opacity-5 focus:outline-none"
           >
             <div className="py-1">
               <Disclosure>
                 <Disclosure.Button className="uppercase text-base	 px-2 py-1">
-                  <Link className="text-[#096DD9]">create new</Link>
+                  <Link className="text-[#096DD9]">
+                    {t("navbar.createNew")}
+                  </Link>
                 </Disclosure.Button>
               </Disclosure>
               <hr />
@@ -66,7 +70,7 @@ const Burger = (props: Props) => {
                       text-base	
                      "
                     >
-                      my library
+                      <span>{t("navbar.library.navTitle")}</span>
                       <SVGArrowUp
                         className={`${
                           open ? "rotate-180 transform" : "rotate-360"
@@ -83,7 +87,7 @@ const Burger = (props: Props) => {
                         "
                       >
                         <SVGFile className="stroke-black w-4 h-4" />
-                        My Publications
+                        <span>{t("navbar.library.publications")}</span>
                       </Disclosure.Panel>
                     </Link>
 
@@ -96,7 +100,7 @@ const Burger = (props: Props) => {
                         "
                       >
                         <SVGFavoriteOutlined className="stroke-black w-4 h-4" />
-                        My Favorites
+                        <span>{t("navbar.library.favorites")}</span>
                       </Disclosure.Panel>
                     </Link>
 
@@ -109,7 +113,7 @@ const Burger = (props: Props) => {
                         "
                       >
                         <SVGFolder className="stroke-black fill-black w-4 h-4" />
-                        My Collections
+                        <span>{t("navbar.library.collections")}</span>
                       </Disclosure.Panel>
                     </Link>
 
@@ -122,7 +126,7 @@ const Burger = (props: Props) => {
                          "
                       >
                         <SVGEye className="stroke-black w-4 h-4" />
-                        Recent Viewed
+                        <span>{t("navbar.library.recentViewed")}</span>
                       </Disclosure.Panel>
                     </Link>
                   </>
@@ -140,7 +144,7 @@ const Burger = (props: Props) => {
                       text-base	
                      "
                     >
-                      About
+                      <span>{t("navbar.about.navTitle")}</span>
                       <SVGArrowUp
                         className={`${
                           open ? "rotate-180 transform" : "rotate-360"
@@ -156,7 +160,7 @@ const Burger = (props: Props) => {
                         text-base	
                         "
                       >
-                        About Freeland
+                        <span>{t("navbar.about.aboutProject")}</span>
                       </Disclosure.Panel>
                     </Link>
 
@@ -168,7 +172,7 @@ const Burger = (props: Props) => {
                         text-base	
                         "
                       >
-                        Contact Us
+                        <span>{t("navbar.about.contacts")}</span>
                       </Disclosure.Panel>
                     </Link>
 
@@ -180,7 +184,7 @@ const Burger = (props: Props) => {
                         text-base	
                         "
                       >
-                        Help
+                        <span>{t("navbar.about.help")}</span>
                       </Disclosure.Panel>
                     </Link>
                   </>
-- 
2.39.5


From a4a8116d326a0c66e7dc903a3b64cb1d39f9202b Mon Sep 17 00:00:00 2001
From: "salar.sali" <salar.sali97@gmail.com>
Date: Fri, 11 Nov 2022 05:16:02 -0500
Subject: [PATCH 2/4] The overlaping in the navbar resolved

---
 src/components/parts/Header.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/parts/Header.tsx b/src/components/parts/Header.tsx
index e38c1d5..84761bf 100755
--- a/src/components/parts/Header.tsx
+++ b/src/components/parts/Header.tsx
@@ -80,7 +80,7 @@ const Header = () => {
           <ContextMenu
             emphasis="high"
             button={t("navbar.library.navTitle")}
-            className="border-none uppercase"
+            className="border-none uppercase z-40"
           >
             <ContextMenuAction
               caption={t("navbar.library.publications")}
@@ -112,7 +112,7 @@ const Header = () => {
           <ContextMenu
             emphasis="high"
             button={t("navbar.about.navTitle")}
-            className="border-none uppercase"
+            className="border-none uppercase z-40"
           >
             <ContextMenuAction
               caption={t("navbar.about.aboutProject")}
-- 
2.39.5


From 355a9af98518e6cde24b95bd874476ea86f52be3 Mon Sep 17 00:00:00 2001
From: "salar.sali" <salar.sali97@gmail.com>
Date: Fri, 11 Nov 2022 08:53:01 -0500
Subject: [PATCH 3/4] topic resolved

---
 src/components/ArticleSearchResult.tsx | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/components/ArticleSearchResult.tsx b/src/components/ArticleSearchResult.tsx
index a1571be..af16c57 100755
--- a/src/components/ArticleSearchResult.tsx
+++ b/src/components/ArticleSearchResult.tsx
@@ -27,17 +27,15 @@ export const ArticleSearchResult = ({ searchItem }: Props) => {
     <Article className=" pt-6 pb-3 ">
       <div className="flex flex-row justify-between">
         <Article.Breadcumbs emphasis="low" className="flex flex-wrap flex-row">
-          {[
-            `${searchItem.topic}`,
-            `${searchItem.topic}`,
-            `${searchItem.topic}`,
-            `${searchItem.topic}`,
-          ]}
+          {[`${searchItem.topic}`]}
         </Article.Breadcumbs>
         <Article.SubscriptionsButtons />
       </div>
 
-      <Article.Title linkTo={`/article/info/${searchItem.id}`} className="text-2xl">
+      <Article.Title
+        linkTo={`/article/info/${searchItem.id}`}
+        className="text-2xl"
+      >
         {searchItem.title}
       </Article.Title>
       <Article.Authors emphasis="low" className="flex flex-wrap flex-row">
-- 
2.39.5


From 43bc96bdf62847082137be732beac56fcb6b2899 Mon Sep 17 00:00:00 2001
From: danysmall <dany.small.work@gmail.com>
Date: Mon, 14 Nov 2022 12:31:42 +0300
Subject: [PATCH 4/4] Removed double request

---
 src/index.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/index.tsx b/src/index.tsx
index 9f61062..0e8c2e4 100755
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -25,7 +25,6 @@ if (!rootElement) throw new Error("Failed to find the root element");
 const root = ReactDOM.createRoot(rootElement);
 root.render(
   <Provider store={store}>
-    <React.StrictMode>
       <BrowserRouter>
         <Routes>
           <Route path="/" element={<App />} />
@@ -46,7 +45,6 @@ root.render(
           <Route path="/*" element={<NotFound />}></Route>
         </Routes>
       </BrowserRouter>
-    </React.StrictMode>
   </Provider>
 );
 
-- 
2.39.5