From 8ecb67230c87754d43c4255c56c05566c8c53feb Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 31 Aug 2022 00:48:38 +0300
Subject: make custom router-link for nav-entry to un-nest the interactive
 elements

---
 .../optional_router_link/optional_router_link.vue  | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 src/components/optional_router_link/optional_router_link.vue

(limited to 'src/components/optional_router_link/optional_router_link.vue')

diff --git a/src/components/optional_router_link/optional_router_link.vue b/src/components/optional_router_link/optional_router_link.vue
new file mode 100644
index 00000000..4eef0d6a
--- /dev/null
+++ b/src/components/optional_router_link/optional_router_link.vue
@@ -0,0 +1,22 @@
+<template>
+  <router-link
+    v-if="to"
+    :to="to"
+    custom
+    v-slot="props"
+  >
+    <slot
+      v-bind="props"
+    />
+  </router-link>
+  <slot
+    v-else
+    v-bind="{}"
+  />
+</template>
+
+<script>
+export default {
+  props: ['to']
+}
+</script>
-- 
cgit v1.2.3-70-g09d2


From 98f97ff9a9806b2cb16f9b9f15df531be0f98919 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 31 Aug 2022 00:57:02 +0300
Subject: lint

---
 src/components/optional_router_link/optional_router_link.vue | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/components/optional_router_link/optional_router_link.vue')

diff --git a/src/components/optional_router_link/optional_router_link.vue b/src/components/optional_router_link/optional_router_link.vue
index 4eef0d6a..a9877dd5 100644
--- a/src/components/optional_router_link/optional_router_link.vue
+++ b/src/components/optional_router_link/optional_router_link.vue
@@ -1,4 +1,5 @@
 <template>
+<!-- eslint-disable vue/no-multiple-template-root -->
   <router-link
     v-if="to"
     :to="to"
-- 
cgit v1.2.3-70-g09d2


From 73abae1b3ec705b95d58e6f4e0f691e99f95d8ad Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 31 Aug 2022 00:58:03 +0300
Subject: lint

---
 src/components/navigation/navigation_entry.vue               | 6 +++---
 src/components/optional_router_link/optional_router_link.vue | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/components/optional_router_link/optional_router_link.vue')

diff --git a/src/components/navigation/navigation_entry.vue b/src/components/navigation/navigation_entry.vue
index b984b234..f4d53836 100644
--- a/src/components/navigation/navigation_entry.vue
+++ b/src/components/navigation/navigation_entry.vue
@@ -1,8 +1,8 @@
 <template>
   <OptionalRouterLink
+    v-slot="{ isActive, href, navigate } = {}"
     ass="ass"
     :to="routeTo"
-    v-slot="{ isActive, href, navigate } = {}"
   >
     <li
       class="NavigationEntry menu-item"
@@ -10,8 +10,8 @@
       v-bind="$attrs"
     >
       <component
-        class="main-link button-unstyled"
         :is="routeTo ? 'a' : 'button'"
+        class="main-link button-unstyled"
         :href="href"
         @click="navigate"
       >
@@ -29,7 +29,7 @@
         >{{ item.iconLetter }}
         </span>
         <span class="label">
-        {{ item.labelRaw || $t(item.label) }}
+          {{ item.labelRaw || $t(item.label) }}
         </span>
       </component>
       <slot />
diff --git a/src/components/optional_router_link/optional_router_link.vue b/src/components/optional_router_link/optional_router_link.vue
index a9877dd5..d56ad268 100644
--- a/src/components/optional_router_link/optional_router_link.vue
+++ b/src/components/optional_router_link/optional_router_link.vue
@@ -1,10 +1,10 @@
 <template>
-<!-- eslint-disable vue/no-multiple-template-root -->
+  <!-- eslint-disable vue/no-multiple-template-root -->
   <router-link
     v-if="to"
+    v-slot="props"
     :to="to"
     custom
-    v-slot="props"
   >
     <slot
       v-bind="props"
-- 
cgit v1.2.3-70-g09d2

