From 119cb4d7c225d03b86997396e8d282b73a536f9b Mon Sep 17 00:00:00 2001
From: raj6939 <raj.v.patil108@gmail.com>
Date: Tue, 29 Nov 2022 12:02:04 +0530
Subject: [PATCH 1/5] tile breaking bug fixed by reducing icon height

---
 .../components/CustomApiEventActionConfig.vue                 | 2 +-
 .../components/CustomContractEventActionConfig.vue            | 2 +-
 .../components/SmartContractEventActionConfig.vue             | 4 ++--
 .../components/WalletEventActionConfig.vue                    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/admin/createProjectSlider/components/CustomApiEventActionConfig.vue b/src/components/admin/createProjectSlider/components/CustomApiEventActionConfig.vue
index beee69a4..b09a88fd 100644
--- a/src/components/admin/createProjectSlider/components/CustomApiEventActionConfig.vue
+++ b/src/components/admin/createProjectSlider/components/CustomApiEventActionConfig.vue
@@ -23,7 +23,7 @@
             <img
               style="padding-right: 5px"
               src="../../../../assets/filled-rest-api-50.png"          
-              height="22px"
+              height="18px"
             />  
           </span>
           <span>{{ truncate1(eventAction.title, 6) }}</span>
diff --git a/src/components/admin/createProjectSlider/components/CustomContractEventActionConfig.vue b/src/components/admin/createProjectSlider/components/CustomContractEventActionConfig.vue
index 304dd0cf..8d351da1 100644
--- a/src/components/admin/createProjectSlider/components/CustomContractEventActionConfig.vue
+++ b/src/components/admin/createProjectSlider/components/CustomContractEventActionConfig.vue
@@ -31,7 +31,7 @@
               style="padding-right: 5px"
               src="../../../../assets/matic-logo.svg"
               v-if="eventAction.type.includes('MATIC_NETWORK')"
-              height="20px"
+              height="16px"
             />
             <img
               style="padding-right: 5px"
diff --git a/src/components/admin/createProjectSlider/components/SmartContractEventActionConfig.vue b/src/components/admin/createProjectSlider/components/SmartContractEventActionConfig.vue
index 674f15c7..636aa671 100644
--- a/src/components/admin/createProjectSlider/components/SmartContractEventActionConfig.vue
+++ b/src/components/admin/createProjectSlider/components/SmartContractEventActionConfig.vue
@@ -31,7 +31,7 @@
               style="padding-right: 5px"
               src="../../../../assets/matic-logo.svg"
               v-if="eventAction.type.includes('MATIC_')"
-              height="20px"
+              height="16px"
             />
             <img
               style="padding-right: 5px"
@@ -55,7 +55,7 @@
               style="padding-right: 5px"
               src="../../../../assets/moonbase-alpha.svg"
               v-if="eventAction.type.includes('MOON_')"
-              height="22px"
+              height="16px"
             />
             <img
               style="padding-right: 5px"
diff --git a/src/components/admin/createProjectSlider/components/WalletEventActionConfig.vue b/src/components/admin/createProjectSlider/components/WalletEventActionConfig.vue
index 3099f084..6e94874d 100644
--- a/src/components/admin/createProjectSlider/components/WalletEventActionConfig.vue
+++ b/src/components/admin/createProjectSlider/components/WalletEventActionConfig.vue
@@ -31,7 +31,7 @@
               style="padding-right: 5px"
               src="../../../../assets/matic-logo.svg"
               v-if="eventAction.type === 'BLOCKCHAIN_MATIC'"
-              height="20px"
+              height="16px"
             />
             <img
               style="padding-right: 5px"
@@ -67,7 +67,7 @@
               style="padding-right: 5px"
               src="../../../../assets/cardano_128.png"
               v-if="eventAction.type === 'BLOCKCHAIN_CARDANO'"
-              height="22px"
+              height="20px"
             />
             <img
               style="padding-right: 5px"

From ab362ef2789e8308d4ce206da155b753c8d0c609 Mon Sep 17 00:00:00 2001
From: raj6939 <raj.v.patil108@gmail.com>
Date: Tue, 29 Nov 2022 12:15:32 +0530
Subject: [PATCH 2/5] attribute tile breaking fixed

---
 .../components/CustomApiEventActionConfig.vue                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/admin/createProjectSlider/components/CustomApiEventActionConfig.vue b/src/components/admin/createProjectSlider/components/CustomApiEventActionConfig.vue
index b09a88fd..542a4967 100644
--- a/src/components/admin/createProjectSlider/components/CustomApiEventActionConfig.vue
+++ b/src/components/admin/createProjectSlider/components/CustomApiEventActionConfig.vue
@@ -138,7 +138,7 @@
                             style="min-width:90px;"
                             :title="attr.fieldName"
                           >
-                          {{ truncate1(attr.fieldName,6) }}
+                          {{ truncate1(attr.fieldName,8) }}
                            <span style="color: gray; padding-left: 5px">
                             <i style="" class="fas fa-minus-circle"></i>
                           </span>
@@ -230,7 +230,7 @@
                             style="min-width:90px;"
                             :title="attr.fieldName"
                           >
-                          {{ truncate1(attr.fieldName,6) }}
+                          {{ truncate1(attr.fieldName,8) }}
                            <span style="color: gray; padding-left: 5px">
                             <i style="" class="fas fa-minus-circle"></i>
                           </span>

From d1b1f8e340e80f0110feef807b87ce335c5a1070 Mon Sep 17 00:00:00 2001
From: raj6939 <raj.v.patil108@gmail.com>
Date: Tue, 29 Nov 2022 13:27:09 +0530
Subject: [PATCH 3/5] validation added for custom contract

---
 .../CustomContractEventActionConfig.vue       | 36 +++++++++++++------
 src/utils/messages/admin/en.js                |  5 +++
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/components/admin/createProjectSlider/components/CustomContractEventActionConfig.vue b/src/components/admin/createProjectSlider/components/CustomContractEventActionConfig.vue
index 8d351da1..a669588e 100644
--- a/src/components/admin/createProjectSlider/components/CustomContractEventActionConfig.vue
+++ b/src/components/admin/createProjectSlider/components/CustomContractEventActionConfig.vue
@@ -275,6 +275,7 @@ import {
   isEmpty,
   isValidURL,
   truncate,
+  isContractValid
 } from "../../../../mixins/fieldValidationMixin";
 import Messages from "../../../../utils/messages/admin/en";
 import config from "../../../../config"
