Merge pull request #1467 from hypersign-protocol/issues#1458

home page issues of theme color fixed
hypersign-protocol · Jul 17, 2022 · bfabaa0 · bfabaa0
2 parents fa15713 + 5418ffb
commit bfabaa0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="app">
-   <NavBar :title="name" :show="showUserNav" :themeData="themeData" /> 
+   <NavBar :title="name" :show="showUserNav" :themeData="themeData" :isForm="isForm" /> 
     <!-- <NavBar title="Fyre" :show="showUserNav" /> -->
 
     <!-- <div :class="[
@@ -153,7 +153,8 @@ export default {
 
       // Nav for user's end
       showUserNav: false,
-      showChat:false
+      showChat:false,
+      isForm:false,
     };
   },
 
@@ -182,6 +183,7 @@ export default {
     }else{
       this.showUserNav = window.location.pathname.includes("/form") ||
         window.location.pathname.includes("/user") || window.location.pathname.includes("/sa/home")?true : false
+        this.isForm= window.location.pathname.includes("/form")? true:false
     }
   },
   updated() {

diff --git a/src/components/participant/NavBar.vue b/src/components/participant/NavBar.vue
@@ -21,7 +21,7 @@ color: white !important;
 			<template #button-content>
 				<b-icon style="color:white" icon="menu-button-wide"></b-icon>
 			</template>
-			<b-dropdown-item to="/user/home/">
+			<b-dropdown-item to="/user/home/" @click="updateIsForm">
 				Home
 			</b-dropdown-item>
 			<b-dropdown-item @click="logout" v-if="authToken != '' && authToken != null">
@@ -48,12 +48,16 @@ export default {
 		themeData: {
 			required: true,
 			type:Object 
+		},
+		isForm:{
+			required: true,
+			type: Boolean
 		}
 	},
 	computed: {
 		themeCss(){
 			return{
-				'--theme-bg-color': this.themeData.themeColor ? this.themeData.themeColor : config.app.themeBgColor
+				'--theme-bg-color': (this.themeData.themeColor && this.isForm) ? this.themeData.themeColor : config.app.themeBgColor
 			}
 		}
 	},
@@ -74,6 +78,9 @@ export default {
 		logout() {
 			localStorage.clear();
 			this.$router.go()
+		},
+		updateIsForm() {
+			this.isForm= false
 		}
 	}
 }