Merge pull request #41 from flo-bit/profile-stuff-2

fix stuff

src/lib/website/Account.svelte

···
 </script>
 
 {#if user.isLoggedIn && user.profile}
-	<div class="fixed bottom-4 right-4 z-20">
+	<div class="fixed right-4 bottom-4 z-20">
 		<Popover sideOffset={8} bind:open={settingsPopoverOpen} class="bg-base-100 dark:bg-base-900">
 			{#snippet child({ props })}
 				<button {...props}>

src/lib/website/EditableProfile.svelte

···
 			: '@5xl/wrapper:max-w-4xl @5xl/wrapper:px-12'
 	]}
 >
-	<div class={['absolute left-2 flex gap-2', profilePosition === 'side' ? 'top-12' : 'top-4']}>
-		<!-- Position toggle button (desktop only) -->
-		{#if !isMobile()}
-			<Button size="sm" type="button" onclick={toggleProfilePosition} variant="ghost">
-				{profilePosition === 'side' ? 'Move to top' : 'Move to side'}
-			</Button>
-		{/if}
-
+	<div class={['absolute left-2 z-20 flex gap-2', profilePosition === 'side' ? 'top-12' : 'top-4']}>
 		<Button
 			size="sm"
 			onclick={() => {
···
 		>
 			hide profile
 		</Button>
+
+		<!-- Position toggle button (desktop only) -->
+		{#if !isMobile()}
+			<Button size="sm" type="button" onclick={toggleProfilePosition} variant="ghost">
+				{profilePosition === 'side' ? 'Move to top' : 'Move to side'}
+			</Button>
+		{/if}
 	</div>
 
 	<div
···
 
 		<div class={['h-10.5 w-1', profilePosition === 'side' && '@5xl/wrapper:hidden']}></div>
 
-		<MadeWithBlento class="hidden @5xl/wrapper:block {profilePosition === 'side' && '@5xl/wrapper:block'}" />
+		<MadeWithBlento class="hidden {profilePosition === 'side' && '@5xl/wrapper:block'}" />
 	</div>
 </div>

src/lib/website/EditableWebsite.svelte

···
 		target.value = '';
 	}
 
-	$inspect(items);
+	// $inspect(items);
 </script>
 
 <svelte:body
···
 		</div>
 	{/if}
 
-	{#if getHideProfileSection(data)}
-		<Button
-			size="sm"
-			variant="ghost"
-			onclick={() => {
-				data.publication.preferences ??= {};
-				data.publication.preferences.hideProfileSection = false;
-				data = { ...data };
-			}}
-			class="absolute top-14 left-4 z-20"
-		>
-			show profile
-		</Button>
-	{/if}
 	{#if showingMobileView}
 		<div
 			class="bg-base-200 dark:bg-base-950 pointer-events-none fixed inset-0 -z-10 h-full w-full"
···
 
 		<div
 			class={[
-				'mx-auto max-w-lg',
+				'pointer-events-none relative mx-auto max-w-lg',
 				!getHideProfileSection(data) && getProfilePosition(data) === 'side'
 					? '@5xl/wrapper:grid @5xl/wrapper:max-w-7xl @5xl/wrapper:grid-cols-4'
 					: '@5xl/wrapper:max-w-4xl'
 			]}
 		>
-			<div></div>
+			{#if getHideProfileSection(data)}
+				<Button
+					size="sm"
+					variant="ghost"
+					onclick={() => {
+						data.publication.preferences ??= {};
+						data.publication.preferences.hideProfileSection = false;
+						data = { ...data };
+					}}
+					class="pointer-events-auto absolute top-2 left-4 z-20"
+				>
+					show profile
+				</Button>
+			{/if}
+			<div class="pointer-events-none"></div>
 			<!-- svelte-ignore a11y_no_static_element_interactions -->
 			<div
 				bind:this={container}
···
 					return true;
 				}}
 				class={[
-					'@container/grid relative col-span-3 rounded-4xl px-2 py-8 @5xl/wrapper:px-8',
+					'@container/grid pointer-events-auto relative col-span-3 rounded-4xl px-2 py-8 @5xl/wrapper:px-8',
 					imageDragOver && 'outline-accent-500 outline-3 -outline-offset-10 outline-dashed'
 				]}
 			>

src/lib/website/load.ts

···
 	page: string = 'self'
 ): Promise<WebsiteData> {
 	if (!handle) throw error(404);
+	if (handle === 'favicon.ico') throw error(404);
 
 	if (!forceUpdate) {
 		const cachedResult = await getCache(handle, page, cache);
···
 		if (cachedResult) return cachedResult;
 	}
 
-	if (handle === 'favicon.ico') throw error(404);
-
-	console.log('resolving', handle);
 	const did = await resolveHandle({ handle });
 
 	const cards = await listRecords({ did, collection: 'app.blento.card' }).catch(() => {
···
 		rkey: 'blento.self'
 	}).catch(() => {
 		console.error('error getting record for collection site.standard.publication');
-		return [] as Awaited<ReturnType<typeof listRecords>>;
+		return undefined;
 	});
 
 	const pages = await listRecords({ did, collection: 'app.blento.page' }).catch(() => {
···
 		cards: (cards.map((v) => {
 			return { ...v.value };
 		}) ?? []) as Item[],
-		publications: [mainPublication, ...pages],
+		publications: [mainPublication, ...pages].filter((v) => v),
 		additionalData,
 		profile,
 		updatedAt: Date.now(),
···
 	await cache?.put?.(handle, stringifiedResult);
 
 	const parsedResult = JSON.parse(stringifiedResult);
+
 	parsedResult.publication = (
 		parsedResult.publications as Awaited<ReturnType<typeof listRecords>>
 	).find((v) => parseUri(v.uri).rkey === parsedResult.page)?.value;

src/routes/[handle=handle]/[[page]]/+layout.server.ts

···
 
 	const cache = platform?.env?.USER_DATA_CACHE as unknown;
 
-	console.log(params.page);
-
 	return await loadData(params.handle as Handle, cache as UserCache, false, params.page);
 }