From d844bd8518aaa58d1b95c342833dc69109caac53 Mon Sep 17 00:00:00 2001
From: Romulus21 <romain@delanoe.me>
Date: Wed, 8 Apr 2020 23:00:26 +0200
Subject: [PATCH] fix menu memory, return memo button & add favicon

---
 public/img/logo.svg                    | 55 ++++++++++++++++++++++++++
 resources/js/components/Nav.vue        | 12 +++++-
 resources/js/views/Memo/MemoCreate.vue |  4 +-
 resources/js/views/Memo/MemoEdit.vue   |  4 +-
 resources/js/views/Memo/MemoIndex.vue  |  4 +-
 resources/js/views/Memo/MemoShow.vue   |  2 +-
 resources/views/layouts/app.blade.php  |  1 +
 7 files changed, 71 insertions(+), 11 deletions(-)
 create mode 100644 public/img/logo.svg

diff --git a/public/img/logo.svg b/public/img/logo.svg
new file mode 100644
index 0000000..0dbdf48
--- /dev/null
+++ b/public/img/logo.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 24 24"
+   class="fill-current"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="logo.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1850"
+     inkscape:window-height="1136"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="9.8333333"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:window-x="70"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6" />
+  <title
+     id="title2">Portal</title>
+  <path
+     d="M22.9 10.1c-.1-.1-.2-.2-.3-.2L20 9.5c-.1-.5-.3-.9-.6-1.4.2-.2.4-.6.8-1 .3-.4.6-.8.7-1 .1 0 .1-.2.1-.3 0-.1 0-.2-.1-.3-.3-.5-1.1-1.3-2.4-2.4-.1-.1-.2-.1-.4-.1-.1 0-.3 0-.3.1l-2 1.5c-.4-.2-.8-.4-1.3-.5l-.4-2.6c0-.1-.1-.2-.2-.3-.1-.2-.2-.2-.3-.2h-3.2c-.3 0-.4.1-.5.4-.1.5-.3 1.4-.4 2.7-.5.1-.9.3-1.3.5l-2-1.5c-.1-.1-.3-.2-.4-.2-.2 0-.7.3-1.4 1-.6.7-1.1 1.3-1.4 1.6-.1.1-.1.2-.1.3 0 .1 0 .2.1.3.6.8 1.2 1.4 1.5 2-.2.5-.3.9-.5 1.4l-2.6.4c-.1 0-.2.1-.3.2-.1.1-.1.2-.1.3v3.2c0 .1 0 .2.1.3.1.1.2.2.3.2l2.6.4c.1.5.3.9.6 1.4-.2.2-.4.6-.8 1-.3.4-.6.8-.7 1-.1.1-.1.2-.1.3 0 .1 0 .2.1.3.4.5 1.2 1.3 2.4 2.4.1.1.2.2.4.2.1 0 .3 0 .4-.1l2-1.5c.3.1.7.3 1.2.5l.4 2.6c0 .1.1.2.2.3.1.1.2.1.4.1h3.2c.3 0 .4-.1.5-.4.1-.5.3-1.4.4-2.7.4-.1.9-.3 1.3-.5l2 1.5c.1.1.3.1.4.1.2 0 .7-.3 1.3-1 .7-.7 1.2-1.2 1.4-1.5.1-.1.1-.2.1-.3 0-.1 0-.2-.1-.4-.7-.8-1.2-1.5-1.5-2 .2-.4.4-.8.6-1.3l2.7-.4c.1 0 .2-.1.3-.2.1-.1.1-.2.1-.3v-3.2c-.2-.1-.2-.2-.3-.3zm-8.3 4.5c-.7.7-1.6 1.1-2.6 1.1s-1.9-.4-2.6-1.1c-.7-.7-1.1-1.6-1.1-2.6s.4-1.9 1.1-2.6c.7-.7 1.6-1.1 2.6-1.1s1.9.4 2.6 1.1c.7.7 1.1 1.6 1.1 2.6s-.4 1.9-1.1 2.6z"
+     id="path4"
+     style="fill:#1f6521;fill-opacity:1" />
+</svg>
diff --git a/resources/js/components/Nav.vue b/resources/js/components/Nav.vue
index 15add09..b795fa0 100644
--- a/resources/js/components/Nav.vue
+++ b/resources/js/components/Nav.vue
@@ -12,7 +12,7 @@
             <svg-vue icon="games" />
             <span v-bind:class="{ navhidden: !toggleNav }">Jeux</span>
         </router-link>
