Merge pull request #1457 from hypersign-protocol/develop

Develop
hypersign-protocol · Jul 14, 2022 · c21a50f · c21a50f
2 parents e1a5924 + 45de44e
commit c21a50f
Show file tree

Hide file tree

Showing 45 changed files with 587 additions and 129 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="app">
-   <NavBar :title="name" :show="showUserNav" /> 
+   <NavBar :title="name" :show="showUserNav" :themeData="themeData" /> 
     <!-- <NavBar title="Fyre" :show="showUserNav" /> -->
 
     <!-- <div :class="[
@@ -59,6 +59,10 @@ export default {
   },
   data() {
     return {
+      themeData: {
+        themeColor: "",
+        logoPath: ""
+      },
       name: config.appName,
       hover: false,
       authToken: localStorage.getItem("authToken"),
@@ -98,6 +102,12 @@ export default {
               icon: "fas fa-user-plus",
               exactPath: true,
             },
+            {
+              href: "/admin/setting/org",
+              title: "Org",
+              icon: "fa fa-university",
+              exactPath: true,
+            },
             {
               href: "/admin/createapp",
               title: "Apps",
@@ -153,13 +163,19 @@ export default {
         this.isSubscribed = isSubscribed;
     })
 
+  
+    eventBus.$on("UpdateThemeEvent", (themeData) => {
+      Object.assign(this.themeData, { ...themeData })
+    })
+
     if(this.$route.meta.admin){
       this.showNavbar =
           window.location.pathname.includes("/admin/participants") ||
           window.location.pathname.includes("/admin/events") ||
           window.location.pathname.includes("/admin/dashboard") ||
           window.location.pathname.includes("/admin/subscription") ||
           window.location.pathname.includes("/admin/teams") ||
+          window.location.pathname.includes("/admin/setting/org") ||
           window.location.pathname.includes("/admin/createapp") ?
           true :
           false;
@@ -175,6 +191,7 @@ export default {
           window.location.pathname.includes("/admin/dashboard") ||
           window.location.pathname.includes("/admin/subscription") ||
           window.location.pathname.includes("/admin/teams") ||
+      window.location.pathname.includes("/admin/setting/org") ||
           window.location.pathname.includes("/admin/createapp") ?
           true :
           false;
@@ -184,6 +201,7 @@ export default {
           window.location.pathname.includes("/admin/dashboard") ||
           window.location.pathname.includes("/admin/subscription") ||
           window.location.pathname.includes("/admin/teams") ||
+      window.location.pathname.includes("/admin/setting/org") ||
           window.location.pathname.includes("/admin/createapp") ?
           true :
           false;

diff --git a/src/components/participant/Action.vue b/src/components/participant/Action.vue
@@ -6,7 +6,7 @@
     <template v-for="(actionItem, index) in ActionSchema">
       <component v-if="actionItem.type==='INFO_TEXT'" :is="CapitaliseString(actionItem.type)" :key="index"
         :idValue="index" :data="actionItem" :done="actionItem.isDone" :authToken="authToken"
-        @input="updateUserInfo(actionItem, $event)">
+        @input="updateUserInfo(actionItem, $event)" :themeData="themeData">
       </component>
     </template>
 
@@ -16,7 +16,7 @@
 
       <component v-if="actionItem.type!=='INFO_TEXT'" :is="CapitaliseString(actionItem.type)" :key="index"
         :idValue="index" :data="actionItem" :authToken="authToken" :done="actionItem.isDone"
-        @input="updateUserInfo(actionItem, $event)">
+        @input="updateUserInfo(actionItem, $event)"  :themeData="themeData">
       </component>
     </template>
   </div>
@@ -92,6 +92,10 @@ export default {
       required: true,
       type: Array,
     },
+    themeData:{
+      required: true,
+      type: Object,
+    }
   },
   components: {
     BinanceNetwork,

diff --git a/src/components/participant/ActionInputs/BinanceErc20.vue b/src/components/participant/ActionInputs/BinanceErc20.vue
@@ -86,6 +86,9 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
   components: {
@@ -94,8 +97,8 @@ export default {
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },

diff --git a/src/components/participant/ActionInputs/BinanceErc721.vue b/src/components/participant/ActionInputs/BinanceErc721.vue
@@ -87,6 +87,9 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
   components: {
@@ -95,8 +98,8 @@ export default {
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },

diff --git a/src/components/participant/ActionInputs/BinanceNetwork.vue b/src/components/participant/ActionInputs/BinanceNetwork.vue
@@ -100,6 +100,9 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
   components: {
@@ -108,8 +111,8 @@ export default {
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },

diff --git a/src/components/participant/ActionInputs/BlockchainAvax.vue b/src/components/participant/ActionInputs/BlockchainAvax.vue
@@ -79,13 +79,16 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },

diff --git a/src/components/participant/ActionInputs/BlockchainBsc.vue b/src/components/participant/ActionInputs/BlockchainBsc.vue
@@ -79,13 +79,16 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },

diff --git a/src/components/participant/ActionInputs/BlockchainCardano.vue b/src/components/participant/ActionInputs/BlockchainCardano.vue
@@ -79,13 +79,16 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },

diff --git a/src/components/participant/ActionInputs/BlockchainEth.vue b/src/components/participant/ActionInputs/BlockchainEth.vue
@@ -78,13 +78,16 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },

diff --git a/src/components/participant/ActionInputs/BlockchainMatic.vue b/src/components/participant/ActionInputs/BlockchainMatic.vue
@@ -79,13 +79,16 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },

diff --git a/src/components/participant/ActionInputs/BlockchainOne.vue b/src/components/participant/ActionInputs/BlockchainOne.vue
@@ -79,13 +79,16 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },

diff --git a/src/components/participant/ActionInputs/BlockchainReef.vue b/src/components/participant/ActionInputs/BlockchainReef.vue
@@ -79,13 +79,16 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },

diff --git a/src/components/participant/ActionInputs/BlockchainTez.vue b/src/components/participant/ActionInputs/BlockchainTez.vue
@@ -79,13 +79,16 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },

diff --git a/src/components/participant/ActionInputs/DiscordJoin.vue b/src/components/participant/ActionInputs/DiscordJoin.vue
@@ -91,13 +91,16 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },

diff --git a/src/components/participant/ActionInputs/EthereumErc20.vue b/src/components/participant/ActionInputs/EthereumErc20.vue
@@ -101,6 +101,9 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
   components: {
@@ -109,8 +112,8 @@ export default {
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },

diff --git a/src/components/participant/ActionInputs/EthereumErc721.vue b/src/components/participant/ActionInputs/EthereumErc721.vue
@@ -85,6 +85,9 @@ export default {
     },
     done: {
       required: true,
+    }, 
+    themeData: {
+      required: true,
     }
   },
   components: {
@@ -93,8 +96,8 @@ export default {
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },

diff --git a/src/components/participant/ActionInputs/EthereumNetwork.vue b/src/components/participant/ActionInputs/EthereumNetwork.vue
@@ -92,6 +92,9 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
   components: {
@@ -100,8 +103,8 @@ export default {
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },