diff --git a/resources/js/views/WorkshopView.vue b/resources/js/views/WorkshopView.vue index 1c832df..a93c82f 100644 --- a/resources/js/views/WorkshopView.vue +++ b/resources/js/views/WorkshopView.vue @@ -20,7 +20,9 @@ v-if=" event.status == 'closed' || (event.status == 'open' && - new SMDate(event.end_at, {format: 'ymd'}).isBefore() + new SMDate(event.end_at, { + format: 'ymd', + }).isBefore()) " class="workshop-registration workshop-registration-closed"> Registration for this event has closed diff --git a/resources/js/views/dashboard/PostEdit.vue b/resources/js/views/dashboard/PostEdit.vue index 846de8e..2e8fc4e 100644 --- a/resources/js/views/dashboard/PostEdit.vue +++ b/resources/js/views/dashboard/PostEdit.vue @@ -64,10 +64,7 @@ import { ref, reactive } from "vue"; import { api } from "../../helpers/api"; import { FormObject, FormControl } from "../../helpers/form"; import { And, Required, Min, DateTime } from "../../helpers/validate"; -import { - timestampLocalToUtc, - timestampUtcToLocal, -} from "../../helpers/datetime"; +import { SMDate } from "../../helpers/datetime"; import { useUserStore } from "../../store/UserStore"; import { useRoute } from "vue-router"; import SMInput from "../../components/SMInput.vue"; @@ -149,7 +146,10 @@ const loadData = async () => { form.user_id.value = res.data.post.user_id; form.content.value = res.data.post.content; form.publish_at.value = res.data.post.publish_at - ? timestampUtcToLocal(res.data.post.publish_at) + ? new SMDate(res.data.post.publish_at, { + format: "yMd", + utc: true, + }) : ""; form.content.value = res.data.post.content; form.hero.value = res.data.post.hero; @@ -166,7 +166,10 @@ const handleSubmit = async () => { let data = { title: form.title.value, slug: form.slug.value, - publish_at: timestampLocalToUtc(form.publish_at.value), + publish_at: new SMDate(form.publish_at.value).format( + "yyyy/MM/dd HH:mm:ss", + { utc: true } + ), user_id: form.user_id.value, content: form.content.value, hero: form.hero.value, diff --git a/resources/js/views/dashboard/PostList.vue b/resources/js/views/dashboard/PostList.vue index 5910601..85cd97c 100644 --- a/resources/js/views/dashboard/PostList.vue +++ b/resources/js/views/dashboard/PostList.vue @@ -124,16 +124,22 @@ const loadFromServer = async () => { items.value.forEach((row) => { if (row.created_at !== "undefined") { - row.created_at = new SMDate(row.created_at, {format: 'yMd', utc: true}).relative(); - ); + row.created_at = new SMDate(row.created_at, { + format: "yMd", + utc: true, + }).relative(); } if (row.updated_at !== "undefined") { - row.updated_at = new SMDate(row.updated_at, {format: 'yMd', utc: true}).relative(); - ); + row.updated_at = new SMDate(row.updated_at, { + format: "yMd", + utc: true, + }).relative(); } if (row.publish_at !== "undefined") { - row.publish_at = new SMDate(row.publish_at, {format: 'yMd', utc: true}).relative(); - ); + row.publish_at = new SMDate(row.publish_at, { + format: "yMd", + utc: true, + }).relative(); } }); diff --git a/resources/js/views/dashboard/UserList.vue b/resources/js/views/dashboard/UserList.vue index fc99589..d32561f 100644 --- a/resources/js/views/dashboard/UserList.vue +++ b/resources/js/views/dashboard/UserList.vue @@ -36,7 +36,7 @@ import { ref, reactive, watch } from "vue"; import EasyDataTable from "vue3-easy-data-table"; import { api } from "../../helpers/api"; -import { relativeDate } from "../../helpers/datetime"; +import { SMDate } from "../../helpers/datetime"; import { useRouter } from "vue-router"; import DialogConfirm from "../../components/dialogs/SMDialogConfirm.vue"; import { openDialog } from "vue3-promise-dialog"; @@ -103,7 +103,10 @@ const loadFromServer = async () => { items.value.forEach((row) => { if (row.created_at !== "undefined") { - row.created_at = relativeDate(row.created_at); + row.created_at = new SMDate(row.created_at, { + format: "yMd", + utc: true, + }).relative(); } });