Merge pull request #1462 from hypersign-protocol/develop

Develop
hypersign-protocol · Jul 15, 2022 · 844177b · 844177b
2 parents c21a50f + 392b84a
commit 844177b
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 7 deletions.
diff --git a/src/components/admin/createProjectSlider/components/PreviewConfig.vue b/src/components/admin/createProjectSlider/components/PreviewConfig.vue
@@ -268,7 +268,7 @@ cursor:default !important
               </b-col>
 
               <b-col cols="2" sm="2" md="2">
-                <b-badge class="btn-score">
+                <b-badge class="btn-score" :style="buttonThemeCss">
                   <img src="../../../../assets/plus.svg" />
                   {{ action.score }}
                 </b-badge>
@@ -282,6 +282,7 @@ cursor:default !important
 </template>
 
 <script>
+import config from "../../../../config";
 import Banner from "../../../participant/Banner.vue";
 import Metrics from "../../../participant/Metrics.vue";
 import draggable from "vuedraggable";
@@ -293,7 +294,14 @@ export default {
     },
   },
   components: { Banner, Metrics, draggable },
-
+computed:{
+ buttonThemeCss() {
+      return {
+        '--button-bg-color': config.app.buttonBgColor,
+        '--button-text-color':config.app.buttonTextColor
+      }
+     }
+  },
 methods: {
     onEnd() {
       this.$root.$emit("actionReorder", this.eventData.actions);

diff --git a/src/components/admin/selectPlanSlider/SelectPlanSlide.vue b/src/components/admin/selectPlanSlider/SelectPlanSlide.vue
@@ -162,6 +162,7 @@
                 block
                 variant="primary"
                 class="btn-plan popular"
+                :style="buttonThemeCss"
                 @click="payment"
                 >Pay ${{ grandTotal }}</b-button
               >

diff --git a/src/components/participant/Login.vue b/src/components/participant/Login.vue
@@ -10,7 +10,7 @@
               </div>
             </template>
             <template v-else-if="value && value != ''">
-              <b-button variant="warning" class="btn-login" :style="buttonThemeCss" @click.prevent="openWalletAfterRecaptcha()">Click To Login
+              <b-button  class="btn-login button-theme" :style="buttonThemeCss" @click.prevent="openWalletAfterRecaptcha()">Click To Login
                 <!--<vue-recaptcha
                   ref="recaptcha"
                   size="invisible"
@@ -154,6 +154,12 @@ export default {
 };
 </script>
 <style scoped>
+.button-theme {
+  background-color:  var(--button-bg-color);
+  border-collapse: var(--button-bg-color);
+  color: var(--button-text-color);
+  border: 0;
+}
 .logincontent {
   margin-top: 20px;
   padding: 2px;

diff --git a/src/views/admin/Events.vue b/src/views/admin/Events.vue
@@ -189,6 +189,7 @@ i {
             :taggable="false"
             :close-on-select="false"
             :clear-on-select="false"
+            :style="buttonThemeCss"
             @input="onInputTag"
           >
           </multiselect>
@@ -405,6 +406,7 @@ i {
       :force-page="currentPage"
       :containerClass="'paginationContainer'"
       :page-class="'paginationItem'"
+      :style="buttonThemeCss"
     >
     </paginate>
   </div>

diff --git a/src/views/admin/Participants.vue b/src/views/admin/Participants.vue
@@ -63,7 +63,7 @@ label {
   margin: 0 2px;
   border-radius: 3px;
 }
-.paginationContainer >>> :deep(li.active) {
+.paginationContainer >>> li.active {
   background-color: var(--button-bg-color);
   color: #fff;
 }
@@ -233,6 +233,7 @@ label {
         :nextText="'Next'"
         :containerClass="'paginationContainer'"
         :page-class="'paginationItem '"
+        :style="buttonThemeCss"
       >
       </paginate>
       <div class="ml-auto">

diff --git a/src/views/admin/Subscription.vue b/src/views/admin/Subscription.vue
@@ -120,7 +120,7 @@ i {
     <b-row class="subscription-wrap">
       <template v-for="plan in plans">
         <b-col cols="12" sm="6" md="3" :key="plan._id" v-if="plan.price !== 0" class="subscription-column">
-          <b-card no-body class="pricing-card" :class="(plan.planName === 'Lambo') ? 'popular' : ''">
+          <b-card no-body class="pricing-card" :class="(plan.planName === 'Lambo') ? 'popular' : ''" :style="buttonThemeCss">
             <b-card-body>
               <h4 class="pricing-heading">
                 <span v-html="getEmoji(plan.planName)"></span>

diff --git a/src/views/admin/TeamMate.vue b/src/views/admin/TeamMate.vue
@@ -220,7 +220,7 @@ export default {
           title: "Invite Form",
           html: `<input type="email" id="email" class="swal2-input" placeholder="Email">
     <input type="name" id="name" class="swal2-input" placeholder="Name">`,
-          confirmButtonText: '<span style="{color:${config.app.buttonTextColor}"}>Send Invitation</span>',
+          confirmButtonText: '<span style="color:black">Send Invitation</span>',
           confirmButtonColor: `${config.app.buttonBgColor}`,
           focusConfirm: false,
           showCloseButton: true,

diff --git a/src/views/admin/setting/OrgSetting.vue b/src/views/admin/setting/OrgSetting.vue
@@ -52,7 +52,7 @@
                                 </label>
                             </div>
                             <div class="col-lg-4 col-md-4 px-0">
-                                <input type="text" id="name" v-model="orgSetting.logoPath" class="form-control w-100" />
+                                <input type="text" placehoolder="https://app.fyre.hypersign.id/img/Fyre_Small.e094f135.png" id="name" v-model="orgSetting.logoPath" class="form-control w-100" />
                             </div>
                         </div>
                         <div class="row g-3 align-items-center w-100 mt-4" style="float:right; padding-right: 1.5%">