From b5d920a95d57e5f4f81faf4545a4abcd00521a6e Mon Sep 17 00:00:00 2001
From: KyzukY <kyzuk.yr@gmail.com>
Date: Mon, 7 Oct 2024 13:12:22 +0300
Subject: [PATCH 1/3] bug fix

---
 .gitignore                                              | 3 +++
 FrontEnd/src/components/Footer/Top/FooterNavigation.jsx | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2bbe866d..1c854114 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,6 @@ BackEnd/celerybeat-schedule.*
 BackEnd/public/*
 !BackEnd/public/media/.gitkeep
 !BackEnd/public/static/.gitkeep
+node_modules
+package-lock.json
+package.json
diff --git a/FrontEnd/src/components/Footer/Top/FooterNavigation.jsx b/FrontEnd/src/components/Footer/Top/FooterNavigation.jsx
index 0b26e5ba..9d5d27fd 100644
--- a/FrontEnd/src/components/Footer/Top/FooterNavigation.jsx
+++ b/FrontEnd/src/components/Footer/Top/FooterNavigation.jsx
@@ -67,11 +67,11 @@ function FooterNavigation() {
   }, []);
 
   if (error) {
-    return <p>{error}</p>;
+    return <p style={{ fontFamily: 'inherit', color: 'white'}}>{error}</p>;
   }
 
   if (!contacts) {
-    return <p>Loading...</p>;
+    return null;
   }
 
   return (

From 406fb8eff28e0f85834baf2895bd96f13bd3dd7d Mon Sep 17 00:00:00 2001
From: KyzukY <kyzuk.yr@gmail.com>
Date: Mon, 7 Oct 2024 13:31:54 +0300
Subject: [PATCH 2/3] fix

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1c854114..2bbe866d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,3 @@ BackEnd/celerybeat-schedule.*
 BackEnd/public/*
 !BackEnd/public/media/.gitkeep
 !BackEnd/public/static/.gitkeep
-node_modules
-package-lock.json
-package.json

From 2435aa67e228f9cbf2e2bc9f56c38ddbc755dd3d Mon Sep 17 00:00:00 2001
From: KyzukY <kyzuk.yr@gmail.com>
Date: Tue, 8 Oct 2024 19:36:41 +0300
Subject: [PATCH 3/3] fix footer

---
 .../Footer/Top/FooterNavigation.jsx           | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/FrontEnd/src/components/Footer/Top/FooterNavigation.jsx b/FrontEnd/src/components/Footer/Top/FooterNavigation.jsx
index 9d5d27fd..58db712b 100644
--- a/FrontEnd/src/components/Footer/Top/FooterNavigation.jsx
+++ b/FrontEnd/src/components/Footer/Top/FooterNavigation.jsx
@@ -66,14 +66,6 @@ function FooterNavigation() {
     fetchContacts();
   }, []);
 
-  if (error) {
-    return <p style={{ fontFamily: 'inherit', color: 'white'}}>{error}</p>;
-  }
-
-  if (!contacts) {
-    return null;
-  }
-
   return (
     <div className={css['navigation-content']}>
       <div className={css['navigation-content-section']}>
@@ -100,11 +92,19 @@ function FooterNavigation() {
       </div>
       <div className={css['navigation-content-section']}>
         <p className={css['navigation-content-section-service__text']}>Контакти</p>
-        <p className={css['navigation-content-section-service__text']}>{contacts.email}</p>
-        <p className={css['navigation-content-section-service__text']}>{contacts.phone}</p>
-        <p className={css['navigation-content-section-service__text']}>{contacts.university}</p>
-        <p className={css['navigation-content-section-service__text']}>{contacts.address}</p>
-     </div>
+        {error ? (
+          <p className={css['navigation-content-section-service__text']} style={{ color: 'white' }}>
+            {error}
+          </p>
+        ) : contacts && (
+          <>
+            <p className={css['navigation-content-section-service__text']}>{contacts.email}</p>
+            <p className={css['navigation-content-section-service__text']}>{contacts.phone}</p>
+            <p className={css['navigation-content-section-service__text']}>{contacts.university}</p>
+            <p className={css['navigation-content-section-service__text']}>{contacts.address}</p>
+          </>
+        )}
+      </div>
     </div>
   );
 }