@ozdao/prometheus-framework 0.0.97 → 0.0.99

package/src/modules/events/components/blocks/CardEvent.vue

@@ -3,6 +3,7 @@
 	  :class="{
 	  	'flex-nowrap flex-v-center flex': type === 'short'
 	  }"
+	  class="pos-relative"
   >
     <CardHeader 
 	    :class="{
@@ -21,7 +22,7 @@
 
  		<div 
  			v-if="event.cover && type !== 'short'" 
- 			class="o-hidden bg-grey mn-small w-100"
+ 			class="o-hidden pos-relative bg-grey mn-small w-100"
  		>
 	    <img 
 	    	:src="(FILE_SERVER_URL || '') + event.cover" 
@@ -41,7 +42,7 @@
 	  </div>
 
     <section 
-    	class="w-100"
+    	class="pos-relative w-100"
     	:class="{'pd-t-zero pd-medium': type !== 'short'}"
     >
 
@@ -196,6 +197,9 @@
 
 	// Computed property for time range
 	const formattedTimeRange = computed(() => {
+
+		console.log(props.event.date.start)
+		console.log(props.event.date.end)
     const start = new Date(props.event.date.start);
     const end = new Date(props.event.date.end);
 

package/src/modules/events/components/pages/EditEvent.vue

@@ -22,22 +22,8 @@
     />
 
 		<h3 class="mn-small">Date</h3>
-    {{event.date.start}}
-    <Field 
-      v-model:field="event.date.start" 
-      label="Start"
-      type="datetime-local"  
-      placeholder="Not specified" 
-      class="mn-thin w-100 bg-grey pd-medium radius-small" 
-    />
+    <VueDatePicker v-model="date" range />
 
-    <Field 
-      v-model:field="event.date.end" 
-      label="End"
-      type="datetime-local"  
-      placeholder="Not specified" 
-      class="mn-thin w-100 bg-grey pd-medium radius-small" 
-    />
 
     <h3 class="mn-small">Description</h3>
 		<section v-if="event" class="pd-b-extra w-100 bg-grey pd-big radius-big">
@@ -99,6 +85,9 @@
 import Textarea from '@pf/src/modules/constructor/components/elements/Textarea.vue';
 import Constructor from '@pf/src/modules/constructor/components/sections/Constructor.vue';
 
+import VueDatePicker from '@vuepic/vue-datepicker';
+import '@vuepic/vue-datepicker/dist/main.css'
+
 import Popup from '@pf/src/components/Popup/Popup.vue';
 import Field         from '@pf/src/components/Field/Field.vue'
 import BlockTags from '@pf/src/components/FieldTags/BlockTags.vue';
@@ -123,18 +112,28 @@ let publics = ref(null);
 const selectedTags = ref([]);
 const selectedOrganization = ref(null);
 
+
+const date = ref();
+
+
 onMounted(async () =>{
   
   if (route.params.url) {
     const data = await events.read({ user: auth.state.user._id, url: route.params.url });
     event.value = data.pop();
 
-    event.value.date.start = event.value.date.start.slice(0, 16);
-    event.value.date.end = event.value.date.end.slice(0, 16);
+    const startDate = event.value.date.start;
+    const endDate = event.value.date.end;
+
+    date.value = [startDate, endDate];
 
   } else {
     events.clean();
     event.value = events.state.current;
+
+    const startDate = new Date();
+    const endDate = new Date();
+    date.value = [startDate, endDate];
   }
 
   if (!event.value.owner) event.value.owner = {
@@ -181,6 +180,11 @@ function onDrafts() {
   if (selectedTags.value.length > 0) selectedTags.value.map(tag => (tag.text))
 
   event.value.status = "draft"
+  
+  event.value.date = {
+    start: date.value.startDate,
+    end: date.value.endDate
+  }
 
   if (route.params.url) {
     events.update(event.value)
@@ -201,18 +205,6 @@ function onDrafts() {
   }
 }
 
-function onDelete() {
-  if (confirm('Are you sure you want to delete this event?')) {
-    events.delete(event.value._id)
-      .then(response => {
-        router.push({ name: 'Drafts' });
-      })
-      .catch(error => {
-        console.error(error);
-      })
-  }
-}
-
 function onSubmit() {
 
   if (selectedOrganization.value) event.value.owner = {
@@ -225,11 +217,16 @@ function onSubmit() {
 
   event.value.status = "published"
 
-  console.log(event.value)
+  event.value.date = {
+    start: date.value[0],
+    end: date.value[1]
+  }
+
+  console.log(date.value)
   if (route.params.url) {
     events.update(event.value)
       .then(response => {
-        router.push({ name: 'Blogevent', params: { url: response.url } });
+        router.push({ name: 'Event', params: { url: response.url } });
       })
       .catch(error => {
         console.log(error);
@@ -244,4 +241,25 @@ function onSubmit() {
       });
   }
 }
-</script>
+
+function onDelete() {
+  if (confirm('Are you sure you want to delete this event?')) {
+    events.remove(event.value._id)
+      .then(response => {
+        router.push({ name: 'User Events', params: { _id: event.value.creator.target._id } });
+      })
+      .catch(error => {
+        console.error(error);
+      })
+  }
+}
+</script>
+
+<style lang="scss">
+  .dp__input {
+    border: 0;
+    padding: var(--medium);
+    padding-left: 3rem;
+    background: rgb(var(--grey))
+  }
+</style>

package/src/modules/events/controllers/events.controller.js

@@ -307,7 +307,7 @@ const middlewareFactory = (db) => {
 
   const deleteMethod = async (req, res) => {
     try {
-      const event = await Event.findOneAndDelete({ url: req.params.url }).exec();
+      const event = await Event.findOneAndDelete({ _id: req.body._id }).exec();
       if (!event) {
         return res.status(404).send({ message: "Event is not deleted." });
       }

package/src/modules/events/routes/events.routes.js

@@ -43,7 +43,7 @@ module.exports = function(app, db) {
     controller.update
   );
 
-  app.delete(
+  app.post(
     "/api/events/delete",
     controller.delete
   );

package/src/modules/events/store/events.js

@@ -141,7 +141,7 @@ async function update(eventData) {
 }
 
 async function remove(_id) {
-  return await $axios.delete(`/api/events/delete/${_id}`).then(
+  return await $axios.post(`/api/events/delete`, {_id: _id}).then(
     response => {
       const index = state.all.findIndex(p => p._id === _id);
           if (index !== -1) {

package/src/modules/users/components/pages/ProfileEdit.vue

@@ -44,12 +44,12 @@
       v-model:field="user.profile.description"     
       label="Description"  
       placeholder="Not specified" 
-      class="mn-thin bg-grey pd-medium radius-small" 
+      class="mn-semi bg-grey pd-medium radius-small" 
       disabled="true"
       :validation="organizationName" 
     />
 
-    <p class="mn-thin">Select your birthday if you want to receive your birthday gift.</p>
+    <!-- <p class="mn-thin">Select your birthday if you want to receive your birthday gift.</p>
     
     <Field 
       v-model:field="user.birthday"     
@@ -58,7 +58,7 @@
       placeholder="Not specified" 
       class="mn-semi bg-grey pd-medium radius-small" 
       :validation="organizationName" 
-    />
+    /> -->
     <h3 class="mn-small">Socials</h3>
     <p class="mn-thin">Please provide only the username for social media profiles, without full links.</p>
 

package/src/styles/layout.scss

@@ -1,6 +1,5 @@
 * {
 	box-sizing: border-box;
-	position: relative;
 }
 
 *[disabled] {