From 0194db2badd209f9f2ba595f29336f76127513cd Mon Sep 17 00:00:00 2001
From: Jazon <2021jhe@tjhsst.edu>
Date: Sat, 20 Feb 2021 13:52:44 -0500
Subject: [PATCH] Fix homepage footer

---
 src/App.css                             | 10 ++++++
 src/App.tsx                             | 47 +++++++++++++++----------
 src/Footer/footer.module.css            |  6 +---
 src/MainPage/Landing/landing.module.css |  2 +-
 4 files changed, 40 insertions(+), 25 deletions(-)
 create mode 100644 src/App.css

diff --git a/src/App.css b/src/App.css
new file mode 100644
index 00000000..9ed1201f
--- /dev/null
+++ b/src/App.css
@@ -0,0 +1,10 @@
+.Content {
+    display: flex;
+    height: 100vh;
+    justify-content: space-between;
+    flex-direction: column;
+}
+
+.Footer {
+    flex-shrink: 0;
+}
\ No newline at end of file
diff --git a/src/App.tsx b/src/App.tsx
index 19cb7a84..6473f814 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,25 +1,34 @@
-import PageScrollProgress from "./PageScrollProgress";
-import { BrowserRouter, Routes, Route } from "react-router-dom";
-import Footer from "./Footer";
+import PageScrollProgress from './PageScrollProgress';
+import { BrowserRouter, Routes, Route } from 'react-router-dom';
+import Footer from './Footer';
 
-import RegistrationPage from "./RegistrationPage";
-import HistoryPage from "./HistoryPage";
-import MainPage from "./MainPage";
-import NotFoundPage from "./NotFoundPage";
+import RegistrationPage from './RegistrationPage';
+import HistoryPage from './HistoryPage';
+import MainPage from './MainPage';
+import NotFoundPage from './NotFoundPage';
+
+import './App.css';
 
 const App = () => (
-  <>
-    <PageScrollProgress />
-    <BrowserRouter>
-      <Routes basename="/2021">
-        <Route path="/registration" element={<RegistrationPage />} />
-        <Route path="/history" element={<HistoryPage />} />
-        <Route path="/" element={<MainPage />} />
-        <Route path="*" element={<NotFoundPage />} />
-      </Routes>
-    </BrowserRouter>
-    <Footer />
-  </>
+    <div className='Content'>
+        <div>
+            <PageScrollProgress />
+            <BrowserRouter>
+                <Routes basename='/2021'>
+                    <Route
+                        path='/registration'
+                        element={<RegistrationPage />}
+                    />
+                    <Route path='/history' element={<HistoryPage />} />
+                    <Route path='/' element={<MainPage />} />
+                    <Route path='*' element={<NotFoundPage />} />
+                </Routes>
+            </BrowserRouter>
+        </div>
+        <div className="Footer">
+            <Footer />
+        </div>
+    </div>
 );
 
 export default App;
diff --git a/src/Footer/footer.module.css b/src/Footer/footer.module.css
index 63b795f3..2b7e0d84 100644
--- a/src/Footer/footer.module.css
+++ b/src/Footer/footer.module.css
@@ -1,11 +1,7 @@
 .footer {
   background-color: var(--theme-primary);
   color: #fff;
-  margin-top: auto;
-  position: fixed;
-  left: 0;
-  bottom: 0;
-  width: 100%;
+  margin-top: auto; 
   padding-top: 1rem;
   padding-bottom: 1rem;
 }
diff --git a/src/MainPage/Landing/landing.module.css b/src/MainPage/Landing/landing.module.css
index 84940bd7..82b2935f 100644
--- a/src/MainPage/Landing/landing.module.css
+++ b/src/MainPage/Landing/landing.module.css
@@ -1,5 +1,5 @@
 .hero {
-  height: 100%;
+  height: 100vh;
   min-height: 750px;
   padding-top: 5%;
   /* position: relative; */