merge: Resolved merge conflicts

Co-Authored-By: Tadios Temesgen <tt2022@ic.ac.uk>
This commit is contained in:
Caspar Jojo Asaam
2025-06-12 16:21:20 +01:00
12 changed files with 397 additions and 21 deletions

View File

@@ -0,0 +1,40 @@
<script lang="ts">
import type { Table } from "$lib";
import { formatTime } from "$lib";
interface Props {
hours: Table<"study_space_hours">[];
}
// Destructure hours with a safe default to avoid undefined
const { hours }: Props = $props();
// Determine today's index (0 = Sunday, 6 = Saturday)
const todayIndex = new Date().getDay();
// Find the hours entry matching today
const todayHours = hours.find((h) => h.day_of_week === todayIndex);
// Compute the display string for opening times
let openingDisplay = $state("");
if (todayHours) {
openingDisplay = todayHours.is_24_7
? "Open 24/7"
: `${formatTime(todayHours.opens_at)} - ${formatTime(todayHours.closes_at)}`;
} else {
openingDisplay = "Closed";
}
</script>
<div class="opening-times">
<strong>Today's Opening Times:</strong>
{openingDisplay}
</div>
<style>
.opening-times {
margin-top: 0.5rem;
font-size: 0.9rem;
color: #eaffeb;
}
</style>

View File

@@ -1,15 +1,17 @@
<script lang="ts">
import CompulsoryTags from "./CompulsoryTags.svelte";
import OpeningTimes from "./OpeningTimes.svelte";
import type { Table } from "$lib";
interface Props {
space: Table<"study_spaces">;
hours: Table<"study_space_hours">[];
alt: string;
imgSrc: string;
href?: string;
}
const { space, alt, imgSrc, href }: Props = $props();
const { space, hours, alt, imgSrc, href }: Props = $props();
</script>
<a class="card" {href}>
@@ -24,6 +26,7 @@
{/each}
</div>
{/if}
<div class="openingTimesContainer"><OpeningTimes {hours} /></div>
</div>
</a>