@@ -330,7 +331,7 @@ export default {
     return {
       appName: config.appName,
       allCondition: [
-        { text: "None", value: null },
+        { text: "Operator", value: null },
         { text: "=", value: "===" },
         { text: ">", value: ">" },
         { text: "<", value: "<" },
@@ -364,7 +365,7 @@ export default {
         contractABI: "",
         methods: null,
         operand: null,
-        operator: "",
+        operator: null,
         returnType: "",
       },
       selected: {
@@ -441,7 +442,7 @@ export default {
         contractABI: "",
         methods: null,
         operand: null,
-        operator: "",
+        operator: null,
         returnType: "",
       };
       this.selected = clearData;
@@ -464,25 +465,40 @@ export default {
             this.notifyErr(
               Messages.EVENTS.ACTIONS.SMARTCONTRACT.CHOOSE_CONTRACT_TYPE
             );
-          }else if (this.contract.methods===null || isEmpty(this.contract.methods)) {
+          }  else if (isEmpty(this.contract.contractAddress)) {
             isvalid = false;
             this.notifyErr(
-              Messages.EVENTS.ACTIONS.SMARTCONTRACT.METHODS_EMPTY
+              Messages.EVENTS.ACTIONS.SMARTCONTRACT.ADDRESS_NOT_EMPTY
             );
-          } else if (isEmpty(this.contract.contractAddress)) {
+          } else if (!isContractValid(this.contract.contractAddress)) {
             isvalid = false;
             this.notifyErr(
-              Messages.EVENTS.ACTIONS.SMARTCONTRACT.ADDRESS_NOT_EMPTY
-            );
+              Messages.EVENTS.ACTIONS.SMARTCONTRACT.VALID_CONTRACT_ADDRESS
+            )
           } else if (isEmpty(this.contract.contractABI)) {
             isvalid = false;
             this.notifyErr(
               Messages.EVENTS.ACTIONS.SMARTCONTRACT.ABI_NOT_EMPTY
             )
-          }else if (isValidURL(this.selected.title)) {
+          } else if (this.contract.methods===null || isEmpty(this.contract.methods)) {
+            isvalid = false;
+            this.notifyErr(
+              Messages.EVENTS.ACTIONS.SMARTCONTRACT.METHODS_EMPTY
+            );
+          } else if (this.contract.operator === null) {
+            isvalid = false;
+            this.notifyErr(
+             Messages.EVENTS.ACTIONS.CUSTOM_CONTRACT.SELECT_OPERATOR
+            );
+          } else if (isEmpty(this.contract.operand)) {
+            isvalid = false;
+            this.notifyErr(
+              Messages.EVENTS.ACTIONS.CUSTOM_CONTRACT.ENTER_CONDITION_VALUE
+            )
+          } else if (isValidURL(this.selected.title)) {
             isvalid = false;
             this.notifyErr(Messages.EVENTS.ACTIONS.TITLE_URL);
-          }else if (isEmpty(this.selected.title)) {
+          } else if (isEmpty(this.selected.title)) {
             isvalid = false;
             this.notifyErr(Messages.EVENTS.ACTIONS.EMPTY_TITLE);
           } else if (isNaN(parseInt(this.selected.score))) {            
diff --git a/src/utils/messages/admin/en.js b/src/utils/messages/admin/en.js
index c98d43ae..985e97e4 100644
--- a/src/utils/messages/admin/en.js
+++ b/src/utils/messages/admin/en.js
@@ -91,6 +91,11 @@ const EVENTS = {
             THBALANCE_NOT_NEGATIVE: "Enter the Threshold balance that should be a Positive Number",
             VALID_CONTRACT_ADDRESS: "Please enter valid Contract address"
         },
+        CUSTOM_CONTRACT: {
+            SELECT_OPERATOR: "Select operator",
+            ENTER_CONDITION_VALUE: "Enter condition value"
+
+        },
 
         PRIZECARD: {
             PRIZE_TYPE: "Please select prize type",

From 579ac0d9ff003fab992ff92b6c5772d6a8c18a91 Mon Sep 17 00:00:00 2001
From: raj6939 <raj.v.patil108@gmail.com>
Date: Tue, 29 Nov 2022 15:08:46 +0530
Subject: [PATCH 4/5] validation added for prize type

---
 .../createProjectSlider/components/PrizeEventActionConfig.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/admin/createProjectSlider/components/PrizeEventActionConfig.vue b/src/components/admin/createProjectSlider/components/PrizeEventActionConfig.vue
index e1931727..88826d9c 100644
--- a/src/components/admin/createProjectSlider/components/PrizeEventActionConfig.vue
+++ b/src/components/admin/createProjectSlider/components/PrizeEventActionConfig.vue
@@ -286,7 +286,7 @@ export default {
             return this.notifyErr(Messages.EVENTS.EVENT_CLOSED)
           }
           this.selected.type = "PRIZE_CARD"
-          if (this.selected.type === null) {
+          if (this.prizeDetails.type === null) {
             isvalid = false;
             this.notifyErr(Messages.EVENTS.ACTIONS.PRIZECARD.PRIZE_TYPE);
           } else if (isEmpty(this.selected.title)) {

From debd5125262719d77ae0fe9389d8533e53634e9a Mon Sep 17 00:00:00 2001
From: raj6939 <raj.v.patil108@gmail.com>
Date: Tue, 29 Nov 2022 17:37:51 +0530
Subject: [PATCH 5/5] added validation for expiry date

---
 .../components/CustomApiEventActionConfig.vue |  5 +++-
 .../CustomContractEventActionConfig.vue       |  5 +++-
 .../components/CustomEventActionConfig.vue    |  8 +++---
 .../components/GeneralConfig.vue              | 12 +++++++--
 .../components/KycEventActionConfig.vue       |  5 +++-
 .../components/PrizeEventActionConfig.vue     |  5 +++-
 .../SmartContractEventActionConfig.vue        |  7 +++--
 .../components/SocialEventActionConfig.vue    |  5 +++-
 .../components/WalletEventActionConfig.vue    |  7 +++--
 src/utils/messages/admin/en.js                |  1 +
 src/views/admin/Events.vue                    | 26 +++++++++++++++++--
 11 files changed, 70 insertions(+), 16 deletions(-)

diff --git a/src/components/admin/createProjectSlider/components/CustomApiEventActionConfig.vue b/src/components/admin/createProjectSlider/components/CustomApiEventActionConfig.vue
index 542a4967..f882a52c 100644
--- a/src/components/admin/createProjectSlider/components/CustomApiEventActionConfig.vue
+++ b/src/components/admin/createProjectSlider/components/CustomApiEventActionConfig.vue
@@ -1184,7 +1184,7 @@ export default {
     },
     handleEventActionValidation() {
       let isvalid = true;
-
+      const ToDate = new Date();
       //////
       //// WARNINGS: This is worst way of handeling validation
       //// You should return or break the moment first error occured
@@ -1193,6 +1193,9 @@ export default {
           if(this.project.projectStatus ==false){
             isvalid = false;
             return this.notifyErr(Messages.EVENTS.EVENT_CLOSED)
+          } if(new Date(this.project.toDate).getTime() <= ToDate.getTime()) {
+            isvalid = false
+            return this.notifyErr(Messages.EVENTS.EVENT_EXPIRY_DATE)
           }
          if (isEmpty(this.selected.title)) {
             isvalid = false;
diff --git a/src/components/admin/createProjectSlider/components/CustomContractEventActionConfig.vue b/src/components/admin/createProjectSlider/components/CustomContractEventActionConfig.vue
index a669588e..3a40c662 100644
--- a/src/components/admin/createProjectSlider/components/CustomContractEventActionConfig.vue
+++ b/src/components/admin/createProjectSlider/components/CustomContractEventActionConfig.vue
@@ -450,7 +450,7 @@ export default {
     },
     handleEventActionValidation() {
       let isvalid = true;
-
+      const ToDate = new Date();
       //////
       //// WARNINGS: This is worst way of handeling validation
       //// You should return or break the moment first error occured
@@ -459,6 +459,9 @@ export default {
           if(this.project.projectStatus ==false){
             isvalid = false;
             return this.notifyErr(Messages.EVENTS.EVENT_CLOSED)
+          } if(new Date(this.project.toDate).getTime() <= ToDate.getTime()) {
+            isvalid = false
+            return this.notifyErr(Messages.EVENTS.EVENT_EXPIRY_DATE)
           }
           if (this.selected.type === null) {
             isvalid = false;
diff --git a/src/components/admin/createProjectSlider/components/CustomEventActionConfig.vue b/src/components/admin/createProjectSlider/components/CustomEventActionConfig.vue
index 642da7aa..2b979514 100644
--- a/src/components/admin/createProjectSlider/components/CustomEventActionConfig.vue
+++ b/src/components/admin/createProjectSlider/components/CustomEventActionConfig.vue
@@ -365,7 +365,7 @@ export default {
     },
     handleEventActionValidation() {
       let isvalid = true;
-
+      const ToDate = new Date();
       //////
       //// WARNINGS: This is worst way of handeling validation
       //// You should return or break the moment first error occured
@@ -374,8 +374,10 @@ export default {
           if(this.project.projectStatus ==false){
             isvalid = false;
             return this.notifyErr(Messages.EVENTS.EVENT_CLOSED)
-          }
-          if (this.selected.type === null) {
+          } if(new Date(this.project.toDate).getTime() <= ToDate.getTime()) {
+            isvalid = false
+            return this.notifyErr(Messages.EVENTS.EVENT_EXPIRY_DATE)
+          } if (this.selected.type === null) {
             isvalid = false;
             this.notifyErr(Messages.EVENTS.ACTIONS.CUSTOM.CUSTOM_TYPE);
           } else if (isEmpty(this.selected.title)) {
diff --git a/src/components/admin/createProjectSlider/components/GeneralConfig.vue b/src/components/admin/createProjectSlider/components/GeneralConfig.vue
index 76042a34..18f84b35 100644
--- a/src/components/admin/createProjectSlider/components/GeneralConfig.vue
+++ b/src/components/admin/createProjectSlider/components/GeneralConfig.vue
@@ -126,10 +126,14 @@
             </div>
             <div class="col-lg-9 col-md-9 px-0">
                 
-                 <select class="form-control" v-model="project.projectStatus">
+                 <!-- <select class="form-control" v-model="project.projectStatus">
                       <option value="true" >OPEN</option>
                       <option value="false">CLOSE</option>
-                </select >
+                </select > -->
+                 <b-form-select
+                      v-model="project.projectStatus"
+                      :options="statusOptions"
+                ></b-form-select>
             </div>  
     </div>
 
@@ -266,6 +270,10 @@ buttonThemeCss() {
           "type": null,
           "id": "",
         },
+        statusOptions:[
+          {text:"OPEN",value:true},
+          {text:"CLOSE",value:false}
+        ]
       }
     },
   props:{
diff --git a/src/components/admin/createProjectSlider/components/KycEventActionConfig.vue b/src/components/admin/createProjectSlider/components/KycEventActionConfig.vue
index f2f5b1d0..8ac0792f 100644
--- a/src/components/admin/createProjectSlider/components/KycEventActionConfig.vue
+++ b/src/components/admin/createProjectSlider/components/KycEventActionConfig.vue
@@ -271,7 +271,7 @@ export default {
     },
     handleEventActionValidation() {
       let isvalid = true;
-
+      const ToDate = new Date();
       //////
       //// WARNINGS: This is worst way of handeling validation
       //// You should return or break the moment first error occured
@@ -280,6 +280,9 @@ export default {
           if(this.project.projectStatus ==false){
             isvalid = false;
             return this.notifyErr(Messages.EVENTS.EVENT_CLOSED)
+          } if(new Date(this.project.toDate).getTime() <= ToDate.getTime()) {
+            isvalid = false
+            return this.notifyErr(Messages.EVENTS.EVENT_EXPIRY_DATE)
           }
           if (this.selected.type === null) {
             isvalid = false;
diff --git a/src/components/admin/createProjectSlider/components/PrizeEventActionConfig.vue b/src/components/admin/createProjectSlider/components/PrizeEventActionConfig.vue
index 88826d9c..bc83d100 100644
--- a/src/components/admin/createProjectSlider/components/PrizeEventActionConfig.vue
+++ b/src/components/admin/createProjectSlider/components/PrizeEventActionConfig.vue
@@ -275,7 +275,7 @@ export default {
     },
     handleEventActionValidation() {
       let isvalid = true;
-
+      const ToDate = new Date();
       //////
       //// WARNINGS: This is worst way of handeling validation
       //// You should return or break the moment first error occured
@@ -284,6 +284,9 @@ export default {
           if(this.project.projectStatus ==false){
             isvalid = false;
             return this.notifyErr(Messages.EVENTS.EVENT_CLOSED)
+          } if(new Date(this.project.toDate).getTime() <= ToDate.getTime()) {
+            isvalid = false
+            return this.notifyErr(Messages.EVENTS.EVENT_EXPIRY_DATE)
           }
           this.selected.type = "PRIZE_CARD"
           if (this.prizeDetails.type === null) {
diff --git a/src/components/admin/createProjectSlider/components/SmartContractEventActionConfig.vue b/src/components/admin/createProjectSlider/components/SmartContractEventActionConfig.vue
index 636aa671..bb047b0f 100644
--- a/src/components/admin/createProjectSlider/components/SmartContractEventActionConfig.vue
+++ b/src/components/admin/createProjectSlider/components/SmartContractEventActionConfig.vue
@@ -401,7 +401,7 @@ export default {
     },
     handleEventActionValidation() {
       let isvalid = true;
-
+      const ToDate = new Date();
       //////
       //// WARNINGS: This is worst way of handeling validation
       //// You should return or break the moment first error occured
@@ -410,7 +410,10 @@ export default {
       if (this.project.projectStatus == false) {
         isvalid = false;
         return this.notifyErr(Messages.EVENTS.EVENT_CLOSED);
-      }
+      } if(new Date(this.project.toDate).getTime() <= ToDate.getTime()) {
+            isvalid = false
+            return this.notifyErr(Messages.EVENTS.EVENT_EXPIRY_DATE)
+          }
       if (this.selected.type === null) {
         isvalid = false;
         this.notifyErr(
diff --git a/src/components/admin/createProjectSlider/components/SocialEventActionConfig.vue b/src/components/admin/createProjectSlider/components/SocialEventActionConfig.vue
index 752c110f..f84fedbb 100644
--- a/src/components/admin/createProjectSlider/components/SocialEventActionConfig.vue
+++ b/src/components/admin/createProjectSlider/components/SocialEventActionConfig.vue
@@ -409,7 +409,7 @@ export default {
     },
     handleEventActionValidation() {
       let isvalid = true;
-
+      const ToDate = new Date();
       //////
       //// WARNINGS: This is worst way of handeling validation
       //// You should return or break the moment first error occured
@@ -418,6 +418,9 @@ export default {
           if(this.project.projectStatus ==false){
             isvalid = false;
             return this.notifyErr(Messages.EVENTS.EVENT_CLOSED)
+          } if(new Date(this.project.toDate).getTime() <= ToDate.getTime()) {
+            isvalid = false
+            return this.notifyErr(Messages.EVENTS.EVENT_EXPIRY_DATE)
           }
           if (this.selected.type === null) {
             isvalid = false;
diff --git a/src/components/admin/createProjectSlider/components/WalletEventActionConfig.vue b/src/components/admin/createProjectSlider/components/WalletEventActionConfig.vue
index 6e94874d..c38b2f75 100644
--- a/src/components/admin/createProjectSlider/components/WalletEventActionConfig.vue
+++ b/src/components/admin/createProjectSlider/components/WalletEventActionConfig.vue
@@ -335,7 +335,7 @@ export default {
     },
     handleEventActionValidation() {
       let isvalid = true;
-
+      const ToDate = new Date();
       //////
       //// WARNINGS: This is worst way of handeling validation
       //// You should return or break the moment first error occured
@@ -344,7 +344,10 @@ export default {
         if(this.project.projectStatus ==false){
           isvalid = false;
           return this.notifyErr(Messages.EVENTS.EVENT_CLOSED)
-        }
+        } if(new Date(this.project.toDate).getTime() <= ToDate.getTime()) {
+            isvalid = false
+            return this.notifyErr(Messages.EVENTS.EVENT_EXPIRY_DATE)
+          }
           if (this.selected.type === null) {
             isvalid = false;
             this.notifyErr(Messages.EVENTS.ACTIONS.BLOCKCHAIN.CHOOSE_TYPE);
diff --git a/src/utils/messages/admin/en.js b/src/utils/messages/admin/en.js
index 985e97e4..9c7e3d84 100644
--- a/src/utils/messages/admin/en.js
+++ b/src/utils/messages/admin/en.js
@@ -14,6 +14,7 @@ const EVENTS = {
     EVENT_DELETED:"Event is deleted successfully",
     WRONG_EVENT_ID:"Please enter valid event Id",
     EVENT_CLOSED:"Cannot edit CLOSED event! OPEN it to edit",
+    EVENT_EXPIRY_DATE:"Event is expired! Please select expiry date greater than current date",
     NO_EVENT_FOUND:"No events found, click on create button to create a new event!",
     CHECK_ALL_TYPE: "PLease Check if any type left empty",
     CHECK_ALL_TITLE_EMPTY: "Check if any Title field you left empty",
diff --git a/src/views/admin/Events.vue b/src/views/admin/Events.vue
index 97901317..706a60f0 100644
--- a/src/views/admin/Events.vue
+++ b/src/views/admin/Events.vue
@@ -319,7 +319,8 @@ i {
                 title="Expiry Day"
               >
               <i class="fa fa-hourglass-end"></i>
-              Expires in {{ getDateDiff(project.toDate, new Date()) }} day (s)
+              <span v-if="!isEventExpired(project.toDate)">Expires in {{ getDateDiff(project.toDate, new Date()) }} day (s)</span>
+              <span v-if="isEventExpired(project.toDate)">Expired !</span>
             </li>
 
               <li
@@ -587,6 +588,15 @@ export default {
       deleteNote:DELETE_EVENT_NOTE
     };
   },
+ watch: {
+        project:{
+          deep:true,
+          handler: function(newValue,oldValue) {
+            this.project = newValue            
+            eventBus.$emit("sendProject", this.project);
+          }
+        }
+    },
 
   async mounted() {
     //const usrStr = localStorage.getItem("user");
@@ -616,6 +626,14 @@ export default {
   },
 
   methods: {
+    isEventExpired(d1) {
+      const ToDate = new Date();
+       if (new Date(d1).getTime() <= ToDate.getTime()) {
+      return true
+        } else {
+          return false
+        }
+    },
     getDateDiff(d1, d2){
       const date1 = new Date(d1);
       const date2 = new Date(d2);
@@ -931,7 +949,7 @@ export default {
       );
       this.project.toDate = dayjs(project.toDate).format("YYYY-MM-DD hh:mm:ss");
 
-      eventBus.$emit("sendProject", this.project);
+      // eventBus.$emit("sendProject", this.project);
       // CHECK IF TELEGRAM AND TWITTER EXISTS AND UPDATE THE DATA STRUCTURE
       this.project.social = {
         twitter: {
@@ -1323,6 +1341,7 @@ export default {
     },
 
     checkIfEverythingIsFilled() {
+      const ToDate = new Date()
       for (let index = 0; index < this.eventActionList.length; index++) {
         if (
           this.eventActionList[index].score === null ||
@@ -1383,6 +1402,9 @@ export default {
       if (!(this.project.fromDate && this.project.toDate)) {
         return Messages.EVENTS.CREATE_EDIT_EVENT.PROJECT_DATE_TIME;
       }
+      if(new Date(this.project.toDate).getTime() <= ToDate.getTime()) {            
+        return Messages.EVENTS.EVENT_EXPIRY_DATE
+      }
       if (this.tagsTemp.length < 1) {
         return Messages.EVENTS.CREATE_EDIT_EVENT.CHOOSE_ATLEAST_ONE_TAG;
       }