Merge branch 'stage' into develop

hypersign-protocol · Jan 10, 2022 · ca396bb · ca396bb
2 parents c801438 + 97b9ae6
commit ca396bb
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 8 deletions.
diff --git a/public/index.html b/public/index.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+
    <!-- Google Tag Manager -->
   <script>(function(w,d,s,l,i){w[l]=w[l]||[];
   w[l].push({'gtm.start':
@@ -13,6 +14,7 @@
   })(window,document,'script','dataLayer','GTM-N2NSJV6');
   </script>
   <!-- End Google Tag Manager -->
+
     <script
       async
       src="https://platform.twitter.com/widgets.js"
@@ -88,11 +90,13 @@
     </style>
   </head>
   <body>
+
   <!-- Google Tag Manager (noscript) -->
   <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-N2NSJV6"
   height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
   <!-- End Google Tag Manager (noscript) -->
 
+
     <noscript>
       <strong
         >We're sorry but simple-vue-app doesn't work properly without JavaScript

diff --git a/src/components/admin/selectPlanSlider/SelectPlanSlide.vue b/src/components/admin/selectPlanSlider/SelectPlanSlide.vue
@@ -157,6 +157,7 @@ import InputDate from '../../participant/ActionInputs/InputDate.vue';
 import EventActionConfig from "./components/EventActionConfig.vue";
 import GeneralConfig from "./components/GeneralConfig.vue";
 import ReferralConfig from "./components/ReferralConfig.vue";
+
 export default {
   name: "CreateProjectSlide",
   components: {
@@ -194,6 +195,7 @@ export default {
   computed: {
     // a computed getter
    grandTotal () {
+     // eslint-disable-next-line vue/no-side-effects-in-computed-properties
      this.plan.grandTotal=this.plan.price - this.discount
      return this.plan.grandTotal
    }
@@ -286,6 +288,7 @@ export default {
       }
     },
     async payment(){
+     
         console.log("clicked");
         var planbody={}
         this.plan.selectedCurrency=this.selectedCurrency
@@ -328,8 +331,8 @@ export default {
           if (!resp.ok) {
             return this.notifyErr(json)
           }else{
-            
-            window.location.replace(json.payment.quick_Pay)
+            window.open(json.payment.quick_Pay)
+           // window.location.replace(json.payment.quick_Pay)
           }
         }else{
           throw new Error('Error while subscritption')

diff --git a/src/router.js b/src/router.js
@@ -15,6 +15,7 @@ const router = new Router({
       path: "/form/:slug",
       name: "Event",
       component: () => import(/* webpackChunkName: "investorLogin" */ './views/participant/Event.vue'),
+      meta: (route) => ({ requiresAuth: false, title: 'Hyperfyre - ' + route.params.slug, tabbar: false })
     },
     {
       path: "/",
@@ -73,6 +74,10 @@ const router = new Router({
 });
 
 router.beforeEach((to, from, next) => {
+  if(to.meta.title){
+    document.title = to.meta.title;
+  }
+
   if (to.matched.some((record) => record.meta.requiresAuth)) {
     const authToken = localStorage.getItem("authToken");
     if (authToken) {

diff --git a/src/views/admin/Subscription.vue b/src/views/admin/Subscription.vue
@@ -200,7 +200,7 @@ i {
               <th>Plan Name</th>
               <th>Limit</th>
               <th>Status</th>
-              <th>Payment Status</th>
+
             </tr>
           </thead>
           <tbody>
@@ -394,10 +394,12 @@ export default {
           return;
         }
         var planbody={}
-        this.plan.selectedCurrency=this.selectedCurrency
-        this.plan.selectedNetwork=this.selectedNetwork
+        this.plan.selectedCurrency='HIDD'
+        this.plan.selectedNetwork='MATICC'
         this.plan.coupon_code='Free120'
-        this.plan.grandTotal=0
+        this.plan.grandTotal='0'
+        this.plan.price='0'
+
         planbody=Object.assign(planbody,this.plan)
         // console.log(planId);
 
@@ -437,7 +439,8 @@ export default {
             return this.notifyErr(json)
           }else{
             this.fetchSubscription();
-            this.notifySuccess(Messages.SUBSCRIPTIONS.YOU_ARE_SUBSCRIBED + json["_id"]);
+            console.log(json);
+            this.notifySuccess(Messages.SUBSCRIPTIONS.YOU_ARE_SUBSCRIBED + json["newSub"]["_id"]);
           }
         }else{
           throw new Error('Error while subscritption')

diff --git a/src/views/participant/Event.vue b/src/views/participant/Event.vue
@@ -109,6 +109,7 @@ export default {
 
       if (this.$route.params["slug"]) {
         this.eventSlug = this.$route.params["slug"];
+        document.title = "Hyperfyre - "+ this.eventSlug.replace(/-/g," ").toUpperCase();
         await this.fetchEventData();
         await this.fetchUserInfoOnLogin();
       }
@@ -274,4 +275,4 @@ export default {
 
   margin-bottom: 120px;
 }
-</style>
+</style>