STEMMechanics/Website
1
0
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects Releases 3 Wiki Activity

update common functions

Browse Source
This commit is contained in:
James Collins
2023-02-20 11:45:11 +10:00
parent 7de134683d
commit 54855e2651
4 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/js/views/WorkshopView.vue
View File

@@ -20,7 +20,9 @@
v-if=" v-if="
event.status == 'closed' || event.status == 'closed' ||
(event.status == 'open' && (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"> class="workshop-registration workshop-registration-closed">
Registration for this event has closed Registration for this event has closed

15
resources/js/views/dashboard/PostEdit.vue
View File

@@ -64,10 +64,7 @@ import { ref, reactive } from "vue";
import { api } from "../../helpers/api"; import { api } from "../../helpers/api";
import { FormObject, FormControl } from "../../helpers/form"; import { FormObject, FormControl } from "../../helpers/form";
import { And, Required, Min, DateTime } from "../../helpers/validate"; import { And, Required, Min, DateTime } from "../../helpers/validate";
import { import { SMDate } from "../../helpers/datetime";
timestampLocalToUtc,
timestampUtcToLocal,
} from "../../helpers/datetime";
import { useUserStore } from "../../store/UserStore"; import { useUserStore } from "../../store/UserStore";
import { useRoute } from "vue-router"; import { useRoute } from "vue-router";
import SMInput from "../../components/SMInput.vue"; import SMInput from "../../components/SMInput.vue";
@@ -149,7 +146,10 @@ const loadData = async () => {
form.user_id.value = res.data.post.user_id; form.user_id.value = res.data.post.user_id;
form.content.value = res.data.post.content; form.content.value = res.data.post.content;
form.publish_at.value = res.data.post.publish_at 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.content.value = res.data.post.content;
form.hero.value = res.data.post.hero; form.hero.value = res.data.post.hero;
@@ -166,7 +166,10 @@ const handleSubmit = async () => {
let data = { let data = {
title: form.title.value, title: form.title.value,
slug: form.slug.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, user_id: form.user_id.value,
content: form.content.value, content: form.content.value,
hero: form.hero.value, hero: form.hero.value,

18
resources/js/views/dashboard/PostList.vue
View File

@@ -124,16 +124,22 @@ const loadFromServer = async () => {
items.value.forEach((row) => { items.value.forEach((row) => {
if (row.created_at !== "undefined") { 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") { 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") { 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();
} }
}); });

7
resources/js/views/dashboard/UserList.vue
View File

@@ -36,7 +36,7 @@
import { ref, reactive, watch } from "vue"; import { ref, reactive, watch } from "vue";
import EasyDataTable from "vue3-easy-data-table"; import EasyDataTable from "vue3-easy-data-table";
import { api } from "../../helpers/api"; import { api } from "../../helpers/api";
import { relativeDate } from "../../helpers/datetime"; import { SMDate } from "../../helpers/datetime";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import DialogConfirm from "../../components/dialogs/SMDialogConfirm.vue"; import DialogConfirm from "../../components/dialogs/SMDialogConfirm.vue";
import { openDialog } from "vue3-promise-dialog"; import { openDialog } from "vue3-promise-dialog";
@@ -103,7 +103,10 @@ const loadFromServer = async () => {
items.value.forEach((row) => { items.value.forEach((row) => {
if (row.created_at !== "undefined") { 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();
} }
}); });