From 136b775c2bad25374bb7786989ad3b5b9e411b96 Mon Sep 17 00:00:00 2001
From: veikko <veikko@lintujarvi.fi>
Date: Sun, 3 Jul 2022 21:39:29 +0300
Subject: [PATCH] Rename Header to NavBar and add it to the bottom too

---
 pages/_app.tsx                                   |  5 +++--
 pages/components/{Header.tsx => NavBar.tsx}      | 10 +++++-----
 pages/index.tsx                                  |  4 ----
 styles/Footer.module.scss                        |  1 +
 styles/Index.module.scss                         |  2 +-
 .../{Header.module.scss => NavBar.module.scss}   | 16 +++++-----------
 styles/Shared.module.scss                        |  1 -
 7 files changed, 15 insertions(+), 24 deletions(-)
 rename pages/components/{Header.tsx => NavBar.tsx} (82%)
 rename styles/{Header.module.scss => NavBar.module.scss} (78%)

diff --git a/pages/_app.tsx b/pages/_app.tsx
index 2539ee5..61bc9d9 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -2,17 +2,18 @@ import '../styles/globals.scss';
 import '../styles/transitions.scss';
 import type { AppProps } from 'next/app';
 import Footer from './components/Footer';
-import Header from './components/Header';
+import NavBar from './components/NavBar';
 import { Logo } from './components/Logo';
 
 function Runosaari({ Component, pageProps }: AppProps) {
   return (
     <>
-      <Header />
+      <NavBar />
       <Logo />
       <main>
         <Component {...pageProps} />
       </main>
+      <NavBar />
       <Footer />
     </>
   );
diff --git a/pages/components/Header.tsx b/pages/components/NavBar.tsx
similarity index 82%
rename from pages/components/Header.tsx
rename to pages/components/NavBar.tsx
index becbd27..39fcfc8 100644
--- a/pages/components/Header.tsx
+++ b/pages/components/NavBar.tsx
@@ -1,10 +1,10 @@
 import Link from 'next/link';
-import styles from '../../styles/Header.module.scss';
+import styles from '../../styles/NavBar.module.scss';
 
-const Header = () => {
+const NavBar = () => {
   return (
     <>
-      <header className={styles.header}>
+      <div className={styles.navBarContainer}>
         <nav className={styles.navBar}>
           <Link href='/'>
             <a className={styles.navBarLink}>Etusivu</a>
@@ -25,9 +25,9 @@ const Header = () => {
             <a className={styles.navBarLink}>Arkisto</a>
           </Link>
         </nav>
-      </header>
+      </div>
     </>
   );
 };
 
-export default Header;
+export default NavBar;
diff --git a/pages/index.tsx b/pages/index.tsx
index 09d405e..b53c8e4 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -2,8 +2,6 @@ import type { NextPage } from 'next';
 import Performers from './performers';
 import Program from './program';
 import Info from './info';
-import Archive from './archive';
-import Safety from './safety';
 import styles from '../styles/Index.module.scss';
 import Lead from './components/Lead';
 
@@ -15,8 +13,6 @@ const Home: NextPage = () => {
       <Performers />
       <Program />
       <Info />
-      <Archive />
-      <Safety />
     </div>
   );
 };
diff --git a/styles/Footer.module.scss b/styles/Footer.module.scss
index 068c2e2..5a579c4 100644
--- a/styles/Footer.module.scss
+++ b/styles/Footer.module.scss
@@ -3,6 +3,7 @@
   flex-direction: column;
   align-items: center;
   margin-bottom: 30px;
+  margin-top: 3rem;
 }
 
 .container {
diff --git a/styles/Index.module.scss b/styles/Index.module.scss
index 5aeab7d..ced60cd 100644
--- a/styles/Index.module.scss
+++ b/styles/Index.module.scss
@@ -3,7 +3,7 @@
   flex-direction: column;
   align-items: center;
   text-align: center;
-  margin-bottom: 8rem;
   width: 47rem;
   max-width: 100%;
+  margin-bottom: 4rem;
 }
diff --git a/styles/Header.module.scss b/styles/NavBar.module.scss
similarity index 78%
rename from styles/Header.module.scss
rename to styles/NavBar.module.scss
index 5d5b6ec..5147b92 100644
--- a/styles/Header.module.scss
+++ b/styles/NavBar.module.scss
@@ -1,12 +1,15 @@
-.header {
+.navBarContainer {
   display: flex;
   flex-direction: column;
   align-items: center;
+  margin-bottom: 1rem;
+  margin-top: 1rem;
 }
 
 .navBar {
   display: flex;
   justify-content: center;
+  flex-wrap: wrap;
 }
 
 .navBarLink {
@@ -14,10 +17,7 @@
   padding-right: 15px;
   color: #2f273e;
   text-decoration: none;
-}
-
-.navBarLink:hover {
-  color: #69568b;
+  font-size: 1.4rem;
 }
 
 @media screen and (max-width: 600px) {
@@ -32,10 +32,4 @@
     margin-right: 1rem;
     width: auto;
   }
-
-  .navBar {
-    flex-wrap: wrap;
-    margin-bottom: 1rem;
-    margin-top: 1rem;
-  }
 }
diff --git a/styles/Shared.module.scss b/styles/Shared.module.scss
index 6912b7c..5302e0e 100644
--- a/styles/Shared.module.scss
+++ b/styles/Shared.module.scss
@@ -16,7 +16,6 @@
   flex-direction: column;
   align-items: center;
   text-align: center;
-  margin-bottom: 8rem;
   width: 47rem;
   max-width: 100%;
 }