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",

src/_pages/Layout.vue

@@ -33,6 +33,7 @@ export default {
       sendMetrics: true,
     },
     payMethods: null,
+    hasPaymentMethod: false,
   }),
 
   computed: {
@@ -41,8 +42,16 @@ export default {
     ...mapState('system', ['configs', 'messages']),
 
     isPageAvailable() {
+      console.log('current user', this.currentUser);
       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 +171,7 @@ export default {
           this.accountPlan.paymentMethodObject.uuid === null &&
           payMethods.length > 0
         ) {
+          this.hasPaymentMethod = true;
           this.navigateToDashboard();
         } else {
           this.navigateToPaymentPage();

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>

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 });
         }
       }

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 },
@@ -219,37 +228,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') },
-          ],
-        },
       ],
     },
 

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));
   },