From e7c2fd557137c82a26290f3244d6f37c77552569 Mon Sep 17 00:00:00 2001
From: XShine555 <xshine555@gmail.com>
Date: Thu, 24 Sep 2026 13:57:02 +0200
Subject: [PATCH] Move the app shell and its data loading into the (app) route
 group layout

---
 web-player/src/routes/(app)/+error.svelte     |  16 +++
 .../src/routes/{ => (app)}/+layout.server.ts  |   4 +-
 web-player/src/routes/(app)/+layout.svelte    | 104 +++++++++++++++++
 web-player/src/routes/+error.svelte           |  18 ++-
 web-player/src/routes/+layout.svelte          | 105 +-----------------
 web-player/src/routes/auth/+page.svelte       |   4 +-
 6 files changed, 133 insertions(+), 118 deletions(-)
 create mode 100644 web-player/src/routes/(app)/+error.svelte
 rename web-player/src/routes/{ => (app)}/+layout.server.ts (94%)
 create mode 100644 web-player/src/routes/(app)/+layout.svelte

diff --git a/web-player/src/routes/(app)/+error.svelte b/web-player/src/routes/(app)/+error.svelte
new file mode 100644
index 0000000..80a31da
--- /dev/null
+++ b/web-player/src/routes/(app)/+error.svelte
@@ -0,0 +1,16 @@
+<script lang="ts">
+	import { page } from '$app/state';
+	import Button from '$lib/components/ui/primitives/Button.svelte';
+</script>
+
+<div class="animate-enter mx-auto my-[14vh] max-w-prose-sm text-center">
+	<h1 class="mb-2.5 text-display-3 text-fg">
+		{page.status === 404 ? 'Página no encontrada' : 'No se pudo cargar tu música'}
+	</h1>
+	<p class="mb-6.5 text-body text-fg-2">
+		{page.status === 404
+			? 'Comprueba el enlace o vuelve al inicio.'
+			: 'Algo salió mal al cargar la página. Inténtalo de nuevo en unos momentos.'}
+	</p>
+	<Button href="/" variant="secondary">Volver</Button>
+</div>
diff --git a/web-player/src/routes/+layout.server.ts b/web-player/src/routes/(app)/+layout.server.ts
similarity index 94%
rename from web-player/src/routes/+layout.server.ts
rename to web-player/src/routes/(app)/+layout.server.ts
index dcb70b2..4b61d6a 100644
--- a/web-player/src/routes/+layout.server.ts
+++ b/web-player/src/routes/(app)/+layout.server.ts
@@ -5,8 +5,6 @@ import { toLikedTrack, toPlaylist, toTrack } from '$lib/server/mappers';
 import { authConfig } from '$lib/server/config';
 import { LIKED_TRACKS_PAGE_SIZE, PLAYLIST_PICKER_PAGE_SIZE } from '$lib/config';
 
-const PUBLIC_PATHS = new Set(['/auth']);
-
 function orFallback<T>(load: Promise<T>, fallback: T): Promise<T> {
 	return load.catch(() => fallback);
 }
