cfp/nextup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: apply requested changes

Browse Source
This commit is contained in:
Jannik
2025-10-09 10:36:40 +02:00
parent 7679f138b6
commit 6208305464
8 changed files with 51 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -22,9 +22,9 @@ COPY --from=install /temp/dev/node_modules node_modules
COPY . .
# [optional] tests & build
ENV NODE_ENV=production
RUN bun test
RUN bun run build
#ENV NODE_ENV=production
#RUN bun test
#RUN bun run build
# copy production dependencies and source code into final image
FROM base AS release

4
web/Dockerfile
View File

@ -1,7 +1,7 @@
FROM node:22-alpine AS builder
WORKDIR /app
COPY package*.json ./
RUN npm ci
RUN npm i
COPY . .
RUN npm run build
RUN npm prune --production
@ -13,4 +13,4 @@ COPY --from=builder /app/node_modules node_modules/
COPY package.json .
EXPOSE 3000
ENV NODE_ENV=production
CMD [ "node", "build" ]
CMD [ "node", "build" ]

2
web/src/app.html
View File

@ -1,5 +1,5 @@
<!doctype html>
<html lang="en" class="dark">
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />

4
web/src/lib/ws.svelte.ts
View File

@ -21,7 +21,7 @@ eventTarget.addEventListener("send", (e) => {
});
export function connectWS() {
ws = new WebSocket(`ws://localhost:3000`);
ws = new WebSocket(`ws://${location.hostname}:3000`);
console.log("Connecting to WebSocket...");
ws.addEventListener("open", () => {
@ -54,4 +54,4 @@ export function connectWS() {
console.log("Received message:", data);
eventTarget.dispatchEvent(new CustomEvent(data.type, { detail: data }));
});
}
}

3
web/src/routes/(manage)/+layout.svelte
View File

@ -11,6 +11,7 @@
import ConnectionLostDialog from '$lib/ConnectionLostDialog.svelte';
import { onMount } from 'svelte';
import { browser } from '$app/environment';
import { sidebarState } from "$lib/sidebar.svelte.ts";
let { children } = $props();
@ -40,7 +41,7 @@
<Toaster position="bottom-right" theme="dark" richColors={true} />
<Sidebar.Provider>
<Sidebar.Provider bind:open={sidebarState.open}>
<AppSidebar />
<Sidebar.Inset>
<!-- <header class="flex h-16 shrink-0 items-center gap-2 px-4"> -->

7
web/src/routes/(manage)/log/+page.svelte
View File

@ -3,6 +3,7 @@
import { eventTarget } from "$lib/ws.svelte";
import { TicketCheckIcon, TicketIcon, TicketSlashIcon, TicketXIcon } from "@lucide/svelte";
import { onMount } from "svelte";
import { sidebarState } from "$lib/sidebar.svelte.ts";
type LogAction = "called" | "completed" | "no-show";
const colors = {
@ -40,7 +41,9 @@
})
</script>
<h1 class="text-2xl font-bold">Log</h1>
<h1 class="text-2xl font-bold" onclick={() => {
sidebarState.open = !sidebarState.open;
}}>Log</h1>
<Table.Root>
<Table.Header>
@ -65,4 +68,4 @@
</Table.Row>
{/each}
</Table.Body>
</Table.Root>
</Table.Root>

7
web/src/routes/(manage)/room/[slug]/+page.svelte
View File

@ -4,6 +4,7 @@
import * as InputOTP from "$lib/components/ui/input-otp";
import { eventTarget } from "$lib/ws.svelte";
import { toast } from "svelte-sonner";
import { sidebarState } from "$lib/sidebar.svelte.ts";
const slug = $derived(page.params.slug);
@ -82,7 +83,9 @@
})
</script>
<h1 class="text-2xl font-bold">Raum {slug}</h1>
<h1 class="text-2xl font-bold" onclick={() => {
sidebarState.open = !sidebarState.open;
}}>Raum {slug}</h1>
<div style="display: flex; align-items: center; gap: 1rem;">
<InputOTP.Root maxlength={3} pattern={TICKET_INPUT_REGEX} bind:value={nextTicket} onkeypress={(e) => {
isInvalid = false;
@ -132,4 +135,4 @@
#ticket {
display: flex;
}
</style>
</style>

39
web/src/routes/display/+page.svelte
View File

@ -23,21 +23,42 @@
eventTarget.dispatchEvent(new CustomEvent("send", { detail: { type: "display" } }));
})
const ENTRIES = {A: 1, B: 2, C: 1, D: 2, E: 1};
</script>
<div class="p-4 flex flex-col items-center gap-4 text-3xl">
<h1 class="text-6xl font-bold">Aufruf</h1>
<div class="p-4 flex items-center justify-center gap-4 text-5xl">
<!-- <h1 class="text-6xl font-bold">Aufruf</h1> -->
{#if connected}
<table>
<tbody>
<tr>
<th class="pr-4 font-bold">Ticket</th>
<th class="pr-4 font-bold">Wartenr.</th>
<th class="pr-4 font-bold">-&gt;</th>
<th class="pr-4 font-bold">Raum</th>
</tr>
{#each calls as call (call.num)}
{#each calls.filter(c => c.num.startsWith("A")) as call (call.num)}
<tr>
<td class="call">{call.num}</td>
<td class="call">{call.ticket.status === "no-show" ? "Empfang " + (call.num.startsWith("A") ? "1" : "2") : call.ticket.room}</td>
<td class="call">-&gt;</td>
<td class="call">{call.ticket.status === "no-show" ? "Empfang " + ENTRIES[call.num[0]] : call.ticket.room}</td>
</tr>
{/each}
</tbody>
</table>
<table>
<tbody>
<tr>
<th class="pr-4 font-bold">Wartenr.</th>
<th class="pr-4 font-bold">-&gt;</th>
<th class="pr-4 font-bold">Raum</th>
</tr>
{#each calls.filter(c => c.num.startsWith("B")) as call (call.num)}
<tr>
<td class="call">{call.num}</td>
<td class="call">-&gt;</td>
<td class="call">{call.ticket.status === "no-show" ? "Empfang " + ENTRIES[call.num[0]] : call.ticket.room}</td>
</tr>
{/each}
</tbody>
@ -47,13 +68,15 @@
<style>
.call {
animation: flash 1s ease-in-out;
animation: flash 5s ease-in-out;
}
@keyframes flash {
0% { opacity: 0; }
20% { opacity: 1; }
40% { opacity: 0; }
10% { opacity: 1; }
20% { opacity: 0; }
40% { opacity: 1; }
60% { opacity: 0; }
100% { opacity: 1; }
}