taskManager & recurrent events generation

pages/event/_id.vue

@@ -29,8 +29,8 @@
         //- info & actions for desktop
         el-col.menu(:sm='6' :xs='24')
           el-menu.menu.mt-2(router)
-            p <i class='el-icon-time'></i>  <b>{{event|when}}</b> <br/><small>{{event|to}}</small>
-            p <i class='el-icon-map-location'></i>  <b>{{event.place.name}}</b> - {{event.place.address}}
+            p <i class='el-icon-date'></i>  <b>{{event|when}}</b> <br/><small>{{event|to}}</small>
+            p <i class='el-icon-location-outline'></i>  <b>{{event.place.name}}</b> - {{event.place.address}}
             el-divider {{$t('common.actions')}}
             el-menu-item(
               v-clipboard:success='copyLink'
@@ -80,7 +80,7 @@ import EmbedEvent from './embedEvent'
 import FollowMe from './followMe'
 import { Message, MessageBox } from 'element-ui'
 
-import moment from 'dayjs'
+import moment from 'moment-timezone'
 
 export default {
   name: 'Event',
@@ -88,17 +88,8 @@ export default {
   components: { EventAdmin, EmbedEvent, FollowMe },
   async asyncData ({ $axios, params, error, store }) {
     try {
-      const [id, start_datetime] = params.id.split('_')
-      const event = await $axios.$get(`/event/${id}`)
-      event.start_datetime = start_datetime
-        ? Number(start_datetime)
-        : event.start_datetime
-      // const now = new Date()
-      // const events = await $axios.$get(
-      // `/event/${now.getMonth()}/${now.getFullYear()}`
-      // )
-      // store.commit('setEvents', events)
-      return { event, id: Number(id) }
+      const event = await $axios.$get(`/event/${params.id}`)
+      return { event, id: Number(params.id) }
     } catch (e) {
       error({ statusCode: 404, message: 'Event not found' })
     }
@@ -201,9 +192,6 @@ export default {
       if (!event) {
         return false
       }
-      if (event.recurrent) {
-        return `${event.id}_${event.start_datetime}`
-      }
       return event.id
     },
     prev () {
@@ -220,9 +208,6 @@ export default {
       if (!event) {
         return false
       }
-      if (event.recurrent) {
-        return `${event.id}_${event.start_datetime}`
-      }
       return event.id
     },
     imgPath () {

pages/event/eventAdmin.vue

@@ -1,11 +1,19 @@
 <template lang='pug'>
-el-menu.menu
+div
   el-divider {{$t('common.admin')}}
-  el-menu-item
-    div(@click.prevents='toggle') {{$t(event.is_visible?'common.hide':'common.confirm')}}
-  el-menu-item
-    div(@click.prevent='remove') {{$t('common.remove')}}
-  el-menu-item(@click='$router.replace(`/add/${event.id}`)') {{$t('common.edit')}}
+  el-menu.menu
+    el-menu-item
+      div(v-if='event.is_visible' @click='toggle(false)') <i class='el-icon-open'/> {{$t('common.hide')}}
+      div(v-else @click='toggle(false)') <i class='el-icon-turn-off'/> {{$t('common.confirm')}}
+    el-menu-item
+      div(@click='remove(false)') <i class='el-icon-delete'/> {{$t('common.remove')}}
+    el-menu-item(@click='$router.replace(`/add/${event.id}`)') <i class='el-icon-edit'/> {{$t('common.edit')}}
+    div(v-if='event.parentId')
+      el-divider  {{$t('event.recurrent')}}
+      el-menu-item(v-if='event.parent.is_visible' @click='toggle(true)') <i class='el-icon-video-pause'/> {{$t('common.pause')}}
+      el-menu-item(v-else @click='toggle(true)') <i class='el-icon-video-play'/> {{$t('common.start')}}
+      el-menu-item(@click='remove(true)') <i class='el-icon-delete'/> {{$t('common.remove')}}
+      el-menu-item(@click='$router.replace(`/add/${event.parentId}`)') <i class='el-icon-edit'/> {{$t('common.edit')}}
 </template>
 <script>
 import { MessageBox } from 'element-ui'
@@ -13,30 +21,39 @@ import { mapActions } from 'vuex'
 
 export default {
   name: 'EventAdmin',
-  props: ['event'],
+  props: {
+    event: {
+      type: Object,
+      default: () => ({})
+    }
+  },
   methods: {
     ...mapActions(['delEvent']),
-    async remove () {
+    async remove (parent = false) {
       try {
         await MessageBox.confirm(this.$t('event.remove_confirmation'), this.$t('common.confirm'), {
           confirmButtonText: this.$t('common.ok'),
           cancelButtonText: this.$t('common.cancel'),
-          type: 'error' })
-        await this.$axios.delete(`/user/event/${this.event.id}`)
-        this.delEvent(Number(this.event.id))
+          type: 'error'
+        })
+        const id = parent ? this.event.parentId : this.event.id
+        await this.$axios.delete(`/user/event/${id}`)
+        this.delEvent(Number(id))
         this.$router.replace('/')
       } catch (e) {
         console.error(e)
       }
     },
-    async toggle () {
+    async toggle (parent = false) {
+      const id = parent ? this.event.parentId : this.event.id
+      const is_visible = parent ? this.event.parent.is_visible : this.event.is_visible
+      const method = is_visible ? 'unconfirm' : 'confirm'
       try {
-        if (this.event.is_visible) {
-          await this.$axios.$get(`/event/unconfirm/${this.event.id}`)
-          this.event.is_visible = false
+        await this.$axios.$get(`/event/${method}/${id}`)
+        if (parent) {
+          this.event.parent.is_visible = !is_visible
         } else {
-          await this.$axios.$get(`/event/confirm/${this.event.id}`)
-          this.event.is_visible = true
+          this.event.is_visible = !is_visible
         }
       } catch (e) {
         console.error(e)