From ccddfe87bc51dd61bd95413d53a13db7df260cd1 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Mon, 23 Oct 2017 10:53:39 +0800
Subject: [PATCH] refactor: refine layout directory structure
---
src/views/layout/Layout.vue | 6 ++++--
src/views/layout/{ => components}/AppMain.vue | 0
src/views/layout/{ => components}/Levelbar.vue | 0
src/views/layout/{ => components}/Navbar.vue | 3 ---
src/views/layout/{ => components}/Sidebar.vue | 0
src/views/layout/{ => components}/SidebarItem.vue | 0
src/views/layout/{ => components}/TabsView.vue | 0
src/views/layout/{ => components}/index.js | 5 +----
8 files changed, 5 insertions(+), 9 deletions(-)
rename src/views/layout/{ => components}/AppMain.vue (100%)
rename src/views/layout/{ => components}/Levelbar.vue (100%)
rename src/views/layout/{ => components}/Navbar.vue (97%)
rename src/views/layout/{ => components}/Sidebar.vue (100%)
rename src/views/layout/{ => components}/SidebarItem.vue (100%)
rename src/views/layout/{ => components}/TabsView.vue (100%)
rename src/views/layout/{ => components}/index.js (72%)
diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue
index f31a5b8c..45fc7224 100644
--- a/src/views/layout/Layout.vue
+++ b/src/views/layout/Layout.vue
@@ -3,20 +3,22 @@
<sidebar class="sidebar-container"></sidebar>
<div class="main-container">
<navbar></navbar>
+ <tabs-view></tabs-view>
<app-main></app-main>
</div>
</div>
</template>
<script>
-import { Navbar, Sidebar, AppMain } from 'views/layout'
+import { Navbar, Sidebar, AppMain, TabsView } from 'views/layout/components'
export default {
name: 'layout',
components: {
Navbar,
Sidebar,
- AppMain
+ AppMain,
+ TabsView
},
computed: {
sidebar() {
diff --git a/src/views/layout/AppMain.vue b/src/views/layout/components/AppMain.vue
similarity index 100%
rename from src/views/layout/AppMain.vue
rename to src/views/layout/components/AppMain.vue
diff --git a/src/views/layout/Levelbar.vue b/src/views/layout/components/Levelbar.vue
similarity index 100%
rename from src/views/layout/Levelbar.vue
rename to src/views/layout/components/Levelbar.vue
diff --git a/src/views/layout/Navbar.vue b/src/views/layout/components/Navbar.vue
similarity index 97%
rename from src/views/layout/Navbar.vue
rename to src/views/layout/components/Navbar.vue
index 8cdf1f29..52a42daa 100644
--- a/src/views/layout/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -2,7 +2,6 @@
<el-menu class="navbar" mode="horizontal">
<hamburger class="hamburger-container" :toggleClick="toggleSideBar" :isActive="sidebar.opened"></hamburger>
<levelbar></levelbar>
- <tabs-view></tabs-view>
<error-log v-if="log.length>0" class="errLog-container" :logsList="log"></error-log>
<screenfull class='screenfull'></screenfull>
<el-dropdown class="avatar-container" trigger="click">
@@ -30,7 +29,6 @@
<script>
import { mapGetters } from 'vuex'
import Levelbar from './Levelbar'
-import TabsView from './TabsView'
import Hamburger from 'components/Hamburger'
import Screenfull from 'components/Screenfull'
import ErrorLog from 'components/ErrLog'
@@ -39,7 +37,6 @@ import errLogStore from 'store/errLog'
export default {
components: {
Levelbar,
- TabsView,
Hamburger,
ErrorLog,
Screenfull
diff --git a/src/views/layout/Sidebar.vue b/src/views/layout/components/Sidebar.vue
similarity index 100%
rename from src/views/layout/Sidebar.vue
rename to src/views/layout/components/Sidebar.vue
diff --git a/src/views/layout/SidebarItem.vue b/src/views/layout/components/SidebarItem.vue
similarity index 100%
rename from src/views/layout/SidebarItem.vue
rename to src/views/layout/components/SidebarItem.vue
diff --git a/src/views/layout/TabsView.vue b/src/views/layout/components/TabsView.vue
similarity index 100%
rename from src/views/layout/TabsView.vue
rename to src/views/layout/components/TabsView.vue
diff --git a/src/views/layout/index.js b/src/views/layout/components/index.js
similarity index 72%
rename from src/views/layout/index.js
rename to src/views/layout/components/index.js
index 91ed46c3..ab8f477a 100644
--- a/src/views/layout/index.js
+++ b/src/views/layout/components/index.js
@@ -1,7 +1,4 @@
export { default as Navbar } from './Navbar'
-
export { default as Sidebar } from './Sidebar'
-
-export { default as Levelbar } from './Levelbar'
-
+export { default as TabsView } from './TabsView'
export { default as AppMain } from './AppMain'
--
GitLab