@axium/storage 0.6.8 → 0.6.10

package/lib/Add.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { forMime } from '@axium/core/icons';
-	import { FormDialog, Icon, Popover, Upload } from '@axium/server/components';
+	import { FormDialog, Icon, Popover, Upload } from '@axium/client/components';
 	import { uploadItem } from '@axium/storage/client';
 	import type { StorageItemMetadata } from '@axium/storage/common';
 
@@ -16,7 +16,7 @@
 
 {#snippet _item(type: string, text: string, includeContent: boolean = false)}
 	<span
-		class="icon-text add-menu-item"
+		class="menu-item"
 		onclick={() => {
 			createType = type;
 			createIncludesContent = includeContent;
@@ -33,12 +33,10 @@
 		<button class="icon-text"><Icon i="plus" />Add</button>
 	{/snippet}
 
-	<div class="add-menu">
-		<span class="icon-text add-menu-item" onclick={() => uploadDialog.showModal()}><Icon i="upload" />Upload</span>
-		{@render _item('inode/directory', 'New Folder')}
-		{@render _item('text/plain', 'Plain Text')}
-		{@render _item('text/x-uri', 'URL', true)}
-	</div>
+	<span class="menu-item" onclick={() => uploadDialog.showModal()}><Icon i="upload" />Upload</span>
+	{@render _item('inode/directory', 'New Folder')}
+	{@render _item('text/plain', 'Plain Text')}
+	{@render _item('text/x-uri', 'URL', true)}
 </Popover>
 
 <FormDialog
@@ -76,17 +74,7 @@
 </FormDialog>
 
 <style>
-	.add-menu {
-		display: flex;
-		flex-direction: column;
-	}
-
-	.add-menu-item {
-		border-radius: 0.5em;
-		padding: 0.25em 0.25em;
-	}
-
-	.add-menu-item:hover {
+	.menu-item:hover {
 		cursor: pointer;
 		background-color: #4455;
 	}

package/lib/List.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { formatBytes } from '@axium/core/format';
 	import { forMime as iconForMime } from '@axium/core/icons';
-	import { FormDialog, Icon } from '@axium/server/components';
+	import { FormDialog, Icon } from '@axium/client/components';
 	import { getDirectoryMetadata, updateItemMetadata } from '@axium/storage/client';
 	import type { StorageItemMetadata } from '@axium/storage/common';
 	import '../styles/list.css';

package/lib/SidebarItem.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
 	import * as icon from '@axium/core/icons';
-	import { ClipboardCopy, FormDialog, Icon } from '@axium/server/components';
+	import { ClipboardCopy, FormDialog, Icon } from '@axium/client/components';
 	import { deleteItem, updateItemMetadata } from '@axium/storage/client';
 	import type { StorageItemMetadata } from '@axium/storage/common';
 	import { debug, getDirectory, selection, toggle, toggleRange } from '@axium/storage/sidebar';

package/lib/Usage.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { formatBytes } from '@axium/core/format';
-	import { NumberBar } from '@axium/server/components';
+	import { NumberBar } from '@axium/client/components';
 	import { getUserStorageInfo } from '@axium/storage/client';
 	import type { UserStorageInfo } from '@axium/storage/common';
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/storage",
-	"version": "0.6.8",
+	"version": "0.6.10",
 	"author": "James Prevett <axium@jamespre.dev> (https://jamespre.dev)",
 	"description": "User file storage for Axium",
 	"funding": {
@@ -38,9 +38,9 @@
 		"build": "tsc"
 	},
 	"peerDependencies": {
-		"@axium/client": ">=0.1.0",
+		"@axium/client": ">=0.2.0",
 		"@axium/core": ">=0.5.4",
-		"@axium/server": ">=0.22.0",
+		"@axium/server": ">=0.22.5",
 		"@sveltejs/kit": "^2.27.3",
 		"utilium": "^2.3.8"
 	},

package/routes/files/+layout.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { Icon } from '@axium/server/components';
+	import { Icon } from '@axium/client/components';
 	import { StorageUsage } from '@axium/storage/components';
 	import { capitalize } from 'utilium';
 

package/routes/files/+layout.ts

@@ -1,11 +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';
 
 export const ssr = false;
 
-export async function load({ url, route }: LayoutLoadEvent) {
-	const session = await getCurrentSession().catch(() => null);
+export async function load({ url, route, parent }: LayoutLoadEvent) {
+	let { session }: { session?: Session | null } = await parent();
+
+	session ||= await getCurrentSession().catch(() => null);
 
 	if (!session) redirect(307, '/login?after=' + url.pathname);
 

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

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { Icon } from '@axium/server/components';
+	import { Icon } from '@axium/client/components';
 	import { StorageAdd, StorageList } from '@axium/storage/components';
 	import type { PageProps } from './$types';
 	import { updateItemMetadata } from '@axium/storage/client';

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

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { formatBytes } from '@axium/core/format';
 	import { forMime as iconForMime } from '@axium/core/icons';
-	import { Icon } from '@axium/server/components';
+	import { Icon } from '@axium/client/components';
 	import '@axium/storage/styles/list';
 	import type { PageProps } from './$types';
 

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

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { formatBytes } from '@axium/core/format';
 	import { forMime as iconForMime } from '@axium/core/icons';
-	import { FormDialog, Icon } from '@axium/server/components';
+	import { FormDialog, Icon } from '@axium/client/components';
 	import { deleteItem, updateItemMetadata } from '@axium/storage/client';
 	import '@axium/storage/styles/list';
 	import type { PageProps } from './$types';

package/routes/files/usage/+page.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { formatBytes } from '@axium/core/format';
 	import { forMime } from '@axium/core/icons';
-	import { FormDialog, Icon, NumberBar } from '@axium/server/components';
+	import { FormDialog, Icon, NumberBar } from '@axium/client/components';
 	import { deleteItem, updateItemMetadata } from '@axium/storage/client';
 	import type { StorageItemUpdate } from '@axium/storage/common';
 	import { StorageList } from '@axium/storage/components';