Merge pull request #1476 from hypersign-protocol/develop

Develop
hypersign-protocol · Jul 19, 2022 · 4b96764 · 4b96764
2 parents 49a13e7 + d45acb9
commit 4b96764
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -159,16 +159,16 @@ export default {
   },
 
   mounted() {
-    
+
     eventBus.$on('UpdateAdminNav',   (isSubscribed) => {
         this.isSubscribed = isSubscribed;
     })
 
   
     eventBus.$on("UpdateThemeEvent", (themeData) => {
       Object.assign(this.themeData, { ...themeData })
+      this.isForm = window.location.pathname.includes("/form") ? true : false
     })
-
     if(this.$route.meta.admin){
       this.showNavbar =
           window.location.pathname.includes("/admin/participants") ||

diff --git a/src/components/admin/selectPlanSlider/SelectPlanSlide.vue b/src/components/admin/selectPlanSlider/SelectPlanSlide.vue
@@ -253,7 +253,7 @@ export default {
       options: {
         currency: [
           {
-            html: "$HID ( flat 30% discount on sub total) <a target='_blank' href='https://coinmarketcap.com/currencies/hypersign-identity/markets/'> <i class='fas fa-exclamation-circle'></i></a>",
+            html: "$HID (flat 30% discount on sub total) <a target='_blank' href='https://coinmarketcap.com/currencies/hypersign-identity/markets/'> <i class='fas fa-exclamation-circle'></i></a>",
             value: "HID",
             disabled: false,
           },

diff --git a/src/config.js b/src/config.js
@@ -11,7 +11,7 @@ const config = {
         buttonTextColor: process.env.VUE_APP_BTN_TXT_COLOR || "black",
         headerBGColor: process.env.VUE_APP_HEADER_BACKGROUND || "rgba(241, 179, 25, 0.24)",
         headerTextColor: process.env.VUE_APP_HEADER_TEXT_COLOR || "#212529",
-        themeBgColor: process.env.VUE_APP_THEME_BACKGROUND || "rgb(54, 55, 64)",
+        themeBgColor: process.env.VUE_APP_THEME_BACKGROUND || "rgb(54, 55, 64)"
     },
     recaptchaSiteKey: process.env.VUE_APP_RECAPTCHA_SITE_KEY,
     webWalletAddress: urlSanitizer(process.env.VUE_APP_WEBWALLET_URL, false),

diff --git a/src/views/admin/setting/OrgSetting.vue b/src/views/admin/setting/OrgSetting.vue
@@ -47,8 +47,7 @@
                         <div class="row g-3 align-items-center w-100 mt-4">
                             <div class="text-left col-lg-8 col-md-8 text-left">
                                 <tool-tips infoMessage="Enter logo path"></tool-tips><label for="name"
-                                    class="col-form-label">Logo Path
-                                    <span style="color: red">*</span>:
+                                    class="col-form-label">Logo Path:
                                 </label>
                             </div>
                             <div class="col-lg-4 col-md-4 px-0">
@@ -246,7 +245,7 @@ export default {
             if (!this.orgSetting.themeColor) {
                 throw new Error('Theme color can not be empty')
             }
-            if(this.orgSetting.logoUrl){
+            if(this.orgSetting.logoPath){
                  if (!isValidURL(this.orgSetting.logoPath)){
                    throw new Error('Invalid URL')
             }

diff --git a/src/views/participant/Home.vue b/src/views/participant/Home.vue
@@ -153,6 +153,12 @@ export default {
       //   if (this.$route.params["slug"]) {
       document.title = `${config.appName} - User Home`;
       await this.fetchEventData();
+
+      // Setting to default on homepage
+      eventBus.$emit('UpdateThemeEvent', {
+        logoPath: null,
+        themeColor: config.app.themeColor
+      })
       // await this.fetchUserInfoOnLogin();
       //   }
     } catch (e) {