From 848e4111c038dc0e64fa305c08f9189f7ce6a11b Mon Sep 17 00:00:00 2001
From: Tatyana <krasnovavgma@yandex.ru>
Date: Thu, 31 Jul 2025 10:58:50 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D1=85=D0=B5=D0=B4=D0=B5=D1=80=D0=B0=20=D1=84?=
 =?UTF-8?q?=D1=83=D1=82=D0=B5=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.tsx                    | 24 ++++++++++--------------
 src/AppRoutes.tsx              |  1 -
 src/components/Footer.tsx      | 10 +++++-----
 src/components/Header.tsx      | 15 ++++++++-------
 src/components/MainContent.tsx | 12 ------------
 src/pages/Home.tsx             |  5 ++++-
 src/pages/Login.tsx            |  3 +--
 src/pages/Register.tsx         |  8 ++------
 8 files changed, 30 insertions(+), 48 deletions(-)
 delete mode 100644 src/components/MainContent.tsx

diff --git a/src/App.tsx b/src/App.tsx
index 7a4474b..1b9bf7d 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -14,23 +14,19 @@ const App: React.FC = () => (
   <IonApp>
     <IonReactRouter>
 
-      {/* Постоянный Header */}
-      <Header />
+<div className='flex flex-col h-screen bg-green-300'>
+  <Header />
 
-      {/* Основной контейнер для контента */}
-      <div className='flex flex-col min-h-screen container mx-auto px-4 bg-fuchsia-200'>
+  {/* Контент с отступом равным высоте Header */}
+  <div className='flex-1 overflow-auto'>
+    <IonRouterOutlet>
+      <AppRoutes />
+    </IonRouterOutlet>
+  </div>
 
+  <Footer />
+</div>
 
-        <div className='container mt-20 flex-1'>
-          <IonRouterOutlet>
-            <AppRoutes />
-          </IonRouterOutlet>
-        </div>
-
-        {/* Постоянный Footer */}
-        <Footer />
-
-      </div>
     </IonReactRouter>
   </IonApp>
 );
diff --git a/src/AppRoutes.tsx b/src/AppRoutes.tsx
index b84559e..ef93dfd 100644
--- a/src/AppRoutes.tsx
+++ b/src/AppRoutes.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Route } from 'react-router-dom';
 
 import Home from './pages/Home';
diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
index d69985d..30af422 100644
--- a/src/components/Footer.tsx
+++ b/src/components/Footer.tsx
@@ -1,12 +1,12 @@
-
+import { IonRouterLink } from '@ionic/react';
 
 function Footer() {
     return (
-        <div className='mt-auto bg-fuchsia-400'>
-            <h1>Footer</h1>
-            
+        <div className='w-full bg-fuchsia-400 shadow h-12 px-4 flex justify-center items-center fixed bottom-0 left-0 right-0 bg-opacity-80'>
+            {/* Можно добавить содержимое футера */}
+            Футер
         </div>
     );
 }
 
-export default Footer;
+export default Footer;
\ No newline at end of file
diff --git a/src/components/Header.tsx b/src/components/Header.tsx
index be63652..a97c857 100644
--- a/src/components/Header.tsx
+++ b/src/components/Header.tsx
@@ -1,16 +1,17 @@
-import React from 'react';
 import { IonRouterLink } from '@ionic/react';
 
 function Header() {
     return (
-        <div className='fixed top-0 left-0 w-full z-50 bg-fuchsia-400 shadow h-12 px-4 flex justify-between'>
-            <h1>Вмеда</h1>
-            <IonRouterLink href="/register">
-                <a className="text-sm">Зарегистрироваться</a>
+        <div className='w-full z-50 bg-fuchsia-400 shadow h-12 px-4 flex justify-between items-center fixed top-0 left-0 right-0 bg-opacity-80'>
+            <IonRouterLink href='/home' className='cursor-pointer'>
+                Вмеда
+            </IonRouterLink>
+
+            <IonRouterLink href="/register" className="text-sm">
+                Зарегистрироваться
             </IonRouterLink>
         </div>
     );
 }
 
-export default Header;
-
+export default Header;
\ No newline at end of file
diff --git a/src/components/MainContent.tsx b/src/components/MainContent.tsx
deleted file mode 100644
index d2cb1c6..0000000
--- a/src/components/MainContent.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-function MainContent() {
-    return (
-        <div className="flex-1 mt-12 bg-green-200">
-            <p>main content</p>
-        </div>
-    );
-}
-
-export default MainContent;
-
diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx
index b22097e..69848e6 100644
--- a/src/pages/Home.tsx
+++ b/src/pages/Home.tsx
@@ -2,7 +2,10 @@
 function Home() {
     return (
         <>
-          <p className="pt-20">Домашняя страница</p>
+          <div className="pt-20 mx-auto px-4">
+            <p>Домашняя страница</p>
+          </div>
+
         </>
     );
 }
diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx
index af930ff..e84d66d 100644
--- a/src/pages/Login.tsx
+++ b/src/pages/Login.tsx
@@ -1,8 +1,7 @@
 function Login() {
     return (
         <div className=''>
-            <h1>Войти/залогиниться</h1>
-            
+            <h1>Войти/залогиниться</h1>         
         </div>
     );
 }
diff --git a/src/pages/Register.tsx b/src/pages/Register.tsx
index c95c62a..6d2a1f3 100644
--- a/src/pages/Register.tsx
+++ b/src/pages/Register.tsx
@@ -1,11 +1,7 @@
-
-
 function Auth() {
   return (
-    <div className='pt-20'>
-
-        <h1 className='cursor-pointer'>Страница регистрации</h1>
-
+    <div className="pt-20 mx-auto px-4">
+      <h1>Страница регистрации</h1>
     </div>
   );
 }