From ed8ea3e5d57e3c4066d32f8a6d449a72de9da03c Mon Sep 17 00:00:00 2001
From: Kia King Ishii <kia.king.08@gmail.com>
Date: Tue, 24 Nov 2020 18:15:30 +0900
Subject: [PATCH] refactor: refactor nav bar component

---
 src/client/theme-default/components/NavBar.ts | 12 ----
 .../theme-default/components/NavBar.vue       | 58 ++++++++-----------
 .../theme-default/components/NavBarTitle.vue  | 44 ++++++++++++++
 3 files changed, 69 insertions(+), 45 deletions(-)
 delete mode 100644 src/client/theme-default/components/NavBar.ts
 create mode 100644 src/client/theme-default/components/NavBarTitle.vue

diff --git a/src/client/theme-default/components/NavBar.ts b/src/client/theme-default/components/NavBar.ts
deleted file mode 100644
index dde9d8cf..00000000
--- a/src/client/theme-default/components/NavBar.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { withBase } from '../utils'
-import NavBarLinks from './NavBarLinks.vue'
-
-export default {
-  components: {
-    NavBarLinks
-  },
-
-  setup() {
-    return { withBase }
-  }
-}
diff --git a/src/client/theme-default/components/NavBar.vue b/src/client/theme-default/components/NavBar.vue
index 96860dd1..970d4fba 100644
--- a/src/client/theme-default/components/NavBar.vue
+++ b/src/client/theme-default/components/NavBar.vue
@@ -1,48 +1,40 @@
 <template>
-  <a
-    class="title"
-    :aria-label="$site.title + ', back to home'"
-    :href="$site.base"
-  >
-    <img
-      class="logo"
-      v-if="$theme.logo"
-      :src="withBase($theme.logo)"
-      alt="logo"
-    />
-    <span>{{ $site.title }}</span>
-  </a>
-  <div class="flex-grow"></div>
-  <NavBarLinks class="hide-mobile" />
+  <NavBarTitle />
+
+  <div class="flex-grow" />
+
+  <div class="nav">
+    <NavBarLinks />
+  </div>
+
   <slot name="search" />
 </template>
 
-<script src="./NavBar"></script>
+<script lang="ts">
+import { defineComponent } from 'vue'
+import NavBarTitle from './NavBarTitle.vue'
+import NavBarLinks from './NavBarLinks.vue'
 
-<style>
-.title {
-  font-size: 1.3rem;
-  font-weight: 600;
-  color: var(--c-text);
-}
-
-.title:hover {
-  text-decoration: none;
-}
+export default defineComponent({
+  components: {
+    NavBarTitle,
+    NavBarLinks
+  }
+})
+</script>
 
+<style scoped>
 .flex-grow {
   flex-grow: 1;
 }
 
-.logo {
-  margin-right: 0.75rem;
-  height: 1.3rem;
-  vertical-align: bottom;
+.nav {
+  display: none;
 }
 
-@media screen and (max-width: 719px) {
-  .hide-mobile {
-    display: none !important;
+@media (min-width: 720px) {
+  .nav {
+    display: block;
   }
 }
 </style>
diff --git a/src/client/theme-default/components/NavBarTitle.vue b/src/client/theme-default/components/NavBarTitle.vue
new file mode 100644
index 00000000..bafdc6c7
--- /dev/null
+++ b/src/client/theme-default/components/NavBarTitle.vue
@@ -0,0 +1,44 @@
+<template>
+  <a
+    class="nav-bar-title"
+    :href="$site.base"
+    :aria-label="`${$site.title}, back to home`"
+  >
+    <img
+      v-if="$theme.logo"
+      class="logo"
+      :src="withBase($theme.logo)"
+      alt="Logo"
+    />
+    {{ $site.title }}
+  </a>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue'
+import { withBase } from '../utils'
+
+export default defineComponent({
+  setup() {
+    return { withBase }
+  }
+})
+</script>
+
+<style scoped>
+.nav-bar-title {
+  font-size: 1.3rem;
+  font-weight: 600;
+  color: var(--c-text);
+}
+
+.nav-bar-title:hover {
+  text-decoration: none;
+}
+
+.logo {
+  margin-right: .75rem;
+  height: 1.3rem;
+  vertical-align: bottom;
+}
+</style>