diff --git a/src/components/MessageBoardCard.vue b/src/components/MessageBoardCard.vue index 05fdae8..4bd1834 100644 --- a/src/components/MessageBoardCard.vue +++ b/src/components/MessageBoardCard.vue @@ -153,7 +153,7 @@
{{ props.boardMessage.member.name }} -

{{ formatDate(props.boardMessage.date, true) }}

+

{{ formatDate(props.boardMessage.date, "collapsed") }}

{{ props.boardMessage.title }}

@@ -225,6 +225,10 @@ color: var(--ion-text-color-step-400); } + ion-card .subheader p { + text-align: right; + } + ion-card .contents { display: flex; flex-direction: column; diff --git a/src/components/frontingEntry/FrontingEntryLabel.vue b/src/components/frontingEntry/FrontingEntryLabel.vue index c8782c0..1288c0e 100644 --- a/src/components/frontingEntry/FrontingEntryLabel.vue +++ b/src/components/frontingEntry/FrontingEntryLabel.vue @@ -20,7 +20,7 @@ let intervalRef: number; function format(startTime: Date, endTime?: Date){ - if(!endTime) return formatDate(startTime, true); + if(!endTime) return formatDate(startTime, "expanded"); const start = dayjs(startTime); const end = dayjs(endTime); @@ -28,7 +28,7 @@ if(end.valueOf() - start.endOf('day').valueOf() <= 0) // same day return formatDate(startTime) + "~" + formatDate(endTime); - return formatDate(startTime, true) + " - " + formatDate(endTime, true); + return formatDate(startTime, "expanded") + " - " + formatDate(endTime, "expanded"); } onMounted(() => { diff --git a/src/lib/util/misc.ts b/src/lib/util/misc.ts index 6ca9f1e..f729bed 100644 --- a/src/lib/util/misc.ts +++ b/src/lib/util/misc.ts @@ -93,9 +93,9 @@ export async function decompressGzip(data: Uint8Array) { return result; } -export function formatDate(date: Date, expanded?: boolean){ - if(expanded) - return dayjs(date).format(`LL, ${appConfig.locale.twelveHourClock ? 'hh:mm A' : "HH:mm"}`); +export function formatDate(date: Date, withDate?: "collapsed" | "expanded"){ + if(withDate) + return dayjs(date).format(`${withDate == "expanded" ? "LL" : "ll"}, ${appConfig.locale.twelveHourClock ? 'hh:mm A' : "HH:mm"}`); return dayjs(date).format(`${appConfig.locale.twelveHourClock ? 'hh:mm A' : "HH:mm"}`); } diff --git a/src/modals/FrontingEntryEdit.vue b/src/modals/FrontingEntryEdit.vue index 9c74d89..2944049 100644 --- a/src/modals/FrontingEntryEdit.vue +++ b/src/modals/FrontingEntryEdit.vue @@ -151,7 +151,7 @@

{{ $t("frontHistory:edit.startTime") }}

-

{{ formatDate(frontingEntry.startTime, true) }}

+

{{ formatDate(frontingEntry.startTime, "expanded") }}

{{ $t("frontHistory:edit.endTime") }}

-

{{ formatDate(frontingEntry.endTime, true) }}

+

{{ formatDate(frontingEntry.endTime, "expanded") }}

-

{{ $t("members:edit.dateCreated", { dateCreated: formatDate(member.dateCreated, true) }) }}

+

{{ $t("members:edit.dateCreated", { dateCreated: formatDate(member.dateCreated, "expanded") }) }}