From 05306c75a555d38adad3f3fc4a4d3bd1211c626c Mon Sep 17 00:00:00 2001
From: Philipp Dormann <philipp.dormann1@gmail.com>
Date: Sun, 3 Jan 2021 12:22:15 +0100
Subject: [PATCH] Footer component cleanup

---
 src/App.svelte                        |  2 ++
 src/components/About.svelte           | 10 ----------
 src/components/Dashboard.svelte       |  1 -
 src/components/MainDashContent.svelte |  9 +++++----
 src/components/Settings.svelte        |  2 --
 5 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/App.svelte b/src/App.svelte
index 337c8349..2e630339 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -41,6 +41,7 @@
   import Transition from "./components/Transition.svelte";
   import Orgs from "./components/Orgs.svelte";
   import Runners from "./components/Runners.svelte";
+  import Footer from "./components/Footer.svelte";
   store.init();
 
   // if ("serviceWorker" in navigator) {
@@ -170,6 +171,7 @@
           <Settings />
         </Route>
       </Transition>
+      <Footer />
     </Dashboard>
   {:else}
     <Login />
diff --git a/src/components/About.svelte b/src/components/About.svelte
index d33561b5..de969a3f 100644
--- a/src/components/About.svelte
+++ b/src/components/About.svelte
@@ -1,12 +1,10 @@
 <script>
   import { _ } from "svelte-i18n";
-  import Footer from "./Footer.svelte";
 </script>
 
 <style>
   * {
     font-family: "Agave", sans-serif;
-    /* font-family: "Comic Neue", cursive; */
   }
 </style>
 
@@ -14,13 +12,6 @@
   <link
     rel="stylesheet"
     href="https://cdn.jsdelivr.net/npm/@xz/fonts@1/serve/agave.min.css" />
-  <link
-    rel="stylesheet"
-    href="https://cdn.jsdelivr.net/npm/@xz/fonts@1/serve/nevermind.min.css" />
-  <link rel="preconnect" href="https://fonts.gstatic.com" />
-  <link
-    href="https://fonts.googleapis.com/css2?family=Comic+Neue:wght@700&display=swap"
-    rel="stylesheet" />
 </svelte:head>
 <div class="pt-12 px-4 sm:px-6 lg:px-8 lg:pt-20 bg-gray-900 pb-12">
   <div class="text-center mb-8">
@@ -220,4 +211,3 @@
     </div>
   </div>
 </div>
-<Footer />
diff --git a/src/components/Dashboard.svelte b/src/components/Dashboard.svelte
index 800512fd..20156913 100644
--- a/src/components/Dashboard.svelte
+++ b/src/components/Dashboard.svelte
@@ -7,7 +7,6 @@
   import BreadcrumbNav from "./BreadcrumbNav.svelte";
   import DataTable from "./DataTable.svelte";
   import FileUpload from "./FileUpload.svelte";
-  import Footer from "./Footer.svelte";
   import FormLayout from "./FormLayout.svelte";
   import NotFound from "./NotFound.svelte";
   import Pagination from "./Pagination.svelte";
diff --git a/src/components/MainDashContent.svelte b/src/components/MainDashContent.svelte
index 2151378d..964063da 100644
--- a/src/components/MainDashContent.svelte
+++ b/src/components/MainDashContent.svelte
@@ -4,7 +4,6 @@
   import BreadcrumbNav from "./BreadcrumbNav.svelte";
   import DataTable from "./DataTable.svelte";
   import FileUpload from "./FileUpload.svelte";
-  import Footer from "./Footer.svelte";
   import FormLayout from "./FormLayout.svelte";
   import NotFound from "./NotFound.svelte";
   import Pagination from "./Pagination.svelte";
@@ -51,7 +50,11 @@
   <!-- Add content here, remove div below -->
   <!-- <div class="border-4 border-dashed rounded h-96" /> -->
   <h1 class="text-3xl leading-tight">
-    <span class="font-bold">Dashboard</span><span> - hello there, <span class="text-blue-500">{store.state.jwtinfo.userdetails.firstname}</span> 👋</span>
+    <span class="font-bold">Dashboard</span><span>
+      - hello there,
+      <span
+        class="text-blue-500">{store.state.jwtinfo.userdetails.firstname}</span>
+      👋</span>
   </h1>
   <div class="shadow px-6 pt-4 pb-1">
     <BreadcrumbNav />
@@ -126,6 +129,4 @@
   <div class="mb-8">
     <FormLayout />
   </div>
-  <Footer />
-  <!-- <NotFound /> -->
 </div>
diff --git a/src/components/Settings.svelte b/src/components/Settings.svelte
index c915390b..f6e908fc 100644
--- a/src/components/Settings.svelte
+++ b/src/components/Settings.svelte
@@ -1,6 +1,5 @@
 <script>
   import { _ } from "svelte-i18n";
-  import Footer from "./Footer.svelte";
 </script>
 
 <style>
@@ -43,4 +42,3 @@
     </div>
   </div>
 </div>
-<Footer />