From 53af4d2b1b3cc8ea5b94901971dc08ff1a1fdec7 Mon Sep 17 00:00:00 2001
From: "Vsevo;od" <96574851+vsevolod22@users.noreply.github.com>
Date: Sun, 24 Dec 2023 11:55:23 +0300
Subject: [PATCH] work site

---
 package-lock.json                      | 3 ---
 package.json                           | 4 +---
 src/Components/HomePageAdmin/index.jsx | 8 ++++----
 src/Components/profilePage/index.jsx   | 4 ++--
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 19bfeec..5bb19db 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,11 +16,8 @@
         "@mui/styled-engine-sc": "^6.0.0-alpha.9",
         "@mui/x-date-pickers": "^6.18.6",
         "axios": "^1.6.2",
-<<<<<<< Updated upstream
         "dayjs": "^1.11.10",
-=======
         "js-cookie": "^3.0.5",
->>>>>>> Stashed changes
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "react-router-dom": "^6.21.1",
diff --git a/package.json b/package.json
index 2d7e576..f4d6bd4 100644
--- a/package.json
+++ b/package.json
@@ -18,11 +18,9 @@
     "@mui/styled-engine-sc": "^6.0.0-alpha.9",
     "@mui/x-date-pickers": "^6.18.6",
     "axios": "^1.6.2",
-<<<<<<< Updated upstream
     "dayjs": "^1.11.10",
-=======
     "js-cookie": "^3.0.5",
->>>>>>> Stashed changes
+
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router-dom": "^6.21.1",
diff --git a/src/Components/HomePageAdmin/index.jsx b/src/Components/HomePageAdmin/index.jsx
index 0026d6d..ed005bf 100644
--- a/src/Components/HomePageAdmin/index.jsx
+++ b/src/Components/HomePageAdmin/index.jsx
@@ -1,10 +1,10 @@
 import Header from "../Header";
 import styles from "./style.module.scss";
 import TableMeets from '../TableMeets/TableMeets'
-import Home from "../Home/Home";
+// import Home from "../Home/Home";
 // import FetchUtils from "../utils/FetchUtils";
-import EditForm from "../edit/EditForm";
-import PostForm from "../post/PostForm";
+// import EditForm from "../edit/EditForm";
+// import PostForm from "../post/PostForm";
 
 const APIURL = ''
 
@@ -63,7 +63,7 @@ const HomePage = () => {
             <div className={styles.cards__container}>
                 <div className={styles.card}></div>
             </div>
-            <Home></Home>
+            {/* <Home></Home> */}
             {/* <FetchUtils></FetchUtils> */}
             {/* <PostForm /> */}
             {/* <EditForm /> */}
diff --git a/src/Components/profilePage/index.jsx b/src/Components/profilePage/index.jsx
index e930651..0f11dd7 100644
--- a/src/Components/profilePage/index.jsx
+++ b/src/Components/profilePage/index.jsx
@@ -3,7 +3,7 @@ import styles from "./style.module.scss"
 import Calendar from "../Calendar";
 import avatar from '../../img/profilePage/avatar.png';
 import gift from '../../img/profilePage/gift.png';
-import Home from '../Home/Home';
+// import Home from '../Home/Home';
 const ProfilePage = () => {
 
     return (
@@ -57,7 +57,7 @@ const ProfilePage = () => {
                     <div className={styles.cards__container}>
                         <div className={styles.card}></div>
                     </div>
-                    <Home></Home>
+                    {/* <Home></Home> */}
                     {/* <FetchUtils></FetchUtils> */}
                     {/* <PostForm /> */}
                     {/* <EditForm /> */}