Merge pull request #1899 from hypersign-protocol/v5.12.0

V5.12.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hyperfye-frontend",
-  "version": "v5.11.0",
+  "version": "v5.12.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --mode production",
@@ -57,8 +57,7 @@
     "vue-stepper": "^1.4.2",
     "vue-sweetalert2": "^5.0.2",
     "vuedraggable": "^2.24.3",
-    "vuejs-datepicker": "^1.6.2",
-    "vuejs-datetimepicker": "^1.1.13",
+    "vue-vanilla-datetime-picker": "^1.2.0",
     "vuejs-paginate": "^2.1.0",
     "vuex": "^3.0.0",
     "watchify": "^4.0.0",

src/App.vue

@@ -86,6 +86,12 @@ export default {
           icon: "fas fa-users",
           exactPath: true,
         },
+        {
+          href: "/admin/marketplace",
+          title: "Marketplace",
+          icon: "fas fa-store",
+          exactPath: true,
+        },
         {
           title: "Settings",
           icon: "fas fa-cog",
@@ -121,13 +127,7 @@ export default {
               exactPath: true,
             }
           ]
-        },
-         {
-          href: "/admin/marketplace",
-          title: "Marketplace",
-          icon: "fas fa-store",
-          exactPath: true,
-        },
+        },         
         {
           href: "/admin/login",
           title: "Logout",
@@ -275,6 +275,10 @@ export default {
   },
 };
 </script>
+<style>
+@import "../node_modules/vue-vanilla-datetime-picker/dist/DateTimePicker.css";
+@import url("./assets/css/style-override.css");
+</style>
 <style scoped>
 .logo {
   /* width: 144px; */

src/assets/css/participant-side-datetime-override.css

@@ -0,0 +1,8 @@
+.datetime-picker-main {
+    width: 100%;    
+    position: static;    
+}
+.datetime-picker__button{
+    color: rgb(26 26 26 / 90%);; 
+    height: calc(1.5em + 0.75rem + 2px);
+}

src/assets/css/style-override.css

@@ -0,0 +1,13 @@
+.weekday__row {    
+    color: rgb(241, 179, 25);    
+}
+.datetime-picker__button{
+    color:  #495057;;
+    border-radius: 5px;
+    width: 100%;
+    background: #fff;
+    border: 1px solid #ced4da;
+}
+.datetime-picker-main {    
+    z-index: 10;
+}

src/components/admin/createProjectSlider/components/CustomEventActionConfig.vue

@@ -310,8 +310,8 @@ export default {
     },
     placeH() {
       if (
-        this.selected.type != "HYPERLINK_URL" &&
-        this.selected.type != "INFO_TEXT"
+        (this.selected.type != "HYPERLINK_URL" &&
+        this.selected.type != "INFO_TEXT" && this.selected.type != "INPUT_DATE") 
       ) {
         return true;
       } else {