From 31732fdf1f87296b7468f2e2e0ef158a9748374a Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Tue, 1 Sep 2020 18:44:10 +0800
Subject: [PATCH] =?UTF-8?q?layout=E6=96=87=E4=BB=B6=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/{Sidebar => Aside}/component/Logo.vue       | 0
 .../{Sidebar => Aside}/component/SidebarItem.vue          | 0
 .../{Sidebar => Aside}/component/SidebarItemContent.vue   | 0
 vue/src/layout/component/{Sidebar => Aside}/index.vue     | 2 +-
 vue/src/layout/component/{Sidebar => Aside}/style.scss    | 0
 .../{ => Header/component}/Navbar/component/Bell.vue      | 0
 .../{ => Header/component}/Navbar/component/Hamburger.vue | 0
 .../{ => Header/component}/Navbar/component/RootMenu.vue  | 0
 .../component}/Navbar/component/SettingDrawer.vue         | 0
 .../component/{ => Header/component}/Navbar/index.vue     | 0
 .../component/{ => Header/component}/Navbar/style.scss    | 0
 .../{ => Header/component}/TagsView/ScrollPane.vue        | 0
 .../component/{ => Header/component}/TagsView/index.vue   | 0
 .../component/{ => Header/component}/TagsView/style.scss  | 0
 vue/src/layout/component/{Header.vue => Header/index.vue} | 4 ++--
 vue/src/layout/index.vue                                  | 8 ++++----
 16 files changed, 7 insertions(+), 7 deletions(-)
 rename vue/src/layout/component/{Sidebar => Aside}/component/Logo.vue (100%)
 rename vue/src/layout/component/{Sidebar => Aside}/component/SidebarItem.vue (100%)
 rename vue/src/layout/component/{Sidebar => Aside}/component/SidebarItemContent.vue (100%)
 rename vue/src/layout/component/{Sidebar => Aside}/index.vue (99%)
 rename vue/src/layout/component/{Sidebar => Aside}/style.scss (100%)
 rename vue/src/layout/component/{ => Header/component}/Navbar/component/Bell.vue (100%)
 rename vue/src/layout/component/{ => Header/component}/Navbar/component/Hamburger.vue (100%)
 rename vue/src/layout/component/{ => Header/component}/Navbar/component/RootMenu.vue (100%)
 rename vue/src/layout/component/{ => Header/component}/Navbar/component/SettingDrawer.vue (100%)
 rename vue/src/layout/component/{ => Header/component}/Navbar/index.vue (100%)
 rename vue/src/layout/component/{ => Header/component}/Navbar/style.scss (100%)
 rename vue/src/layout/component/{ => Header/component}/TagsView/ScrollPane.vue (100%)
 rename vue/src/layout/component/{ => Header/component}/TagsView/index.vue (100%)
 rename vue/src/layout/component/{ => Header/component}/TagsView/style.scss (100%)
 rename vue/src/layout/component/{Header.vue => Header/index.vue} (96%)