-        <div @click="toggleNav = !toggleNav"  class="nav-toggle mt-5">
+        <div @click="toggleNavBar"  class="nav-toggle mt-5">
             <svg-vue icon="arrow" v-bind:class="{ small: !toggleNav }" />
         </div>
     </nav>
@@ -25,6 +25,16 @@
             return {
                 toggleNav: true,
             }
+        },
+        mounted() {
+            let isTrueSet = (localStorage.getItem('navbar') === 'true');
+            (isTrueSet) ? this.toggleNav = true : this.toggleNav = false
+        },
+        methods: {
+            toggleNavBar() {
+                this.toggleNav = !this.toggleNav
+                localStorage.setItem('navbar', JSON.stringify(this.toggleNav));
+            }
         }
     }
 </script>
diff --git a/resources/js/views/Memo/MemoCreate.vue b/resources/js/views/Memo/MemoCreate.vue
index fc53400..02930e0 100755
--- a/resources/js/views/Memo/MemoCreate.vue
+++ b/resources/js/views/Memo/MemoCreate.vue
@@ -1,9 +1,7 @@
 <template>
     <div class="memo-edit p-2">
         <div class="flex-between mb-1">
-            <a href="#" @click="$router.back()" class="link">
-                < Back
-            </a>
+            <router-link to="/memos/" class="btn">< Back</router-link>
             <button @click="$router.back()" class="btn-alert mr-1">Cancel</button>
         </div>
         <form @submit.prevent="submitForm">
diff --git a/resources/js/views/Memo/MemoEdit.vue b/resources/js/views/Memo/MemoEdit.vue
index e0ed654..5964a66 100755
--- a/resources/js/views/Memo/MemoEdit.vue
+++ b/resources/js/views/Memo/MemoEdit.vue
@@ -1,9 +1,7 @@
 <template>
     <div class="memo-edit p-2">
         <div class="flex-between mb-1">
-            <a href="#" @click="$router.back()" class="link">
-                < Back
-            </a>
+            <router-link :to="'/memos/' + this.$route.params.id" class="btn">< Back</router-link>
             <button class="btn-alert mr-1">Cancel</button>
         </div>
         <form @submit.prevent="submitForm">
diff --git a/resources/js/views/Memo/MemoIndex.vue b/resources/js/views/Memo/MemoIndex.vue
index db29b52..d2469e8 100755
--- a/resources/js/views/Memo/MemoIndex.vue
+++ b/resources/js/views/Memo/MemoIndex.vue
@@ -1,9 +1,7 @@
 <template>
     <div class="p-2">
         <div class="flex-between flex-center mb-1">
-            <a href="#" @click="$router.back()">
-                < Back
-            </a>
+            <a href="#" class="btn" @click="$router.back()">< Back</a>
             <router-link :to="'/memos/create'" class="btn-primary">Add New Memo</router-link>
         </div>
         <div v-if="loading">> Loading...</div>
diff --git a/resources/js/views/Memo/MemoShow.vue b/resources/js/views/Memo/MemoShow.vue
index 59c438c..badbcf2 100755
--- a/resources/js/views/Memo/MemoShow.vue
+++ b/resources/js/views/Memo/MemoShow.vue
@@ -3,7 +3,7 @@
         <div v-if="loading" >> Loading...</div>
         <div v-else>
             <div class="flex-between flex-center mb-1">
-                <a href="#" class="link" @click="$router.back()">< Back</a>
+                <router-link to="/memos/" class="btn">< Back</router-link>
                 <div class="relative">
                     <router-link :to="'/memos/' + memo.memo_id + '/edit'" class="btn-secondary mr-1" >Edit</router-link>
                     <a href="#" class="btn-alert" @click="modal = ! modal">Delete</a>
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index c24914b..d433219 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -12,6 +12,7 @@
     <!-- Scripts -->
     <script src="{{ asset('js/app.js') }}" defer></script>
 
+    <link rel="icon" href="{{ URL::asset('/img/logo.svg') }}" type="image/x-icon"/>
     <!-- Styles -->
     <link href="{{ asset('css/app.css') }}" rel="stylesheet">
 </head>