ctome
/
paimon-moe-fork
mirror of https://github.com/CrimsonTome/paimon-moe-fork.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix upcoming event on home

pull/1/head
Made Baruna 2022-01-04 13:27:12 +07:00
parent 6c20f3d026
commit 20682a653f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/routes/_index/event.svelte
View File

@ -36,12 +36,13 @@
if (start.isBefore(now) && end.isAfter(now)) { if (start.isBefore(now) && end.isAfter(now)) {
const diff = end.diff(now); const diff = end.diff(now);
const timeLeft = dayjs.duration(diff); const timeLeft = dayjs.duration(diff);
event.time = timeLeft.format(diff > 86400000 ? 'D[d] H[h]' : 'H[h]'); event.time = diff > 86400000 ? `${timeLeft.asDays().toFixed(0)}d ${timeLeft.hours()}h` : `${timeLeft.hours()}h`;
current = [...current, event]; current = [...current, event];
} else if (start.isAfter(now)) { } else if (start.isAfter(now)) {
const diff = start.diff(now); const diff = start.diff(now);
const timeUpcoming = dayjs.duration(diff); const timeUpcoming = dayjs.duration(diff);
event.time = timeUpcoming.format(diff > 86400000 ? 'D[d] H[h]' : 'H[h]'); event.time =
diff > 86400000 ? `${timeUpcoming.asDays().toFixed(0)}d ${timeUpcoming.hours()}h` : `${timeUpcoming.hours()}h`;
upcoming = [...upcoming, event]; upcoming = [...upcoming, event];
} }
} }
@ -56,6 +57,9 @@
checkEvent(event); checkEvent(event);
} }
} }
current.sort((a, b) => (dayjs(a.start).isAfter(dayjs(b.start)) ? 1 : -1));
upcoming.sort((a, b) => (dayjs(a.start).isAfter(dayjs(b.start)) ? 1 : -1));
} }
onMount(async () => { onMount(async () => {
@ -73,7 +77,6 @@
await tick(); await tick();
dispatch('done'); dispatch('done');
}); });
</script> </script>
<div class="bg-item rounded-xl p-4 flex flex-col"> <div class="bg-item rounded-xl p-4 flex flex-col">