fix(web): layout nesting (#1881)

Co-authored-by: Alex Tran <alex.tran1502@gmail.com>

web/src/routes/(user)/sharing/+page.server.ts

@@ -0,0 +1,25 @@
+export const prerender = false;
+
+import { redirect } from '@sveltejs/kit';
+import type { PageServerLoad } from './$types';
+
+export const load = (async ({ parent, locals: { api } }) => {
+	try {
+		const { user } = await parent();
+		if (!user) {
+			throw redirect(302, '/auth/login');
+		}
+
+		const { data: sharedAlbums } = await api.albumApi.getAllAlbums(true);
+
+		return {
+			user: user,
+			sharedAlbums,
+			meta: {
+				title: 'Albums'
+			}
+		};
+	} catch (e) {
+		throw redirect(302, '/auth/login');
+	}
+}) satisfies PageServerLoad;

web/src/routes/(user)/sharing/+page.svelte

@@ -0,0 +1,106 @@
+<script lang="ts">
+	import NavigationBar from '$lib/components/shared-components/navigation-bar/navigation-bar.svelte';
+	import SideBar from '$lib/components/shared-components/side-bar/side-bar.svelte';
+	import PlusBoxOutline from 'svelte-material-icons/PlusBoxOutline.svelte';
+	import Link from 'svelte-material-icons/Link.svelte';
+
+	import SharedAlbumListTile from '$lib/components/sharing-page/shared-album-list-tile.svelte';
+	import { goto } from '$app/navigation';
+	import { api } from '@api';
+	import type { PageData } from './$types';
+	import {
+		notificationController,
+		NotificationType
+	} from '$lib/components/shared-components/notification/notification';
+	import empty2Url from '$lib/assets/empty-2.svg';
+
+	export let data: PageData;
+
+	const createSharedAlbum = async () => {
+		try {
+			const { data: newAlbum } = await api.albumApi.createAlbum({
+				albumName: 'Untitled'
+			});
+
+			goto('/albums/' + newAlbum.id);
+		} catch (e) {
+			notificationController.show({
+				message: 'Error creating album, check console for more details',
+				type: NotificationType.Error
+			});
+
+			console.log('Error [createAlbum] ', e);
+		}
+	};
+</script>
+
+<section>
+	<NavigationBar user={data.user} shouldShowUploadButton={false} />
+</section>
+
+<section
+	class="grid grid-cols-[250px_auto] relative pt-[72px] h-screen bg-immich-bg dark:bg-immich-dark-bg"
+>
+	<SideBar />
+
+	<section class="overflow-y-auto relative">
+		<section
+			id="album-content"
+			class="relative pt-8 pl-4 mb-12 bg-immich-bg dark:bg-immich-dark-bg"
+		>
+			<!-- Main Section -->
+			<div class="px-4 flex justify-between place-items-center dark:text-immich-dark-fg">
+				<div>
+					<p class="font-medium">Sharing</p>
+				</div>
+
+				<div class="flex">
+					<button
+						on:click={createSharedAlbum}
+						class="flex place-items-center gap-1 text-sm hover:bg-immich-primary/5 p-2 rounded-lg font-medium hover:text-gray-700 dark:hover:bg-immich-dark-primary/25 dark:text-immich-dark-fg"
+					>
+						<span>
+							<PlusBoxOutline size="18" />
+						</span>
+						<p>Create shared album</p>
+					</button>
+
+					<button
+						on:click={() => goto('/sharing/sharedlinks')}
+						class="flex place-items-center gap-1 text-sm hover:bg-immich-primary/5 p-2 rounded-lg font-medium hover:text-gray-700 dark:hover:bg-immich-dark-primary/25 dark:text-immich-dark-fg"
+					>
+						<span>
+							<Link size="18" />
+						</span>
+						<p>Shared links</p>
+					</button>
+				</div>
+			</div>
+
+			<div class="my-4">
+				<hr class="dark:border-immich-dark-gray" />
+			</div>
+
+			<!-- Share Album List -->
+			<div class="w-full flex flex-col place-items-center">
+				{#each data.sharedAlbums as album}
+					<a data-sveltekit-preload-data="hover" href={`albums/${album.id}`}>
+						<SharedAlbumListTile {album} user={data.user} />
+					</a>
+				{/each}
+			</div>
+
+			<!-- Empty List -->
+			{#if data.sharedAlbums.length === 0}
+				<div
+					class="border dark:border-immich-dark-gray p-5 w-[50%] m-auto mt-10 bg-gray-50 dark:bg-immich-dark-gray rounded-3xl flex flex-col place-content-center place-items-center dark:text-immich-dark-fg"
+				>
+					<img src={empty2Url} alt="Empty shared album" width="500" draggable="false" />
+					<p class="text-center text-immich-text-gray-500">
+						Create a shared album to share photos and videos with people in your network
+					</p>
+				</div>
+			{/if}
+		</section>
+	</section>
+</section>

web/src/routes/(user)/sharing/sharedlinks/+page.server.ts

@@ -0,0 +1,21 @@
+import { redirect } from '@sveltejs/kit';
+export const prerender = false;
+import type { PageServerLoad } from './$types';
+
+export const load: PageServerLoad = async ({ parent }) => {
+	try {
+		const { user } = await parent();
+		if (!user) {
+			throw redirect(302, '/auth/login');
+		}
+
+		return {
+			user,
+			meta: {
+				title: 'Shared Links'
+			}
+		};
+	} catch (e) {
+		throw redirect(302, '/auth/login');
+	}
+};

web/src/routes/(user)/sharing/sharedlinks/+page.svelte

@@ -0,0 +1,105 @@
+<script lang="ts">
+	import ControlAppBar from '$lib/components/shared-components/control-app-bar.svelte';
+	import ArrowLeft from 'svelte-material-icons/ArrowLeft.svelte';
+
+	import { api, SharedLinkResponseDto } from '@api';
+	import { goto } from '$app/navigation';
+	import SharedLinkCard from '$lib/components/sharedlinks-page/shared-link-card.svelte';
+	import {
+		notificationController,
+		NotificationType
+	} from '$lib/components/shared-components/notification/notification';
+	import { onMount } from 'svelte';
+	import CreateSharedLinkModal from '$lib/components/shared-components/create-share-link-modal/create-shared-link-modal.svelte';
+
+	let sharedLinks: SharedLinkResponseDto[] = [];
+	let showEditForm = false;
+	let editSharedLink: SharedLinkResponseDto;
+
+	onMount(async () => {
+		sharedLinks = await getSharedLinks();
+	});
+
+	const getSharedLinks = async () => {
+		const { data: sharedLinks } = await api.shareApi.getAllSharedLinks();
+
+		return sharedLinks;
+	};
+
+	const handleDeleteLink = async (linkId: string) => {
+		if (window.confirm('Do you want to delete the shared link? ')) {
+			try {
+				await api.shareApi.removeSharedLink(linkId);
+				notificationController.show({
+					message: 'Shared link deleted',
+					type: NotificationType.Info
+				});
+
+				sharedLinks = await getSharedLinks();
+			} catch (e) {
+				console.error(e);
+				notificationController.show({
+					message: 'Failed to delete shared link',
+					type: NotificationType.Error
+				});
+			}
+		}
+	};
+
+	const handleEditLink = async (id: string) => {
+		const { data } = await api.shareApi.getSharedLinkById(id);
+		editSharedLink = data;
+		showEditForm = true;
+	};
+
+	const handleEditDone = async () => {
+		sharedLinks = await getSharedLinks();
+		showEditForm = false;
+	};
+
+	const handleCopy = async (key: string) => {
+		const link = `${window.location.origin}/share/${key}`;
+		await navigator.clipboard.writeText(link);
+		notificationController.show({
+			message: 'Link copied to clipboard',
+			type: NotificationType.Info
+		});
+	};
+</script>
+
+<ControlAppBar backIcon={ArrowLeft} on:close-button-click={() => goto('/sharing')}>
+	<svelte:fragment slot="leading">Shared links</svelte:fragment>
+</ControlAppBar>
+
+<section class="flex flex-col  pb-[120px] mt-[120px]">
+	<div class="w-[50%] m-auto mb-4 dark:text-immich-gray">
+		<p>Manage shared links</p>
+	</div>
+	{#if sharedLinks.length === 0}
+		<div
+			class="w-[50%] m-auto bg-gray-100 flex place-items-center place-content-center rounded-lg p-12"
+		>
+			<p>You don't have any shared links</p>
+		</div>
+	{:else}
+		<div class="flex flex-col w-[50%] m-auto">
+			{#each sharedLinks as link (link.id)}
+				<SharedLinkCard
+					{link}
+					on:delete={() => handleDeleteLink(link.id)}
+					on:edit={() => handleEditLink(link.id)}
+					on:copy={() => handleCopy(link.key)}
+				/>
+			{/each}
+		</div>
+	{/if}
+</section>
+
+{#if showEditForm}
+	<CreateSharedLinkModal
+		editingLink={editSharedLink}
+		shareType={editSharedLink.type}
+		album={editSharedLink.album}
+		on:close={handleEditDone}
+	/>
+{/if}