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

move date/month to computed

Browse Source
This commit is contained in:
James Collins
2023-02-27 23:18:58 +10:00
parent 91a4a2c2a4
commit 62a3180e53
1 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
resources/js/components/SMPanel.vue
View File

@@ -3,10 +3,10 @@
<div v-if="image" class="sm-panel-image" :style="styleObject">
<div v-if="dateInImage && date" class="sm-panel-image-date">
<div class="sm-panel-image-date-day">
{{ new SMDate(date, { format: "yMd" }).format("dd") }}
{{ computedDay }}
</div>
<div class="sm-panel-image-date-month">
{{ new SMDate(date, { format: "yMd" }).format("MMM") }}
{{ computedMonth }}
</div>
</div>
<ion-icon
@@ -145,30 +145,30 @@ let imageUrl = ref("");
const computedDate = computed(() => {
let str = "";
// if (props.date.length > 0) {
// if (
// (props.endDate.length > 0 &&
// props.date.substring(0, props.date.indexOf(" ")) !=
// props.endDate.substring(0, props.endDate.indexOf(" "))) ||
// props.showTime == false
// ) {
// str = new SMDate(props.date, { format: "yMd" }).format(
// "dd/MM/yyyy"
// );
// if (props.endDate.length > 0) {
// str =
// str +
// " - " +
// new SMDate(props.endDate, { format: "yMd" }).format(
// "dd/MM/yyyy"
// );
// }
// } else {
// str = new SMDate(props.endDate, { format: "yMd" }).format(
// "dd/MM/yyyy @ h:mm aa"
// );
// }
// }
if (props.date.length > 0) {
if (
(props.endDate.length > 0 &&
props.date.substring(0, props.date.indexOf(" ")) !=
props.endDate.substring(0, props.endDate.indexOf(" "))) ||
props.showTime == false
) {
str = new SMDate(props.date, { format: "yMd" }).format(
"dd/MM/yyyy"
);
if (props.endDate.length > 0) {
str =
str +
" - " +
new SMDate(props.endDate, { format: "yMd" }).format(
"dd/MM/yyyy"
);
}
} else {
str = new SMDate(props.endDate, { format: "yMd" }).format(
"dd/MM/yyyy @ h:mm aa"
);
}
}
return str;
});
@@ -180,6 +180,14 @@ const computedContent = computed(() => {
return excerpt(replaceHtmlEntites(stripHtmlTags(props.content)), 200);
});
const computedDay = computed(() => {
return new SMDate(props.date, { format: "yMd" }).format("dd");
});
const computedMonth = computed(() => {
return new SMDate(props.date, { format: "yMd" }).format("MMM");
});
onMounted(async () => {
if (props.image && props.image.length > 0 && isUUID(props.image)) {
api.get({ url: "/media/{medium}", params: { medium: props.image } })