From ba43a5062c9b44499149409c7d22b6fbd9bd4286 Mon Sep 17 00:00:00 2001
From: southatelove <artem.jlez@gmail.com>
Date: Wed, 4 Sep 2024 17:55:59 +0300
Subject: [PATCH] =?UTF-8?q?hotfix:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=86=D0=B2=D0=B5=D1=82=D0=B0?=
 =?UTF-8?q?=20=D1=88=D1=80=D0=B8=D1=84=D1=82=D0=B0=20=D0=BF=D1=80=D0=B8=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B5/=D0=BE=D1=88?=
 =?UTF-8?q?=D0=B8=D0=B1=D0=BA=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Search/Search.module.css |  2 +-
 src/main.tsx                            |  7 ++-----
 src/pages/Menu/Menu.module.css          |  4 ++++
 src/pages/Menu/Menu.tsx                 | 11 +++++++----
 src/styles/themes/dark.css              |  3 ---
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/components/Search/Search.module.css b/src/components/Search/Search.module.css
index b76c276..94c4c17 100644
--- a/src/components/Search/Search.module.css
+++ b/src/components/Search/Search.module.css
@@ -6,7 +6,7 @@
   font-size: 14px;
   font-style: normal;
   font-weight: 400;
-  color: var(--text-color);
+  color: var(--separator-color);
   background-color: #fcfcfd;
   border: 1px solid #efefef;
   box-shadow: 15px 20px 45px 0px rgba(233, 233, 233, 0.25);
diff --git a/src/main.tsx b/src/main.tsx
index d8b13e1..79dde67 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -19,6 +19,7 @@ import { Provider } from "react-redux";
 import { store } from "./store/store";
 import Success from "./pages/Success/Success";
 import { ThemeProvider } from "./components/ThemeProvider/ThemeProvider";
+import "./styles/index.css";
 
 const Menu = lazy(() => import("./pages/Menu/Menu"));
 
@@ -34,11 +35,7 @@ const router = createBrowserRouter([
     children: [
       {
         path: "/",
-        element: (
-          <Suspense fallback={<>Загрузка Меню...</>}>
-            <Menu />
-          </Suspense>
-        ),
+        element: <Menu />,
       },
       {
         path: "/success",
diff --git a/src/pages/Menu/Menu.module.css b/src/pages/Menu/Menu.module.css
index bbb1aac..b9164aa 100644
--- a/src/pages/Menu/Menu.module.css
+++ b/src/pages/Menu/Menu.module.css
@@ -2,3 +2,7 @@
   display: flex;
   justify-content: space-between;
 }
+
+.error {
+  color: var(--separator-color);
+}
diff --git a/src/pages/Menu/Menu.tsx b/src/pages/Menu/Menu.tsx
index 24b296a..7f0cd19 100644
--- a/src/pages/Menu/Menu.tsx
+++ b/src/pages/Menu/Menu.tsx
@@ -68,12 +68,15 @@ const Menu = () => {
         <Headling>Меню</Headling>
         <Search placeholder="Введите блюдо или состав" onChange={onSearch} />
       </div>
+
       {error && <>{error}</>}
       {!isLoading && <MenuList products={products} />}
-      {isLoading && <>Загружаем продукты...</>}
-      {!isLoading && products.length === 0 && (
-        <>Не найдено блюд по запросу...</>
-      )}
+      <div className={styles["error"]}>
+        {isLoading && <>Загружаем продукты...</>}
+        {!isLoading && products.length === 0 && (
+          <>Не найдено блюд по запросу...</>
+        )}
+      </div>
     </>
   );
 };
diff --git a/src/styles/themes/dark.css b/src/styles/themes/dark.css
index 8a10842..cc34767 100644
--- a/src/styles/themes/dark.css
+++ b/src/styles/themes/dark.css
@@ -1,7 +1,4 @@
 .app.dark {
   --bg-color: #03031a;
-  /* --primary-color: #bdc7bd; */
-  /* --text-color: white;
-  --second-text-color: black; */
   --text-color: white;
 }