fixed UI bugs for reward-dist

hypersign-protocol · Jan 10, 2023 · 0c071c2 · 0c071c2
1 parent 95e23c4
commit 0c071c2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 27 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -125,7 +125,7 @@ export default {
          {
           href: "/admin/marketplace",
           title: "Marketplace",
-          icon: "fa fa-trophy",
+          icon: "fas fa-store",
           exactPath: true,
         },
         {

diff --git a/src/components/admin/marketPlaceSlider/marketPlaceSlide.vue b/src/components/admin/marketPlaceSlider/marketPlaceSlide.vue
@@ -211,7 +211,7 @@ allButtons {
                 <label for="placeHolder" class="col-form-label">Total:</label>
               </div>
               <div class="col-lg-6 col-md-6 px-0">
-                <span v-if="feeStructure.fyrePlatformCommision!==''" style="float:right">{{ getFriendlyValue(feeStructure.totalAmountToDistribute) - getFriendlyValue(feeStructure.fyrePlatformCommision)}}
+                <span v-if="feeStructure.fyrePlatformCommision!==''" style="float:right">{{ (getFriendlyValue(feeStructure.totalAmountToDistribute) - getFriendlyValue(feeStructure.fyrePlatformCommision)).toFixed(4)}}
                   {{feeStructure.symbol}} Tokens</span>
               </div>
             </div>
@@ -427,9 +427,9 @@ export default {
         selectedProjectId:{
           deep:true,
           handler: function () {
-            if (this.$route.query.projectId) {
-              // this.selectedProjectId = this.$route.query.projectId
-              this.selectedEvent = this.$route.query.projectId              
+            if (this.$route.params.project) {
+              // this.selectedProjectId = this.$route.params.project
+              this.selectedEvent = this.$route.params.project              
               this.flash = null
               this.showContractField = false
               this.prizeList = [];
@@ -772,7 +772,7 @@ export default {
         this.showContractField = true
       }
     },
-    selectOption(e) {
+    selectOption() {
       this.isCheckEveryThing = false
       this.flash = null
       this.simpleData = ''

diff --git a/src/views/admin/Events.vue b/src/views/admin/Events.vue
@@ -379,20 +379,9 @@ i {
                 <span
                   title="Click to Distribute Reward"
                   style="cursor: pointer"
-                  v-if="project.isDistributed"
+                  @click="goToMarketPlace(project._id)"
                 >
-                  <a :href="`/admin/marketplace?projectId=${project._id}`" target="_blank" class="card-body-custom">
-                                    <i class="fa fa-trophy" style="color: #39ff14"></i>
-                  </a>
-                </span>
-                <span
-                  title="Click to Reward Distribution"
-                  style="cursor: pointer"
-                  v-else
-                >
-                  <a :href="`/admin/marketplace?projectId=${project._id}`" target="_blank" class="card-body-custom">
-                    <i class="fa fa-trophy" ></i>
-                  </a>                  
+                <i class="fa fa-trophy"></i>                 
                 </span>
                 <span
                   @click="editProject(project)"
@@ -645,6 +634,9 @@ export default {
   },
 
   methods: {
+    goToMarketPlace(projectId) {
+      this.$router.push({name: 'MarketPlace', params: { project: projectId }})
+    },
     isEventExpired(d1) {
       const ToDate = new Date();
        if (new Date(d1).getTime() <= ToDate.getTime()) {

diff --git a/src/views/admin/MarketPlace.vue b/src/views/admin/MarketPlace.vue
@@ -156,14 +156,13 @@ async mounted() {
       _id: null,
       projectName: "Select an event",
     });
-    await this.getDistributerDetails()
-    //Hardcoding tool since we have only 1 tool for now
-    if (this.$route.query.projectId) {
-      this.selectedProjectId = this.$route.query.projectId;
-      console.log(this.selectedProjectId,'pid')
-      this.openMPSidebar(this.tools[0])
-
-    }
+    await this.getDistributerDetails()     
+    if(this.$route.params.project){
+    const projectId = this.$route.params.project    
+    this.selectedProjectId = projectId
+    //Hardcoding tool since we have only 1 tool for now  
+    this.openMPSidebar(this.tools[0])
+    }    
   },
   methods: {
     async getDistributerDetails() {