@@ -14,7 +12,7 @@ function orFallback<T>(load: Promise<T>, fallback: T): Promise<T> {
 export const load: LayoutServerLoad = async ({ locals, url, fetch }) => {
 	const allowAnonymousListening = await getAllowAnonymousListening(fetch);
 
-	if (!locals.user && !allowAnonymousListening && !PUBLIC_PATHS.has(url.pathname)) {
+	if (!locals.user && !allowAnonymousListening) {
 		loginRedirect(url);
 	}
 
diff --git a/web-player/src/routes/(app)/+layout.svelte b/web-player/src/routes/(app)/+layout.svelte
new file mode 100644
index 0000000..84e8f6c
--- /dev/null
+++ b/web-player/src/routes/(app)/+layout.svelte
@@ -0,0 +1,104 @@
+<script lang="ts">
+	import type { Snippet } from 'svelte';
+	import type { LayoutData } from './$types';
+	import PlayerDock from '$lib/components/player/PlayerDock.svelte';
+	import Queue from '$lib/components/player/Queue.svelte';
+	import Sidebar from '$lib/components/layout/Sidebar.svelte';
+	import TopBar from '$lib/components/layout/TopBar.svelte';
+	import MobileHeader from '$lib/components/layout/MobileHeader.svelte';
+	import Modal from '$lib/components/ui/overlay/Modal.svelte';
+	import PlaylistForm from '$lib/components/ui/forms/PlaylistForm.svelte';
+	import { player } from '$lib/player/player.svelte';
+	import { queuePanel } from '$lib/state/panels.svelte';
+	import { liked } from '$lib/player/liked.svelte';
+	import { createPlaylistModal } from '$lib/state/panels.svelte';
+	import { trackNavigation } from '$lib/state/history.svelte';
+	import { restoreScroll } from '$lib/state/scroll';
+	import { page } from '$app/state';
+
+	interface Props {
+		children: Snippet;
+		data: LayoutData;
+	}
+
+	let { children, data }: Props = $props();
+
+	let scroller = $state<HTMLElement>();
+
+	trackNavigation();
+	restoreScroll(() => scroller);
+
+	$effect(() => {
+		if (data.likedTracks?.length) liked.hydrate(data.likedTracks);
+	});
+
+	$effect(() => {
+		if (data.lastPlayedTrack) player.hydrate(data.lastPlayedTrack);
+	});
+
+	let queueAutoOpened = false;
+	$effect(() => {
+		if (!player.playing || queueAutoOpened) return;
+		queueAutoOpened = true;
+		queuePanel.show();
+	});
+
+	function isTypingTarget(target: EventTarget | null): boolean {
+		if (!(target instanceof HTMLElement)) return false;
+		if (target.isContentEditable) return true;
+		return ['INPUT', 'TEXTAREA', 'SELECT', 'BUTTON', 'A'].includes(target.tagName);
+	}
+
+	function onWindowKeydown(event: KeyboardEvent) {
+		if (event.code !== 'Space' || isTypingTarget(event.target)) return;
+		event.preventDefault();
+		player.toggle();
+	}
+</script>
+
+<svelte:window onkeydown={onWindowKeydown} />
+
+<div class="relative flex h-dvh overflow-hidden text-fg antialiased">
+	<div class="app-backdrop"></div>
+	<div class="app-vignette"></div>
+
+	<Sidebar
+		user={data.user}
+		playlists={data.userPlaylists ?? []}
+		playlistCount={data.userPlaylistsTotal ?? 0}
+	/>
+
+	<div class="flex min-w-0 flex-1 flex-col">
+		<div class="flex min-h-0 flex-1">
+			<div bind:this={scroller} class="flex min-w-0 flex-1 app-scroll flex-col">
+				<MobileHeader user={data.user} accountUrl={data.accountUrl} />
+				<TopBar user={data.user} accountUrl={data.accountUrl} />
+				<main class="flex-1">
+					{#key page.url.pathname}
+						<div class="animate-fade">{@render children()}</div>
+					{/key}
+				</main>
+			</div>
+
+			<Queue />
+		</div>
+
+		<PlayerDock user={data.user} />
+	</div>
+
+	<Modal
+		open={createPlaylistModal.open}
+		onClose={() => createPlaylistModal.close()}
+		title="Crear nueva playlist"
+	>
+		<PlaylistForm
+			action="/playlists?/create"
+			formMessage={page.form?.message}
+			submitLabel="Crear"
+			submittingLabel="Creando…"
+			helperText="Podrás añadir canciones más tarde."
+			onCancel={() => createPlaylistModal.close()}
+			onSuccess={() => createPlaylistModal.close()}
+		/>
+	</Modal>
+</div>
diff --git a/web-player/src/routes/+error.svelte b/web-player/src/routes/+error.svelte
index 80a31da..b068217 100644
--- a/web-player/src/routes/+error.svelte
+++ b/web-player/src/routes/+error.svelte
@@ -1,16 +1,12 @@
 <script lang="ts">
 	import { page } from '$app/state';
-	import Button from '$lib/components/ui/primitives/Button.svelte';
 </script>
 
-<div class="animate-enter mx-auto my-[14vh] max-w-prose-sm text-center">
-	<h1 class="mb-2.5 text-display-3 text-fg">
-		{page.status === 404 ? 'Página no encontrada' : 'No se pudo cargar tu música'}
-	</h1>
-	<p class="mb-6.5 text-body text-fg-2">
-		{page.status === 404
-			? 'Comprueba el enlace o vuelve al inicio.'
-			: 'Algo salió mal al cargar la página. Inténtalo de nuevo en unos momentos.'}
-	</p>
-	<Button href="/" variant="secondary">Volver</Button>
+<div class="min-h-screen bg-bg text-fg antialiased">
+	<div class="mx-auto my-[14vh] max-w-prose-sm text-center">
+		<h1 class="mb-2.5 text-display-3">
+			{page.status === 404 ? 'Página no encontrada' : 'Algo salió mal'}
+		</h1>
+		<a href="/" class="text-body text-fg-2 underline">Volver al inicio</a>
+	</div>
 </div>
diff --git a/web-player/src/routes/+layout.svelte b/web-player/src/routes/+layout.svelte
index 18fc28b..9f8ea49 100644
--- a/web-player/src/routes/+layout.svelte
+++ b/web-player/src/routes/+layout.svelte
@@ -1,134 +1,33 @@
 <script lang="ts">
 	import type { Snippet } from 'svelte';
-	import type { LayoutData } from './$types';
 	import '@fontsource-variable/sora/index.css';
 	import '@fontsource-variable/plus-jakarta-sans/index.css';
 	import '$lib/theme/theme.css';
 	import './layout.css';
 	import favicon from '$lib/assets/favicon.svg';
-	import PlayerDock from '$lib/components/player/PlayerDock.svelte';
-	import Queue from '$lib/components/player/Queue.svelte';
-	import Sidebar from '$lib/components/layout/Sidebar.svelte';
-	import TopBar from '$lib/components/layout/TopBar.svelte';
-	import MobileHeader from '$lib/components/layout/MobileHeader.svelte';
-	import Modal from '$lib/components/ui/overlay/Modal.svelte';
 	import DialogHost from '$lib/components/ui/overlay/DialogHost.svelte';
-	import PlaylistForm from '$lib/components/ui/forms/PlaylistForm.svelte';
-	import { player } from '$lib/player/player.svelte';
-	import { queuePanel } from '$lib/state/panels.svelte';
-	import { liked } from '$lib/player/liked.svelte';
-	import { createPlaylistModal } from '$lib/state/panels.svelte';
 	import { ACCENT_HUE } from '$lib/theme/color';
 	import { buildThemeTokens, tokensToCss } from '$lib/theme/tokens';
 	import { accent, animateThemeHue } from '$lib/theme/accent.svelte';
 	import { themeMode } from '$lib/theme/mode.svelte';
-	import { trackNavigation } from '$lib/state/history.svelte';
-	import { restoreScroll } from '$lib/state/scroll';
-	import { page } from '$app/state';
 
 	interface Props {
 		children: Snippet;
-		data: LayoutData;
 	}
 
-	let { children, data }: Props = $props();
-
-	let scroller = $state<HTMLElement>();
-
-	trackNavigation();
-	restoreScroll(() => scroller);
-
-	$effect(() => {
-		if (data.likedTracks?.length) liked.hydrate(data.likedTracks);
-	});
-
-	$effect(() => {
-		if (data.lastPlayedTrack) player.hydrate(data.lastPlayedTrack);
-	});
-
-	const isAuthPage = $derived(page.url.pathname === '/auth');
+	let { children }: Props = $props();
 
 	const initialThemeCss = `:root{${tokensToCss(buildThemeTokens(ACCENT_HUE, 'dark'))}}:root[data-theme='light']{${tokensToCss(buildThemeTokens(ACCENT_HUE, 'light'))}}`;
 
-	let queueAutoOpened = false;
-	$effect(() => {
-		if (!player.playing || queueAutoOpened) return;
-		queueAutoOpened = true;
-		queuePanel.show();
-	});
-
-	function isTypingTarget(target: EventTarget | null): boolean {
-		if (!(target instanceof HTMLElement)) return false;
-		if (target.isContentEditable) return true;
-		return ['INPUT', 'TEXTAREA', 'SELECT', 'BUTTON', 'A'].includes(target.tagName);
-	}
-
-	function onWindowKeydown(event: KeyboardEvent) {
-		if (event.code !== 'Space' || isTypingTarget(event.target)) return;
-		event.preventDefault();
-		player.toggle();
-	}
-
 	$effect(() => animateThemeHue(accent.hue, themeMode.current));
 </script>
 
-<svelte:window onkeydown={onWindowKeydown} />
-
 <svelte:head>
 	<link rel="icon" href={favicon} />
 	<!-- eslint-disable-next-line svelte/no-at-html-tags -- CSS generado a partir de números, sin entrada de usuario -->
 	{@html `<style>${initialThemeCss}</style>`}
 </svelte:head>
 
-{#if isAuthPage || (!data.user && !data.allowAnonymousListening)}
-	<div class="min-h-screen bg-bg text-fg antialiased">
-		{@render children()}
-	</div>
-{:else}
-	<div class="relative flex h-dvh overflow-hidden text-fg antialiased">
-		<div class="app-backdrop"></div>
-		<div class="app-vignette"></div>
-
-		<Sidebar
-			user={data.user}
-			playlists={data.userPlaylists ?? []}
-			playlistCount={data.userPlaylistsTotal ?? 0}
-		/>
-
-		<div class="flex min-w-0 flex-1 flex-col">
-			<div class="flex min-h-0 flex-1">
-				<div bind:this={scroller} class="flex min-w-0 flex-1 app-scroll flex-col">
-					<MobileHeader user={data.user} accountUrl={data.accountUrl} />
-					<TopBar user={data.user} accountUrl={data.accountUrl} />
-					<main class="flex-1">
-						{#key page.url.pathname}
-							<div class="animate-fade">{@render children()}</div>
-						{/key}
-					</main>
-				</div>
-
-				<Queue />
-			</div>
-
-			<PlayerDock user={data.user} />
-		</div>
-
-		<Modal
-			open={createPlaylistModal.open}
-			onClose={() => createPlaylistModal.close()}
-			title="Crear nueva playlist"
-		>
-			<PlaylistForm
-				action="/playlists?/create"
-				formMessage={page.form?.message}
-				submitLabel="Crear"
-				submittingLabel="Creando…"
-				helperText="Podrás añadir canciones más tarde."
-				onCancel={() => createPlaylistModal.close()}
-				onSuccess={() => createPlaylistModal.close()}
-			/>
-		</Modal>
-	</div>
-{/if}
+{@render children()}
 
 <DialogHost />
diff --git a/web-player/src/routes/auth/+page.svelte b/web-player/src/routes/auth/+page.svelte
index 26f0586..c3a1074 100644
--- a/web-player/src/routes/auth/+page.svelte
+++ b/web-player/src/routes/auth/+page.svelte
@@ -12,7 +12,9 @@
 	<meta name="description" content="Inicia sesión o crea una cuenta en Musify." />
 </svelte:head>
 
-<div class="relative grid min-h-screen place-items-center overflow-hidden bg-bg px-6 text-fg">
+<div
+	class="relative grid min-h-screen place-items-center overflow-hidden bg-bg px-6 text-fg antialiased"
+>
 	<div class="pointer-events-none absolute inset-0" style="background:var(--mf-ambient)"></div>
 
 	<div class="relative flex w-full max-w-4xl flex-col items-center gap-12 text-center">