diff --git a/vue/src/layout/component/Sidebar/component/Logo.vue b/vue/src/layout/component/Aside/component/Logo.vue
similarity index 100%
rename from vue/src/layout/component/Sidebar/component/Logo.vue
rename to vue/src/layout/component/Aside/component/Logo.vue
diff --git a/vue/src/layout/component/Sidebar/component/SidebarItem.vue b/vue/src/layout/component/Aside/component/SidebarItem.vue
similarity index 100%
rename from vue/src/layout/component/Sidebar/component/SidebarItem.vue
rename to vue/src/layout/component/Aside/component/SidebarItem.vue
diff --git a/vue/src/layout/component/Sidebar/component/SidebarItemContent.vue b/vue/src/layout/component/Aside/component/SidebarItemContent.vue
similarity index 100%
rename from vue/src/layout/component/Sidebar/component/SidebarItemContent.vue
rename to vue/src/layout/component/Aside/component/SidebarItemContent.vue
diff --git a/vue/src/layout/component/Sidebar/index.vue b/vue/src/layout/component/Aside/index.vue
similarity index 99%
rename from vue/src/layout/component/Sidebar/index.vue
rename to vue/src/layout/component/Aside/index.vue
index a431a0d..9dd200e 100644
--- a/vue/src/layout/component/Sidebar/index.vue
+++ b/vue/src/layout/component/Aside/index.vue
@@ -6,7 +6,7 @@ import Logo from './component/Logo'
 import SidebarItem from './component/SidebarItem'
 
 export default {
-    name: 'sidebar',
+    name: 'Aside',
 
     mixins: [actionOnSelectMenuMixin],
 
diff --git a/vue/src/layout/component/Sidebar/style.scss b/vue/src/layout/component/Aside/style.scss
similarity index 100%
rename from vue/src/layout/component/Sidebar/style.scss
rename to vue/src/layout/component/Aside/style.scss
diff --git a/vue/src/layout/component/Navbar/component/Bell.vue b/vue/src/layout/component/Header/component/Navbar/component/Bell.vue
similarity index 100%
rename from vue/src/layout/component/Navbar/component/Bell.vue
rename to vue/src/layout/component/Header/component/Navbar/component/Bell.vue
diff --git a/vue/src/layout/component/Navbar/component/Hamburger.vue b/vue/src/layout/component/Header/component/Navbar/component/Hamburger.vue
similarity index 100%
rename from vue/src/layout/component/Navbar/component/Hamburger.vue
rename to vue/src/layout/component/Header/component/Navbar/component/Hamburger.vue
diff --git a/vue/src/layout/component/Navbar/component/RootMenu.vue b/vue/src/layout/component/Header/component/Navbar/component/RootMenu.vue
similarity index 100%
rename from vue/src/layout/component/Navbar/component/RootMenu.vue
rename to vue/src/layout/component/Header/component/Navbar/component/RootMenu.vue
diff --git a/vue/src/layout/component/Navbar/component/SettingDrawer.vue b/vue/src/layout/component/Header/component/Navbar/component/SettingDrawer.vue
similarity index 100%
rename from vue/src/layout/component/Navbar/component/SettingDrawer.vue
rename to vue/src/layout/component/Header/component/Navbar/component/SettingDrawer.vue
diff --git a/vue/src/layout/component/Navbar/index.vue b/vue/src/layout/component/Header/component/Navbar/index.vue
similarity index 100%
rename from vue/src/layout/component/Navbar/index.vue
rename to vue/src/layout/component/Header/component/Navbar/index.vue
diff --git a/vue/src/layout/component/Navbar/style.scss b/vue/src/layout/component/Header/component/Navbar/style.scss
similarity index 100%
rename from vue/src/layout/component/Navbar/style.scss
rename to vue/src/layout/component/Header/component/Navbar/style.scss
diff --git a/vue/src/layout/component/TagsView/ScrollPane.vue b/vue/src/layout/component/Header/component/TagsView/ScrollPane.vue
similarity index 100%
rename from vue/src/layout/component/TagsView/ScrollPane.vue
rename to vue/src/layout/component/Header/component/TagsView/ScrollPane.vue
diff --git a/vue/src/layout/component/TagsView/index.vue b/vue/src/layout/component/Header/component/TagsView/index.vue
similarity index 100%
rename from vue/src/layout/component/TagsView/index.vue
rename to vue/src/layout/component/Header/component/TagsView/index.vue
diff --git a/vue/src/layout/component/TagsView/style.scss b/vue/src/layout/component/Header/component/TagsView/style.scss
similarity index 100%
rename from vue/src/layout/component/TagsView/style.scss
rename to vue/src/layout/component/Header/component/TagsView/style.scss
diff --git a/vue/src/layout/component/Header.vue b/vue/src/layout/component/Header/index.vue
similarity index 96%
rename from vue/src/layout/component/Header.vue
rename to vue/src/layout/component/Header/index.vue
index eff1df1..39c529e 100644
--- a/vue/src/layout/component/Header.vue
+++ b/vue/src/layout/component/Header/index.vue
@@ -1,9 +1,9 @@
 <script type="text/jsx">
-import VNavbar from './Navbar'
-import TagsView from './TagsView'
 import {mutations as mainMutations} from "@/layout/store/main"
 import {getters as settingGetters} from "@/layout/store/setting"
 import {mutations as tagsViewMutations} from "@/layout/store/tagsView"
+import VNavbar from './component/Navbar'
+import TagsView from './component/TagsView'
 
 export default {
     name: "Header",
diff --git a/vue/src/layout/index.vue b/vue/src/layout/index.vue
index b1f48e5..858d339 100644
--- a/vue/src/layout/index.vue
+++ b/vue/src/layout/index.vue
@@ -1,6 +1,6 @@
 <template>
     <section class="app-wrapper">
-        <v-sidebar/>
+        <v-aside/>
 
         <section :class="containerClass">
             <v-header/>
@@ -17,9 +17,9 @@
 <script>
 import offlineMixin from './mixin/offline'
 import resizeMixin from './mixin/resize'
-import VMain from './component/Main'
+import VAside from './component/Aside'
 import VHeader from './component/Header'
-import VSidebar from './component/Sidebar'
+import VMain from './component/Main'
 import {getters as mainGetters} from "@/layout/store/main"
 import {getters as settingGetters, mutations as settingMutations} from "@/layout/store/setting"
 
@@ -28,7 +28,7 @@ export default {
 
     mixins: [offlineMixin, resizeMixin],
 
-    components: {VMain, VSidebar, VHeader},
+    components: {VAside, VHeader, VMain},
 
     computed: {
         device: () => mainGetters.device,