From 66cfc908147b7f76ce97d5744286b356681ad8ce Mon Sep 17 00:00:00 2001
From: Leonid Chelakhov <leonidchelahov@gmail.com>
Date: Fri, 20 Dec 2024 19:24:36 +0300
Subject: [PATCH 1/7] Changed the behavior of cookies

---
 .../components/CookieAcception/CookieMod.jsx  |  15 +-
 FrontEnd/src/routes/ClientRouter.jsx          | 187 ++++++++++--------
 2 files changed, 105 insertions(+), 97 deletions(-)

diff --git a/FrontEnd/src/components/CookieAcception/CookieMod.jsx b/FrontEnd/src/components/CookieAcception/CookieMod.jsx
index 7b8e0d0b..c9338d05 100644
--- a/FrontEnd/src/components/CookieAcception/CookieMod.jsx
+++ b/FrontEnd/src/components/CookieAcception/CookieMod.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import { useCookies } from 'react-cookie';
 import { Link } from 'react-router-dom';
@@ -7,11 +7,7 @@ import styles from './CookieMod.module.css';
 const CookieMod = ({ active, setActive }) => {
   const [cookies, setCookie] = useCookies(['cookies']);
 
-  useEffect(() => {
-    if (cookies.cookies !== undefined) {
-      setActive(false);
-    }
-  }, [cookies, setActive]);
+  const shouldShowModal = cookies.cookies === undefined;
 
   const allowCookies = () => {
     const expirationDate = new Date();
@@ -26,8 +22,7 @@ const CookieMod = ({ active, setActive }) => {
     setCookie('cookies', false, { expires: expirationDate, sameSite: 'lax' });
     setActive(false);
   };
-
-  return active ? (
+  return shouldShowModal && active ? (
     <div className={styles['cookie-banner']} data-testid="cookiemodal">
       <div className={styles['cookie-content']}>
         <div className={styles['cookie-header']}>
@@ -43,11 +38,11 @@ const CookieMod = ({ active, setActive }) => {
         </p>
         <p className={styles['cookie-text']}>
           Дізнатися більше
-          <Link to="privacy-policy/" className={styles['cookie-link']}>
+          <Link to="/privacy-policy" className={styles['cookie-link']}>
             про файли cookie.
           </Link>
         </p>
-        <div className={styles['cookie-buttons']} >
+        <div className={styles['cookie-buttons']}>
           <button className={styles['allow-all-btn']} onClick={allowCookies}>
             Дозволити
           </button>
diff --git a/FrontEnd/src/routes/ClientRouter.jsx b/FrontEnd/src/routes/ClientRouter.jsx
index 217970bf..e02b5264 100644
--- a/FrontEnd/src/routes/ClientRouter.jsx
+++ b/FrontEnd/src/routes/ClientRouter.jsx
@@ -2,6 +2,7 @@ import { ToastContainer } from 'react-toastify';
 import { Route, Routes, Navigate } from 'react-router-dom';
 import { ConfigProvider } from 'antd';
 import { SWRConfig } from 'swr';
+import React, { useState } from 'react';
 
 import 'react-toastify/dist/ReactToastify.css';
 import customTheme from '../pages/CustomThemes/customTheme.js';
@@ -12,6 +13,7 @@ import CookiesPolicyComponent from '../pages/CookiesPolicyPage/CookiesPolicyComp
 import Footer from '../components/Footer/Footer';
 import Header from '../components/Header/Header';
 import Loader from '../components/Loader/Loader';
+import CookieMod from '../components/CookieAcception/CookieMod';
 import MainPage from '../pages/LandingPage/MainPage';
 import PrivacyPolicy from '../pages/PrivacyPolicyPage/PrivacyPolicyPage';
 import ProfileDetailPage from '../pages/ProfileDetail/ProfileDetailPage';
@@ -39,6 +41,7 @@ import PageWrapper from '../components/PageWrapper/PageWrapper';
 
 function ClientRouter() {
   const { isAuth, user, logout, isLoading } = useAuth();
+  const [isCookieModalActive, setCookieModalActive] = useState(true);
 
   return (
     <ConfigProvider theme={customTheme}>
@@ -57,98 +60,108 @@ function ClientRouter() {
           {isLoading ? (
             <Loader />
           ) : (
-            <PageWrapper>
-              <Routes>
-                <Route path="/" element={<MainPage isAuthorized={isAuth} />} />
-                <Route path="/about-us" element={<AboutUsPage />} />
-                {isAuth ? (
-                  <Route path="/profile/*" element={<ProfilePage />} />
-                ) : (
-                  <Route path="/profile/*" element={<Navigate to="/" />} />
-                )}
-                <Route
-                  path="/profile-detail/:id"
-                  element={<ProfileDetailPage isAuthorized={isAuth} />}
-                />
-                <Route
-                  path="/profiles"
-                  element={<ProfileListPage isAuthorized={isAuth} isSaved={false}/>}
-                />
-                <Route
-                  path="/profiles/saved"
-                  element={<ProfileListPage isAuthorized={isAuth} isSaved={true}/>}
-                />
-                {isAuth ? (
+            <>
+              <CookieMod
+                active={isCookieModalActive}
+                setActive={setCookieModalActive}
+              />
+              <PageWrapper>
+                <Routes>
+                  <Route path="/" element={<MainPage isAuthorized={isAuth} />} />
+                  <Route path="/about-us" element={<AboutUsPage />} />
+                  {isAuth ? (
+                    <Route path="/profile/*" element={<ProfilePage />} />
+                  ) : (
+                    <Route path="/profile/*" element={<Navigate to="/" />} />
+                  )}
                   <Route
-                    path="/login"
-                    element={<Navigate to="/profile/user-info" />}
+                    path="/profile-detail/:id"
+                    element={<ProfileDetailPage isAuthorized={isAuth} />}
                   />
-                ) : (
-                  <Route path="/login" element={<LoginPage />} />
-                )}
-                {isAuth ? (
                   <Route
-                    path="/sign-up"
-                    element={<Navigate to="/profile/user-info" />}
+                    path="/profiles"
+                    element={
+                      <ProfileListPage isAuthorized={isAuth} isSaved={false} />
+                    }
                   />
-                ) : (
-                  <Route path="/sign-up" element={<SignUpPage />} />
-                )}
-                <Route
-                  path="/sign-up/completion"
-                  element={<SignUpCompletionPage />}
-                />
-                <Route
-                  path="/sign-up/resend-activation"
-                  element={<ResendActivationPage />}
-                />
-                <Route
-                  path="/activate/:uid/:token"
-                  element={<ActivateProfilePage />}
-                />
-                <Route
-                  path="/reset-password"
-                  element={<SendEmailForgotPasswordPage />}
-                />
-                <Route
-                  path="/reset-password/completion"
-                  element={<ForgotPasswordCompletionPage />}
-                />
-                <Route
-                  path="/password/reset/confirm/:uid/:token"
-                  element={<RestorePasswordPage />}
-                />
-                <Route
-                  path="/reset-password/successfully"
-                  element={<RestorePasswordSuccessPage />}
-                />
-                <Route
-                  path="/reset-password/failed"
-                  element={<RestorePasswordFailedPage />}
-                />
-                <Route path="/privacy-policy" element={<PrivacyPolicy />} />
-                <Route
-                  path="/terms-and-conditions"
-                  element={<TermsAndConditions />}
-                />
-                <Route
-                  path="/cookies-policy"
-                  element={<CookiesPolicyComponent />}
-                />
-                <Route path="/contact" element={<Contact />} />
-                <Route
-                  path="/search"
-                  element={<Search isAuthorized={isAuth} userData={user} />}
-                />
-                <Route
-                  path="/moderation/:id/:action"
-                  element={<ModerationModal />}
-                />
-                <Route path="*" element={<ErrorPage404 />} />
-              </Routes>
-            </PageWrapper>
+                  <Route
+                    path="/profiles/saved"
+                    element={
+                      <ProfileListPage isAuthorized={isAuth} isSaved={true} />
+                    }
+                  />
+                  {isAuth ? (
+                    <Route
+                      path="/login"
+                      element={<Navigate to="/profile/user-info" />}
+                    />
+                  ) : (
+                    <Route path="/login" element={<LoginPage />} />
+                  )}
+                  {isAuth ? (
+                    <Route
+                      path="/sign-up"
+                      element={<Navigate to="/profile/user-info" />}
+                    />
+                  ) : (
+                    <Route path="/sign-up" element={<SignUpPage />} />
+                  )}
+                  <Route
+                    path="/sign-up/completion"
+                    element={<SignUpCompletionPage />}
+                  />
+                  <Route
+                    path="/sign-up/resend-activation"
+                    element={<ResendActivationPage />}
+                  />
+                  <Route
+                    path="/activate/:uid/:token"
+                    element={<ActivateProfilePage />}
+                  />
+                  <Route
+                    path="/reset-password"
+                    element={<SendEmailForgotPasswordPage />}
+                  />
+                  <Route
+                    path="/reset-password/completion"
+                    element={<ForgotPasswordCompletionPage />}
+                  />
+                  <Route
+                    path="/password/reset/confirm/:uid/:token"
+                    element={<RestorePasswordPage />}
+                  />
+                  <Route
+                    path="/reset-password/successfully"
+                    element={<RestorePasswordSuccessPage />}
+                  />
+                  <Route
+                    path="/reset-password/failed"
+                    element={<RestorePasswordFailedPage />}
+                  />
+                  <Route path="/privacy-policy" element={<PrivacyPolicy />} />
+                  <Route
+                    path="/terms-and-conditions"
+                    element={<TermsAndConditions />}
+                  />
+                  <Route
+                    path="/cookies-policy"
+                    element={<CookiesPolicyComponent />}
+                  />
+                  <Route path="/contact" element={<Contact />} />
+                  <Route
+                    path="/search"
+                    element={<Search isAuthorized={isAuth} userData={user} />}
+                  />
+                  <Route
+                    path="/moderation/:id/:action"
+                    element={<ModerationModal />}
+                  />
+                  <Route path="*" element={<ErrorPage404 />} />
+                </Routes>
+              </PageWrapper>
+            </>
           )}
-          <Footer />
+         <Footer />
           <ToastContainer
             position="top-right"
             autoClose={3000}

From 5888411fe3c47a1e537ae01bddac3b0936233f89 Mon Sep 17 00:00:00 2001
From: Leonid Chelakhov <leonidchelahov@gmail.com>
Date: Fri, 20 Dec 2024 19:51:44 +0300
Subject: [PATCH 2/7] Changed code

---
 FrontEnd/src/routes/ClientRouter.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FrontEnd/src/routes/ClientRouter.jsx b/FrontEnd/src/routes/ClientRouter.jsx
index e02b5264..f72c3740 100644
--- a/FrontEnd/src/routes/ClientRouter.jsx
+++ b/FrontEnd/src/routes/ClientRouter.jsx
@@ -161,7 +161,7 @@ function ClientRouter() {
               </PageWrapper>
             </>
           )}
-         <Footer />
+          <Footer />
           <ToastContainer
             position="top-right"
             autoClose={3000}

From 1a5418fa33e881246864f2caddde4dda15c57f99 Mon Sep 17 00:00:00 2001
From: Leonid Chelakhov <leonidchelahov@gmail.com>
Date: Mon, 23 Dec 2024 19:43:46 +0300
Subject: [PATCH 3/7] Changed font-family at root

---
 FrontEnd/src/components/CookieAcception/CookieMod.jsx | 1 -
 FrontEnd/src/index.module.css                         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/FrontEnd/src/components/CookieAcception/CookieMod.jsx b/FrontEnd/src/components/CookieAcception/CookieMod.jsx
index c9338d05..5f36f959 100644
--- a/FrontEnd/src/components/CookieAcception/CookieMod.jsx
+++ b/FrontEnd/src/components/CookieAcception/CookieMod.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import PropTypes from 'prop-types';
 import { useCookies } from 'react-cookie';
 import { Link } from 'react-router-dom';
diff --git a/FrontEnd/src/index.module.css b/FrontEnd/src/index.module.css
index 34e14b30..58c06243 100644
--- a/FrontEnd/src/index.module.css
+++ b/FrontEnd/src/index.module.css
@@ -14,5 +14,5 @@ a {
 :root {
   display: flex;
   scroll-behavior: smooth;
-  font-family: 'Inter', sans-serif;
+  font-family: 'Geologica', sans-serif;
 }

From 3c5f6d6828874546733cdb273f6bda92157deaaf Mon Sep 17 00:00:00 2001
From: Leonid Chelakhov <leonidchelahov@gmail.com>
Date: Tue, 24 Dec 2024 18:06:44 +0300
Subject: [PATCH 4/7] added cokkie context

---
 .../components/CookieAcception/CookieMod.jsx  | 30 ++----------
 .../components/PageWrapper/PageWrapper.jsx    |  5 +-
 FrontEnd/src/context/CookieContext.js         | 46 +++++++++++++++++++
 FrontEnd/src/routes/ClientRouter.jsx          | 41 ++++++++---------
 4 files changed, 73 insertions(+), 49 deletions(-)
 create mode 100644 FrontEnd/src/context/CookieContext.js

diff --git a/FrontEnd/src/components/CookieAcception/CookieMod.jsx b/FrontEnd/src/components/CookieAcception/CookieMod.jsx
index 5f36f959..66de5893 100644
--- a/FrontEnd/src/components/CookieAcception/CookieMod.jsx
+++ b/FrontEnd/src/components/CookieAcception/CookieMod.jsx
@@ -1,27 +1,12 @@
-import PropTypes from 'prop-types';
-import { useCookies } from 'react-cookie';
+import { useCookieContext } from '../../context/CookieContext';
 import { Link } from 'react-router-dom';
 import styles from './CookieMod.module.css';
 
-const CookieMod = ({ active, setActive }) => {
-  const [cookies, setCookie] = useCookies(['cookies']);
+const CookieMod = () => {
+  const { isCookieModalActive, allowCookies, declineCookies } =
+    useCookieContext();
 
-  const shouldShowModal = cookies.cookies === undefined;
-
-  const allowCookies = () => {
-    const expirationDate = new Date();
-    expirationDate.setTime(expirationDate.getTime() + 30 * 24 * 60 * 60 * 1000);
-    setCookie('cookies', true, { expires: expirationDate, sameSite: 'lax' });
-    setActive(false);
-  };
-
-  const declineCookies = () => {
-    const expirationDate = new Date();
-    expirationDate.setTime(expirationDate.getTime() + 30 * 24 * 60 * 60 * 1000);
-    setCookie('cookies', false, { expires: expirationDate, sameSite: 'lax' });
-    setActive(false);
-  };
-  return shouldShowModal && active ? (
+  return isCookieModalActive ? (
     <div className={styles['cookie-banner']} data-testid="cookiemodal">
       <div className={styles['cookie-content']}>
         <div className={styles['cookie-header']}>
@@ -54,9 +39,4 @@ const CookieMod = ({ active, setActive }) => {
   ) : null;
 };
 
-CookieMod.propTypes = {
-  active: PropTypes.bool.isRequired,
-  setActive: PropTypes.func.isRequired,
-};
-
 export default CookieMod;
diff --git a/FrontEnd/src/components/PageWrapper/PageWrapper.jsx b/FrontEnd/src/components/PageWrapper/PageWrapper.jsx
index 88b052d2..b1383b2b 100644
--- a/FrontEnd/src/components/PageWrapper/PageWrapper.jsx
+++ b/FrontEnd/src/components/PageWrapper/PageWrapper.jsx
@@ -1,13 +1,16 @@
-import React from 'react';
 import PropTypes from 'prop-types';
 import { useBurgerMenu } from '../../context/BurgerMenuContext';
+import { useCookieContext } from '../../context/CookieContext';
+import CookieMod from '../CookieAcception/CookieMod';
 import css from './PageWrapper.module.css';
 
 const PageWrapper = ({ children }) => {
   const { isOpen } = useBurgerMenu();
+  const { isCookieModalActive } = useCookieContext();
 
   return (
     <div className={`${css.pageContent} ${isOpen ? css.menuOpen : ''}`}>
+      {isCookieModalActive && <CookieMod />}
       {children}
     </div>
   );
diff --git a/FrontEnd/src/context/CookieContext.js b/FrontEnd/src/context/CookieContext.js
new file mode 100644
index 00000000..b0754477
--- /dev/null
+++ b/FrontEnd/src/context/CookieContext.js
@@ -0,0 +1,46 @@
+import { createContext, useContext, useState, useEffect } from 'react';
+import PropTypes from 'prop-types';
+import { useCookies } from 'react-cookie';
+
+const CookieContext = createContext();
+
+export const CookieProvider = ({ children }) => {
+  const [cookies, setCookie] = useCookies(['cookies']);
+  const [isCookieModalActive, setCookieModalActive] = useState(false);
+
+  useEffect(() => {
+    setCookieModalActive(cookies.cookies === undefined);
+  }, [cookies]);
+
+  const allowCookies = () => {
+    const expirationDate = new Date();
+    expirationDate.setTime(expirationDate.getTime() + 30 * 24 * 60 * 60 * 1000);
+    setCookie('cookies', true, { expires: expirationDate, sameSite: 'lax' });
+    setCookieModalActive(false);
+  };
+
+  const declineCookies = () => {
+    const expirationDate = new Date();
+    expirationDate.setTime(expirationDate.getTime() + 24 * 60 * 60 * 1000);
+    setCookie('cookies', false, { expires: expirationDate, sameSite: 'lax' });
+    setCookieModalActive(true);
+  };
+
+  return (
+    <CookieContext.Provider
+      value={{
+        isCookieModalActive,
+        allowCookies,
+        declineCookies,
+      }}
+    >
+      {children}
+    </CookieContext.Provider>
+  );
+};
+
+CookieProvider.propTypes = {
+  children: PropTypes.node.isRequired,
+};
+
+export const useCookieContext = () => useContext(CookieContext);
diff --git a/FrontEnd/src/routes/ClientRouter.jsx b/FrontEnd/src/routes/ClientRouter.jsx
index f72c3740..cf758946 100644
--- a/FrontEnd/src/routes/ClientRouter.jsx
+++ b/FrontEnd/src/routes/ClientRouter.jsx
@@ -2,7 +2,7 @@ import { ToastContainer } from 'react-toastify';
 import { Route, Routes, Navigate } from 'react-router-dom';
 import { ConfigProvider } from 'antd';
 import { SWRConfig } from 'swr';
-import React, { useState } from 'react';
+import React from 'react';
 
 import 'react-toastify/dist/ReactToastify.css';
 import customTheme from '../pages/CustomThemes/customTheme.js';
@@ -13,7 +13,6 @@ import CookiesPolicyComponent from '../pages/CookiesPolicyPage/CookiesPolicyComp
 import Footer from '../components/Footer/Footer';
 import Header from '../components/Header/Header';
 import Loader from '../components/Loader/Loader';
-import CookieMod from '../components/CookieAcception/CookieMod';
 import MainPage from '../pages/LandingPage/MainPage';
 import PrivacyPolicy from '../pages/PrivacyPolicyPage/PrivacyPolicyPage';
 import ProfileDetailPage from '../pages/ProfileDetail/ProfileDetailPage';
@@ -37,11 +36,11 @@ import Contact from '../pages/Contact/Contact.jsx';
 import ErrorPage404 from '../pages/ErrorPages/ErrorPage404';
 
 import { BurgerMenuProvider } from '../context/BurgerMenuContext';
+import { CookieProvider } from '../context/CookieContext';
 import PageWrapper from '../components/PageWrapper/PageWrapper';
 
 function ClientRouter() {
   const { isAuth, user, logout, isLoading } = useAuth();
-  const [isCookieModalActive, setCookieModalActive] = useState(true);
 
   return (
     <ConfigProvider theme={customTheme}>
@@ -55,16 +54,12 @@ function ClientRouter() {
           },
         }}
       >
-        <BurgerMenuProvider>
-          <Header isAuthorized={isAuth} />
-          {isLoading ? (
-            <Loader />
-          ) : (
-            <>
-              <CookieMod
-                active={isCookieModalActive}
-                setActive={setCookieModalActive}
-              />
+        <CookieProvider>
+          <BurgerMenuProvider>
+            <Header isAuthorized={isAuth} />
+            {isLoading ? (
+              <Loader />
+            ) : (
               <PageWrapper>
                 <Routes>
                   <Route path="/" element={<MainPage isAuthorized={isAuth} />} />
@@ -159,16 +154,16 @@ function ClientRouter() {
                   <Route path="*" element={<ErrorPage404 />} />
                 </Routes>
               </PageWrapper>
-            </>
-          )}
-          <Footer />
-          <ToastContainer
-            position="top-right"
-            autoClose={3000}
-            theme="colored"
-            icon={false}
-          />
-        </BurgerMenuProvider>
+            )}
+            <Footer />
+            <ToastContainer
+              position="top-right"
+              autoClose={3000}
+              theme="colored"
+              icon={false}
+            />
+          </BurgerMenuProvider>
+        </CookieProvider>
       </SWRConfig>
     </ConfigProvider>
   );

From 090f6f388373ea8f0d22b533a6d672102df40103 Mon Sep 17 00:00:00 2001
From: Leonid Chelakhov <leonidchelahov@gmail.com>
Date: Tue, 24 Dec 2024 18:39:23 +0300
Subject: [PATCH 5/7] adde new behavior of cookies

---
 .../components/CookieAcception/CookieMod.jsx  |  2 +-
 .../pages/CookiesPolicyPage/RenderContent.jsx |  7 +++-
 .../RenderingTextContainer.jsx                | 33 ++++++++++++++++---
 .../PrivacyPolicyPage/PrivacyPolicyPage.jsx   | 12 ++++++-
 FrontEnd/src/pages/PrivacyPolicyPage/text.js  |  3 +-
 5 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/FrontEnd/src/components/CookieAcception/CookieMod.jsx b/FrontEnd/src/components/CookieAcception/CookieMod.jsx
index 66de5893..622d9c84 100644
--- a/FrontEnd/src/components/CookieAcception/CookieMod.jsx
+++ b/FrontEnd/src/components/CookieAcception/CookieMod.jsx
@@ -22,7 +22,7 @@ const CookieMod = () => {
         </p>
         <p className={styles['cookie-text']}>
           Дізнатися більше
-          <Link to="/privacy-policy" className={styles['cookie-link']}>
+          <Link to="/privacy-policy#cookies-usage" className={styles['cookie-link']}>
             про файли cookie.
           </Link>
         </p>
diff --git a/FrontEnd/src/pages/CookiesPolicyPage/RenderContent.jsx b/FrontEnd/src/pages/CookiesPolicyPage/RenderContent.jsx
index d5712a28..b9fab36f 100644
--- a/FrontEnd/src/pages/CookiesPolicyPage/RenderContent.jsx
+++ b/FrontEnd/src/pages/CookiesPolicyPage/RenderContent.jsx
@@ -4,7 +4,12 @@ import styles from './cookiesPolicyComponent.module.css';
 
 const renderContent = (Text) => (
   Text.content.map((item) => (
-    <ContentRenderer key={item.id || uuidv4()} item={item} styles={styles} />
+    <ContentRenderer
+      key={item.id || uuidv4()}
+      item={item}
+      styles={styles}
+      id={item.sectionId || null}
+    />
   ))
 );
 
diff --git a/FrontEnd/src/pages/CookiesPolicyPage/RenderingTextContainer.jsx b/FrontEnd/src/pages/CookiesPolicyPage/RenderingTextContainer.jsx
index 9679da67..882404f0 100644
--- a/FrontEnd/src/pages/CookiesPolicyPage/RenderingTextContainer.jsx
+++ b/FrontEnd/src/pages/CookiesPolicyPage/RenderingTextContainer.jsx
@@ -3,20 +3,44 @@ import PropTypes from 'prop-types';
 
 const RenderingTextContainer = ({ item, styles }) => {
   const renderParagraph = () => (
-    <p className={styles['text_content']} key={item.id || uuidv4()}>{item.text}</p>
+    <p
+      className={styles['text_content']}
+      key={item.id || uuidv4()}
+      id={item.sectionId || null} // Додано атрибут id
+    >
+      {item.text}
+    </p>
   );
 
   const renderHeading = () => {
     const HeadingTag = `h${item.level}`;
-    return <HeadingTag className={styles['text_content__heading']} key={item.id || uuidv4()}>{item.text}</HeadingTag>;
+    return (
+      <HeadingTag
+        className={styles['text_content__heading']}
+        key={item.id || uuidv4()}
+        id={item.sectionId || null} // Додано атрибут id
+      >
+        {item.text}
+      </HeadingTag>
+    );
   };
 
   const renderParagraphMarginBottom = () => (
-    <p className={styles['text_content__margin_bottom']} key={item.id || uuidv4()}>{item.text}</p>
+    <p
+      className={styles['text_content__margin_bottom']}
+      key={item.id || uuidv4()}
+      id={item.sectionId || null} // Додано атрибут id
+    >
+      {item.text}
+    </p>
   );
 
   const renderListItem = () => (
-    <ul key={item.id || uuidv4()} className={styles['custom-list']}>
+    <ul
+      key={item.id || uuidv4()}
+      className={styles['custom-list']}
+      id={item.sectionId || null} // Додано атрибут id
+    >
       <li className={styles['custom-list__item']}>{item.text}</li>
     </ul>
   );
@@ -49,6 +73,7 @@ RenderingTextContainer.propTypes = {
     type: PropTypes.string.isRequired,
     text: PropTypes.string.isRequired,
     level: PropTypes.number,
+    sectionId: PropTypes.string,
   }).isRequired,
   styles: PropTypes.object.isRequired,
 };
diff --git a/FrontEnd/src/pages/PrivacyPolicyPage/PrivacyPolicyPage.jsx b/FrontEnd/src/pages/PrivacyPolicyPage/PrivacyPolicyPage.jsx
index 7269dd6f..1cead1b3 100644
--- a/FrontEnd/src/pages/PrivacyPolicyPage/PrivacyPolicyPage.jsx
+++ b/FrontEnd/src/pages/PrivacyPolicyPage/PrivacyPolicyPage.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useEffect } from 'react';
 import styles from './PrivacyPolicy.module.css';
 import privacyPolicyText from './text';
 import TEXT_CONTENT from './text';
@@ -9,6 +9,16 @@ import useScrollToTop from '../../hooks/useScrollToTop';
 const PrivacyPolicy = () => {
   useScrollToTop();
 
+  useEffect(() => {
+    const hash = window.location.hash.substring(1);
+    if (hash) {
+      const element = document.getElementById(hash);
+      if (element) {
+        element.scrollIntoView({ behavior: 'smooth' });
+      }
+    }
+  }, []);
+
   return (
     <div className={styles['privacy_policy']}>
       <div className={styles['privacy_policy__text_container']}>
diff --git a/FrontEnd/src/pages/PrivacyPolicyPage/text.js b/FrontEnd/src/pages/PrivacyPolicyPage/text.js
index ac17e48f..dd42c878 100644
--- a/FrontEnd/src/pages/PrivacyPolicyPage/text.js
+++ b/FrontEnd/src/pages/PrivacyPolicyPage/text.js
@@ -108,7 +108,8 @@ const privacyPolicyText = {
             id: 17,
             type: 'heading',
             level: 4,
-            text: '4. Використання файлів "cookies"'
+            text: '4. Використання файлів "cookies"',
+            sectionId: 'cookies-usage',
         },
         {
             id: 18,

From 762b195f43349dd7866c3b87d3f48986a88f99ff Mon Sep 17 00:00:00 2001
From: Leonid Chelakhov <leonidchelahov@gmail.com>
Date: Tue, 24 Dec 2024 19:08:30 +0300
Subject: [PATCH 6/7] changed tests

---
 .../CookieAcception/tests/CookieModal.test.js | 43 +++++++++----------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/FrontEnd/src/components/CookieAcception/tests/CookieModal.test.js b/FrontEnd/src/components/CookieAcception/tests/CookieModal.test.js
index 62f7e822..ab106c68 100644
--- a/FrontEnd/src/components/CookieAcception/tests/CookieModal.test.js
+++ b/FrontEnd/src/components/CookieAcception/tests/CookieModal.test.js
@@ -1,56 +1,53 @@
 import { render, screen, cleanup } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 import CookieMod from '../CookieMod';
+import { CookieProvider } from '../../../context/CookieContext';
+import { useCookies } from 'react-cookie';
+
+jest.mock('react-cookie', () => ({
+  useCookies: jest.fn(),
+}));
 
 afterEach(cleanup);
 
 describe('CookieMod component unit tests', () => {
-  test('renders "Allow" button', () => {
-    render(
+  const renderWithProvider = (cookiesValue) => {
+    useCookies.mockReturnValue([cookiesValue, jest.fn()]);
+    return render(
       <MemoryRouter>
-        <CookieMod active={true} setActive={() => {}} />
+        <CookieProvider>
+          <CookieMod />
+        </CookieProvider>
       </MemoryRouter>
     );
+  };
+
+  test('renders "Allow" button', () => {
+    renderWithProvider({ cookies: undefined });
     const buttonElement = screen.getByText(/Дозволити/i);
     expect(buttonElement).toBeInTheDocument();
   });
 
   test('renders "Decline" button', () => {
-    render(
-      <MemoryRouter>
-        <CookieMod active={true} setActive={() => {}} />
-      </MemoryRouter>
-    );
+    renderWithProvider({ cookies: undefined });
     const buttonElement = screen.getByText(/Відмовитись/i);
     expect(buttonElement).toBeInTheDocument();
   });
 
   test('renders link to cookie policy', () => {
-    render(
-      <MemoryRouter>
-        <CookieMod active={true} setActive={() => {}} />
-      </MemoryRouter>
-    );
+    renderWithProvider({ cookies: undefined });
     const linkElement = screen.getByText(/про файли cookie/i);
     expect(linkElement).toBeInTheDocument();
   });
 
   test('does not render cookie banner when inactive', () => {
-    render(
-      <MemoryRouter>
-        <CookieMod active={false} setActive={() => {}} />
-      </MemoryRouter>
-    );
+    renderWithProvider({ cookies: true });
     const cookieElement = screen.queryByTestId('cookiemodal');
     expect(cookieElement).not.toBeInTheDocument();
   });
 
   test('renders cookie banner when active', () => {
-    render(
-      <MemoryRouter>
-        <CookieMod active={true} setActive={() => {}} />
-      </MemoryRouter>
-    );
+    renderWithProvider({ cookies: undefined });
     const cookieElement = screen.getByTestId('cookiemodal');
     expect(cookieElement).toBeInTheDocument();
   });

From 36ad3cde06765483db1ab8f308e0140d9b49455f Mon Sep 17 00:00:00 2001
From: Leonid Chelakhov <leonidchelahov@gmail.com>
Date: Wed, 25 Dec 2024 18:02:15 +0300
Subject: [PATCH 7/7] Changed files

---
 .../components/CookieAcception/CookieMod.jsx  |  7 +++---
 .../CookieAcception/tests/CookieModal.test.js | 25 +++++++++++--------
 .../RenderingTextContainer.jsx                |  8 +++---
 FrontEnd/src/pages/LandingPage/MainPage.jsx   | 10 ++------
 FrontEnd/src/routes/ClientRouter.jsx          |  1 -
 5 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/FrontEnd/src/components/CookieAcception/CookieMod.jsx b/FrontEnd/src/components/CookieAcception/CookieMod.jsx
index 622d9c84..a87ae663 100644
--- a/FrontEnd/src/components/CookieAcception/CookieMod.jsx
+++ b/FrontEnd/src/components/CookieAcception/CookieMod.jsx
@@ -3,10 +3,9 @@ import { Link } from 'react-router-dom';
 import styles from './CookieMod.module.css';
 
 const CookieMod = () => {
-  const { isCookieModalActive, allowCookies, declineCookies } =
-    useCookieContext();
+  const { allowCookies, declineCookies } = useCookieContext();
 
-  return isCookieModalActive ? (
+  return (
     <div className={styles['cookie-banner']} data-testid="cookiemodal">
       <div className={styles['cookie-content']}>
         <div className={styles['cookie-header']}>
@@ -36,7 +35,7 @@ const CookieMod = () => {
         </div>
       </div>
     </div>
-  ) : null;
+  );
 };
 
 export default CookieMod;
diff --git a/FrontEnd/src/components/CookieAcception/tests/CookieModal.test.js b/FrontEnd/src/components/CookieAcception/tests/CookieModal.test.js
index ab106c68..3004e3de 100644
--- a/FrontEnd/src/components/CookieAcception/tests/CookieModal.test.js
+++ b/FrontEnd/src/components/CookieAcception/tests/CookieModal.test.js
@@ -1,7 +1,8 @@
 import { render, screen, cleanup } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
-import CookieMod from '../CookieMod';
+import PageWrapper from '../../PageWrapper/PageWrapper';
 import { CookieProvider } from '../../../context/CookieContext';
+import { BurgerMenuProvider } from '../../../context/BurgerMenuContext';
 import { useCookies } from 'react-cookie';
 
 jest.mock('react-cookie', () => ({
@@ -11,43 +12,47 @@ jest.mock('react-cookie', () => ({
 afterEach(cleanup);
 
 describe('CookieMod component unit tests', () => {
-  const renderWithProvider = (cookiesValue) => {
+  const renderWithProviders = (cookiesValue) => {
     useCookies.mockReturnValue([cookiesValue, jest.fn()]);
     return render(
       <MemoryRouter>
-        <CookieProvider>
-          <CookieMod />
-        </CookieProvider>
+        <BurgerMenuProvider>
+          <CookieProvider>
+            <PageWrapper>
+              <div>Test Content</div>
+            </PageWrapper>
+          </CookieProvider>
+        </BurgerMenuProvider>
       </MemoryRouter>
     );
   };
 
   test('renders "Allow" button', () => {
-    renderWithProvider({ cookies: undefined });
+    renderWithProviders({ cookies: undefined });
     const buttonElement = screen.getByText(/Дозволити/i);
     expect(buttonElement).toBeInTheDocument();
   });
 
   test('renders "Decline" button', () => {
-    renderWithProvider({ cookies: undefined });
+    renderWithProviders({ cookies: undefined });
     const buttonElement = screen.getByText(/Відмовитись/i);
     expect(buttonElement).toBeInTheDocument();
   });
 
   test('renders link to cookie policy', () => {
-    renderWithProvider({ cookies: undefined });
+    renderWithProviders({ cookies: undefined });
     const linkElement = screen.getByText(/про файли cookie/i);
     expect(linkElement).toBeInTheDocument();
   });
 
   test('does not render cookie banner when inactive', () => {
-    renderWithProvider({ cookies: true });
+    renderWithProviders({ cookies: true });
     const cookieElement = screen.queryByTestId('cookiemodal');
     expect(cookieElement).not.toBeInTheDocument();
   });
 
   test('renders cookie banner when active', () => {
-    renderWithProvider({ cookies: undefined });
+    renderWithProviders({ cookies: undefined });
     const cookieElement = screen.getByTestId('cookiemodal');
     expect(cookieElement).toBeInTheDocument();
   });
diff --git a/FrontEnd/src/pages/CookiesPolicyPage/RenderingTextContainer.jsx b/FrontEnd/src/pages/CookiesPolicyPage/RenderingTextContainer.jsx
index 882404f0..75083302 100644
--- a/FrontEnd/src/pages/CookiesPolicyPage/RenderingTextContainer.jsx
+++ b/FrontEnd/src/pages/CookiesPolicyPage/RenderingTextContainer.jsx
@@ -6,7 +6,7 @@ const RenderingTextContainer = ({ item, styles }) => {
     <p
       className={styles['text_content']}
       key={item.id || uuidv4()}
-      id={item.sectionId || null} // Додано атрибут id
+      id={item.sectionId || null}
     >
       {item.text}
     </p>
@@ -18,7 +18,7 @@ const RenderingTextContainer = ({ item, styles }) => {
       <HeadingTag
         className={styles['text_content__heading']}
         key={item.id || uuidv4()}
-        id={item.sectionId || null} // Додано атрибут id
+        id={item.sectionId || null}
       >
         {item.text}
       </HeadingTag>
@@ -29,7 +29,7 @@ const RenderingTextContainer = ({ item, styles }) => {
     <p
       className={styles['text_content__margin_bottom']}
       key={item.id || uuidv4()}
-      id={item.sectionId || null} // Додано атрибут id
+      id={item.sectionId || null}
     >
       {item.text}
     </p>
@@ -39,7 +39,7 @@ const RenderingTextContainer = ({ item, styles }) => {
     <ul
       key={item.id || uuidv4()}
       className={styles['custom-list']}
-      id={item.sectionId || null} // Додано атрибут id
+      id={item.sectionId || null}
     >
       <li className={styles['custom-list__item']}>{item.text}</li>
     </ul>
diff --git a/FrontEnd/src/pages/LandingPage/MainPage.jsx b/FrontEnd/src/pages/LandingPage/MainPage.jsx
index 2ef3e31e..6b35875c 100644
--- a/FrontEnd/src/pages/LandingPage/MainPage.jsx
+++ b/FrontEnd/src/pages/LandingPage/MainPage.jsx
@@ -1,9 +1,7 @@
-import { useState } from 'react';
 import MainBanner from './Banner/Banner';
 import MainCompanies from './Companies/Companies';
 import JoinUs from './JoinUs/JoinUs';
 import MainAboutSection from './AboutSection/About';
-import CookieMod from '../../components/CookieAcception/CookieMod';
 import css from './MainPage.module.css';
 import PropTypes from 'prop-types';
 
@@ -11,19 +9,15 @@ const MainPage = ({ isAuthorized }) => {
   MainPage.propTypes = {
     isAuthorized: PropTypes.bool,
   };
-  const [modalActive, setModalActive] = useState(true);
+
   return (
     <div className={css['main-app']}>
       <MainBanner isAuthorized={isAuthorized} />
       <MainCompanies isAuthorized={isAuthorized} />
       {!isAuthorized ? <JoinUs /> : null}
       <MainAboutSection />
-      <CookieMod
-        active={modalActive}
-        setActive={setModalActive}
-      ></CookieMod>
     </div>
   );
 };
 
-export default MainPage;
\ No newline at end of file
+export default MainPage;
diff --git a/FrontEnd/src/routes/ClientRouter.jsx b/FrontEnd/src/routes/ClientRouter.jsx
index cf758946..9f647e39 100644
--- a/FrontEnd/src/routes/ClientRouter.jsx
+++ b/FrontEnd/src/routes/ClientRouter.jsx
@@ -2,7 +2,6 @@ import { ToastContainer } from 'react-toastify';
 import { Route, Routes, Navigate } from 'react-router-dom';
 import { ConfigProvider } from 'antd';
 import { SWRConfig } from 'swr';
-import React from 'react';
 
 import 'react-toastify/dist/ReactToastify.css';
 import customTheme from '../pages/CustomThemes/customTheme.js';