From a0aa1ae620ae991209bd538fc22e1d8b0396d076 Mon Sep 17 00:00:00 2001 From: Tyler Date: Tue, 22 Sep 2020 18:02:10 -0400 Subject: [PATCH] feat: implement new layout --- src/_components/layout/Header.vue | 4 +- src/_components/layout/Sidebar.vue | 70 +++++++++--- src/_pages/main/account/Devices.vue | 2 +- src/_pages/main/bubble/LaunchBubble.vue | 2 +- src/_pages/main/bubble/LaunchingBubble.vue | 4 +- src/_pages/main/bubble/MyBubble.vue | 72 +++++++++++++ src/_pages/main/bubble/Network.vue | 63 +++++++++-- src/_pages/main/bubble/Networks.vue | 117 +++++++++++++++++++++ src/_router/index.js | 27 ++--- src/_store/account.module.js | 14 +-- src/_store/system.module.js | 4 +- src/account/NetworkPage.vue | 4 +- src/account/profile/ActionPage.vue | 4 +- src/app/App.vue | 22 ---- webpack.config.dev-example.js | 19 ---- 15 files changed, 323 insertions(+), 105 deletions(-) create mode 100644 src/_pages/main/bubble/MyBubble.vue create mode 100644 src/_pages/main/bubble/Networks.vue delete mode 100644 webpack.config.dev-example.js diff --git a/src/_components/layout/Header.vue b/src/_components/layout/Header.vue index a1991a1..9f39f24 100644 --- a/src/_components/layout/Header.vue +++ b/src/_components/layout/Header.vue @@ -33,7 +33,7 @@
- + @@ -104,7 +104,7 @@
- + {{ messages.label_menu_network }} - +
- + + +
@@ -171,7 +202,7 @@ margin-left: 20px; } - &.active { + &.router-link-active { background-color: #66cda4; color: white; border-radius: 20px; @@ -195,6 +226,7 @@ .icon { font-size: 20px; + width: 20px; } .icon-home { @@ -203,6 +235,12 @@ .icon-devices { color: #4b53df; } +.icon-apps { + color: #9916df; +} +.icon-users { + color: #2ed1a1; +} .icon-settings { color: #e6458a; } @@ -229,7 +267,7 @@ export default { }), computed: { - ...mapState('system', ['messages']), + ...mapState('system', ['messages', 'configs']), userHash() { return md5(this.currentUser.email); @@ -240,6 +278,10 @@ export default { toggleMenu() { this.menuVisible = !this.menuVisible; }, + closeMenu() { + console.log('click.nativeed'); + this.menuVisible = false; + } }, }; diff --git a/src/_pages/main/account/Devices.vue b/src/_pages/main/account/Devices.vue index f71ea84..b394b97 100644 --- a/src/_pages/main/account/Devices.vue +++ b/src/_pages/main/account/Devices.vue @@ -1,6 +1,6 @@