From 6132ed120e573d365554d39c87d3408f5249bbfb Mon Sep 17 00:00:00 2001
From: Tyler <everdev0923@gmail.com>
Date: Fri, 18 Sep 2020 09:30:08 -0400
Subject: [PATCH 01/13] fix: login by enter key

---
 src/_components/shared/Input.vue | 9 +++++++++
 src/_pages/auth/Login.vue        | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/src/_components/shared/Input.vue b/src/_components/shared/Input.vue
index 41bed69..3445b28 100644
--- a/src/_components/shared/Input.vue
+++ b/src/_components/shared/Input.vue
@@ -2,6 +2,7 @@
 <template>
   <input
     v-bind="$attrs"
+    v-on="nativeEvents"
     v-model="content"
     @input="handleInput()"
     class="form-input"
@@ -18,6 +19,7 @@ export default {
       default: '',
     },
   },
+
   data() {
     return {
       content: this.value,
@@ -28,6 +30,13 @@ export default {
       this.content = v;
     },
   },
+  computed: {
+    nativeEvents() {
+      return Object.keys(this.$listeners)
+        .filter((e) => e !== 'input')
+        .reduce((obj, v) => ({ ...obj, [v]: this.$listeners[v] }), {});
+    },
+  },
   methods: {
     handleInput(e) {
       this.$emit('input', this.content);
diff --git a/src/_pages/auth/Login.vue b/src/_pages/auth/Login.vue
index ea18ed1..2ec9166 100644
--- a/src/_pages/auth/Login.vue
+++ b/src/_pages/auth/Login.vue
@@ -48,6 +48,7 @@
             'is-invalid': submitted && errors.has('password'),
           }"
           v-model="password"
+          @keyup.enter="submit"
           :placeholder="messages.field_label_enter_password"
         />
         <div
@@ -65,6 +66,7 @@
             'is-invalid': submitted && errors.has('totpToken'),
           }"
           v-model="totpToken"
+          @keyup.enter="submit"
           :placeholder="messages.field_label_totp_code"
         />
         <div
@@ -177,6 +179,7 @@ export default {
     ...mapActions('account', ['login', 'logout']),
 
     submit() {
+      console.log('submit');
       this.errors.clear();
       this.$v.$touch();
       this.submitted = true;
-- 
2.17.1


From 8fb4e1c29e0a4ca35d6720600da0951923d59493 Mon Sep 17 00:00:00 2001
From: Tyler <everdev0923@gmail.com>
Date: Fri, 18 Sep 2020 09:30:40 -0400
Subject: [PATCH 02/13] fix: showing error on add ssh modal

---
 src/_components/modals/AddSshKey.vue |  7 +++++++
 src/_store/users.module.js           | 10 ++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/_components/modals/AddSshKey.vue b/src/_components/modals/AddSshKey.vue
index 587cd91..d092ad4 100644
--- a/src/_components/modals/AddSshKey.vue
+++ b/src/_components/modals/AddSshKey.vue
@@ -134,6 +134,13 @@ export default {
 
     show() {
       this.$modal.show('add-ssh-key');
+
+      this.name = '';
+      this.sshPublicKey = '';
+      this.minExpiration = new Date().toISOString();
+      this.expiration = null;
+      this.timezone = this.detectedTimezone.timeZoneId;
+      this.submitted = false;
     },
     hide() {
       this.$modal.hide('add-ssh-key');
diff --git a/src/_store/users.module.js b/src/_store/users.module.js
index 442ab56..64307a5 100644
--- a/src/_store/users.module.js
+++ b/src/_store/users.module.js
@@ -144,8 +144,14 @@ const actions = {
         commit('addSshKeyByUserIdRequest');
         return userService.addSshKeyByUserId(userId, sshKey, messages, errors)
             .then(
-                key => commit('addSshKeyByUserIdSuccess', key),
-                error => commit('addSshKeyByUserIdFailure', error)
+                key => {
+                    commit('addSshKeyByUserIdSuccess', key);
+                    return Promise.resolve();
+                },
+                error => {
+                    commit('addSshKeyByUserIdFailure', error);
+                    return Promise.reject();
+                }
             );
     },
 
-- 
2.17.1


From 26dbe9c917872e0885a64dafc25a71c6da7965be Mon Sep 17 00:00:00 2001
From: Tyler <everdev0923@gmail.com>
Date: Fri, 18 Sep 2020 09:31:03 -0400
Subject: [PATCH 03/13] fix: header

---
 src/_components/layout/Header.vue  | 6 +++---
 src/_pages/main/account/Delete.vue | 2 +-
 src/_router/index.js               | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/_components/layout/Header.vue b/src/_components/layout/Header.vue
index 0755e23..71d0547 100644
--- a/src/_components/layout/Header.vue
+++ b/src/_components/layout/Header.vue
@@ -12,7 +12,7 @@
           v-if="status.loggedIn !== true"
           class="d-flex justify-content-center align-items-center"
         >
-          <router-link to="/help" class="d-flex align-items-center">
+          <router-link to="/support" class="d-flex align-items-center">
             <Button headerLink>
               {{ messages.button_label_help }}
             </Button>
@@ -70,7 +70,7 @@
               {{ messages.label_menu_account }}
             </Button>
           </router-link>
-          <router-link to="/help" class="d-flex align-items-center">
+          <router-link to="/support" class="d-flex align-items-center">
             <Button headerLink>
               {{ messages.button_label_help }}
             </Button>
@@ -131,7 +131,7 @@
         <router-link to="/me" class="dropdown-item">
           {{ messages.label_menu_account }}
         </router-link>
-        <router-link class="dropdown-item" to="/help">
+        <router-link class="dropdown-item" to="/support">
           {{ messages.button_label_help }}
         </router-link>
         <router-link class="dropdown-item" to="/logout">
diff --git a/src/_pages/main/account/Delete.vue b/src/_pages/main/account/Delete.vue
index f9bed4c..4206a6f 100644
--- a/src/_pages/main/account/Delete.vue
+++ b/src/_pages/main/account/Delete.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="bubble-form">
     <h4 class="text-center form-title">
-      {{ messages.manage_account_delete_title }}
+      {{ messages.manage_account_delete_backup_title }}
     </h4>
 
     <span v-if="me && currentUser.name != 'root'">
diff --git a/src/_router/index.js b/src/_router/index.js
index d69ff7f..743c422 100644
--- a/src/_router/index.js
+++ b/src/_router/index.js
@@ -69,7 +69,7 @@ export const router = new Router({
     // { path: '/legal', component: LegalPage },
     // { path: '/support', component: SupportPage },
 
-    // { path: '/me', component: ProfilePage },
+    // { path: '/me/old', component: ProfilePage },
     // { path: '/me/policy', component: PolicyPage },
     {
       path: '/me/download/:uuid',
@@ -79,7 +79,7 @@ export const router = new Router({
       }),
     },
     { path: '/me/action', component: ActionPage },
-    // { path: '/me/changePassword', component: ChangePasswordPage },
+    // { path: '/me/changePassword/old', component: ChangePasswordPage },
     // { path: '/me/setPassword/:code', component: SetPasswordPage },
     // { path: '/me/keys', component: SshKeysPage },
     // { path: '/me/bills', component: BillsPage },
-- 
2.17.1


From 8e881b8aec38058b43c0699152a8de08f0b57c8d Mon Sep 17 00:00:00 2001
From: Tyler <everdev0923@gmail.com>
Date: Tue, 22 Sep 2020 06:32:55 -0400
Subject: [PATCH 04/13] feat: implement new layout

---
 package-lock.json                             |   5 +
 package.json                                  |   1 +
 src/_assets/post_auth_messages.json           |   3 +
 src/_assets/pre_auth_messages.json            |   7 +
 src/_components/layout/Footer.vue             | 117 ++++++++
 src/_components/layout/Header.vue             |   4 +-
 src/_components/layout/Notification.vue       |  27 ++
 src/_components/layout/Sidebar.vue            | 245 +++++++++++++++
 src/_components/layout/index.js               |   3 +
 src/_pages/Layout.vue                         |   4 +-
 src/_pages/auth/Layout.vue                    |   2 +
 src/_pages/{main/account => auth}/Payment.vue |   2 +-
 src/_pages/auth/VerifyEmail.vue               |  49 ++-
 src/_pages/main/Layout.vue                    | 105 ++++++-
 src/_pages/main/account/VerifyEmail.vue       | 125 --------
 src/_router/index.js                          | 278 +++++++++---------
 src/app/App.vue                               |  19 +-
 src/public/bubble_bkgrnd.png                  | Bin 0 -> 38611 bytes
 18 files changed, 699 insertions(+), 297 deletions(-)
 create mode 100644 src/_components/layout/Footer.vue
 create mode 100644 src/_components/layout/Notification.vue
 create mode 100644 src/_components/layout/Sidebar.vue
 rename src/_pages/{main/account => auth}/Payment.vue (99%)
 delete mode 100644 src/_pages/main/account/VerifyEmail.vue
 create mode 100644 src/public/bubble_bkgrnd.png

diff --git a/package-lock.json b/package-lock.json
index 3cd4581..dc389d9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1280,6 +1280,11 @@
       "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
       "dev": true
     },
+    "blueimp-md5": {
+      "version": "2.18.0",
+      "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.18.0.tgz",
+      "integrity": "sha512-vE52okJvzsVWhcgUHOv+69OG3Mdg151xyn41aVQN/5W5S+S43qZhxECtYLAEHMSFWX6Mv5IZrzj3T5+JqXfj5Q=="
+    },
     "bn.js": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz",
diff --git a/package.json b/package.json
index edafd88..f8dec94 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
     "dev": "webpack-dev-server --open --env.server=$MY_BUBBLE_API"
   },
   "dependencies": {
+    "blueimp-md5": "^2.18.0",
     "lottie-web": "^5.7.1",
     "luxon": "^1.21.3",
     "qrcode": "^1.4.4",
diff --git a/src/_assets/post_auth_messages.json b/src/_assets/post_auth_messages.json
index 2c63c08..a08853a 100644
--- a/src/_assets/post_auth_messages.json
+++ b/src/_assets/post_auth_messages.json
@@ -1,2 +1,5 @@
 {
+  "label_homepage_welcome": "Hello",
+  "label_menu_help": "Help",
+  "label_menu_settings": "Settings"
 }
diff --git a/src/_assets/pre_auth_messages.json b/src/_assets/pre_auth_messages.json
index 2c63c08..bac8ec1 100644
--- a/src/_assets/pre_auth_messages.json
+++ b/src/_assets/pre_auth_messages.json
@@ -1,2 +1,9 @@
 {
+  "footer_links": "get_help,legal_stuff,about_bubble",
+  "title_get_help": "Get Help",
+  "title_legal_stuff": "Legal Stuff",
+  "title_about_bubble": "About Bubble",
+  "link_get_help": "https://example.com/get_help",
+  "link_legal_stuff": "https://example.com/legal_stuff",
+  "link_about_bubble": "https://example.com/about_bubble"
 }
diff --git a/src/_components/layout/Footer.vue b/src/_components/layout/Footer.vue
new file mode 100644
index 0000000..3a40db7
--- /dev/null
+++ b/src/_components/layout/Footer.vue
@@ -0,0 +1,117 @@
+<template>
+  <footer class="footer">
+    <p class="text-white text-center">
+      {{ messages.label_get_bubble_for_devices }}
+    </p>
+    <div class="devices">
+      <a
+        class="device"
+        v-for="device in availableDevices"
+        :key="device"
+        download
+        href=""
+      >
+        <img :src="`/${device}.png`" />
+        <span>{{ messages[`label_device_${device}`] }}</span>
+      </a>
+    </div>
+    <div class="links">
+      <a
+        class="text-white link"
+        v-for="item in footerLinks"
+        :key="item"
+        :to="messages[`link_${item}`]"
+      >
+        {{ messages[`title_${item}`] }}
+      </a>
+    </div>
+  </footer>
+</template>
+
+<style lang="scss" scoped>
+@import '../../_scss/breakpoints';
+
+.footer {
+  z-index: 1;
+  & > * {
+    margin: 20px 0;
+  }
+
+  p {
+    font-size: 26px;
+    line-height: 30px;
+  }
+
+  @include respond-below(sm) {
+    padding: 0 70px;
+  }
+}
+
+.devices,
+.links {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+}
+
+.device {
+  width: 165px;
+  padding: 10px;
+
+  @include respond-below(lg) {
+    width: 120px;
+    padding: 10px 0;
+  }
+
+  margin: 10px;
+  border-radius: 10px;
+  background-color: white;
+  box-shadow: 0px 5px 30px #1551ab;
+
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+
+  span {
+    font-size: 12px;
+    color: #7c7c7c;
+    margin-top: 16px;
+  }
+}
+
+.link {
+  font-size: 14px;
+  &:not(:last-child) {
+    display: inline-flex;
+    align-items: center;
+    &:after {
+      content: '';
+      width: 3px;
+      height: 3px;
+      background-color: white;
+      margin: 0 12px;
+      display: inline-flex;
+      border-radius: 3px;
+    }
+  }
+}
+</style>
+
+<script>
+import { mapState } from 'vuex';
+
+export default {
+  computed: {
+    ...mapState('system', ['messages']),
+
+    availableDevices() {
+      return this.messages.available_devices ? this.messages.available_devices.split(',') : [];
+    },
+
+    footerLinks() {
+      return this.messages.footer_links ? this.messages.footer_links.split(',') : [];
+    },
+  },
+};
+</script>
diff --git a/src/_components/layout/Header.vue b/src/_components/layout/Header.vue
index 71d0547..a1991a1 100644
--- a/src/_components/layout/Header.vue
+++ b/src/_components/layout/Header.vue
@@ -1,6 +1,6 @@
 <!-- Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/ -->
 <template>
-  <div class="header d-flex align-items-center justify-content-center">
+  <header class="header d-flex align-items-center justify-content-center">
     <div class="d-flex justify-content-center align-items-center container ">
       <router-link to="/">
         <img src="/small-BubbleLogo-Horizontal-BlackText.png" height="40" />
@@ -139,7 +139,7 @@
         </router-link>
       </div>
     </div>
-  </div>
+  </header>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/_components/layout/Notification.vue b/src/_components/layout/Notification.vue
new file mode 100644
index 0000000..a8d1ff2
--- /dev/null
+++ b/src/_components/layout/Notification.vue
@@ -0,0 +1,27 @@
+<template>
+  <div class="notification">
+    <i class="fa fa-bell"></i>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.notification {
+  position: absolute;
+  top: 10px;
+  right: 20px;
+
+  width: 48px;
+  height: 48px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  border: 1px solid #eaeaea;
+  border-radius: 50%;
+  color: #c4c4c4;
+}
+</style>
+
+<script>
+export default {};
+</script>
diff --git a/src/_components/layout/Sidebar.vue b/src/_components/layout/Sidebar.vue
new file mode 100644
index 0000000..30a1963
--- /dev/null
+++ b/src/_components/layout/Sidebar.vue
@@ -0,0 +1,245 @@
+<template>
+  <aside class="sidebar">
+    <!-- Logo -->
+    <div class="d-flex align-items-center logo">
+      <router-link to="/">
+        <img src="/small-BubbleLogo-Horizontal-BlackText.png" height="40" />
+      </router-link>
+      <a @click="toggleMenu" class="toggle-menu">
+        <i class="fa fa-bars"></i>
+      </a>
+    </div>
+    <div
+      class="flex-grow-1 d-flex flex-column menu"
+      :class="{ 'menu-invisible': !menuVisible }"
+    >
+      <!-- Profile -->
+      <router-link to="/me">
+        <div class="profile">
+          <img
+            :src="`https://www.gravatar.com/avatar/${userHash}?r=pg`"
+            class="profile-image"
+          />
+          <div class="profile-info">
+            <strong>{{ currentUser.name }}</strong>
+            <br />
+            <span>{{ currentUser.email }}</span>
+          </div>
+          <i class="fa fa-chevron-right"></i>
+        </div>
+      </router-link>
+
+      <!-- Navigation -->
+      <div class="navigation">
+        <div class="navigation-item active">
+          <i class="fa fa-home icon icon-home"></i>
+          <span>{{ messages.label_menu_network }}</span>
+        </div>
+        <div class="navigation-item">
+          <i class="fa fa-tablet icon icon-devices"></i>
+          <span>{{ messages.label_menu_devices }}</span>
+        </div>
+        <div class="navigation-item">
+          <i class="fa fa-cog icon icon-settings"></i>
+          <span>{{ messages.label_menu_settings }}</span>
+        </div>
+        <div class="navigation-item">
+          <i class="fa fa-question-circle icon icon-help"></i>
+          <span>{{ messages.label_menu_help }}</span>
+        </div>
+      </div>
+      <!-- Upgrade Plan -->
+
+      <div class="flex-grow-1"></div>
+      <!-- Logout -->
+      <Button color="outline" class="logout-button">
+        {{ messages.log_out }}
+      </Button>
+    </div>
+  </aside>
+</template>
+
+<style lang="scss" scoped>
+@import '../../_scss/breakpoints';
+
+.sidebar {
+  z-index: 1;
+  padding: 20px 0;
+  display: flex;
+  flex-direction: column;
+}
+
+.logout-button {
+  margin-top: 30px;
+}
+
+.profile {
+  color: #172239;
+  margin-top: 30px;
+  padding: 24px;
+  border: 1px solid #e0e2f0;
+  border-radius: 32px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  @include respond-between(sm, lg) {
+    margin-top: 0px;
+    border: none;
+    > *:not(.profile-image) {
+      display: none;
+    }
+  }
+}
+
+.logo {
+  padding: 0 20px;
+}
+
+.profile-image {
+  height: 48px;
+  width: 48px;
+  border-radius: 50%;
+}
+.profile-info {
+  width: 156px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+
+  margin: 0 20px;
+  font-size: 12px;
+  strong {
+    font-size: 16px;
+  }
+}
+
+.toggle-menu {
+  display: none;
+  @include respond-below(sm) {
+    display: block;
+  }
+}
+
+.menu {
+  max-height: 10000px;
+  padding: 0 20px 20px;
+
+  transition: max-height 0.5s;
+  overflow: hidden;
+  background-color: white;
+
+  @include respond-below(sm) {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 60px;
+
+    &.menu-invisible {
+      max-height: 0px;
+    }
+  }
+}
+
+.navigation {
+  margin-top: 30px;
+  border: 1px solid #e0e2f0;
+  border-radius: 32px;
+  padding: 32px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+
+  @include respond-between(sm, lg) {
+    margin-top: 12px;
+    span {
+      display: none;
+    }
+  }
+}
+
+.navigation-item {
+  color: #6d6d78;
+  padding: 16px;
+  margin: 10px 0;
+  width: 240px;
+
+  display: flex;
+  align-items: center;
+
+  span {
+    margin-left: 20px;
+  }
+
+  &.active {
+    background-color: #66cda4;
+    color: white;
+    border-radius: 20px;
+
+    .icon {
+      color: white;
+    }
+  }
+
+  @include respond-between(sm, lg) {
+    width: auto;
+  }
+}
+
+.toggle-menu {
+  margin-left: 20px;
+  font-size: 20px;
+  font-weight: bold;
+  color: #1930d7 !important;
+}
+
+.icon {
+  font-size: 20px;
+}
+
+.icon-home {
+  color: #5055bd;
+}
+.icon-devices {
+  color: #4b53df;
+}
+.icon-settings {
+  color: #e6458a;
+}
+.icon-help {
+  color: #57c8e9;
+}
+</style>
+
+<script>
+import { mapState } from 'vuex';
+import md5 from 'blueimp-md5';
+
+import { util } from '~/_helpers';
+import { Button } from '~/_components/shared';
+
+export default {
+  components: {
+    Button,
+  },
+
+  data: () => ({
+    currentUser: util.currentUser(),
+    menuVisible: false,
+  }),
+
+  computed: {
+    ...mapState('system', ['messages']),
+
+    userHash() {
+      return md5(this.currentUser.email);
+    },
+  },
+
+  methods: {
+    toggleMenu() {
+      this.menuVisible = !this.menuVisible;
+    },
+  },
+};
+</script>
diff --git a/src/_components/layout/index.js b/src/_components/layout/index.js
index 2abf172..d37206c 100644
--- a/src/_components/layout/index.js
+++ b/src/_components/layout/index.js
@@ -3,3 +3,6 @@
  * For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/
  */
 export { default as Header } from './Header';
+export { default as Footer } from './Footer';
+export { default as Notification } from './Notification';
+export { default as Sidebar } from './Sidebar';
diff --git a/src/_pages/Layout.vue b/src/_pages/Layout.vue
index a2910a7..bafb6f0 100644
--- a/src/_pages/Layout.vue
+++ b/src/_pages/Layout.vue
@@ -1,8 +1,6 @@
 <!-- Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/ -->
 <template>
-  <div class="w-100">
-    <router-view></router-view>
-  </div>
+  <router-view></router-view>
 </template>
 
 <script>
diff --git a/src/_pages/auth/Layout.vue b/src/_pages/auth/Layout.vue
index b526611..804bb0e 100644
--- a/src/_pages/auth/Layout.vue
+++ b/src/_pages/auth/Layout.vue
@@ -1,6 +1,8 @@
 <!-- Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/ -->
 <template>
   <div class="background w-100 h-100">
+    <Header></Header>
+
     <div
       :class="backgroundClass"
       class="auth-layout d-flex flex-column content"
diff --git a/src/_pages/main/account/Payment.vue b/src/_pages/auth/Payment.vue
similarity index 99%
rename from src/_pages/main/account/Payment.vue
rename to src/_pages/auth/Payment.vue
index a43bb83..825d720 100644
--- a/src/_pages/main/account/Payment.vue
+++ b/src/_pages/auth/Payment.vue
@@ -163,7 +163,7 @@
 </template>
 
 <style lang="scss" scoped>
-@import '../../../_scss/components/form';
+@import '../../_scss/components/form';
 
 .features-section-link {
   color: $vivid-navy;
diff --git a/src/_pages/auth/VerifyEmail.vue b/src/_pages/auth/VerifyEmail.vue
index a9db1e7..e58bd16 100644
--- a/src/_pages/auth/VerifyEmail.vue
+++ b/src/_pages/auth/VerifyEmail.vue
@@ -8,7 +8,7 @@
       <span class="text-center white-text">
         {{ messages.resend_verify_email_label }}
       </span>
-      <a class="resend-btn" href="#">
+      <a class="resend-btn" href="#" @click="resendVerification(firstContact)">
         {{ messages.button_label_resend_verify_email }}
       </a>
     </h4>
@@ -53,18 +53,31 @@
 </style>
 
 <script>
-import { mapState } from 'vuex';
+import { mapState, mapActions } from 'vuex';
 import Lottie from 'lottie-web';
 
+import { util } from '~/_helpers'
 import { Features } from '~/_components/sections';
 
+// convenience methods
+import { isAuthenticator, isNotAuthenticator } from '~/_store/users.module';
+window.isAuthenticator = isAuthenticator;
+window.isNotAuthenticator = isNotAuthenticator;
+
 export default {
   components: {
     Features,
   },
 
+  data() {
+    return {
+      firstContact: null,
+    };
+  },
+
   computed: {
     ...mapState('system', ['messages']),
+    ...mapState('users', ['policy']),
   },
 
   mounted() {
@@ -76,5 +89,37 @@ export default {
       path: '/green_email_sent.json',
     });
   },
+
+  methods: {
+    ...mapActions('account', ['resendVerificationCode']),
+
+    getFirstContact(policy) {
+      if (policy && policy.accountContacts) {
+        const contacts = policy.accountContacts;
+        for (let i = 0; i < contacts.length; i++) {
+          if (isNotAuthenticator(contacts[i])) return contacts[i];
+        }
+        return null;
+      }
+      return null;
+    },
+
+    resendVerification(contact) {
+      console.log(contact);
+      this.resendVerificationCode({
+        userId: util.currentUser().uuid,
+        contact: contact,
+        messages: this.messages,
+        errors: this.errors,
+      });
+      return false; // do not follow the click
+    },
+  },
+
+  watch: {
+    policy(p) {
+      this.firstContact = this.getFirstContact(p);
+    },
+  },
 };
 </script>
diff --git a/src/_pages/main/Layout.vue b/src/_pages/main/Layout.vue
index a000830..bb3aae7 100644
--- a/src/_pages/main/Layout.vue
+++ b/src/_pages/main/Layout.vue
@@ -1,21 +1,102 @@
 <!-- Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/ -->
 <template>
-  <router-view></router-view>
+  <div class="container-fluid">
+    <img src="/bubble_bkgrnd.png" alt="" class="background-image" />
+    <div class="content">
+      <Sidebar />
+      <div class="flex-grow-1 p-4">
+        <header>
+          <p class="mb-0">{{ messages.label_homepage_welcome }},</p>
+          <p class="name">{{ currentUser.name }} 👋</p>
+        </header>
+        <main>
+          <router-view></router-view>
+        </main>
+      </div>
+      <Notification />
+    </div>
+    <Footer />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+@import '../../_scss/breakpoints';
+
+.container-fluid {
+  background: linear-gradient(26.64deg, #1933dd -10.01%, #18d59d 86.47%);
+  height: 100%;
+  padding: 30px 20px;
+
+  @include respond-below(lg) {
+    padding: 0;
+    .content {
+      border-radius: 0;
+    }
+  }
+
+  display: flex;
+  flex-direction: column;
+}
+
+.background-image {
+  position: absolute;
+  bottom: 20px;
+  left: 100px;
+  pointer-events: none;
+
+  @include respond-below(lg) {
+    bottom: -20px;
+    left: 0px;
+  }
+  @include respond-below(sm) {
+    bottom: -20px;
+    left: 0px;
+    width: 100%;
+  }
+}
+
+.content {
+  position: relative;
+  z-index: 2;
+  flex-grow: 1;
+  background: #fafafd;
+  border-radius: 10px;
+  box-shadow: 0px 4px 25px rgba(149, 149, 149, 0.25);
+
+  display: flex;
+  @include respond-below(sm) {
+    flex-direction: column;
+  }
+}
+
+header {
+  .name {
+    color: #172239;
+    font-size: 3rem;
+  }
+}
+</style>
+
 <script>
 import { mapState, mapActions } from 'vuex';
 import { util } from '~/_helpers';
 import { isAuthenticator, isNotAuthenticator } from '~/_store/users.module';
+import { Footer, Notification, Sidebar } from '~/_components/layout';
 
 export default {
+  components: {
+    Footer,
+    Notification,
+    Sidebar,
+  },
   data: () => ({
     verifiedContacts: null,
     verifiedContactRefresher: null,
     accountPlan: {
+      currentUser: null,
       name: '',
       domain: '',
-      locale: util.currentUser().locale,
+      locale: null,
       timezone: '',
       plan: 'bubble',
       footprint: 'Worldwide',
@@ -37,7 +118,12 @@ export default {
   computed: {
     ...mapState('users', ['policy']),
     ...mapState('paymentMethods', ['accountPaymentMethods']),
-    ...mapState('system', ['configs']),
+    ...mapState('system', ['configs', 'messages']),
+  },
+
+  created() {
+    this.currentUser = util.currentUser();
+    this.locale = this.currentUser.locale;
   },
 
   mounted() {
@@ -49,16 +135,15 @@ export default {
     ...mapActions('paymentMethods', ['getAllAccountPaymentMethods']),
 
     initDefaults() {
-      const currentUser = util.currentUser();
       const selectedLocale =
-        currentUser !== null &&
-        typeof currentUser.locale !== 'undefined' &&
-        currentUser.locale !== null
-          ? currentUser.locale
+        this.currentUser !== null &&
+        typeof this.currentUser.locale !== 'undefined' &&
+        this.currentUser.locale !== null
+          ? this.currentUser.locale
           : 'detect';
-      if (!currentUser.admin) {
+      if (!this.currentUser.admin) {
         this.getPolicyByUserId({
-          userId: currentUser.uuid,
+          userId: this.currentUser.uuid,
           messages: this.messages,
           errors: this.errors,
         });
diff --git a/src/_pages/main/account/VerifyEmail.vue b/src/_pages/main/account/VerifyEmail.vue
deleted file mode 100644
index 8272f9c..0000000
--- a/src/_pages/main/account/VerifyEmail.vue
+++ /dev/null
@@ -1,125 +0,0 @@
-<!-- Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/ -->
-<template>
-  <div class="wrapper">
-    <h1 class="text-center white-text form-title">
-      {{ messages.verify_email_title }}
-    </h1>
-    <h4 class="d-flex align-items-center justify-content-center form-sub-title">
-      <span class="text-center white-text">
-        {{ messages.resend_verify_email_label }}
-      </span>
-      <a class="resend-btn" href="#" @click="resendVerification(firstContact)">
-        {{ messages.button_label_resend_verify_email }}
-      </a>
-    </h4>
-
-    <div class="d-flex justify-content-center mt-5">
-      <div ref="lottie" class="lottie"></div>
-    </div>
-
-    <Features></Features>
-
-    <a
-      class="features-section-link text-center d-block"
-      href="https://getbubblenow.com/features/"
-    >
-      {{ messages.more_features_label }}
-    </a>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-@import '../../../_scss/components/form';
-
-.features-section-link {
-  color: $vivid-navy;
-  font-size: 16px;
-  margin-top: 25px;
-}
-
-.sub-title {
-  font-size: 24px;
-}
-
-.lottie {
-  width: 400px;
-}
-
-.resend-btn {
-  text-decoration: underline;
-  color: white;
-  margin-left: 10px;
-}
-</style>
-
-<script>
-import { mapState, mapActions } from 'vuex';
-import Lottie from 'lottie-web';
-
-import { util } from '~/_helpers'
-import { Features } from '~/_components/sections';
-
-// convenience methods
-import { isAuthenticator, isNotAuthenticator } from '~/_store/users.module';
-window.isAuthenticator = isAuthenticator;
-window.isNotAuthenticator = isNotAuthenticator;
-
-export default {
-  components: {
-    Features,
-  },
-
-  data() {
-    return {
-      firstContact: null,
-    };
-  },
-
-  computed: {
-    ...mapState('system', ['messages']),
-    ...mapState('users', ['policy']),
-  },
-
-  mounted() {
-    Lottie.loadAnimation({
-      container: this.$refs.lottie,
-      renderer: '',
-      loop: true,
-      autoplay: true,
-      path: '/green_email_sent.json',
-    });
-  },
-
-  methods: {
-    ...mapActions('account', ['resendVerificationCode']),
-
-    getFirstContact(policy) {
-      if (policy && policy.accountContacts) {
-        const contacts = policy.accountContacts;
-        for (let i = 0; i < contacts.length; i++) {
-          if (isNotAuthenticator(contacts[i])) return contacts[i];
-        }
-        return null;
-      }
-      return null;
-    },
-
-    resendVerification(contact) {
-      console.log(contact);
-      this.resendVerificationCode({
-        userId: util.currentUser().uuid,
-        contact: contact,
-        messages: this.messages,
-        errors: this.errors,
-      });
-      return false; // do not follow the click
-    },
-  },
-
-  watch: {
-    policy(p) {
-      this.firstContact = this.getFirstContact(p);
-    },
-  },
-};
-</script>
diff --git a/src/_router/index.js b/src/_router/index.js
index 743c422..24c779d 100644
--- a/src/_router/index.js
+++ b/src/_router/index.js
@@ -62,23 +62,12 @@ const newNetworkChildren = [
 export const router = new Router({
   mode: 'history',
   routes: [
-
     // existing pages
-    { path: '', component: DashboardPage },
-    { path: '/', component: DashboardPage },
     // { path: '/legal', component: LegalPage },
     // { path: '/support', component: SupportPage },
 
     // { path: '/me/old', component: ProfilePage },
     // { path: '/me/policy', component: PolicyPage },
-    {
-      path: '/me/download/:uuid',
-      redirect: (r) => ({
-        path: '/me/policy',
-        query: { download: r.params.uuid },
-      }),
-    },
-    { path: '/me/action', component: ActionPage },
     // { path: '/me/changePassword/old', component: ChangePasswordPage },
     // { path: '/me/setPassword/:code', component: SetPasswordPage },
     // { path: '/me/keys', component: SshKeysPage },
@@ -89,64 +78,17 @@ export const router = new Router({
     //   children: paymentMethodsChildren,
     // },
     // { path: '/devices', component: DevicesPage },
-    { path: '/apps', component: AppsPage },
-    { path: '/app/:app', component: AppPage },
-    { path: '/app/:app/config/:view', component: AppConfigPage },
-    { path: '/app/:app/config/:view/:item', component: AppConfigPage },
-    { path: '/app/:app/view/:view', component: AppDataViewPage },
-    { path: '/app/:app/site/:site', component: AppSitePage },
-    { path: '/app/:app/site/:site/view/:view', component: AppDataViewPage },
-    { path: '/notifications', component: NotificationsPage },
-    {
-      path: '/bubbles',
-      component: NetworksPage,
-      children: [
-        {
-          path: '',
-          component: NewNetworkPage,
-          children: newNetworkChildren,
-        },
-      ],
-    },
-    {
-      path: '/new_bubble',
-      component: NewNetworkPage,
-      children: newNetworkChildren,
-    },
-    { path: '/bubble/:id', component: NetworkPage },
-    { path: '/action', component: ActionPage },
-    { path: '/resetPassword/:code', component: SetPasswordPage },
 
-    { path: '/activate', component: ActivationPage },
     // {
     //   path: '/register',
     //   component: RegisterPage,
     //   children: paymentMethodsChildren,
     // },
-    { path: '/auth', component: MultifactorAuthPage },
     // { path: '/login', component: LoginPage },
-    { path: '/logout', component: LogoutPage },
     // { path: '/forgotPassword', component: ForgotPasswordPage },
     // { path: '/appLogin', component: AppLoginPage },
     // { path: '/restore', component: RestorePage },
 
-    { path: '/admin/accounts', component: AccountsPage },
-    { path: '/admin/new_account', component: ProfilePage },
-    { path: '/admin/accounts/:id', component: ProfilePage },
-    { path: '/admin/accounts/:id/policy', component: PolicyPage },
-    {
-      path: '/admin/accounts/:id/changePassword',
-      component: ChangePasswordPage,
-    },
-    { path: '/admin/accounts/:id/keys', component: SshKeysPage },
-    { path: '/admin/accounts/:id/bills', component: BillsPage },
-    {
-      path: '/admin/accounts/:id/payment',
-      component: PaymentMethodsPage,
-      children: paymentMethodsChildren,
-    },
-    { path: '/admin/model', component: ModelSetupPage },
-
     // new route
     {
       path: '',
@@ -154,100 +96,123 @@ export const router = new Router({
       children: [
         {
           path: '',
-          component: () => import('~/_pages/auth/Layout'),
+          component: () => import('~/_pages/main/Layout'),
           children: [
+            { path: '', component: DashboardPage },
             {
-              path: 'login',
-              component: () => import('~/_pages/auth/Login'),
+              path: 'me/download/:uuid',
+              redirect: (r) => ({
+                path: 'me/policy',
+                query: { download: r.params.uuid },
+              }),
             },
+            { path: 'me/action', component: ActionPage },
+            { path: 'apps', component: AppsPage },
+            { path: 'app/:app', component: AppPage },
+            { path: 'app/:app/config/:view', component: AppConfigPage },
             {
-              path: 'forgotPassword',
-              component: () => import('~/_pages/auth/ForgotPassword'),
+              path: 'app/:app/config/:view/:item',
+              component: AppConfigPage,
             },
+            { path: 'app/:app/view/:view', component: AppDataViewPage },
+            { path: 'app/:app/site/:site', component: AppSitePage },
             {
-              path: 'register',
-              component: () => import('~/_pages/auth/Register'),
+              path: 'app/:app/site/:site/view/:view',
+              component: AppDataViewPage,
             },
+            { path: 'notifications', component: NotificationsPage },
             {
-              path: 'appLogin',
-              component: () => import('~/_pages/auth/AppLogin'),
-            },
-          ],
-        },
-        {
-          path: '',
-          component: () => import('~/_pages/main/Layout'),
-          children: [
-            {
-              path: '',
-              component: () => import('~/_pages/main/account/Layout'),
+              path: 'bubbles',
+              component: NetworksPage,
               children: [
                 {
-                  path: 'verifyEmail',
-                  component: () => import('~/_pages/main/account/VerifyEmail'),
-                },
-                {
-                  path: 'payment',
-                  component: () => import('~/_pages/main/account/Payment'),
-                },
-                {
-                  path: 'me',
-                  exact: true,
-                  component: () => import('~/_pages/main/account/MyAccount'),
-                },
-                {
-                  path: 'me/changePassword',
-                  component: () =>
-                    import('~/_pages/main/account/ChangePassword'),
-                },
-                {
-                  path: 'me/setPassword/:code',
-                  component: () => import('~/_pages/main/account/SetPassword'),
-                },
-                {
-                  path: 'me/keys',
-                  component: () => import('~/_pages/main/account/ManageSSH'),
-                },
-                {
-                  path: 'me/payment',
-                  component: () =>
-                    import('~/_pages/main/account/PaymentMethods'),
-                },
-                {
-                  path: 'me/bills',
-                  component: () => import('~/_pages/main/account/Bills'),
-                },
-                {
-                  path: 'me/policy',
-                  component: () => import('~/_pages/main/account/Policy'),
-                },
-                {
-                  path: 'me/delete',
-                  component: () => import('~/_pages/main/account/Delete'),
+                  path: '',
+                  component: NewNetworkPage,
+                  children: newNetworkChildren,
                 },
+              ],
+            },
+            {
+              path: 'new_bubble',
+              component: NewNetworkPage,
+              children: newNetworkChildren,
+            },
+            { path: 'bubble/:id', component: NetworkPage },
+            { path: 'action', component: ActionPage },
+            { path: 'resetPassword/:code', component: SetPasswordPage },
 
-                {
-                  path: 'devices',
-                  component: () => import('~/_pages/main/account/Devices'),
-                },
+            { path: 'activate', component: ActivationPage },
+            { path: 'auth', component: MultifactorAuthPage },
+            { path: 'admin/accounts', component: AccountsPage },
+            { path: 'admin/new_account', component: ProfilePage },
+            { path: 'admin/accounts/:id', component: ProfilePage },
+            { path: 'admin/accounts/:id/policy', component: PolicyPage },
+            {
+              path: 'admin/accounts/:id/changePassword',
+              component: ChangePasswordPage,
+            },
+            { path: 'admin/accounts/:id/keys', component: SshKeysPage },
+            { path: 'admin/accounts/:id/bills', component: BillsPage },
+            {
+              path: 'admin/accounts/:id/payment',
+              component: PaymentMethodsPage,
+              children: paymentMethodsChildren,
+            },
+            { path: 'admin/model', component: ModelSetupPage },
+            {
+              path: 'me',
+              exact: true,
+              component: () => import('~/_pages/main/account/MyAccount'),
+            },
+            {
+              path: 'me/changePassword',
+              component: () => import('~/_pages/main/account/ChangePassword'),
+            },
+            {
+              path: 'me/setPassword/:code',
+              component: () => import('~/_pages/main/account/SetPassword'),
+            },
+            {
+              path: 'me/keys',
+              component: () => import('~/_pages/main/account/ManageSSH'),
+            },
+            {
+              path: 'me/payment',
+              component: () => import('~/_pages/main/account/PaymentMethods'),
+            },
+            {
+              path: 'me/bills',
+              component: () => import('~/_pages/main/account/Bills'),
+            },
+            {
+              path: 'me/policy',
+              component: () => import('~/_pages/main/account/Policy'),
+            },
+            {
+              path: 'me/delete',
+              component: () => import('~/_pages/main/account/Delete'),
+            },
 
-                {
-                  path: 'bubble/:id',
-                  component: () => import('~/_pages/main/bubble/Network'),
-                },
-                {
-                  path: 'restore',
-                  component: () => import('~/_pages/main/bubble/Restore'),
-                },
-                {
-                  path: 'legal',
-                  component: () => import('~/_pages/main/account/Legal'),
-                },
-                {
-                  path: 'support',
-                  component: () => import('~/_pages/main/account/Support'),
-                },
-              ],
+            {
+              path: 'devices',
+              component: () => import('~/_pages/main/account/Devices'),
+            },
+
+            {
+              path: 'bubble/:id',
+              component: () => import('~/_pages/main/bubble/Network'),
+            },
+            {
+              path: 'restore',
+              component: () => import('~/_pages/main/bubble/Restore'),
+            },
+            {
+              path: 'legal',
+              component: () => import('~/_pages/main/account/Legal'),
+            },
+            {
+              path: 'support',
+              component: () => import('~/_pages/main/account/Support'),
             },
             {
               path: 'launch-bubble',
@@ -259,11 +224,42 @@ export const router = new Router({
             },
           ],
         },
+        {
+          path: '',
+          component: () => import('~/_pages/auth/Layout'),
+          children: [
+            {
+              path: 'login',
+              component: () => import('~/_pages/auth/Login'),
+            },
+            {
+              path: 'forgotPassword',
+              component: () => import('~/_pages/auth/ForgotPassword'),
+            },
+            {
+              path: 'register',
+              component: () => import('~/_pages/auth/Register'),
+            },
+            {
+              path: 'appLogin',
+              component: () => import('~/_pages/auth/AppLogin'),
+            },
+            {
+              path: 'verifyEmail',
+              component: () => import('~/_pages/auth/VerifyEmail'),
+            },
+            {
+              path: 'payment',
+              component: () => import('~/_pages/auth/Payment'),
+            },
+            { path: 'logout', component: () => import('~/auth/LogoutPage') },
+          ],
+        },
       ],
     },
 
     // otherwise redirect to dashboard
-    { path: '*', redirect: '/' },
+    { path: '*', redirect: '' },
   ],
 });
 
@@ -281,10 +277,10 @@ const publicPages = [
   '/legal',
 
   // new Pages
-  '/new_pages',
 ];
 
 router.beforeEach((to, from, next) => {
+  console.log('to', to);
   const authRequired =
     !publicPages.includes(to.path) &&
     publicPages.filter((p) => to.path.startsWith(p)).length === 0;
diff --git a/src/app/App.vue b/src/app/App.vue
index a4393be..8574e51 100644
--- a/src/app/App.vue
+++ b/src/app/App.vue
@@ -1,18 +1,15 @@
 <!-- Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/ -->
 <template>
-  <div v-if="isNewPage" class="page-container">
-    <Header></Header>
-
+  <div class="page-container">
     <router-view></router-view>
     <vue-snotify></vue-snotify>
+    <totp-modal />
   </div>
-  <div v-else>
+  <!-- <div v-else>
     <Header></Header>
     <div v-if="!configs"><img :src="loadingImgSrc" /></div>
 
     <div v-else class="jumbotron">
-      <totp-modal />
-
       <table
         v-if="
           this.user !== null &&
@@ -106,14 +103,14 @@
         >
       </div>
     </div>
-  </div>
+  </div> -->
 </template>
 
 <style lang="scss">
 @import '../_scss/base';
 
 .page-container {
-  height: 100vh;
+  min-height: 100vh;
 }
 </style>
 
@@ -121,13 +118,9 @@
 import { mapState, mapActions, mapGetters } from 'vuex';
 import { util } from '~/_helpers';
 import { loadingImgSrc } from '~/_store';
-import { Header } from '~/_components/layout';
 
 export default {
   name: 'app',
-  components: {
-    Header,
-  },
   data() {
     return {
       showLocaleSelector: false,
@@ -197,7 +190,7 @@ export default {
         '/support',
         '/legal',
       ];
-      
+
       return (
         newPages.includes(this.$route.path) ||
         newPages.filter((p) => this.$route.path.startsWith(p)).length
diff --git a/src/public/bubble_bkgrnd.png b/src/public/bubble_bkgrnd.png
new file mode 100644
index 0000000000000000000000000000000000000000..5607dca41d5df5309c9b5a1bed86923ca86db9f9
GIT binary patch
literal 38611
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%0DH<t51$^FD
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
M>LPS%fa3Q50N9d#NB{r;

literal 0
HcmV?d00001

-- 
2.17.1


From a0aa1ae620ae991209bd538fc22e1d8b0396d076 Mon Sep 17 00:00:00 2001
From: Tyler <everdev0923@gmail.com>
Date: Tue, 22 Sep 2020 18:02:10 -0400
Subject: [PATCH 05/13] 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 @@
           </router-link>
         </div>
         <div v-else class="d-flex justify-content-center align-items-center">
-          <router-link to="/bubbles" class="d-flex align-items-center">
+          <router-link to="/bubble" class="d-flex align-items-center">
             <Button headerLink>
               {{ messages.label_menu_network }}
             </Button>
@@ -104,7 +104,7 @@
         </router-link>
       </div>
       <div v-else>
-        <router-link class="dropdown-item" to="/bubbles">
+        <router-link class="dropdown-item" to="/bubble">
           {{ messages.label_menu_network }}
         </router-link>
         <router-link
diff --git a/src/_components/layout/Sidebar.vue b/src/_components/layout/Sidebar.vue
index 30a1963..12a07ea 100644
--- a/src/_components/layout/Sidebar.vue
+++ b/src/_components/layout/Sidebar.vue
@@ -14,7 +14,7 @@
       :class="{ 'menu-invisible': !menuVisible }"
     >
       <!-- Profile -->
-      <router-link to="/me">
+      <router-link to="/me" @click.native="closeMenu()">
         <div class="profile">
           <img
             :src="`https://www.gravatar.com/avatar/${userHash}?r=pg`"
@@ -31,30 +31,61 @@
 
       <!-- Navigation -->
       <div class="navigation">
-        <div class="navigation-item active">
+        <router-link to="/bubble" class="navigation-item" @click.native="closeMenu()">
           <i class="fa fa-home icon icon-home"></i>
           <span>{{ messages.label_menu_network }}</span>
-        </div>
-        <div class="navigation-item">
+        </router-link>
+
+        <router-link
+          to="/devices"
+          v-if="!configs.sageLauncher"
+          class="navigation-item"
+        >
           <i class="fa fa-tablet icon icon-devices"></i>
           <span>{{ messages.label_menu_devices }}</span>
-        </div>
-        <div class="navigation-item">
+        </router-link>
+
+        <router-link
+          to="/apps"
+          v-if="!configs.sageLauncher"
+          class="navigation-item"
+        >
+          <i class="fa fa-smile icon icon-apps"></i>
+          <span>{{ messages.label_menu_apps }}</span>
+        </router-link>
+
+        <router-link
+          to="/admin/accounts"
+          v-if="!configs.sageLauncher"
+          class="navigation-item"
+        >
+          <i class="fa fa-users icon icon-users"></i>
+
+          <span>
+            {{ messages.label_menu_admin_users }}
+          </span>
+        </router-link>
+
+        <!-- settings -->
+        <!-- <router-link class="navigation-item">
           <i class="fa fa-cog icon icon-settings"></i>
           <span>{{ messages.label_menu_settings }}</span>
-        </div>
-        <div class="navigation-item">
+        </router-link> -->
+
+        <router-link to="/support" class="navigation-item" @click.native="closeMenu()">
           <i class="fa fa-question-circle icon icon-help"></i>
           <span>{{ messages.label_menu_help }}</span>
-        </div>
+        </router-link>
       </div>
       <!-- Upgrade Plan -->
 
       <div class="flex-grow-1"></div>
       <!-- Logout -->
-      <Button color="outline" class="logout-button">
-        {{ messages.log_out }}
-      </Button>
+      <router-link to="/logout" class="logout-button" @click.native="closeMenu()">
+        <Button color="outline" block>
+          {{ messages.log_out }}
+        </Button>
+      </router-link>
     </div>
   </aside>
 </template>
@@ -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;
+    }
   },
 };
 </script>
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 @@
 <!-- Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/ -->
 <template>
-  <div class="bubble-form">
+  <div>
     <em v-if="loading && loading.devices">{{ messages.loading_devices }}</em>
     <div v-if="devices && devices.length > 0">
       <h2>{{ messages.table_title_devices }}</h2>
diff --git a/src/_pages/main/bubble/LaunchBubble.vue b/src/_pages/main/bubble/LaunchBubble.vue
index a3c4597..09ba288 100644
--- a/src/_pages/main/bubble/LaunchBubble.vue
+++ b/src/_pages/main/bubble/LaunchBubble.vue
@@ -260,7 +260,7 @@ export default {
     newNodeNotification(nn) {
       if (nn && nn.uuid) {
         this.$router.push({
-          path: '/launching-bubble/' + nn.networkName,
+          path: '/bubble/' + nn.networkName,
         });
         this.submitted = false;
       }
diff --git a/src/_pages/main/bubble/LaunchingBubble.vue b/src/_pages/main/bubble/LaunchingBubble.vue
index 11296f9..4dc99eb 100644
--- a/src/_pages/main/bubble/LaunchingBubble.vue
+++ b/src/_pages/main/bubble/LaunchingBubble.vue
@@ -281,7 +281,7 @@ export default {
     network(net) {
       if (net) {
         if (net.uuid === 'Not Found')
-          this.$router.replace({ path: '/bubbles' });
+          this.$router.replace({ path: '/bubble' });
         this.networkUuid = net.uuid;
         if (net.state !== 'stopping')
           this.clearRefresherInterval(this.stopRefresher);
@@ -327,7 +327,7 @@ export default {
 
     deletedNetworkUuid(uuid) {
       if (uuid && this.networkUuid && uuid === this.networkUuid) {
-        this.$router.replace({ path: '/bubbles' });
+        this.$router.replace({ path: '/bubble' });
       }
     },
 
diff --git a/src/_pages/main/bubble/MyBubble.vue b/src/_pages/main/bubble/MyBubble.vue
new file mode 100644
index 0000000..4c4a8e8
--- /dev/null
+++ b/src/_pages/main/bubble/MyBubble.vue
@@ -0,0 +1,72 @@
+<!-- Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/ -->
+<template>
+  <div>
+    <em v-if="loading && loading.networks">{{ messages.loading_networks }}</em>
+
+    <div v-if="networks && networks.length > 0">
+      <!-- Show network list -->
+      <NetworkList />
+    </div>
+    <div v-else>
+      <!-- Show Launch Bubble Page -->
+      <LaunchBubble />
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState, mapActions, mapGetters } from 'vuex';
+import { util } from '~/_helpers';
+
+import NetworkList from './Networks';
+import LaunchBubble from './LaunchBubble';
+
+export default {
+  components: {
+    NetworkList,
+    LaunchBubble,
+  },
+  computed: {
+    ...mapState('networks', ['networks']),
+    ...mapState('system', ['messages', 'configs']),
+    ...mapState('users', ['policy']),
+  },
+
+  created() {
+    if (!this.configs.sageLauncher) {
+      this.$router.replace({ path: '/bubble/' + this.configs.networkUuid });
+    }
+
+    const user = util.currentUser();
+    const selectedLocale =
+      user !== null &&
+      typeof user.locale !== 'undefined' &&
+      user.locale !== null
+        ? user.locale
+        : 'detect';
+    this.getAllNetworks({
+      userId: user.uuid,
+      messages: this.messages,
+      errors: this.errors,
+    });
+    this.loadMessages('post_auth', selectedLocale);
+    this.loadMessages('apps', selectedLocale);
+  },
+  methods: {
+    ...mapActions('networks', [
+      'getAllNetworks',
+      'stopNetwork',
+      'deleteNetwork',
+    ]),
+    ...mapGetters('networks', ['loading']),
+    ...mapActions('system', ['loadMessages']),
+  },
+  watch: {
+    networks(nets) {
+      if (nets && nets.length === 1 && util.currentUser().admin !== true) {
+        this.$router.replace({ path: '/bubble/' + nets[0].name });
+      }
+    },
+  },
+};
+</script>
diff --git a/src/_pages/main/bubble/Network.vue b/src/_pages/main/bubble/Network.vue
index 0f7722f..b769251 100644
--- a/src/_pages/main/bubble/Network.vue
+++ b/src/_pages/main/bubble/Network.vue
@@ -1,6 +1,6 @@
 <!-- Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/ -->
 <template>
-  <div v-if="network" class="bubble-form">
+  <div v-if="network">
     <h4>
       {{ network.nickname }} -
       <i>{{ messages['msg_network_state_' + network.state] }}</i>
@@ -12,8 +12,7 @@
 
     <h6
       v-if="
-        !isSelfNet &&
-          (isInReadyToRestoreState || network.state === 'running')
+        !isSelfNet && (isInReadyToRestoreState || network.state === 'running')
       "
     >
       <Button
@@ -42,6 +41,8 @@
             network.state === 'restoring')
       "
     >
+      <div ref="lottie" class="lottie"></div>
+
       <!-- adapted from: https://code-boxx.com/simple-vanilla-javascript-progress-bar/ -->
       <div v-if="stats.percent" class="progress-wrap">
         <div
@@ -80,7 +81,8 @@
         <table border="0" width="100%">
           <tr>
             <td
-              v-for="deviceType in addableDeviceTypes"
+              v-for="(deviceType, key) in addableDeviceTypes"
+              :key="key"
               align="center"
               :width="addableDeviceWidth + '%'"
             >
@@ -394,12 +396,14 @@
 @import '../../../_scss/components/form';
 @import '../../../_scss/breakpoints';
 
-.bubble-form {
-  width: 800px;
+.lottie {
+  width: 100%;
+  max-width: 500px;
 }
 </style>
 
 <script>
+import Lottie from 'lottie-web';
 import { mapState, mapActions, mapGetters } from 'vuex';
 import { util } from '~/_helpers';
 import { loadingImgSrc } from '~/_store';
@@ -427,8 +431,16 @@ export default {
       upgradeRefresher: null,
       logsExpirationDays: null,
       backupDownloadRefresher: null,
+
+      lottie: null,
+      timerID: null,
+      frameNumber: 0,
+      targetFrameNumber: 0,
     };
   },
+
+  mounted() {},
+
   computed: {
     ...mapState('networks', [
       'network',
@@ -577,6 +589,23 @@ export default {
       'upgrade',
     ]),
     refreshStatus(userId) {
+      if (!this.lottie && this.$refs.lottie) {
+        this.lottie = Lottie.loadAnimation({
+          container: this.$refs.lottie,
+          renderer: '',
+          loop: false,
+          autoplay: false,
+          path: '/launching-bubble.json',
+        });
+        this.frameNumber = 0;
+        this.targetFrameNumber = 20;
+
+        this.timerID = setInterval(() => {
+          if (this.frameNumber < this.targetFrameNumber) {
+            this.frameNumber++;
+          }
+        }, 100);
+      }
       this.getNetworkById({
         userId: userId,
         networkId: this.networkId,
@@ -757,6 +786,7 @@ export default {
       this.upgrade();
     },
   },
+
   created() {
     const user = util.currentUser();
     this.refreshStatus(user.uuid);
@@ -765,17 +795,18 @@ export default {
     this.getAppLinks(user.locale);
     this.loadSystemConfigs();
   },
+
   beforeDestroy() {
     this.clearRefresherInterval(this.refresher);
     this.clearRefresherInterval(this.stopRefresher);
     this.clearRefresherInterval(this.backupDownloadRefresher);
     this.resetRestoreKey();
   },
+
   watch: {
-    network(net) {
+    network(net, oldNet) {
       if (net) {
-        if (net.uuid === 'Not Found')
-          this.$router.replace({ path: '/bubbles' });
+        if (net.uuid === 'Not Found') this.$router.replace({ path: '/bubble' });
         this.networkUuid = net.uuid;
         if (net.state !== 'stopping')
           this.clearRefresherInterval(this.stopRefresher);
@@ -814,10 +845,22 @@ export default {
         // status not found for our network
         this.clearRefresherInterval(this.refresher);
       }
+
+      if (this.stats) {
+        this.targetFrameNumber = 20 + (30 / 100) * this.stats.percent;
+      }
     },
+
+    frameNumber() {
+      this.lottie.goToAndStop(this.frameNumber, true);
+      if (this.frameNumber >= 50) {
+        clearInterval(this.timerID);
+      }
+    },
+
     deletedNetworkUuid(uuid) {
       if (uuid && this.networkUuid && uuid === this.networkUuid) {
-        this.$router.replace({ path: '/bubbles' });
+        this.$router.replace({ path: '/bubble' });
       }
     },
     configs(c) {
diff --git a/src/_pages/main/bubble/Networks.vue b/src/_pages/main/bubble/Networks.vue
new file mode 100644
index 0000000..3ed74ea
--- /dev/null
+++ b/src/_pages/main/bubble/Networks.vue
@@ -0,0 +1,117 @@
+<!-- Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/ -->
+<template>
+  <div>
+    <div v-if="networks && networks.length > 0">
+      <h2>{{ messages.table_title_networks }}</h2>
+      <table border="1">
+        <thead>
+          <tr>
+            <th nowrap="nowrap">{{ messages.label_field_networks_name }}</th>
+            <th nowrap="nowrap">{{ messages.label_field_networks_locale }}</th>
+            <th nowrap="nowrap">
+              {{ messages.label_field_networks_timezone }}
+            </th>
+            <th nowrap="nowrap">
+              {{ messages.label_field_networks_object_state }}
+            </th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr v-for="network in networks" :key="network.uuid">
+            <td>
+              <router-link :to="{ path: '/bubble/' + network.name }"
+                >{{ network.name }}.{{ network.domainName }}</router-link
+              >
+            </td>
+            <td nowrap="nowrap">
+              {{ messages['locale_' + network.locale] || network.locale }}
+            </td>
+            <td nowrap="nowrap">
+              {{ messages['tz_name_' + network.timezone] || network.timezone }}
+            </td>
+            <td>{{ messages['msg_network_state_' + network.state] }}</td>
+          </tr>
+        </tbody>
+      </table>
+      <hr />
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState, mapActions, mapGetters } from 'vuex';
+import { util } from '~/_helpers';
+
+export default {
+  data() {
+    return {
+      verifiedContacts: null,
+    };
+  },
+  computed: {
+    ...mapState('networks', ['networks']),
+    ...mapState('system', ['messages', 'configs']),
+    ...mapState('users', ['policy']),
+  },
+  created() {
+    if (!this.configs.sageLauncher) {
+      this.$router.replace({ path: '/bubble/' + this.configs.networkUuid });
+    }
+
+    const user = util.currentUser();
+    const selectedLocale =
+      user !== null &&
+      typeof user.locale !== 'undefined' &&
+      user.locale !== null
+        ? user.locale
+        : 'detect';
+    this.getAllNetworks({
+      userId: user.uuid,
+      messages: this.messages,
+      errors: this.errors,
+    });
+    this.loadMessages('post_auth', selectedLocale);
+    this.loadMessages('apps', selectedLocale);
+    this.getPolicyByUserId({
+      userId: user.uuid,
+      messages: this.messages,
+      errors: this.errors,
+    });
+  },
+  methods: {
+    ...mapActions('users', ['getPolicyByUserId']),
+    ...mapActions('networks', [
+      'getAllNetworks',
+      'stopNetwork',
+      'deleteNetwork',
+    ]),
+    ...mapGetters('networks', ['loading']),
+    ...mapActions('system', ['loadMessages']),
+    hasVerifiedContact(policy) {
+      if (policy && policy.accountContacts) {
+        const contacts = policy.accountContacts;
+        for (let i = 0; i < contacts.length; i++) {
+          if (contacts[i].verified && isNotAuthenticator(contacts[i]))
+            return true;
+        }
+        return false;
+      }
+      return false;
+    },
+  },
+  watch: {
+    networks(nets) {
+      if (nets && nets.length) {
+        if (nets.length === 0) {
+          this.$router.replace({ path: '/new_bubble' });
+        } else if (nets.length === 1 && util.currentUser().admin !== true) {
+          this.$router.replace({ path: '/bubble/' + nets[0].name });
+        }
+      }
+    },
+    policy(p) {
+      this.verifiedContacts = this.hasVerifiedContact(p);
+    },
+  },
+};
+</script>
diff --git a/src/_router/index.js b/src/_router/index.js
index 24c779d..7243b86 100644
--- a/src/_router/index.js
+++ b/src/_router/index.js
@@ -90,6 +90,8 @@ export const router = new Router({
     // { path: '/restore', component: RestorePage },
 
     // new route
+    { path: '', redirect: '/bubble', exact: true },
+
     {
       path: '',
       component: () => import('~/_pages/Layout'),
@@ -122,22 +124,13 @@ export const router = new Router({
             },
             { path: 'notifications', component: NotificationsPage },
             {
-              path: 'bubbles',
-              component: NetworksPage,
-              children: [
-                {
-                  path: '',
-                  component: NewNetworkPage,
-                  children: newNetworkChildren,
-                },
-              ],
+              path: 'bubble',
+              component: () => import('~/_pages/main/bubble/MyBubble'),
             },
             {
-              path: 'new_bubble',
-              component: NewNetworkPage,
-              children: newNetworkChildren,
+              path: 'bubble/:id',
+              component: () => import('~/_pages/main/bubble/Network'),
             },
-            { path: 'bubble/:id', component: NetworkPage },
             { path: 'action', component: ActionPage },
             { path: 'resetPassword/:code', component: SetPasswordPage },
 
@@ -214,14 +207,6 @@ export const router = new Router({
               path: 'support',
               component: () => import('~/_pages/main/account/Support'),
             },
-            {
-              path: 'launch-bubble',
-              component: () => import('~/_pages/main/bubble/LaunchBubble'),
-            },
-            {
-              path: 'launching-bubble/:id',
-              component: () => import('~/_pages/main/bubble/LaunchingBubble'),
-            },
           ],
         },
         {
diff --git a/src/_store/account.module.js b/src/_store/account.module.js
index d133d5c..e1ee29c 100644
--- a/src/_store/account.module.js
+++ b/src/_store/account.module.js
@@ -99,19 +99,19 @@ const actions = {
                 systemConfigs.bubbleNode === false ||
                 systemConfigs.sageLauncher === true
               ) {
-                router.replace('/bubbles');
+                router.replace('/bubble');
               } else if (systemConfigs.bubbleNode === true) {
                 router.replace('/devices');
               } else {
                 router.replace('/');
               }
             } else {
-              console.log(
-                'account.login: landing page==' +
-                  JSON.stringify(landing) +
-                  ', systemConfigs.bubbleNode==' +
-                  systemConfigs.bubbleNode
-              );
+              // console.log(
+              //   'account.login: landing page==' +
+              //     JSON.stringify(landing) +
+              //     ', systemConfigs.bubbleNode==' +
+              //     systemConfigs.bubbleNode
+              // );
               util.resetLandingPage();
               router.replace(landing.fullPath);
             }
diff --git a/src/_store/system.module.js b/src/_store/system.module.js
index 6ccdc62..4a5b2cf 100644
--- a/src/_store/system.module.js
+++ b/src/_store/system.module.js
@@ -246,7 +246,7 @@ const getters = {
     });
     if (configs.sageLauncher) {
       dashApps.push({
-        href: '/bubbles',
+        href: '/bubble',
         title: messages.label_menu_networks,
         icon: messages.label_menu_networks_icon,
         index: 1,
@@ -295,7 +295,7 @@ const getters = {
         index: 2,
       });
       adminApps.push({
-        href: '/admin/bubbles',
+        href: '/admin/bubble',
         title: messages.label_menu_admin_networks,
         icon: messages.label_menu_admin_networks_icon,
         index: 3,
diff --git a/src/account/NetworkPage.vue b/src/account/NetworkPage.vue
index 6fa0bc1..3a0c010 100644
--- a/src/account/NetworkPage.vue
+++ b/src/account/NetworkPage.vue
@@ -447,7 +447,7 @@
         watch: {
             network (net) {
                 if (net) {
-                    if (net.uuid === 'Not Found') this.$router.replace({path: '/bubbles'});
+                    if (net.uuid === 'Not Found') this.$router.replace({path: '/bubble'});
                     this.networkUuid = net.uuid;
                     if (net.state !== 'stopping') this.clearRefresherInterval(this.stopRefresher);
                 }
@@ -483,7 +483,7 @@
             },
             deletedNetworkUuid (uuid) {
                 if (uuid && this.networkUuid && (uuid === this.networkUuid)) {
-                    this.$router.replace({path: '/bubbles'});
+                    this.$router.replace({path: '/bubble'});
                 }
             },
             configs (c) {
diff --git a/src/account/profile/ActionPage.vue b/src/account/profile/ActionPage.vue
index 1237d0a..76fc960 100644
--- a/src/account/profile/ActionPage.vue
+++ b/src/account/profile/ActionPage.vue
@@ -72,8 +72,8 @@
                     console.log('ActionPage.watch.actionStatus: still requesting, doing nothing');
                 } else {
                     if (status.success) {
-                        console.log('ActionPage.watch.actionStatus: sending to /bubbles with success');
-                        this.$router.push({path: '/bubbles', query: {action: this.actionType, ok: 'true'}});
+                        console.log('ActionPage.watch.actionStatus: sending to /bubble with success');
+                        this.$router.push({path: '/bubble', query: {action: this.actionType, ok: 'true'}});
 
                     } else if (status.error !== null && status.type === 'approve'
                         && this.errors && this.errors.items && this.errors.items.length === 1
diff --git a/src/app/App.vue b/src/app/App.vue
index 8574e51..49b15f4 100644
--- a/src/app/App.vue
+++ b/src/app/App.vue
@@ -174,28 +174,6 @@ export default {
     isInRestoringMode() {
       return this.configs ? this.configs.awaitingRestore : undefined;
     },
-    isNewPage() {
-      const newPages = [
-        '/login',
-        '/forgotPassword',
-        '/register',
-        '/appLogin',
-        '/verifyEmail',
-        '/payment',
-        '/me',
-        '/devices',
-        '/launch-bubble',
-        '/launching-bubble',
-        '/restore',
-        '/support',
-        '/legal',
-      ];
-
-      return (
-        newPages.includes(this.$route.path) ||
-        newPages.filter((p) => this.$route.path.startsWith(p)).length
-      );
-    },
   },
   methods: {
     ...mapActions({ clearAlert: 'alert/clear' }),
diff --git a/webpack.config.dev-example.js b/webpack.config.dev-example.js
deleted file mode 100644
index 6a0edf5..0000000
--- a/webpack.config.dev-example.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) 2020 Bubble, Inc.  All rights reserved.
- * For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/
- */
-
-// -------------------------------------------------------------
-// Copy this file to webpack.config.dev.js to use in development
-// -------------------------------------------------------------
-
-const webpackMerge = require('webpack-merge');
-
-module.exports = webpackMerge.merge(require('./webpack.config.js'), {
-  mode: 'development',
-  devServer: {
-    proxy: {
-    '/api': 'http://example.com:8888'   // change this to wherever your bubble API is running
-    }
-  },
-});
-- 
2.17.1


From 1a511fa2334e2c725e284b42d4c4e1f1cbe0cfb3 Mon Sep 17 00:00:00 2001
From: Tyler <everdev0923@gmail.com>
Date: Fri, 25 Sep 2020 09:26:29 -0400
Subject: [PATCH 06/13] feat: implement devices screen

---
 package-lock.json                             |  42 +-
 src/_assets/post_auth_messages.json           |  11 +-
 src/_components/layout/Footer.vue             |  31 +-
 .../modals/ConfirmDeleteDevice.vue            |  89 +++
 src/_components/modals/DeviceDetail.vue       | 159 +++++
 src/_components/modals/index.js               |   6 +-
 src/_pages/main/account/Devices.vue           | 627 ++++--------------
 src/_router/index.js                          |  15 +-
 src/public/.DS_Store                          | Bin 10244 -> 10244 bytes
 src/public/device-android.png                 | Bin 0 -> 1044 bytes
 src/public/device-ios.png                     | Bin 0 -> 1037 bytes
 src/public/device-linux.png                   | Bin 0 -> 4133 bytes
 src/public/device-macosx.png                  | Bin 0 -> 4116 bytes
 src/public/device-windows.png                 | Bin 0 -> 957 bytes
 src/public/linux.png                          | Bin 0 -> 4133 bytes
 15 files changed, 458 insertions(+), 522 deletions(-)
 create mode 100644 src/_components/modals/ConfirmDeleteDevice.vue
 create mode 100644 src/_components/modals/DeviceDetail.vue
 create mode 100644 src/public/device-android.png
 create mode 100644 src/public/device-ios.png
 create mode 100644 src/public/device-linux.png
 create mode 100644 src/public/device-macosx.png
 create mode 100644 src/public/device-windows.png
 create mode 100644 src/public/linux.png

diff --git a/package-lock.json b/package-lock.json
index dc389d9..b39167f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2524,6 +2524,11 @@
         "entities": "^1.1.1"
       }
     },
+    "dom-walk": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
+      "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
+    },
     "domain-browser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
@@ -3432,6 +3437,15 @@
         }
       }
     },
+    "global": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
+      "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
+      "requires": {
+        "min-document": "^2.19.0",
+        "process": "^0.11.10"
+      }
+    },
     "global-modules": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
@@ -4550,6 +4564,14 @@
         "mime-db": "1.44.0"
       }
     },
+    "min-document": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
+      "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
+      "requires": {
+        "dom-walk": "^0.1.0"
+      }
+    },
     "minimalistic-assert": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@@ -5504,8 +5526,7 @@
     "process": {
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
     },
     "process-nextick-args": {
       "version": "2.0.1",
@@ -7665,6 +7686,23 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.10.tgz",
       "integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ=="
     },
+    "vue-carousel": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/vue-carousel/-/vue-carousel-0.18.0.tgz",
+      "integrity": "sha512-a2zxh7QJioDxNMguqcuJ7TPbfgK5bGDaAXIia7NWxPAWsEvNE4ZtHgsGu40L5Aha4uyjmNKXvleB14QAXFoKig==",
+      "requires": {
+        "global": "^4.3.2",
+        "regenerator-runtime": "^0.12.1",
+        "vue": "^2.5.17"
+      },
+      "dependencies": {
+        "regenerator-runtime": {
+          "version": "0.12.1",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz",
+          "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg=="
+        }
+      }
+    },
     "vue-click-outside": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/vue-click-outside/-/vue-click-outside-1.1.0.tgz",
diff --git a/src/_assets/post_auth_messages.json b/src/_assets/post_auth_messages.json
index a08853a..ad304e9 100644
--- a/src/_assets/post_auth_messages.json
+++ b/src/_assets/post_auth_messages.json
@@ -1,5 +1,14 @@
 {
   "label_homepage_welcome": "Hello",
   "label_menu_help": "Help",
-  "label_menu_settings": "Settings"
+  "label_menu_settings": "Settings",
+  "no_devices_added": "You don't have any devices added yet.",
+  "label_button_detail": "Details",
+  "warning": "warning",
+  "warning_delete_bubble": "If you delete this device, Internet service will no longer work while Bubble is connected.",
+  "label_add_device_back": "To add this device back to your bubble",
+  "steps_add_device_back": "Open the Bubble App on the device|If you are signed in, first sign out|Sign in again your Bubble",
+  "confirm_delete_device": "Are you sure you want to delete this device?",
+  "yes": "yes",
+  "no": "no"
 }
diff --git a/src/_components/layout/Footer.vue b/src/_components/layout/Footer.vue
index 3a40db7..0476a6f 100644
--- a/src/_components/layout/Footer.vue
+++ b/src/_components/layout/Footer.vue
@@ -9,7 +9,7 @@
         v-for="device in availableDevices"
         :key="device"
         download
-        href=""
+        :href="appLink(device)"
       >
         <img :src="`/${device}.png`" />
         <span>{{ messages[`label_device_${device}`] }}</span>
@@ -103,14 +103,37 @@ import { mapState } from 'vuex';
 
 export default {
   computed: {
-    ...mapState('system', ['messages']),
+    ...mapState('system', ['messages', 'appLinks']),
 
     availableDevices() {
-      return this.messages.available_devices ? this.messages.available_devices.split(',') : [];
+      return this.messages.available_devices
+        ? this.messages.available_devices.split(',')
+        : [];
     },
 
     footerLinks() {
-      return this.messages.footer_links ? this.messages.footer_links.split(',') : [];
+      return this.messages.footer_links
+        ? this.messages.footer_links.split(',')
+        : [];
+    },
+  },
+  methods: {
+    appLink(type) {
+      if (!this.appLinks) return '';
+      switch (type) {
+        case 'iphone':
+          return this.appLinks['ios'];
+        case 'android':
+          return this.appLinks['android'];
+        case 'mac_computer':
+          return this.appLinks['macos'];
+        case 'windows_computer':
+          return this.appLinks['windows'];
+        case 'linux_computer':
+          return this.appLinks['linux'];
+        default:
+          return '';
+      }
     },
   },
 };
diff --git a/src/_components/modals/ConfirmDeleteDevice.vue b/src/_components/modals/ConfirmDeleteDevice.vue
new file mode 100644
index 0000000..4045f1c
--- /dev/null
+++ b/src/_components/modals/ConfirmDeleteDevice.vue
@@ -0,0 +1,89 @@
+<!-- Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/ -->
+<template>
+  <modal
+    name="advanced-settings"
+    width="90%"
+    :maxWidth="600"
+    height="auto"
+    scrollable
+  >
+    <a class="close-btn" @click="hide">
+      <i class="fa fa-times"></i>
+    </a>
+    <div class="d-flex flex-column align-items-center">
+      <div class="alert alert-warning">
+        <strong>{{ messages.warning }}:</strong>
+        {{ messages.warning_delete_bubble }}
+      </div>
+
+      <div>
+        {{ messages.label_add_device_back }}:
+        <ol>
+          <li v-for="(step, key) in addDeviceBackSteps" :key="key">
+            {{ step }}
+          </li>
+        </ol>
+      </div>
+
+      <p>
+        {{ messages.confirm_delete_device }}
+      </p>
+      <div class="d-flex">
+        <Button color="default" class="mr-3" @click="confirm(true)">
+          {{ messages.yes }}
+        </Button>
+        <Button color="outline" @click="confirm(false)">{{
+          messages.no
+        }}</Button>
+      </div>
+    </div>
+  </modal>
+</template>
+
+<style lang="scss">
+@import '../../_scss/components/form';
+@import '../../_scss/components/modal';
+@import '../../_scss/breakpoints';
+
+.close-btn {
+  position: absolute;
+  top: 15px;
+  right: 20px;
+  font-size: 20px;
+}
+</style>
+
+<script>
+import { mapState, mapActions, mapGetters } from 'vuex';
+import { util } from '~/_helpers';
+
+import { Button } from '../shared';
+
+import AddSSHKeyModal from './AddSshKey';
+
+export default {
+  components: {
+    Button,
+  },
+  computed: {
+    ...mapState('system', ['messages']),
+    addDeviceBackSteps() {
+      return this.messages.steps_add_device_back
+        ? this.messages.steps_add_device_back.split('|')
+        : [];
+    },
+  },
+
+  methods: {
+    show() {
+      this.$modal.show('advanced-settings');
+    },
+    hide() {
+      this.$modal.hide('advanced-settings');
+    },
+    confirm(value) {
+      this.$emit('confirm', value);
+    },
+  },
+};
+</script>
diff --git a/src/_components/modals/DeviceDetail.vue b/src/_components/modals/DeviceDetail.vue
new file mode 100644
index 0000000..083ad26
--- /dev/null
+++ b/src/_components/modals/DeviceDetail.vue
@@ -0,0 +1,159 @@
+<!-- Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/ -->
+<template>
+  <modal
+    name="device-detail"
+    :adaptive="true"
+    width="90%"
+    :maxWidth="600"
+    height="auto"
+  >
+    <div class="close-btn" @click="hide">
+      <i class="fa fa-times"></i>
+    </div>
+
+    <form action="" class="form" v-if="device">
+      <h2 class="device-text">
+        {{ device.name }}
+      </h2>
+      <img :src="`/device-${device.deviceType}.png`" class="mb-3" />
+
+      <v-select
+        v-if="configs.securityLevels"
+        :clearable="false"
+        :placeholder="messages.label_field_device_security_level"
+        :options="configs.securityLevels"
+        v-model="device.securityLevel"
+        @input="setSecurityLevel($event)"
+        class="mb-3 security-level"
+      >
+        <template v-slot:selected-option="option">
+          <span>
+            {{ messages.label_field_device_security_level }}: {{ option.label }}
+          </span>
+        </template>
+      </v-select>
+
+      <div class="d-flex align-items-center justify-content-center mb-3">
+        <a
+          v-if="appLinks"
+          target="_blank"
+          rel="noopener noreferrer"
+          :href="appLinks[device.deviceType]"
+          class="mr-3"
+        >
+          <Button color="default">
+            {{ messages.message_download_app }}
+          </Button>
+        </a>
+
+        <a :href="'/api/auth/cacert?deviceType=' + device.deviceType">
+          <Button color="default">
+            {{ messages.message_download_ca_cert }}
+          </Button>
+        </a>
+      </div>
+
+      <Button color="outline" @click="onDelete">
+        {{ messages.delete }}
+      </Button>
+    </form>
+    <ConfirmDeleteDevice ref="confirm" @confirm="confirm" />
+  </modal>
+</template>
+
+<style lang="scss">
+@import '../../_scss/components/form';
+@import '../../_scss/components/modal';
+@import '../../_scss/breakpoints';
+
+.form {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.close-btn {
+  position: absolute;
+  top: 15px;
+  right: 20px;
+  font-size: 20px;
+}
+
+.device-image {
+  margin-bottom: 20px;
+}
+
+.security-level {
+  width: 250px;
+}
+</style>
+
+<script>
+import { mapActions, mapState } from 'vuex';
+import { util } from '~/_helpers';
+
+import { Button, Input } from '../shared';
+import ConfirmDeleteDevice from './ConfirmDeleteDevice';
+
+export default {
+  components: {
+    Button,
+    Input,
+    ConfirmDeleteDevice,
+  },
+
+  data: () => ({
+    userId: util.currentUser().uuid,
+    device: null,
+  }),
+
+  methods: {
+    ...mapActions('devices', [
+      'removeDeviceByUserId',
+      'setDeviceSecurityLevel',
+    ]),
+
+    show(selectedDevice) {
+      this.device = selectedDevice;
+      this.$modal.show('device-detail');
+    },
+    hide() {
+      this.$modal.hide('device-detail');
+    },
+
+    confirm(v) {
+      this.$refs.confirm.hide();
+      if (v) {
+        this.removeDevice();
+      }
+    },
+
+    onDelete() {
+      this.$refs.confirm.show();
+    },
+
+    removeDevice() {
+      this.removeDeviceByUserId({
+        userId: this.userId,
+        deviceId: this.device.uuid,
+        messages: this.messages,
+        errors: this.errors,
+      });
+      this.$emit('delete');
+    },
+
+    setSecurityLevel(event) {
+      this.setDeviceSecurityLevel({
+        userId: this.userId,
+        deviceId: this.device.uuid,
+        securityLevel: event,
+        messages: this.messages,
+        errors: this.errors,
+      });
+    },
+  },
+
+  computed: {
+    ...mapState('system', ['messages', 'appLinks', 'configs']),
+  },
+};
+</script>
diff --git a/src/_components/modals/index.js b/src/_components/modals/index.js
index b8323d1..89565fd 100644
--- a/src/_components/modals/index.js
+++ b/src/_components/modals/index.js
@@ -2,5 +2,9 @@
  * Copyright (c) 2020 Bubble, Inc.  All rights reserved.
  * For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/
  */
-export { default as LaunchBubbleSettingsModal } from './LaunchBubbleSettingsModal';
+export {
+  default as LaunchBubbleSettingsModal,
+} from './LaunchBubbleSettingsModal';
 export { default as AddSSHKeyModal } from './AddSshKey';
+export { default as DeviceDetailModal } from './DeviceDetail';
+export { default as ConfirmDeleteDevice } from './ConfirmDeleteDevice';
diff --git a/src/_pages/main/account/Devices.vue b/src/_pages/main/account/Devices.vue
index b394b97..930dcbb 100644
--- a/src/_pages/main/account/Devices.vue
+++ b/src/_pages/main/account/Devices.vue
@@ -4,399 +4,125 @@
     <em v-if="loading && loading.devices">{{ messages.loading_devices }}</em>
     <div v-if="devices && devices.length > 0">
       <h2>{{ messages.table_title_devices }}</h2>
-      <table border="1">
-        <thead>
-          <tr>
-            <th nowrap="nowrap">{{ messages.label_field_device_name }}</th>
-            <!--                    <th nowrap="nowrap">{{messages.label_field_device_type}}</th>-->
-            <th nowrap="nowrap">{{ messages.label_field_device_app }}</th>
-            <!--                    <th nowrap="nowrap">{{messages.label_field_device_enabled}}</th>-->
-            <th>{{ messages.label_field_device_vpn_config }}</th>
-            <th nowrap="nowrap">
-              {{ messages.label_field_device_certificate }}
-            </th>
-            <th nowrap="nowrap">
-              {{ messages.label_field_device_security_level }}
-            </th>
-            <th nowrap="nowrap">
-              {{ messages.label_field_device_connection }}
-            </th>
-            <!--                    <th>{{messages.label_field_device_ctime}}</th>-->
-            <th>{{ messages.label_field_device_help }}</th>
-            <th><!-- delete --></th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr v-for="device in devices">
-            <td nowrap="nowrap">{{ device.name }}</td>
-            <!--                    <td nowrap="nowrap">-->
-            <!--                        <i :class="messages['device_type_icon_'+device.deviceType]+' bubble-app-icon'"></i><br/>-->
-            <!--                        {{messages['device_type_'+device.deviceType]}}-->
-            <!--                    </td>-->
-            <td align="center">
-              <a
-                v-if="appLinks"
-                target="_blank"
-                rel="noopener noreferrer"
-                :href="appLinks[device.deviceType]"
+      <div class="row">
+        <div
+          class="col-12 col-md-6 col-lg-4 col-xl-3"
+          v-for="(device, key) in devices"
+          :key="key"
+        >
+          <div class="device">
+            <img
+              :src="`/device-${device.deviceType}.png`"
+              class="device-image"
+            />
+            <p class="device-text">
+              {{ device.name }}
+            </p>
+            <div v-if="device.status.lastHandshakeTime" class="device-text">
+              <hr />
+              {{ messages.label_field_device_connection_handshake }}:
+              <span v-if="device.status.lastHandshakeDays">
+                {{ device.status.lastHandshakeDays }}{{ messages.units_days }}
+              </span>
+              <span
+                v-else-if="
+                  device.status.lastHandshakeHours &&
+                    device.status.lastHandshakeMinutes
+                "
               >
-                <i
-                  :class="
-                    messages['device_type_icon_' + device.deviceType] +
-                      ' bubble-app-icon'
-                  "
-                ></i
-                ><br />
-                {{ messages.message_download_app }}
-              </a>
-            </td>
-            <!--                    <td>{{messages['message_'+device.enabled]}}</td>-->
-            <td>
-              <div
-                v-if="displayVpnConfig[device.uuid] === true"
-                class="device-vpn-config-div"
+                {{ device.status.lastHandshakeHours
+                }}{{ messages.units_hours_short }},
+                {{ device.status.lastHandshakeMinutes
+                }}{{ messages.units_minutes_short }}
+              </span>
+              <span v-else-if="device.status.lastHandshakeHours">
+                {{ device.status.lastHandshakeHours
+                }}{{ messages.units_hours_short }}
+              </span>
+              <span
+                v-else-if="
+                  device.status.lastHandshakeMinutes &&
+                    device.status.lastHandshakeSeconds
+                "
               >
-                <h3>{{ device.name }}</h3>
+                {{ device.status.lastHandshakeMinutes
+                }}{{ messages.units_minutes_short }},
+                {{ device.status.lastHandshakeSeconds
+                }}{{ messages.units_seconds_short }}
+              </span>
+              <span v-else-if="device.status.lastHandshakeMinutes">
+                {{ device.status.lastHandshakeMinutes
+                }}{{ messages.units_minutes_short }}
+              </span>
+              <span v-else-if="device.status.lastHandshakeSeconds">
+                {{ device.status.lastHandshakeSeconds
+                }}{{ messages.units_seconds_short }}
+              </span>
+              {{ messages.label_field_device_connection_handshake_ago }}
+            </div>
+            <div v-if="device.status.ip" class="device-text">
+              {{ device.status.ip }}
+              <div v-if="device.status.location">
                 <hr />
-
-                <div
+                <span
                   v-if="
-                    qrCodeImageBase64 &&
-                      messages['device_type_vpn_' + device.deviceType] ===
-                        'show_qr_code'
+                    device.status.location.city &&
+                      device.status.location.region &&
+                      device.status.location.country
                   "
                 >
-                  <img :src="'data:image/png;base64,' + qrCodeImageBase64" />
-                  <div
-                    v-if="errors.has('deviceQRcode')"
-                    class="invalid-feedback d-block"
-                  >
-                    {{ errors.first('deviceQRcode') }}
-                  </div>
-                </div>
-                <div
+                  {{ device.status.location.city }},
+                  {{ device.status.location.region }},
+                  {{ messages['country_' + device.status.location.country] }}
+                </span>
+                <span
                   v-else-if="
-                    vpnConfBase64 &&
-                      messages['device_type_vpn_' + device.deviceType] ===
-                        'download_conf'
+                    device.status.location.region &&
+                      device.status.location.country
                   "
                 >
-                  <Button
-                    color="default"
-                    v-if="vpnConfBase64"
-                    @click="
-                      util.downloadURI(
-                        'data:text/plain;base64,' + vpnConfBase64,
-                        vpnConfFileName
-                      )
-                    "
-                  >
-                    {{ messages.message_device_vpn_download_conf }}
-                  </Button>
-                  <div
-                    v-if="errors.has('deviceVpnConf')"
-                    class="invalid-feedback d-block"
-                  >
-                    {{ errors.first('deviceVpnConf') }}
-                  </div>
-                </div>
-                <div v-else>
-                  <h5>{{ messages.message_device_vpn_unavailable }}</h5>
-                </div>
-                <hr />
-                <Button
-                  color="default"
-                  @click="hideVpnConfig()"
-                  class="btn btn-primary"
-                >
-                  {{ messages.button_label_close_device_vpn_config }}
-                </Button>
-              </div>
-              <div
-                v-else-if="
-                  messages[
-                    '!button_label_vpn_config_' +
-                      messages['device_type_vpn_' + device.deviceType]
-                  ]
-                "
-              >
-                <Button color="default" @click="showVpnConfig(device.uuid)">
-                  {{
-                    messages[
-                      'button_label_vpn_config_' +
-                        messages['device_type_vpn_' + device.deviceType]
-                    ]
-                  }}
-                </Button>
-              </div>
-              <div v-else>
-                {{ messages.message_device_vpn_unavailable }}
-              </div>
-            </td>
-            <td>
-              <a :href="'/api/auth/cacert?deviceType=' + device.deviceType">
-                {{ messages.message_download_ca_cert }}
-              </a>
-            </td>
-            <td>
-              <form v-if="configs.securityLevels" @submit.prevent="false">
-                <input type="hidden" name="deviceId" :value="device.uuid" />
-                <v-select
-                  v-model="device.securityLevel"
-                  @change="setSecurityLevel($event)"
-                  :options="configs.securityLevels"
-                >
-                  <template v-slot:option="option">
-                    {{ messages['device_security_level_' + option.label] }}
-                  </template>
-                  <template v-slot:selected-option="option">
-                    {{ messages['device_security_level_' + option.label] }}
-                  </template>
-                </v-select>
-              </form>
-            </td>
-            <td class="device-connection-status">
-              <div v-if="device.status.ip">
-                {{ device.status.ip }}
-                <div v-if="device.status.location">
-                  <hr />
-                  <span
-                    v-if="
-                      device.status.location.city &&
-                        device.status.location.region &&
-                        device.status.location.country
-                    "
-                  >
-                    {{ device.status.location.city }},
-                    {{ device.status.location.region }},
-                    {{ messages['country_' + device.status.location.country] }}
-                  </span>
-                  <span
-                    v-else-if="
-                      device.status.location.region &&
-                        device.status.location.country
-                    "
-                  >
-                    {{ device.status.location.region }},
-                    {{ messages['country_' + device.status.location.country] }}
-                  </span>
-                  <span
-                    v-else-if="
-                      device.status.location.city &&
-                        device.status.location.country
-                    "
-                  >
-                    {{ device.status.location.city }},
-                    {{ messages['country_' + device.status.location.country] }}
-                  </span>
-                  <span v-else-if="device.status.location.country">
-                    {{
-                      messages['country_' + device.status.location.country]
-                    }}</span
-                  >
-                  <span
-                    v-else-if="
-                      device.status.location.city &&
-                        device.status.location.region
-                    "
-                  >
-                    {{ device.status.location.city }},
-                    {{ device.status.location.region }}
-                  </span>
-                  <span v-else-if="device.status.location.region">
-                    {{ device.status.location.region }}</span
-                  >
-                  <span v-else-if="device.status.location.city">
-                    {{ device.status.location.city }}</span
-                  >
-                </div>
-              </div>
-              <div
-                v-if="device.status.bytesSent || device.status.bytesReceived"
-              >
-                <hr />
-                <div v-if="device.status.bytesSent">
-                  {{ device.status.bytesSent }}{{ device.status.sentUnits }}
-                  {{ messages.label_field_device_transfer_sent }}
-                </div>
-                <div v-if="device.status.bytesReceived">
-                  {{ device.status.bytesReceived
-                  }}{{ device.status.receivedUnits }}
-                  {{ messages.label_field_device_transfer_received }}
-                </div>
-              </div>
-              <div v-if="device.status.lastHandshakeTime">
-                <hr />
-                {{ messages.label_field_device_connection_handshake }}:
-                <span v-if="device.status.lastHandshakeDay">
-                  {{ device.status.lastHandshakeDays }}{{ messages.units_days }}
+                  {{ device.status.location.region }},
+                  {{ messages['country_' + device.status.location.country] }}
                 </span>
                 <span
                   v-else-if="
-                    device.status.lastHandshakeHours &&
-                      device.status.lastHandshakeMinutes
+                    device.status.location.city &&
+                      device.status.location.country
                   "
                 >
-                  {{ device.status.lastHandshakeHours
-                  }}{{ messages.units_hours_short }},
-                  {{ device.status.lastHandshakeMinutes
-                  }}{{ messages.units_minutes_short }}
+                  {{ device.status.location.city }},
+                  {{ messages['country_' + device.status.location.country] }}
                 </span>
-                <span v-else-if="device.status.lastHandshakeHours">
-                  {{ device.status.lastHandshakeHours }}
-                  {{ messages.units_hours_short }}
+                <span v-else-if="device.status.location.country">
+                  {{ messages['country_' + device.status.location.country] }}
                 </span>
                 <span
                   v-else-if="
-                    device.status.lastHandshakeMinutes &&
-                      device.status.lastHandshakeSeconds
+                    device.status.location.city && device.status.location.region
                   "
                 >
-                  {{ device.status.lastHandshakeMinutes }}
-                  {{ messages.units_minutes_short }},
-                  {{ device.status.lastHandshakeSeconds }}
-                  {{ messages.units_seconds_short }}
+                  {{ device.status.location.city }},
+                  {{ device.status.location.region }}
                 </span>
-                <span v-else-if="device.status.lastHandshakeMinutes">
-                  {{ device.status.lastHandshakeMinutes }}
-                  {{ messages.units_minutes_short }}
+                <span v-else-if="device.status.location.region">
+                  {{ device.status.location.region }}
                 </span>
-                <span v-else-if="device.status.lastHandshakeSeconds">
-                  {{ device.status.lastHandshakeSeconds }}
-                  {{ messages.units_seconds_short }}
+                <span v-else-if="device.status.location.city">
+                  {{ device.status.location.city }}
                 </span>
-                {{ messages.label_field_device_connection_handshake_ago }}
               </div>
-            </td>
-            <!--                    <td nowrap="nowrap">{{messages.label_device_ctime_format.parseDateMessage(device.ctime, messages)}}</td>-->
-            <td>
-              <div
-                v-if="displayDeviceHelp[device.uuid] === true"
-                class="device-help-div"
-              >
-                <div
-                  v-html="
-                    messages['device_type_' + device.deviceType + '_help_html']
-                  "
-                ></div>
-                <Button
-                  color="default"
-                  @click="hideDeviceHelp()"
-                  class="btn btn-primary"
-                >
-                  {{ messages.button_label_close_device_help }}
-                </Button>
-              </div>
-              <div v-else>
-                <Button color="default" @click="showDeviceHelp(device.uuid)">
-                  {{ messages.label_field_device_help }}
-                </Button>
-              </div>
-            </td>
-            <td>
-              <i
-                @click="removeDevice(device.uuid)"
-                aria-hidden="true"
-                :class="messages.button_label_remove_device_icon"
-                :title="messages.button_label_remove_device"
-              ></i>
-              <span class="sr-only">{{
-                messages.button_label_remove_device
-              }}</span>
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-
-    <hr />
-
-    <form @submit.prevent="addDevice()">
-      <h4>{{ messages.form_title_add_device }}</h4>
-
-      <div class="form-group">
-        <Input
-          v-model="deviceName"
-          name="name"
-          class="form-control"
-          :placeholder="messages.label_field_device_name"
-        />
-        <div
-          v-if="submitted && errors.has('name')"
-          class="invalid-feedback d-block"
-        >
-          {{ errors.first('name') }}
-        </div>
-        <div
-          v-if="submitted && errors.has('deviceName')"
-          class="invalid-feedback d-block"
-        >
-          {{ errors.first('deviceName') }}
+            </div>
+            <a @click="showDetails(device)" class="device-details">
+              {{ messages.label_button_detail }}
+            </a>
+          </div>
         </div>
       </div>
-
-      <div class="form-group" v-if="addableDeviceTypes">
-        <v-select
-          v-model="deviceType"
-          name="deviceType"
-          :placeholder="messages.label_field_device_type"
-          :options="addableDeviceTypes"
-        >
-          <template v-slot:option="option">
-            {{ messages['device_type_' + option.label] }}
-          </template>
-          <template v-slot:selected-option="option">
-            {{ messages.label_field_device_type }}:
-            {{ messages['device_type_' + option.label] }}
-          </template>
-        </v-select>
-      </div>
-
-      <hr />
-      <div class="form-group">
-        <Button
-          color="default"
-          type="submit"
-          class="btn btn-primary"
-          :disabled="loading || !addDeviceReady"
-        >
-          {{ messages.button_label_add_device }}
-        </Button>
-        <img v-show="loading" :src="loadingImgSrc" />
-      </div>
-    </form>
-
-    <hr />
-
-    <div v-if="certDeviceTypes">
-      <table border="0" width="100%">
-        <tr>
-          <td colspan="5">
-            <h4>{{ messages.message_download_ca_cert }}</h4>
-          </td>
-        </tr>
-        <tr>
-          <td
-            v-for="certDevice in certDeviceTypes"
-            align="center"
-            :width="certDeviceWidth + '%'"
-          >
-            <a :href="'/api/auth/cacert?deviceType=' + certDevice">
-              <i
-                :class="
-                  messages['device_type_icon_' + certDevice] +
-                    ' bubble-app-icon'
-                "
-              ></i
-              ><br />
-              {{ messages['device_type_' + certDevice] }}
-            </a>
-          </td>
-        </tr>
-      </table>
-
-      <hr />
     </div>
+    <div v-else>
+      {{ messages.no_devices_added }}
+    </div>
+    <DeviceDetailModal ref="deviceDetail" @delete="onDeleteDevice" />
   </div>
 </template>
 
@@ -406,6 +132,30 @@
 .bubble-form {
   width: 800px;
 }
+
+.device {
+  display: flex;
+  padding: 30px;
+  flex-direction: column;
+  align-items: center;
+}
+
+.device-image {
+  height: 80px;
+  margin-bottom: 10px;
+}
+
+.device-text {
+  color: #666;
+  font-size: 14px;
+  line-height: 20px;
+  margin-bottom: 8px;
+}
+
+.device-details {
+  color: #221fe0 !important;
+  font-size: 14px;
+}
 </style>
 
 <script>
@@ -415,24 +165,19 @@ import config from 'config';
 import { loadingImgSrc } from '~/_store';
 
 import { Input, Button } from '~/_components/shared';
+import { DeviceDetailModal } from '~/_components/modals';
 
 export default {
   components: {
     Input,
     Button,
+    DeviceDetailModal,
   },
   data() {
     return {
       user: util.currentUser(),
       userId: util.currentUser().uuid,
-      submitted: false,
-      deviceName: null,
-      deviceType: null,
-      displayVpnConfig: {},
-      displayDeviceHelp: {},
-      config: config,
       loadingImgSrc: loadingImgSrc,
-      util: util,
     };
   },
   computed: {
@@ -445,39 +190,6 @@ export default {
     ]),
     ...mapState('system', ['messages', 'appLinks', 'configs']),
     ...mapGetters('devices', ['loading']),
-    vpnConfFileName: function() {
-      if (this.configs && this.configs.networkUuid) {
-        return 'bubble-' + this.configs.networkUuid.split('-')[0] + '-vpn.conf';
-      } else {
-        return 'vpn.conf';
-      }
-    },
-    addDeviceReady: function() {
-      return (
-        this.deviceName !== null &&
-        this.deviceName !== '' &&
-        this.deviceType !== null &&
-        this.deviceType !== ''
-      );
-    },
-    addableDeviceTypes: function() {
-      if (this.messages && this.messages['!addable_device_types']) {
-        return this.messages['addable_device_types'].split('|');
-      }
-      return [];
-    },
-    addableDeviceWidth: function() {
-      return 100.0 / this.addableDeviceTypes.length;
-    },
-    certDeviceTypes: function() {
-      if (this.messages && this.messages['!cert_device_types']) {
-        return this.messages['cert_device_types'].split('|');
-      }
-      return [];
-    },
-    certDeviceWidth: function() {
-      return 100.0 / this.certDeviceTypes.length;
-    },
   },
   created() {
     this.getDevicesByUserId({
@@ -485,112 +197,25 @@ export default {
       messages: this.messages,
       errors: this.errors,
     });
-    this.getAllDeviceTypesByUserId({
-      userId: this.userId,
-      messages: this.messages,
-      errors: this.errors,
-    });
     const user = util.currentUser();
     if (user) this.getAppLinks(user.locale);
     this.loadSystemConfigs();
   },
-  mounted() {
-    window.addEventListener('keyup', (ev) => {
-      if (ev.key === 'Escape') {
-        this.hideVpnConfig();
-        this.hideDeviceHelp();
-      }
-    });
-  },
   methods: {
-    ...mapActions('devices', [
-      'getAllDeviceTypesByUserId',
-      'getDevicesByUserId',
-      'addDeviceByUserId',
-      'removeDeviceByUserId',
-      'getDeviceQRcodeById',
-      'getDeviceVPNconfById',
-      'setDeviceSecurityLevel',
-    ]),
+    ...mapActions('devices', ['getDevicesByUserId', 'setDeviceSecurityLevel']),
     ...mapActions('system', ['getAppLinks', 'loadSystemConfigs']),
-    addDevice() {
-      console.log('add device');
-      this.errors.clear();
-      this.submitted = true;
-      this.addDeviceByUserId({
-        userId: this.userId,
-        device: {
-          name: this.deviceName,
-          deviceType: this.deviceType,
-        },
-        messages: this.messages,
-        errors: this.errors,
-      });
-    },
-    removeDevice(id) {
-      this.errors.clear();
-      this.submitted = true;
-      this.removeDeviceByUserId({
-        userId: this.userId,
-        deviceId: id,
-        messages: this.messages,
-        errors: this.errors,
-      });
-    },
-    setSecurityLevel(event) {
-      this.setDeviceSecurityLevel({
-        userId: this.userId,
-        deviceId: event.target.form.deviceId.value,
-        securityLevel: event.target.value,
-        messages: this.messages,
-        errors: this.errors,
-      });
+
+    showDetails(device) {
+      this.$refs.deviceDetail.show(device);
     },
-    showVpnConfig(id) {
-      this.hideDeviceHelp();
-      const show = {};
-      show[id] = true;
-      this.errors.clear();
-      this.getDeviceQRcodeById({
-        userId: this.userId,
-        deviceId: id,
-        messages: this.messages,
-        errors: this.errors,
-      });
-      this.getDeviceVPNconfById({
+
+    onDeleteDevice() {
+      this.$refs.deviceDetail.hide();
+      this.getDevicesByUserId({
         userId: this.userId,
-        deviceId: id,
         messages: this.messages,
         errors: this.errors,
       });
-      this.displayVpnConfig = Object.assign({}, show);
-    },
-    hideVpnConfig() {
-      this.displayVpnConfig = {};
-    },
-
-    showDeviceHelp(id) {
-      this.hideVpnConfig();
-      this.displayDeviceHelp = {};
-      this.displayDeviceHelp[id] = true;
-    },
-    hideDeviceHelp() {
-      this.displayDeviceHelp = {};
-    },
-  },
-  watch: {
-    device(dev) {
-      if (dev) {
-        // after device added, clear device fields
-        this.deviceName = null;
-        this.deviceType = null;
-        if (dev.uuid) this.showVpnConfig(dev.uuid);
-        this.getDevicesByUserId({
-          userId: this.userId,
-          messages: this.messages,
-          errors: this.errors,
-        });
-      }
     },
   },
 };
diff --git a/src/_router/index.js b/src/_router/index.js
index 3977209..3277cf9 100644
--- a/src/_router/index.js
+++ b/src/_router/index.js
@@ -16,7 +16,7 @@ import DashboardPage from '~/account/DashboardPage';
 import ProfilePage from '~/account/profile/ProfilePage';
 import ActionPage from '~/account/profile/ActionPage';
 import PolicyPage from '~/account/profile/PolicyPage';
-// import DevicesPage from '~/account/DevicesPage';
+import DevicesPage from '~/account/DevicesPage';
 import AppsPage from '~/account/AppsPage';
 import AppPage from '~/account/AppPage';
 import BillsPage from '~/account/payment/BillsPage';
@@ -49,16 +49,6 @@ const paymentMethods = {
 
 const paymentMethodsChildren = [{ path: '', components: paymentMethods }];
 
-const newNetworkChildren = [
-  {
-    path: '',
-    components: {
-      default: NewNetworkPage,
-      ...paymentMethods,
-    },
-  },
-];
-
 export const router = new Router({
   mode: 'history',
   routes: [
@@ -77,7 +67,7 @@ export const router = new Router({
     //   component: PaymentMethodsPage,
     //   children: paymentMethodsChildren,
     // },
-    // { path: '/devices', component: DevicesPage },
+    { path: '/devices/old', component: DevicesPage },
 
     // {
     //   path: '/register',
@@ -307,7 +297,6 @@ const publicPages = [
 ];
 
 router.beforeEach((to, from, next) => {
-  console.log('to', to);
   const authRequired =
     !publicPages.includes(to.path) &&
     publicPages.filter((p) => to.path.startsWith(p)).length === 0;
diff --git a/src/public/.DS_Store b/src/public/.DS_Store
index 1a4ed6c951e4cabfacefb2c36206badea18bde0b..c3e6bd81474b95709991b398194825a6f733f4cf 100644
GIT binary patch
delta 338
zcmZn(XbG6$&#1OBU^hRb+T;WQ<<0s6E=<yb3`q>7K%B&o!;s1l52Ujh(iw^v@)%Mk
z3kXXwF}|3bA>_@Q0+cLc$Ye+c(z=s(2&k%lW?*1^@gEErK!A?{MGa7GK11>32?Ao1
z7YMSbp(qtVQ<?)*oCkD81z7n8aaMI?g9Xu4=Q1P$odGl)tX^E#nt_2S0?8plXzI(s
zrl$aPl!F~4#l#e`d702#CT>okpJ6r&2#d3dgG}1oA$pW!GrPhsmd%ww|6^A)xkL02
E06s-s5C8xG

delta 55
zcmZn(XbG6$&nUk!U^hRb{Nw}y<<0s6E=-fR3OQ`H7J0z5*;jlQ$Hs<TjGNgNez8pM
L6q^JTDP#fw61)>y

diff --git a/src/public/device-android.png b/src/public/device-android.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3f33db0f7437eec8ef4262753fb24be86f032e9
GIT binary patch
literal 1044
zcmeAS@N?(olHy`uVBq!ia0vp^c0gRl!3HEJoKkQFQk(@Ik;M!Q+`=Ht$S`Y;1W=H%
zILO_JVcj{Imp~3nx}&cn1H;CC?mvmF3=GUGJzX3_Dj46+_4T{$AkuKZ$Mba4w#Hbc
zPz&`Hr~8jwdb7*Bis=w%K-pcvu-HrU7Cd1&!1+O_bHXn5j-{6_$SzF1yzJYT-ehU#
z=37TX4pqLNe5U8PT>8GB#@hCb<r_9_N=gpmZCaq#qLH+Z<LAMv?Avx<&D%aV(7fX|
z>+033#ZJ9Ty4LpcfTjr7?BmCe$L;#i_T$s1Phx8C7hSfKTf1Trx8=d_f0g*=bl#Mb
zlP=sDwCdu^lBDg~AEPg^|7d7?y-V(i#OX~whYe;4lsZJ&iNr@o8?!e%n(GK8v0rx;
zUdC}}{Va{WYd;5_ny#*{o~O~bxR&Lx>E80Hs$DbJU9tV2=PkcV;mZEpJg+azkFWps
z%DmTHy`Z`-(W^c!d(Zv$!(J~tC+oQ#ua)qtXP3R+dT;MW^DR5#<fm3tmG2gJ{dnWX
z@t=u@cW^wM@pSp?0{)7<`R<dqI5yniuKU&Nl^XXx^y8NQ9XFNEy(;az^pS1D^tj8P
zCT_HzxP|TY%f9BGmh&?<@N$LN%IxSkvDP$a-YQR@wJ&ZZermSZTk3kk>EH^-FrLG0
zIxiT1)FdwVnxnB+?UBXVy-zmDr{ry!aDDxx&iRQeVo!8U=;XFKw*KiOpBM{k>)ZZ!
z=l$Jp@+SBF>D2JXj0Tav8(*<;U02L`XzX*ML*&uTjz`%a|F>v5yj{%EbCxCam?KkQ
z#2hIdKVGrrY~8`lM^_$vbS0rMYlDR;y@fMA2FlmUzjyw?Kf__=X^VIbkxBf|UOy0A
z_$0w#!=&Az1q_#+PO-*17b>=BfAp6zIn<ZG!e)MX$qD`w)-MEhxf~I6GT=S>SnlQq
z9qpN1uiF1xUH^3B+XY1@_y3KF4HCAG*6w#d#(6mR#H=aG%?36WO%Cf{K2Wf|BvtaK
z!Bdu>Usiizg~%&!_uh+_7u<YVQkKva5fydoSYY0(8kxVxFR1U0d!M~BWY>}I^&d8z
ze!6MrjvYT<zImf_efRF%+ecelTerXX;x_*^L%79?hnMyVzSoge<@)%c;7iqv*|Upf
zkDqi^&$zjIwf5h(Rg1i37tPRraWP~2?fPTZ-JMOUFHQ3gi72#5e>wM7p#IT1uE3Br
rR$(=bD_MUYYR=epPxSHxo&AhbMzQ{Xry2hTW?}|US3j3^P6<r_v>5T_

literal 0
HcmV?d00001

diff --git a/src/public/device-ios.png b/src/public/device-ios.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a469d4c2d46725740a096eeb686b0971d41943b
GIT binary patch
literal 1037
zcmeAS@N?(olHy`uVBq!ia0vp^c0gRg!3HE(9dI-SQk(@Ik;M!Q+`=Ht$S`Y;1W=H%
zILO_JVcj{Imp~3nx}&cn1H;CC?mvmF3=GVRJY5_^Dj46+_014=6lu7hrz5geO5ZS3
zF!<xOFefk72M2X+JM49NZ9A6#yR*b8;~>}93D=w*Me6;U*taTawBCAfw%N>8d!t!t
z=fbax)=dw3rFx}z`lKT>FHD)SY?tks8}F*+b0*J})wq9d_DPlY?;<x^mMv3@SDXA%
zvuo4*SoQ?=iD%PzLqmIS-n{uDEqThNzGKIZm3<RRn$Bh|-yG}wv7%<nmt(tjEXzDM
zb?VgHIc2*K)VV}{VJnUG7qz-_Ncysgdal;li!yx2-RGZwu2b^l=-;|}i|MC-9=KOA
z^H0jcg)B^r?_a%oW$wV#{VHwW%auM>JRJ!W=YD^>Fz>s7zU$-cT5%4s@||}UY@M^o
z<lFI2LO%PdI2Wy4v*t`U_fm5chOfNW=I7orNqqL#q{EH%;2*Eq(NgiT!NQE39P>ZA
z^S@hq=iRG)&h2~u%VgL5oz!I`|C)tU<4wmb=9G|-kSkpLU*B?dCO041==kWyje-Wr
z`j1j?jvV>1`O4&rzt3H&yM2Dg?Y9?Cf4wYqoDHT-p)hBHg_(zpv`QbZ5KV;5QojG1
za-sdTbf08`@U!Q_Hk+r1-HO+<&D5HHdg%c-jjl(!d7r;5c`9_t>ZXJG4VhbaQVtmx
ze12W8Wb?hq@VS1;p_|+IZfs7^-#6E9wt;Xpce20y;ZL80PPllzOSRk0+<bk(w-XmP
zecxG9u_1oeo-KDyPj_OT?N$7vSyFB%>+b7Hj%<gH_Otsr%xyjLDQ4ePUFJv*@%5{>
z&-4BNW#<CENdkKBie$IgY+IEzf3oa6o(T;FA4{zEPJMXEujkOw$)2w-u5MU#+RBtm
z{J+3#w#$DqGu86%Nz6*pzjUOvP27G-j6CP(O!I$6J++3X%Jx?qt1k8O*AX+`vE#$s
z61$bz(|_x`-Mqf!MceE(`HB-c%C>BslcKB7(Wbj}&-zE-fA5ZXtaw7PXql<S)ytQ&
zH$)WI#d%1DuW#A2YE@fG=>4Ss%k%T{-t`@N&Ga!ULE&L$K68(c+T}H`cP;$1DnIAg
zZbo+Jm|6P^KiGG7cefpX{PUcggY^xOXJ#_}$KS8p-ktyH)YO|fWlV2Gzx@ebJ=^nt
zV6vyCc~S1+$EKY>+BOT<w>>%?o-Q5Pvi9Z0M@oIHb<7IB%wi9#CtU#MUItHBKbLh*
G2~7YL8tS$H

literal 0
HcmV?d00001

diff --git a/src/public/device-linux.png b/src/public/device-linux.png
new file mode 100644
index 0000000000000000000000000000000000000000..39500820e8efb4f8c75cc3522addbaac4c86ce87
GIT binary patch
literal 4133
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

literal 0
HcmV?d00001

diff --git a/src/public/device-macosx.png b/src/public/device-macosx.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea907b5f2d4fd96c7bc2064f8351278a58f6b2d6
GIT binary patch
literal 4116
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
SyLu=90000<MNUMnLSTZ^D$IHS

literal 0
HcmV?d00001

diff --git a/src/public/device-windows.png b/src/public/device-windows.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bc9e36f001d46dd110837c4af9c53f3a5221d2b
GIT binary patch
literal 957
zcmV;u148_XP)<h;3K|Lk000e1NJLTq001!n001!v1^@s6bDTjO00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH15!yuK~#7F?OMrB
z6hRpNs=5bMMg%k>tKbmG7>u}JOuTUSrY94h#KeRHk742#FD8f_^bPc+F)`{3kSIpB
z1BM9Q_4`%#49pV806o-9XTC{IRsXfjzgBfsjY6|vakCdDxC|rx5Sf5d6Qo`M)H@%I
zgvH<e2><jTl$%g`3JRTM@;aFwL$H(CZKu>;AFVzey%29#JF)HO5t=-d3_x&+oQ$xX
zL$G~@99qUoI!HvSh58Axu#tlSwP?nu)d4ay&2$l4>I7I3^QZP06&x4`7vjZ6H`<Y-
z28Wo&sjfWD?&EIH{ir^aN7Ud<Z2BUH3iZIhg?PVo96z%RCJfWQlTfCYyo^RZs>~@e
z+`rqls8PXJIDn5=D|r|_3QY#Be=3zFgV*qbG)Q~g%#@g0O5C6l_0jbI;6uD`D7Cm0
znK^)yx{-nUKU7FH1~gKDmL;kn;v_0`qIPiPoGFP3)ryIR04<?XU<pZ51~*GK-6;*0
zX#TiPI<Vc$6Ui=i&Q|Oc%ud|d$sBX9szz}qB=#c)T8G>i2`Pp`Te{sOGm);t0$uYv
zT-)uh<sky@tv#@>gwc40W5MGyX(lic-6r3Q^Qhj^{E&wR25lMpyDS&!Z6Pw1)2Z1&
z8lW)0I(x`~w3;!o#ngA)>3$qh=htpQd!2<AvG!~P1_6!XF%RS18p<&D3T=vQJ!(8a
zdDPlE&yUBjFk<_y)1CAKK4x%O*i#LW&n(44h?;{jGi7b8BPktuCS4TqLR(m>OvQKw
zKC9`$URg)K`8?q{(b<aK{AdYL1s98*q`?wgtXu9>4Og>M>$IZ+0!MGLDL_h2024(T
zUOOD#Pc%JJ5feUkOb)*0EhxI8OGTLTd`};W@0ZcDuhCrCm1oI5?wwv@aj8IhUDn{u
z<~eKygV8l_d@0#Wbx*SAAhph`-vl;O383~p_U-I4zis-!v`|(zO9f1>Oi>S6_-dRx
zu&eR5?dVZIA6{7RLKsd!d3ip?e|vx)k1PoEAt@+4bu%e0{yK@^*cGUqAzE;RF*r>s
zFZf~qIkP_joe5D3&z8@k!y5$J8H?ry#L$XrIC58oj;i)rKWRK6YT@OVHh6s$#-jy8
fx}~0ir$7D$52q%(SQkU|00000NkvXXu0mjfMFpk8

literal 0
HcmV?d00001

diff --git a/src/public/linux.png b/src/public/linux.png
new file mode 100644
index 0000000000000000000000000000000000000000..39500820e8efb4f8c75cc3522addbaac4c86ce87
GIT binary patch
literal 4133
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

literal 0
HcmV?d00001

-- 
2.17.1


From c5cca74c9527353e9b0c5147da19d2ea6b26bcbc Mon Sep 17 00:00:00 2001
From: Tyler <everdev0923@gmail.com>
Date: Fri, 25 Sep 2020 18:38:29 -0400
Subject: [PATCH 07/13] fix: refreshing issue

---
 src/_components/layout/Sidebar.vue |  22 +++-
 src/_pages/Layout.vue              | 169 ++++++++++++++++++++++++++++-
 src/_pages/auth/Register.vue       |   4 +-
 src/_pages/auth/VerifyEmail.vue    |   2 +-
 src/_pages/main/Layout.vue         | 166 +++++-----------------------
 src/_router/index.js               |  24 +---
 6 files changed, 218 insertions(+), 169 deletions(-)

diff --git a/src/_components/layout/Sidebar.vue b/src/_components/layout/Sidebar.vue
index 12a07ea..6944fd8 100644
--- a/src/_components/layout/Sidebar.vue
+++ b/src/_components/layout/Sidebar.vue
@@ -31,7 +31,11 @@
 
       <!-- Navigation -->
       <div class="navigation">
-        <router-link to="/bubble" class="navigation-item" @click.native="closeMenu()">
+        <router-link
+          to="/bubble"
+          class="navigation-item"
+          @click.native="closeMenu()"
+        >
           <i class="fa fa-home icon icon-home"></i>
           <span>{{ messages.label_menu_network }}</span>
         </router-link>
@@ -72,16 +76,24 @@
           <span>{{ messages.label_menu_settings }}</span>
         </router-link> -->
 
-        <router-link to="/support" class="navigation-item" @click.native="closeMenu()">
+        <router-link
+          to="/support"
+          class="navigation-item"
+          @click.native="closeMenu()"
+        >
           <i class="fa fa-question-circle icon icon-help"></i>
           <span>{{ messages.label_menu_help }}</span>
         </router-link>
       </div>
       <!-- Upgrade Plan -->
 
-      <div class="flex-grow-1"></div>
+      <!-- <div class="flex-grow-1"></div> -->
       <!-- Logout -->
-      <router-link to="/logout" class="logout-button" @click.native="closeMenu()">
+      <router-link
+        to="/logout"
+        class="logout-button"
+        @click.native="closeMenu()"
+      >
         <Button color="outline" block>
           {{ messages.log_out }}
         </Button>
@@ -281,7 +293,7 @@ export default {
     closeMenu() {
       console.log('click.nativeed');
       this.menuVisible = false;
-    }
+    },
   },
 };
 </script>
diff --git a/src/_pages/Layout.vue b/src/_pages/Layout.vue
index bafb6f0..0b472f0 100644
--- a/src/_pages/Layout.vue
+++ b/src/_pages/Layout.vue
@@ -1,8 +1,173 @@
 <!-- Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/ -->
 <template>
-  <router-view></router-view>
+  <router-view v-if="isPageAvailable"></router-view>
 </template>
 
 <script>
-export default {};
+import { mapState, mapActions } from 'vuex';
+import { util } from '~/_helpers';
+import { isAuthenticator, isNotAuthenticator } from '~/_store/users.module';
+
+export default {
+  data: () => ({
+    verifiedContacts: null,
+    verifiedContactRefresher: null,
+    accountPlan: {
+      currentUser: null,
+      name: '',
+      domain: '',
+      locale: null,
+      timezone: '',
+      plan: 'bubble',
+      footprint: 'Worldwide',
+      paymentMethodObject: {
+        uuid: null,
+        paymentMethodType: null,
+        paymentInfo: null,
+      },
+      sshKey: '',
+      forkHost: '',
+      syncAccount: true,
+      launchLock: false,
+      sendErrors: true,
+      sendMetrics: true,
+    },
+    payMethods: null,
+  }),
+
+  computed: {
+    ...mapState('users', ['policy']),
+    ...mapState('paymentMethods', ['accountPaymentMethods']),
+    ...mapState('system', ['configs', 'messages']),
+
+    isPageAvailable() {
+      return (
+        !this.currentUser || (this.verifiedContacts || this.currentUser.admin)
+      );
+    },
+  },
+
+  created() {
+    this.currentUser = util.currentUser();
+    if (this.currentUser) {
+      this.locale = this.currentUser.locale;
+    }
+  },
+
+  mounted() {
+    this.initDefaults();
+  },
+
+  methods: {
+    ...mapActions('users', ['getPolicyByUserId']),
+    ...mapActions('paymentMethods', ['getAllAccountPaymentMethods']),
+
+    initDefaults() {
+      const selectedLocale =
+        this.currentUser !== null &&
+        typeof this.currentUser.locale !== 'undefined' &&
+        this.currentUser.locale !== null
+          ? this.currentUser.locale
+          : 'detect';
+      if (this.currentUser && !this.currentUser.admin) {
+        this.getPolicyByUserId({
+          userId: this.currentUser.uuid,
+          messages: this.messages,
+          errors: this.errors,
+        });
+      }
+    },
+
+    hasVerifiedContact(policy) {
+      if (policy && policy.accountContacts) {
+        const contacts = policy.accountContacts;
+        for (let i = 0; i < contacts.length; i++) {
+          if (contacts[i].verified && isNotAuthenticator(contacts[i]))
+            return true;
+        }
+        return false;
+      }
+      return false;
+    },
+
+    navigateToVerifyEmail() {
+      if (this.$route.path !== '/verifyEmail') {
+        this.$router.push('/verifyEmail');
+      }
+    },
+
+    navigateToPaymentPage() {
+      if (this.$route.path !== '/payment') {
+        this.$router.push('/payment');
+      }
+    },
+
+    navigateToDashboard() {
+      if (
+        this.$route.path === '/payment' ||
+        this.$route.path === '/verifyEmail'
+      ) {
+        this.$router.push('/');
+      }
+    },
+  },
+
+  watch: {
+    policy(p) {
+      this.verifiedContacts = this.hasVerifiedContact(p);
+      const currentUser = util.currentUser();
+      if (!this.verifiedContacts && !currentUser.admin) {
+        this.navigateToVerifyEmail();
+        if (this.verifiedContactRefresher === null) {
+          const vue = this;
+          const currentUser = util.currentUser();
+          this.verifiedContactRefresher = window.setInterval(() => {
+            vue.getPolicyByUserId({
+              userId: currentUser.uuid,
+              messages: vue.messages,
+              errors: vue.errors,
+            });
+          }, 5000);
+        }
+      } else {
+        const currentUser = util.currentUser();
+        this.getAllAccountPaymentMethods({
+          userId: currentUser.uuid,
+          messages: this.messages,
+          errors: this.errors,
+        });
+        if (this.verifiedContactRefresher !== null) {
+          window.clearInterval(this.verifiedContactRefresher);
+          this.verifiedContactRefresher = null;
+        }
+      }
+    },
+
+    accountPaymentMethods(pms, oldpms) {
+      if (pms && this.configs.paymentsEnabled) {
+        const payMethods = [];
+        for (let i = 0; i < pms.length; i++) {
+          const pm = pms[i];
+          if (
+            (typeof pm.promotion === 'undefined' ||
+              pm.promotion === null ||
+              !pm.promotion) &&
+            (typeof pm.deleted === 'undefined' || pm.deleted === null)
+          ) {
+            payMethods.push(pm);
+          }
+        }
+
+        if (
+          this.accountPlan.paymentMethodObject.uuid === null &&
+          payMethods.length > 0
+        ) {
+          this.navigateToDashboard();
+        } else {
+          this.navigateToPaymentPage();
+        }
+      }
+    },
+  },
+};
 </script>
diff --git a/src/_pages/auth/Register.vue b/src/_pages/auth/Register.vue
index 1ef32e8..cd45bf5 100644
--- a/src/_pages/auth/Register.vue
+++ b/src/_pages/auth/Register.vue
@@ -220,6 +220,7 @@ export default {
       paymentMethodObject: null,
       confirmPassword: '',
       submitted: false,
+      preferredPlan: null,
     };
   },
 
@@ -314,6 +315,7 @@ export default {
             receivePromotionalMessages: this.receivePromotionalMessages,
             agreeToTerms: this.agreeToTerms,
             promoCode: this.promoCode,
+            preferredPlan: this.preferredPlan,
           },
           messages: this.messages,
           errors: this.errors,
@@ -346,7 +348,7 @@ export default {
     },
     plan(p) {
       if (p.uuid) {
-        this.user.preferredPlan = p.uuid;
+        this.preferredPlan = p.uuid;
       }
     },
     configs(configs) {
diff --git a/src/_pages/auth/VerifyEmail.vue b/src/_pages/auth/VerifyEmail.vue
index e58bd16..d49b74c 100644
--- a/src/_pages/auth/VerifyEmail.vue
+++ b/src/_pages/auth/VerifyEmail.vue
@@ -56,7 +56,7 @@
 import { mapState, mapActions } from 'vuex';
 import Lottie from 'lottie-web';
 
-import { util } from '~/_helpers'
+import { util } from '~/_helpers';
 import { Features } from '~/_components/sections';
 
 // convenience methods
diff --git a/src/_pages/main/Layout.vue b/src/_pages/main/Layout.vue
index bb3aae7..d1e800a 100644
--- a/src/_pages/main/Layout.vue
+++ b/src/_pages/main/Layout.vue
@@ -1,6 +1,6 @@
 <!-- Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/ -->
 <template>
-  <div class="container-fluid">
+  <div class="container-fluid" v-if="isPageAvailable">
     <img src="/bubble_bkgrnd.png" alt="" class="background-image" />
     <div class="content">
       <Sidebar />
@@ -80,166 +80,58 @@ header {
 <script>
 import { mapState, mapActions } from 'vuex';
 import { util } from '~/_helpers';
-import { isAuthenticator, isNotAuthenticator } from '~/_store/users.module';
-import { Footer, Notification, Sidebar } from '~/_components/layout';
 
+import { Footer, Notification, Sidebar } from '~/_components/layout';
 export default {
   components: {
     Footer,
     Notification,
     Sidebar,
   },
+
   data: () => ({
-    verifiedContacts: null,
-    verifiedContactRefresher: null,
-    accountPlan: {
-      currentUser: null,
-      name: '',
-      domain: '',
-      locale: null,
-      timezone: '',
-      plan: 'bubble',
-      footprint: 'Worldwide',
-      paymentMethodObject: {
-        uuid: null,
-        paymentMethodType: null,
-        paymentInfo: null,
-      },
-      sshKey: '',
-      forkHost: '',
-      syncAccount: true,
-      launchLock: false,
-      sendErrors: true,
-      sendMetrics: true,
-    },
-    payMethods: null,
+    currentUser: null,
+    hasPaymentMethod: false,
   }),
 
   computed: {
-    ...mapState('users', ['policy']),
-    ...mapState('paymentMethods', ['accountPaymentMethods']),
     ...mapState('system', ['configs', 'messages']),
+
+    isPageAvailable() {
+      return !this.configs.paymentsEnabled || this.hasPaymentMethod;
+    },
   },
 
   created() {
     this.currentUser = util.currentUser();
-    this.locale = this.currentUser.locale;
   },
 
   mounted() {
-    this.initDefaults();
-  },
-
-  methods: {
-    ...mapActions('users', ['getPolicyByUserId']),
-    ...mapActions('paymentMethods', ['getAllAccountPaymentMethods']),
-
-    initDefaults() {
-      const selectedLocale =
-        this.currentUser !== null &&
-        typeof this.currentUser.locale !== 'undefined' &&
-        this.currentUser.locale !== null
-          ? this.currentUser.locale
-          : 'detect';
-      if (!this.currentUser.admin) {
-        this.getPolicyByUserId({
-          userId: this.currentUser.uuid,
-          messages: this.messages,
-          errors: this.errors,
-        });
-      }
-    },
-
-    hasVerifiedContact(policy) {
-      if (policy && policy.accountContacts) {
-        const contacts = policy.accountContacts;
-        for (let i = 0; i < contacts.length; i++) {
-          if (contacts[i].verified && isNotAuthenticator(contacts[i]))
-            return true;
+    if (this.configs.paymentsEnabled) {
+      this.hasPaymentMethod = true;
+    }
+    if (this.accountPaymentMethods && this.configs.paymentsEnabled) {
+      const payMethods = [];
+      Array.from(this.accountPaymentMethods).forEach((pm) => {
+        if (
+          (typeof pm.promotion === 'undefined' ||
+            pm.promotion === null ||
+            !pm.promotion) &&
+          (typeof pm.deleted === 'undefined' || pm.deleted === null)
+        ) {
+          payMethods.push(pm);
         }
-        return false;
-      }
-      return false;
-    },
+      });
 
-    navigateToVerifyEmail() {
-      if (this.$route.path !== '/verifyEmail') {
-        this.$router.push('/verifyEmail');
+      if (payMethods.length > 0) {
+        this.hasPaymentMethod = true;
       }
-    },
-
-    navigateToPaymentPage() {
-      if (this.$route.path !== '/payment') {
-        this.$router.push('/payment');
-      }
-    },
-
-    navigateToDashboard() {
-      if (
-        this.$route.path === '/payment' ||
-        this.$route.path === '/verifyEmail'
-      ) {
-        this.$router.push('/');
-      }
-    },
+    }
   },
 
-  watch: {
-    policy(p) {
-      this.verifiedContacts = this.hasVerifiedContact(p);
-      const currentUser = util.currentUser();
-      if (!this.verifiedContacts && !currentUser.admin) {
-        this.navigateToVerifyEmail();
-        if (this.verifiedContactRefresher === null) {
-          const vue = this;
-          const currentUser = util.currentUser();
-          this.verifiedContactRefresher = window.setInterval(() => {
-            vue.getPolicyByUserId({
-              userId: currentUser.uuid,
-              messages: vue.messages,
-              errors: vue.errors,
-            });
-          }, 5000);
-        }
-      } else {
-        const currentUser = util.currentUser();
-        this.getAllAccountPaymentMethods({
-          userId: currentUser.uuid,
-          messages: this.messages,
-          errors: this.errors,
-        });
-        if (this.verifiedContactRefresher !== null) {
-          window.clearInterval(this.verifiedContactRefresher);
-          this.verifiedContactRefresher = null;
-        }
-      }
-    },
-
-    accountPaymentMethods(pms, oldpms) {
-      if (pms && this.configs.paymentsEnabled) {
-        const payMethods = [];
-        for (let i = 0; i < pms.length; i++) {
-          const pm = pms[i];
-          if (
-            (typeof pm.promotion === 'undefined' ||
-              pm.promotion === null ||
-              !pm.promotion) &&
-            (typeof pm.deleted === 'undefined' || pm.deleted === null)
-          ) {
-            payMethods.push(pm);
-          }
-        }
-
-        if (
-          this.accountPlan.paymentMethodObject.uuid === null &&
-          payMethods.length > 0
-        ) {
-          this.navigateToDashboard();
-        } else {
-          this.navigateToPaymentPage();
-        }
-      }
-    },
+  methods: {
+    ...mapActions('paymentMethods', ['getAllAccountPaymentMethods']),
+    ...mapState('paymentMethods', ['accountPaymentMethods']),
   },
 };
 </script>
diff --git a/src/_router/index.js b/src/_router/index.js
index 3277cf9..e261d66 100644
--- a/src/_router/index.js
+++ b/src/_router/index.js
@@ -91,28 +91,6 @@ export const router = new Router({
           component: () => import('~/_pages/main/Layout'),
           children: [
             { path: '', component: DashboardPage },
-            {
-              path: 'me/download/:uuid',
-              redirect: (r) => ({
-                path: 'me/policy',
-                query: { download: r.params.uuid },
-              }),
-            },
-            { path: 'me/action', component: ActionPage },
-            { path: 'apps', component: AppsPage },
-            { path: 'app/:app', component: AppPage },
-            { path: 'app/:app/config/:view', component: AppConfigPage },
-            {
-              path: 'app/:app/config/:view/:item',
-              component: AppConfigPage,
-            },
-            { path: 'app/:app/view/:view', component: AppDataViewPage },
-            { path: 'app/:app/site/:site', component: AppSitePage },
-            {
-              path: 'app/:app/site/:site/view/:view',
-              component: AppDataViewPage,
-            },
-            { path: 'notifications', component: NotificationsPage },
             {
               path: 'bubble',
               component: () => import('~/_pages/main/bubble/MyBubble'),
@@ -293,7 +271,7 @@ const publicPages = [
   '/activate',
   '/legal',
 
-  // new Pages
+  '/me/action',
 ];
 
 router.beforeEach((to, from, next) => {
-- 
2.17.1


From c20c77100823af2cfd8695097e6f1bdb9f9cbc1f Mon Sep 17 00:00:00 2001
From: Tyler <everdev0923@gmail.com>
Date: Mon, 28 Sep 2020 21:07:11 -0400
Subject: [PATCH 08/13] fix: launch bubble screen

---
 .../modals/LaunchBubbleSettingsModal.vue      | 37 ++++++++++++++++---
 src/_pages/main/account/ChangePassword.vue    | 15 +++++++-
 src/_pages/main/bubble/LaunchBubble.vue       |  2 +
 3 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/src/_components/modals/LaunchBubbleSettingsModal.vue b/src/_components/modals/LaunchBubbleSettingsModal.vue
index fa8ce30..6e6eff1 100644
--- a/src/_components/modals/LaunchBubbleSettingsModal.vue
+++ b/src/_components/modals/LaunchBubbleSettingsModal.vue
@@ -24,7 +24,7 @@
             v-validate="'required'"
             :placeholder="messages.field_label_network_type"
             :options="networkTypeOptions"
-            v-model="networkType"
+            v-model="accountPlan.launchType"
             label="name"
             :reduce="(option) => option.value"
           >
@@ -37,7 +37,14 @@
         </div>
       </div>
       <!-- fork host -->
-      <div v-if="showForkOption && networkType === 'fork'" class="form-group">
+      <div
+        v-if="
+          showForkOption &&
+            (accountPlan.launchType === 'fork_sage' ||
+              accountPlan.launchType === 'fork_node')
+        "
+        class="form-group"
+      >
         <Input
           type="text"
           v-model="accountPlan.forkHost"
@@ -324,6 +331,7 @@ export default {
     accountPlan: {
       name: '',
       domain: '',
+      launchType: 'node',
       locale: util.currentUser().locale,
       timezone: '',
       plan: 'bubble',
@@ -351,7 +359,6 @@ export default {
     },
     flexRegion: true,
     cloudRegionUuid: '',
-    networkType: 'bubble',
     submitted: false,
   }),
 
@@ -387,8 +394,12 @@ export default {
           value: 'bubble',
         },
         {
-          name: this.messages.field_label_network_type_fork,
-          value: 'fork',
+          name: this.messages.field_label_network_type_fork_sage,
+          value: 'fork_sage',
+        },
+        {
+          name: this.messages.field_label_network_type_fork_node,
+          value: 'fork_node',
         },
       ];
     },
@@ -456,6 +467,11 @@ export default {
       return false;
     },
 
+    getDefaultName() {
+      const currentUser = util.currentUser();
+      return currentUser.email.split('@')[0];
+    },
+
     show() {
       this.$modal.show('advanced-settings');
     },
@@ -469,6 +485,7 @@ export default {
 
     initDefaults() {
       const currentUser = util.currentUser();
+      this.accountPlan.name = this.getDefaultName();
 
       this.getAllDomains({
         userId: currentUser.uuid,
@@ -581,6 +598,14 @@ export default {
   },
 
   watch: {
+    'accountPlan.name'(newVal) {
+      console.log('--changed--', newVal);
+      if (newVal === '') {
+        this.$nextTick(() => {
+          this.accountPlan.name = this.getDefaultName();
+        });
+      }
+    },
     domains(doms) {
       if (doms && doms[0]) {
         if (this.accountPlan.domain == null || this.accountPlan.domain === '')
@@ -612,7 +637,7 @@ export default {
     newNodeNotification(nn) {
       if (nn && nn.uuid) {
         this.$router.push({
-          path: '/launching-bubble/' + nn.networkName,
+          path: '/bubble/' + nn.networkName,
         });
         this.submitted = false;
       }
diff --git a/src/_pages/main/account/ChangePassword.vue b/src/_pages/main/account/ChangePassword.vue
index 8337823..084aae5 100644
--- a/src/_pages/main/account/ChangePassword.vue
+++ b/src/_pages/main/account/ChangePassword.vue
@@ -11,9 +11,19 @@
     </h4>
 
     <form class="bubble-form" @submit.prevent="changePass">
+      <div
+        v-if="submitted && alertType && alertMessage"
+        class="alert"
+        :class="alertType"
+      >
+        {{ alertMessage }}
+      </div>
       <div v-if="me && requiredExternalAuthContacts.length > 0">
         <div class="form-group">
-          <div v-for="(contact, key) in requiredExternalAuthContacts" :key="key">
+          <div
+            v-for="(contact, key) in requiredExternalAuthContacts"
+            :key="key"
+          >
             {{ messages['field_label_' + contact.type] }}: {{ contact.info }}
           </div>
         </div>
@@ -109,7 +119,7 @@
         @click="changePass"
         :disabled="loading()"
       >
-        {{ messages.button_label_change_password }}
+        {{ messages.button_label_resetPassword }}
       </Button>
     </form>
   </div>
@@ -168,6 +178,7 @@ export default {
   computed: {
     ...mapState('users', ['user', 'policy', 'changePasswordResponse']),
     ...mapState('system', ['messages']),
+    ...mapState('alert', { alertType: 'type', alertMessage: 'message' }),
   },
   methods: {
     ...mapActions({ alertSuccess: 'alert/success', alertError: 'alert/error' }),
diff --git a/src/_pages/main/bubble/LaunchBubble.vue b/src/_pages/main/bubble/LaunchBubble.vue
index 09ba288..af71e26 100644
--- a/src/_pages/main/bubble/LaunchBubble.vue
+++ b/src/_pages/main/bubble/LaunchBubble.vue
@@ -89,6 +89,7 @@ export default {
       locale: util.currentUser().locale,
       timezone: '',
       plan: 'bubble',
+      launchType: 'node',
       footprint: 'Worldwide',
       sshKey: '',
       paymentMethodObject: {
@@ -167,6 +168,7 @@ export default {
 
     initDefaults() {
       const currentUser = util.currentUser();
+      this.accountPlan.name = currentUser.email.split('@')[0];
       this.getAllAccountPaymentMethods({
         userId: currentUser.uuid,
         messages: this.messages,
-- 
2.17.1


From 73838bdad90781dfdc22a9464f086f9396829197 Mon Sep 17 00:00:00 2001
From: Tyler <everdev0923@gmail.com>
Date: Tue, 29 Sep 2020 10:45:30 -0400
Subject: [PATCH 09/13] fix: sign up and payment check stuff

---
 src/_pages/Layout.vue               | 11 +++++++-
 src/_pages/main/Layout.vue          | 39 ++++-------------------------
 src/_pages/main/bubble/Networks.vue |  4 +--
 src/_router/index.js                | 31 -----------------------
 src/_store/account.module.js        | 34 ++++++++++++++++++-------
 5 files changed, 41 insertions(+), 78 deletions(-)

diff --git a/src/_pages/Layout.vue b/src/_pages/Layout.vue
index 0b472f0..6080b01 100644
--- a/src/_pages/Layout.vue
+++ b/src/_pages/Layout.vue
@@ -33,6 +33,7 @@ export default {
       sendMetrics: true,
     },
     payMethods: null,
+    hasPaymentMethod: false,
   }),
 
   computed: {
@@ -42,7 +43,14 @@ export default {
 
     isPageAvailable() {
       return (
-        !this.currentUser || (this.verifiedContacts || this.currentUser.admin)
+        !this.currentUser ||
+        ((this.verifiedContacts ||
+          this.currentUser.admin ||
+          this.$route.path === '/verifyEmail' ||
+          this.$route.path === '/me/action') &&
+          (!this.configs.paymentsEnabled ||
+            this.hasPaymentMethod === true ||
+            this.$route.path === '/payment'))
       );
     },
   },
@@ -162,6 +170,7 @@ export default {
           this.accountPlan.paymentMethodObject.uuid === null &&
           payMethods.length > 0
         ) {
+          this.hasPaymentMethod = true;
           this.navigateToDashboard();
         } else {
           this.navigateToPaymentPage();
diff --git a/src/_pages/main/Layout.vue b/src/_pages/main/Layout.vue
index 35a941a..6492fef 100644
--- a/src/_pages/main/Layout.vue
+++ b/src/_pages/main/Layout.vue
@@ -1,13 +1,13 @@
 <!-- Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/ -->
 <template>
-  <div class="container-fluid" v-if="isPageAvailable">
+  <div class="container-fluid">
     <img src="/bubble_bkgrnd.png" alt="" class="background-image" />
     <div class="content">
       <Sidebar />
       <div class="flex-grow-1 p-4">
         <header>
-<!--          <p class="mb-0">{{ messages.label_homepage_welcome }},</p>-->
-<!--          <p class="name">{{ currentUser.name }} 👋</p>-->
+          <!--          <p class="mb-0">{{ messages.label_homepage_welcome }},</p>-->
+          <!--          <p class="name">{{ currentUser.name }} 👋</p>-->
         </header>
         <main>
           <router-view></router-view>
@@ -91,47 +91,18 @@ export default {
 
   data: () => ({
     currentUser: null,
-    hasPaymentMethod: false,
   }),
 
   computed: {
     ...mapState('system', ['configs', 'messages']),
-
-    isPageAvailable() {
-      return !this.configs.paymentsEnabled || this.hasPaymentMethod;
-    },
   },
 
   created() {
     this.currentUser = util.currentUser();
   },
 
-  mounted() {
-    if (this.configs.paymentsEnabled) {
-      this.hasPaymentMethod = true;
-    }
-    if (this.accountPaymentMethods && this.configs.paymentsEnabled) {
-      const payMethods = [];
-      Array.from(this.accountPaymentMethods).forEach((pm) => {
-        if (
-          (typeof pm.promotion === 'undefined' ||
-            pm.promotion === null ||
-            !pm.promotion) &&
-          (typeof pm.deleted === 'undefined' || pm.deleted === null)
-        ) {
-          payMethods.push(pm);
-        }
-      });
-
-      if (payMethods.length > 0) {
-        this.hasPaymentMethod = true;
-      }
-    }
-  },
+  mounted() {},
 
-  methods: {
-    ...mapActions('paymentMethods', ['getAllAccountPaymentMethods']),
-    ...mapState('paymentMethods', ['accountPaymentMethods']),
-  },
+  methods: {},
 };
 </script>
diff --git a/src/_pages/main/bubble/Networks.vue b/src/_pages/main/bubble/Networks.vue
index 3ed74ea..128af47 100644
--- a/src/_pages/main/bubble/Networks.vue
+++ b/src/_pages/main/bubble/Networks.vue
@@ -102,9 +102,7 @@ export default {
   watch: {
     networks(nets) {
       if (nets && nets.length) {
-        if (nets.length === 0) {
-          this.$router.replace({ path: '/new_bubble' });
-        } else if (nets.length === 1 && util.currentUser().admin !== true) {
+        if (nets.length === 1 && util.currentUser().admin !== true) {
           this.$router.replace({ path: '/bubble/' + nets[0].name });
         }
       }
diff --git a/src/_router/index.js b/src/_router/index.js
index e261d66..a36a0c4 100644
--- a/src/_router/index.js
+++ b/src/_router/index.js
@@ -219,37 +219,6 @@ export const router = new Router({
             { path: 'logout', component: () => import('~/auth/LogoutPage') },
           ],
         },
-        {
-          path: '',
-          component: () => import('~/_pages/auth/Layout'),
-          children: [
-            {
-              path: 'login',
-              component: () => import('~/_pages/auth/Login'),
-            },
-            {
-              path: 'forgotPassword',
-              component: () => import('~/_pages/auth/ForgotPassword'),
-            },
-            {
-              path: 'register',
-              component: () => import('~/_pages/auth/Register'),
-            },
-            {
-              path: 'appLogin',
-              component: () => import('~/_pages/auth/AppLogin'),
-            },
-            {
-              path: 'verifyEmail',
-              component: () => import('~/_pages/auth/VerifyEmail'),
-            },
-            {
-              path: 'payment',
-              component: () => import('~/_pages/auth/Payment'),
-            },
-            { path: 'logout', component: () => import('~/auth/LogoutPage') },
-          ],
-        },
       ],
     },
 
diff --git a/src/_store/account.module.js b/src/_store/account.module.js
index e1ee29c..0cd90c2 100644
--- a/src/_store/account.module.js
+++ b/src/_store/account.module.js
@@ -164,11 +164,17 @@ const actions = {
         (error) => commit('restoreFailure', systemConfigs, error)
       );
   },
-  restoreFromPackage({ commit }, { shortKey, backupFileRef, password, systemConfigs, messages, errors }) {
+  restoreFromPackage(
+    { commit },
+    { shortKey, backupFileRef, password, systemConfigs, messages, errors }
+  ) {
     commit('restoreRequest', systemConfigs);
-    userService.restoreFromPackage(shortKey, backupFileRef, password, messages, errors)
-               .then(ok => commit('restoreSuccess', systemConfigs),
-                     error => commit('restoreFailure', systemConfigs, error));
+    userService
+      .restoreFromPackage(shortKey, backupFileRef, password, messages, errors)
+      .then(
+        (ok) => commit('restoreSuccess', systemConfigs),
+        (error) => commit('restoreFailure', systemConfigs, error)
+      );
   },
   forgotPassword({ commit }, { username, messages, errors }) {
     commit('forgotPasswordRequest');
@@ -187,7 +193,7 @@ const actions = {
     userService.register(user, messages, errors).then(
       (user) => {
         commit('registerSuccess', user);
-        router.push('/new_bubble');
+        router.push('/bubble');
         setTimeout(() => {
           // display success message after route change completes
           dispatch('alert/success', messages.alert_registration_success, {
@@ -315,7 +321,11 @@ const mutations = {
   },
   checkSessionRequest(state) {},
   checkSessionSuccess(state, user) {
-    console.log('checkSessionSuccess', state.user.preferredPlan, user.preferredPlan);
+    console.log(
+      'checkSessionSuccess',
+      state.user.preferredPlan,
+      user.preferredPlan
+    );
     if (user.token) {
       if (util.currentUser() === null) {
         // we must have logged out while this request was in flight... do nothing
@@ -410,15 +420,21 @@ const mutations = {
   },
 
   restoreRequest(state, systemConfigs) {
-    state.status = Object.assign({}, state.status, { uploadingRestoreRequestData: true });
+    state.status = Object.assign({}, state.status, {
+      uploadingRestoreRequestData: true,
+    });
   },
   restoreSuccess(state, systemConfigs) {
-    state.status = Object.assign({}, state.status, { uploadingRestoreRequestData: false });
+    state.status = Object.assign({}, state.status, {
+      uploadingRestoreRequestData: false,
+    });
     systemConfigs.restoreInProgress = true;
     systemConfigs.awaitingRestore = false;
   },
   restoreFailure(state, systemConfigs, error) {
-    state.status = Object.assign({}, state.status, { uploadingRestoreRequestData: false });
+    state.status = Object.assign({}, state.status, {
+      uploadingRestoreRequestData: false,
+    });
     systemConfigs.restoreInProgress = false;
     console.log('restore failed: ' + JSON.stringify(error));
   },
-- 
2.17.1


From dfe69120e3175970758a250929558f38854fe809 Mon Sep 17 00:00:00 2001
From: Tyler <everdev0923@gmail.com>
Date: Tue, 29 Sep 2020 11:03:59 -0400
Subject: [PATCH 10/13] fix: login stuff

---
 src/_pages/Layout.vue | 1 +
 src/_router/index.js  | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/src/_pages/Layout.vue b/src/_pages/Layout.vue
index 6080b01..c3a64c3 100644
--- a/src/_pages/Layout.vue
+++ b/src/_pages/Layout.vue
@@ -42,6 +42,7 @@ export default {
     ...mapState('system', ['configs', 'messages']),
 
     isPageAvailable() {
+      console.log('current user', this.currentUser);
       return (
         !this.currentUser ||
         ((this.verifiedContacts ||
diff --git a/src/_router/index.js b/src/_router/index.js
index a36a0c4..f533799 100644
--- a/src/_router/index.js
+++ b/src/_router/index.js
@@ -189,6 +189,15 @@ export const router = new Router({
                 query: { download: r.params.uuid },
               }),
             },
+            { path: 'login', component: () => import('~/_pages/auth/Login') },
+            {
+              path: 'forgotPassword',
+              component: () => import('~/_pages/auth/ForgotPassword'),
+            },
+            {
+              path: 'register',
+              component: () => import('~/_pages/auth/Register'),
+            },
             { path: 'me/action', component: ActionPage },
             { path: 'apps', component: AppsPage },
             { path: 'app/:app', component: AppPage },
-- 
2.17.1


From c628ce37b68a1610531ff2050d0bbef42a58b323 Mon Sep 17 00:00:00 2001
From: Tyler <everdev0923@gmail.com>
Date: Tue, 29 Sep 2020 11:22:29 -0400
Subject: [PATCH 11/13] fix: page reloading stuff

---
 src/_pages/Layout.vue | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/_pages/Layout.vue b/src/_pages/Layout.vue
index c3a64c3..b8dd008 100644
--- a/src/_pages/Layout.vue
+++ b/src/_pages/Layout.vue
@@ -34,26 +34,13 @@ export default {
     },
     payMethods: null,
     hasPaymentMethod: false,
+    isPageAvailable: false,
   }),
 
   computed: {
     ...mapState('users', ['policy']),
     ...mapState('paymentMethods', ['accountPaymentMethods']),
     ...mapState('system', ['configs', 'messages']),
-
-    isPageAvailable() {
-      console.log('current user', this.currentUser);
-      return (
-        !this.currentUser ||
-        ((this.verifiedContacts ||
-          this.currentUser.admin ||
-          this.$route.path === '/verifyEmail' ||
-          this.$route.path === '/me/action') &&
-          (!this.configs.paymentsEnabled ||
-            this.hasPaymentMethod === true ||
-            this.$route.path === '/payment'))
-      );
-    },
   },
 
   created() {
@@ -85,6 +72,16 @@ export default {
           errors: this.errors,
         });
       }
+
+      this.isPageAvailable =
+        !this.currentUser ||
+        this.$route.path === '/me/action' ||
+        this.$route.path === '/logout' ||
+        this.$route.path === '/verifyEmail' ||
+        ((this.verifiedContacts || this.currentUser.admin) &&
+          (!this.configs.paymentsEnabled ||
+            this.hasPaymentMethod === true ||
+            this.$route.path === '/payment'));
     },
 
     hasVerifiedContact(policy) {
@@ -122,6 +119,17 @@ export default {
   },
 
   watch: {
+    $route() {
+      this.isPageAvailable =
+        !this.currentUser ||
+        this.$route.path === '/me/action' ||
+        this.$route.path === '/logout' ||
+        this.$route.path === '/verifyEmail' ||
+        ((this.verifiedContacts || this.currentUser.admin) &&
+          (!this.configs.paymentsEnabled ||
+            this.hasPaymentMethod === true ||
+            this.$route.path === '/payment'));
+    },
     policy(p) {
       this.verifiedContacts = this.hasVerifiedContact(p);
       const currentUser = util.currentUser();
-- 
2.17.1


From 40efcf1de8c0e3558a7801dcbeff1532d12846a8 Mon Sep 17 00:00:00 2001
From: Tyler <everdev0923@gmail.com>
Date: Tue, 29 Sep 2020 12:00:58 -0400
Subject: [PATCH 12/13] fix: login and sign up stuff

---
 src/_pages/Layout.vue | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/_pages/Layout.vue b/src/_pages/Layout.vue
index 10215a1..58ac79e 100644
--- a/src/_pages/Layout.vue
+++ b/src/_pages/Layout.vue
@@ -59,6 +59,7 @@ export default {
     ...mapActions('paymentMethods', ['getAllAccountPaymentMethods']),
 
     initDefaults() {
+      this.currentUser = util.currentUser();
       const selectedLocale =
         this.currentUser !== null &&
         typeof this.currentUser.locale !== 'undefined' &&
@@ -82,6 +83,14 @@ export default {
           (!this.configs.paymentsEnabled ||
             this.hasPaymentMethod === true ||
             this.$route.path === '/payment'));
+
+      console.log(
+        'initDefaults',
+        !this.currentUser,
+        this.$route.path,
+        !!this.verifiedContacts,
+        this.currentUser && !!this.currentUser.admin
+      );
     },
 
     hasVerifiedContact(policy) {
@@ -120,20 +129,15 @@ export default {
 
   watch: {
     $route() {
-      this.isPageAvailable =
-        !this.currentUser ||
-        this.$route.path === '/me/action' ||
-        this.$route.path === '/logout' ||
-        this.$route.path === '/verifyEmail' ||
-        ((this.verifiedContacts || this.currentUser.admin) &&
-          (!this.configs.paymentsEnabled ||
-            this.hasPaymentMethod === true ||
-            this.$route.path === '/payment'));
+      this.$nextTick(() => {
+        this.initDefaults();
+      });
     },
 
     policy(p) {
       this.verifiedContacts = this.hasVerifiedContact(p);
       const currentUser = util.currentUser();
+      if (!currentUser) return;
       if (!this.verifiedContacts && !currentUser.admin) {
         this.navigateToVerifyEmail();
         if (this.verifiedContactRefresher === null) {
@@ -162,7 +166,11 @@ export default {
     },
 
     accountPaymentMethods(pms, oldpms) {
-      if (pms && this.configs.paymentsEnabled) {
+      if (
+        pms &&
+        this.configs.paymentsEnabled &&
+        (this.verifiedContacts || (this.currentUser && this.currentUser.admin))
+      ) {
         const payMethods = [];
         for (let i = 0; i < pms.length; i++) {
           const pm = pms[i];
-- 
2.17.1


From a406a27a39f5ce3bfc762a8fb3b2a8d093508a26 Mon Sep 17 00:00:00 2001
From: Tyler <everdev0923@gmail.com>
Date: Tue, 29 Sep 2020 12:10:33 -0400
Subject: [PATCH 13/13] fix: login

---
 src/_pages/Layout.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/_pages/Layout.vue b/src/_pages/Layout.vue
index 2105d59..682629f 100644
--- a/src/_pages/Layout.vue
+++ b/src/_pages/Layout.vue
@@ -115,6 +115,8 @@ export default {
         this.$route.path === '/verifyEmail'
       ) {
         this.$router.push('/');
+      } else {
+        this.initDefaults();
       }
     },
   },
-- 
2.17.1