Merge pull request #1207 from hypersign-protocol/develop

Develop
hypersign-protocol · May 26, 2022 · b403fe9 · b403fe9
2 parents 60d6bc1 + df7588f
commit b403fe9
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 15 deletions.
diff --git a/src/components/admin/createProjectSlider/CreateProjectSlide.vue b/src/components/admin/createProjectSlider/CreateProjectSlide.vue
@@ -5,7 +5,16 @@
 .b-sidebar > .b-sidebar-header {
   border: 1px solid #000 !important;
 }
+.previewshow{
+  display: block !important;
+}
+/* .show.collapse{
+  display: block !important;
+} */
+/* .show.collapse{
+  transition: height 1s;
 
+} */
 .button-theme {
   background-color: #f1b319;
   border-collapse: #f1b319;
@@ -95,7 +104,7 @@
             </b-card-header>
             <b-collapse
               visible
-
+              class="previewshow"
               id="accordion-1"
               accordion="my-accordion1"
               role="tabpanel"
@@ -160,11 +169,7 @@
                 ><i class="fa fa-user-plus"></i> Referral Configurations
               <!-- <a class="tool" data-position="right" draggable="false" title="Creates a unique referral URL for each campaign participants, set points of each referral"><i class='fas fa-exclamation-circle'></i></a> -->
               </b-button>
-              <div class="info">
-              <i class='fas fa-exclamation-circle'>
-                <p class="tooltiptext">Creates a unique referral URL for each campaign participants and sets points of each referral</p>
-                </i>
-                </div>
+
             </b-card-header>
             <b-collapse
               id="accordion-2"
@@ -199,7 +204,7 @@
             </b-card-header>
             <b-collapse
               id="accordion-3"
-              visible
+              :appear="visible"
               accordion="my-accordion"
               role="tabpanel"
             >
@@ -438,16 +443,16 @@
         <button
           class="btn btn-primary mt-3 button-theme  mr-3"
           type="button"
-          @click="saveProject"
+          @click="openPreview"
         >
-          Submit
+          Preview
         </button>
         <button
           class="btn btn-primary mt-3 button-theme"
           type="button"
-          @click="openPreview"
+          @click="saveProject"
         >
-          Preview
+          Save
         </button>
       </div>
     </b-sidebar>
@@ -469,6 +474,7 @@ export default {
   },
 
   props: {
+    
     project: {
       type: Object,
     },
@@ -676,6 +682,7 @@ export default {
 this.$root.$on("openPreview",()=>{
   this.preview=true
 })
+this.$root.$on("closePreview",this.closePreview)
   }
   ,
   methods: {

diff --git a/src/components/admin/createProjectSlider/components/PreviewConfig.vue b/src/components/admin/createProjectSlider/components/PreviewConfig.vue
@@ -8,8 +8,10 @@
           parseInt(
             (new Date(eventData.toDate).getTime() - new Date().getTime()) /
               (1000 * 3600 * 24)
-          )
-        "
+          )<0?'0':parseInt(
+            (new Date(eventData.toDate).getTime() - new Date().getTime()) /
+              (1000 * 3600 * 24)
+          ) "
       />
     </div>
     <div>

diff --git a/src/views/admin/Events.vue b/src/views/admin/Events.vue
@@ -1193,7 +1193,9 @@ export default {
 
         await this.fetchProjects();
         this.$bvModal.hide("create-project-modal");
+        
         this.$root.$emit("bv::toggle::collapse", "sidebar-right");
+         this.$root.$emit("closePreview")
       } catch (e) {
         if (e.errors) {
           this.errors = e.errors;
@@ -1204,6 +1206,7 @@ export default {
         this.isLoading = false;
         // this.clear();
       }
+   
     },
 
     checkIfEverythingIsFilled() {

diff --git a/src/views/participant/Event.vue b/src/views/participant/Event.vue
@@ -15,11 +15,12 @@
     <template v-if="authToken != '' && authToken != null">
       <ErrorMessage v-if="!eventData.projectStatus" errorMessage="Event is over" />
       <Action v-if="eventData.projectStatus" :userProfile="userProfileData" :ActionSchema="eventActionsToShow" :prizeData="prizeData" @UserUpdateEvent="updateUserData" />
-    </template>
-     <div class="footer">
+    <div class="footer mx-auto overflow-hidden" style="max-width:600px;align-items:center;padding-top:20px" >
      <b>Disclaimer:</b>
       Anyone can create campaigns on HyperFyre, rewards are distributed by the campaign creator and HyperFyre is not responsible for reward distribution.
       </div>
+   </template>
+
   </div>
 </template>
 <script>