From 98d19e5e0bd1f9ca99f4eb422cd3564cc1788286 Mon Sep 17 00:00:00 2001
From: Max <m.giller.dev@gmail.com>
Date: Sun, 7 Nov 2021 22:20:30 +0100
Subject: [PATCH] Added footer and credits and new timer package

---
 package.json                                  |  3 +-
 src/components/layout/LayoutFooter.vue        | 32 +++++++++++++
 src/components/layout/LayoutMinimal.vue       | 35 ++++++++------
 src/components/layout/LayoutNavbarPrivate.vue | 16 +++++--
 src/router/index.js                           |  6 +++
 src/views/Changelog.vue                       |  8 ++++
 src/views/Credits.vue                         | 46 +++++++++++++++++++
 7 files changed, 126 insertions(+), 20 deletions(-)
 create mode 100644 src/components/layout/LayoutFooter.vue
 create mode 100644 src/views/Credits.vue

diff --git a/package.json b/package.json
index 1eca7ad..37b6161 100644
--- a/package.json
+++ b/package.json
@@ -9,12 +9,13 @@
     "lint:fix": "eslint --fix --ext .js,.vue ."
   },
   "dependencies": {
-    "axios": "^0.21.0",
+    "axios": "^0.21.4",
     "bootstrap": "^4.5.3",
     "bootstrap-vue": "^2.21.1",
     "core-js": "^3.6.5",
     "vue": "^2.6.12",
     "vue-router": "^3.2.0",
+    "vue-timers": "^2.0.4",
     "vuex": "^3.4.0"
   },
   "devDependencies": {
diff --git a/src/components/layout/LayoutFooter.vue b/src/components/layout/LayoutFooter.vue
new file mode 100644
index 0000000..3a2ea6c
--- /dev/null
+++ b/src/components/layout/LayoutFooter.vue
@@ -0,0 +1,32 @@
+<template>
+  <footer>
+    <BaseContainer
+      width="medium"
+      center
+    >
+      <b-link to="/changelog" class="surround-space">Changelog</b-link>
+      <b-link to="/credits" class="surround-space">Credits</b-link>
+    </BaseContainer>
+  </footer>
+</template>
+
+<script>
+import BaseContainer from "@/components/base/BaseContainer.vue";
+
+export default {
+  name: "LayoutFooter",
+  components: {
+    BaseContainer,
+  },
+};
+</script>
+
+<style lang="sass" scoped>
+footer
+  margin-bottom: 3rem
+  text-align: center
+
+.surround-space
+  margin-left: 1rem
+  margin-right: 1rem
+</style>
diff --git a/src/components/layout/LayoutMinimal.vue b/src/components/layout/LayoutMinimal.vue
index 8894686..69bf438 100644
--- a/src/components/layout/LayoutMinimal.vue
+++ b/src/components/layout/LayoutMinimal.vue
@@ -1,31 +1,36 @@
 <template>
-  <main>
-    <BaseLogo id="logo" size="medium" center class="space-top" />
-    <BaseContainer
-      :width="width"
-      center
-      class="space-bottom"
-      :class="{ 'center-content': center }"
-    >
-      <BaseTitle v-if="title" center size="giant" class="centered" outline>
-        {{ title.toUpperCase() }}
-      </BaseTitle>
-      <slot />
-    </BaseContainer>
-  </main>
+  <div>
+    <main>
+      <BaseLogo id="logo" size="medium" center class="space-top" />
+      <BaseContainer
+        :width="width"
+        center
+        class="space-bottom"
+        :class="{ 'center-content': center }"
+      >
+        <BaseTitle v-if="title" center size="giant" class="centered" outline>
+          {{ title.toUpperCase() }}
+        </BaseTitle>
+        <slot />
+      </BaseContainer>
+    </main>
+    <LayoutFooter />
+  </div>
 </template>
 
 <script>
 import BaseContainer from "@/components/base/BaseContainer";
 import BaseLogo from "@/components/base/BaseLogo";
 import BaseTitle from "@/components/base/BaseTitle";
+import LayoutFooter from "@/components/layout/LayoutFooter";
 
 export default {
   name: "LayoutMinimal",
   components: {
     BaseContainer,
     BaseLogo,
-    BaseTitle
+    BaseTitle,
+    LayoutFooter
   },
   props: {
     width: {
diff --git a/src/components/layout/LayoutNavbarPrivate.vue b/src/components/layout/LayoutNavbarPrivate.vue
index dff621d..fab2924 100644
--- a/src/components/layout/LayoutNavbarPrivate.vue
+++ b/src/components/layout/LayoutNavbarPrivate.vue
@@ -6,9 +6,6 @@
           <li>
             <BaseLogo id="logo" size="normal" />
           </li>
-          <li>
-            Take a look at the new <b-link to="/changelog">changelog here</b-link>.
-          </li>
           <li class="right">
             <BaseUserDropdown />
           </li>
@@ -27,6 +24,7 @@
         <slot />
       </BaseContainer>
     </main>
+    <LayoutFooter/>
   </div>
 </template>
 
@@ -35,6 +33,7 @@ import BaseContainer from "@/components/base/BaseContainer.vue";
 import BaseLogo from "@/components/base/BaseLogo.vue";
 import BaseUserDropdown from "@/components/base/BaseUserDropdown.vue";
 import BaseTitle from "@/components/base/BaseTitle";
+import LayoutFooter from "@/components/layout/LayoutFooter";
 
 export default {
   name: "LayoutNavbarPrivate",
@@ -42,7 +41,8 @@ export default {
     BaseContainer,
     BaseLogo,
     BaseUserDropdown,
-    BaseTitle
+    BaseTitle,
+    LayoutFooter
   },
   props: {
     title: {
@@ -89,6 +89,14 @@ main
   margin-top: 6rem
   margin-bottom: 6rem
 
+footer
+  margin-bottom: 3rem
+  text-align: center
+
+  *
+    margin-left: 1rem
+    margin-right: 1rem
+
 .center-content
   text-align: center
 </style>
diff --git a/src/router/index.js b/src/router/index.js
index 8da9fc8..6f26b66 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,6 +8,7 @@ import History from "../views/History.vue";
 import Manage from "../views/Manage.vue";
 import Statistics from "../views/Statistics.vue";
 import Changelog from "../views/Changelog.vue";
+import Credits from "../views/Credits.vue";
 
 Vue.use(VueRouter);
 
@@ -50,6 +51,11 @@ const routes = [
     name: "Changelog",
     component: Changelog
   },
+  {
+    path: "/credits",
+    name: "Credits",
+    component: Credits
+  },
   {
     path: "/logout",
     name: "Logout",
diff --git a/src/views/Changelog.vue b/src/views/Changelog.vue
index e958a7d..5cd2663 100644
--- a/src/views/Changelog.vue
+++ b/src/views/Changelog.vue
@@ -1,5 +1,13 @@
 <template>
   <LayoutMinimal title="Changelog">
+    <BaseTitle size="small">
+      07.11.2021
+    </BaseTitle>
+    <ul>
+      <li>Added credits page</li>
+      <li>Created basic footer</li>
+      <li>Added live timer in record list</li>
+    </ul>
     <BaseTitle size="small">
       27.07.2021
     </BaseTitle>
diff --git a/src/views/Credits.vue b/src/views/Credits.vue
new file mode 100644
index 0000000..0b3b172
--- /dev/null
+++ b/src/views/Credits.vue
@@ -0,0 +1,46 @@
+<template>
+  <LayoutMinimal title="Credits" >
+    <BaseTitle>
+      vue-timers
+    </BaseTitle>
+    <BaseTitle size="tiny">
+      <b-link href="https://github.com/Kelin2025/vue-timers">
+        GitHub
+      </b-link>
+    </BaseTitle>
+    <p class="monospace">
+      MIT License
+<br/>
+<br/>
+Copyright (c) 2017 Anton Kosykh
+<br/>
+<br/>
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+<br/>
+<br/>
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+<br/>
+<br/>
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+    </p>
+  </LayoutMinimal>
+</template>
+
+<script>
+// @ is an alias to /src
+import LayoutMinimal from "@/components/layout/LayoutMinimal";
+import BaseTitle from "@/components/base/BaseTitle";
+
+export default {
+  name: "Credits",
+  components: {
+    LayoutMinimal,
+    BaseTitle
+  }
+};
+</script>
+
+<style lang="sass" scoped>
+.monospace
+  font-family: Courier New, Courier, monospace
+</style>