From 9b9e7cd73884e511791bef7bab54b94a4fcb593d Mon Sep 17 00:00:00 2001
From: Tyler Chen <tyler@noreply.git.bubblev.org>
Date: Fri, 4 Dec 2020 14:11:30 +0000
Subject: [PATCH 1/5] fix: support page (#74)

fix: support page

Co-authored-by: Tyler <everdev0923@gmail.com>
Reviewed-on: https://git.bubblev.org/bubblev/bubble-web/pulls/74
---
 src/_components/layout/Footer.vue   | 24 +++++++++++++-----------
 src/_pages/main/account/Support.vue |  4 ++--
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/_components/layout/Footer.vue b/src/_components/layout/Footer.vue
index 7fb91e5..37c7385 100644
--- a/src/_components/layout/Footer.vue
+++ b/src/_components/layout/Footer.vue
@@ -18,17 +18,19 @@
       </a>
     </div>
     <div class="links">
-      <a
-        class="text-white link"
-        v-for="item in footerLinks"
-        :key="item"
-        :href="messages[`link_${item}`]"
-        :target="
-          messages[`link_${item}`].startsWith('http') ? '_blank' : '_self'
-        "
-      >
-        {{ messages[`title_${item}`] }}
-      </a>
+      <div class="link" v-for="item in footerLinks" :key="item">
+        <a
+          class="text-white"
+          v-if="messages[`link${item}`].startsWith('http')"
+          :href="messages[`link_${item}`]"
+          target="_blank"
+        >
+          {{ messages[`title_${item}`] }}
+        </a>
+        <router-link v-else :to="messages[`link_${item}`]" class="text-white">
+          {{ messages[`title_${item}`] }}
+        </router-link>
+      </div>
     </div>
   </footer>
 </template>
diff --git a/src/_pages/main/account/Support.vue b/src/_pages/main/account/Support.vue
index 7715f36..3560967 100644
--- a/src/_pages/main/account/Support.vue
+++ b/src/_pages/main/account/Support.vue
@@ -1,9 +1,9 @@
 <!-- Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/ -->
 <template>
   <div>
-    <h1 class="title text-center white-text">{{ messages.title_support }}</h1>
+    <h1 class="title text-center">{{ messages.title_support }}</h1>
     <hr />
-    <h5 class="text-center white-text">
+    <h5 class="text-center">
       {{ messages.support_preamble }}
     </h5>
     <hr />

From 6e9b9fd011e218fee88ac46c9657947c1ae7de5c Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Sun, 6 Dec 2020 03:32:01 -0500
Subject: [PATCH 2/5] always update state.upgradeCheck after upgrade, even if
 failure

---
 src/_store/system.module.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/_store/system.module.js b/src/_store/system.module.js
index fe5e360..46f6932 100644
--- a/src/_store/system.module.js
+++ b/src/_store/system.module.js
@@ -210,11 +210,8 @@ const actions = {
           (error) => commit('checkForUpgradeFailure', error)
         );
     } else {
-      console.log(
-        'checkForUpgrade: already checked (' +
-          state.upgradeCheck +
-          '), not checking again'
-      );
+      commit('checkForUpgradeFailure', null)
+      console.log('checkForUpgrade: already checked (' + state.upgradeCheck + '), not checking again');
     }
   },
   upgrade({ commit }) {
@@ -535,6 +532,7 @@ const mutations = {
   },
   checkForUpgradeFailure(state, error) {
     state.error = error;
+    state.upgradeCheck = null;
   },
 
   upgradeRequest(state) {},

From 23b2a5c0188618909feea52730e27e1c0685617e Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Sun, 6 Dec 2020 04:42:33 -0500
Subject: [PATCH 3/5] fix broken messsages

---
 src/_components/layout/Footer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/_components/layout/Footer.vue b/src/_components/layout/Footer.vue
index 37c7385..0becd5a 100644
--- a/src/_components/layout/Footer.vue
+++ b/src/_components/layout/Footer.vue
@@ -21,7 +21,7 @@
       <div class="link" v-for="item in footerLinks" :key="item">
         <a
           class="text-white"
-          v-if="messages[`link${item}`].startsWith('http')"
+          v-if="messages[`link_${item}`].startsWith('http')"
           :href="messages[`link_${item}`]"
           target="_blank"
         >

From b42ef396d44993e7c64a8244d6cf86c3556045b8 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Sun, 6 Dec 2020 09:34:58 -0500
Subject: [PATCH 4/5] only show billing and payment when
 configs.paymentsEnabled is true

---
 src/_pages/main/account/MyAccount.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/_pages/main/account/MyAccount.vue b/src/_pages/main/account/MyAccount.vue
index e8da2c6..41da92d 100644
--- a/src/_pages/main/account/MyAccount.vue
+++ b/src/_pages/main/account/MyAccount.vue
@@ -72,7 +72,8 @@ export default {
       if (this.messages) {
         const account_actions = this.configs.bubbleNode === true ? 'manage_account_node_actions' : 'manage_account_sage_actions';
         if (this.messages[account_actions]) {
-          const actions = this.messages[account_actions].split(',');
+          const vue = this;
+          const actions = this.messages[account_actions].split(',').filter(a => vue.configs.paymentsEnabled ? a : a !== 'billing' && a !== 'payment');
           if (this.currentUser.admin && this.currentUser.firstAdmin) {
             const delete_index = actions.indexOf('delete');
             if (delete_index !== -1) actions.splice(delete_index, 1);

From e0248d40efe8394a13da7c5ba0a422827e623611 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Sun, 6 Dec 2020 09:38:46 -0500
Subject: [PATCH 5/5] simplify

---
 src/_pages/main/account/MyAccount.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/_pages/main/account/MyAccount.vue b/src/_pages/main/account/MyAccount.vue
index 41da92d..5b1bbbe 100644
--- a/src/_pages/main/account/MyAccount.vue
+++ b/src/_pages/main/account/MyAccount.vue
@@ -73,7 +73,7 @@ export default {
         const account_actions = this.configs.bubbleNode === true ? 'manage_account_node_actions' : 'manage_account_sage_actions';
         if (this.messages[account_actions]) {
           const vue = this;
-          const actions = this.messages[account_actions].split(',').filter(a => vue.configs.paymentsEnabled ? a : a !== 'billing' && a !== 'payment');
+          const actions = this.messages[account_actions].split(',').filter(a => vue.configs.paymentsEnabled || (a !== 'billing' && a !== 'payment'));
           if (this.currentUser.admin && this.currentUser.firstAdmin) {
             const delete_index = actions.indexOf('delete');
             if (delete_index !== -1) actions.splice(delete_index, 1);