@axium/storage 0.7.4 → 0.7.5

package/lib/SidebarItem.svelte

@@ -1,10 +1,11 @@
 <script lang="ts">
-	import { FormDialog, Icon } from '@axium/client/components';
+	import { page } from '$app/state';
 	import { copy } from '@axium/client/clipboard';
+	import { FormDialog, Icon } from '@axium/client/components';
 	import * as icon from '@axium/core/icons';
 	import { deleteItem, updateItemMetadata } from '@axium/storage/client';
 	import type { StorageItemMetadata } from '@axium/storage/common';
-	import { getDirectory, preferences, selection, toggle, toggleRange } from '@axium/storage/sidebar';
+	import { getDirectory, selection, toggle, toggleRange } from '@axium/storage/sidebar';
 	import SidebarItem from './SidebarItem.svelte';
 
 	let {
@@ -105,7 +106,7 @@
 	{#if item.type == 'cas_item'}
 		{@render action('download', 'download', 'Download')}
 	{/if}
-	{#if preferences.debug}
+	{#if page.data.session?.user.preferences.debug}
 		<div class="action icon-text" onclick={() => copy('text/plain', item.id)}>
 			<Icon i="copy" --size="14px" />
 			Copy ID

package/lib/Usage.svelte

@@ -4,21 +4,25 @@
 	import { getUserStorageInfo } from '@axium/storage/client';
 	import type { UserStorageInfo } from '@axium/storage/common';
 
-	const { userId, info }: { userId: string; info?: UserStorageInfo } = $props();
+	const { userId, info }: { userId?: string; info?: UserStorageInfo } = $props();
 </script>
 
-{#await info || getUserStorageInfo(userId) then info}
-	<p>
-		<a href="/files/usage">
-			<NumberBar
-				max={info.limits.user_size * 1_000_000}
-				value={info.usage.bytes}
-				text="Using {formatBytes(info.usage.bytes)} of {formatBytes(info.limits.user_size * 1_000_000)}"
-				--fill="#345"
-			/>
-		</a>
-	</p>
-{:catch error}
-	<p>Couldn't load your uploads.</p>
-	<p>{error.message}</p>
-{/await}
+{#if !info && !userId}
+	<p>Log in to see storage usage.</p>
+{:else}
+	{#await info || getUserStorageInfo(userId!) then info}
+		<p>
+			<a href="/files/usage">
+				<NumberBar
+					max={info.limits.user_size * 1_000_000}
+					value={info.usage.bytes}
+					text="Using {formatBytes(info.usage.bytes)} of {formatBytes(info.limits.user_size * 1_000_000)}"
+					--fill="#345"
+				/>
+			</a>
+		</p>
+	{:catch error}
+		<p>Couldn't load your uploads.</p>
+		<p>{error.message}</p>
+	{/await}
+{/if}

package/lib/sidebar.svelte.ts

@@ -1,9 +1,6 @@
-import type { StorageItemMetadata } from '@axium/storage/common';
 import { getDirectoryMetadata } from '@axium/storage/client';
+import type { StorageItemMetadata } from '@axium/storage/common';
 import { SvelteSet } from 'svelte/reactivity';
-import { preferenceDefaults, type Preferences } from '@axium/core';
-
-export const preferences = $state<Preferences>(preferenceDefaults);
 
 export const selection = $state(new SvelteSet());
 

package/lib/tsconfig.json

@@ -4,7 +4,8 @@
 		"rootDir": "..",
 		"noEmit": true,
 		"module": "preserve",
-		"moduleResolution": "Bundler"
+		"moduleResolution": "Bundler",
+		"types": ["@sveltejs/kit"]
 	},
 	"include": ["**/*.svelte", "**/*.ts"],
 	"exclude": [],

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/storage",
-	"version": "0.7.4",
+	"version": "0.7.5",
 	"author": "James Prevett <axium@jamespre.dev> (https://jamespre.dev)",
 	"description": "User file storage for Axium",
 	"funding": {

package/routes/files/+layout.svelte

@@ -13,7 +13,7 @@
 		{/each}
 
 		<div class="usage">
-			<StorageUsage userId={data.session.userId} />
+			<StorageUsage userId={data.session?.userId} />
 		</div>
 	</div>
 

package/routes/files/+layout.ts

@@ -1,17 +1,14 @@
 import { getCurrentSession } from '@axium/client/user';
-import { redirect } from '@sveltejs/kit';
-import type { LayoutLoadEvent, LayoutRouteId } from './$types';
 import type { Session } from '@axium/core';
+import type { LayoutRouteId } from './$types';
 
 export const ssr = false;
 
-export async function load({ url, route, parent }: LayoutLoadEvent) {
+export async function load({ url, route, parent }) {
 	let { session }: { session?: Session | null } = await parent();
 
 	session ||= await getCurrentSession().catch(() => null);
 
-	if (!session) redirect(307, '/login?after=' + url.pathname);
-
 	const tabs = [
 		{ name: 'files', href: '/files', icon: 'folders', active: route.id.endsWith('/files/[id]') || route.id.endsWith('/files') },
 		{ name: 'trash', href: '/files/trash', icon: 'trash', active: route.id.endsWith('/files/trash') },

package/routes/files/+page.ts

@@ -1,12 +1,12 @@
 import { getUserStorageRoot } from '@axium/storage/client';
-import type { LoadEvent } from '@sveltejs/kit';
+import { redirect } from '@sveltejs/kit';
 
 export const ssr = false;
 
-export async function load({ parent }: LoadEvent) {
+export async function load({ parent }) {
 	const { session } = await parent();
 
-	return {
-		items: await getUserStorageRoot(session.userId),
-	};
+	if (!session) redirect(307, '/login?after=/files');
+
+	return { items: await getUserStorageRoot(session.userId) };
 }

package/routes/files/[id]/+page.ts

@@ -4,7 +4,7 @@ import type { StorageItemMetadata } from '@axium/storage/common';
 
 export const ssr = false;
 
-export async function load({ parent, params }: PageLoadEvent) {
+export async function load({ params }: PageLoadEvent) {
 	const item = await getItemMetadata(params.id);
 
 	let items: StorageItemMetadata[] | undefined;

package/routes/files/shared/+page.ts

@@ -1,12 +1,12 @@
-import type { LoadEvent } from '@sveltejs/kit';
 import { itemsSharedWith } from '@axium/storage/client';
+import { redirect } from '@sveltejs/kit';
 
 export const ssr = false;
 
-export async function load({ parent }: LoadEvent) {
+export async function load({ parent }) {
 	const { session } = await parent();
 
-	return {
-		items: await itemsSharedWith(session.userId),
-	};
+	if (!session) redirect(307, '/login?after=/files/shared');
+
+	return { items: await itemsSharedWith(session.userId) };
 }

package/routes/files/trash/+page.ts

@@ -1,12 +1,12 @@
 import { getUserTrash } from '@axium/storage/client';
-import type { LoadEvent } from '@sveltejs/kit';
+import { redirect } from '@sveltejs/kit';
 
 export const ssr = false;
 
-export async function load({ parent }: LoadEvent) {
+export async function load({ parent }) {
 	const { session } = await parent();
 
-	return {
-		items: await getUserTrash(session.userId),
-	};
+	if (!session) redirect(307, '/login?after=/files/trash');
+
+	return { items: await getUserTrash(session.userId) };
 }