From 2ebaca1b8ff56963f72adba02750a4013332fc2e Mon Sep 17 00:00:00 2001
From: hybridherbst <felix.herbst@gmail.com>
Date: Tue, 9 Apr 2024 21:46:52 +0200
Subject: [PATCH] cleanup for loading items

---
 web/src/routes/+layout.svelte            | 24 +++++++++++++++++++++++-
 web/src/routes/[...path]/+page.server.ts |  2 +-
 web/src/routes/[...path]/+page.svelte    |  4 +---
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/web/src/routes/+layout.svelte b/web/src/routes/+layout.svelte
index e12f1a36..2062282a 100644
--- a/web/src/routes/+layout.svelte
+++ b/web/src/routes/+layout.svelte
@@ -1,2 +1,24 @@
 
-<slot></slot>
\ No newline at end of file
+<slot></slot>
+
+<div>
+    <p>Data from <a href="https://github.com/usd-wg/assets" target="_blank">usd-wg/assets</a></p>
+    <p>
+        Made by <a href="https://twitter.com/hybridherbst" target="_blank">@hybridherbst</a> 
+        from <a href="https://needle.tools" target="_blank">Needle</a> 
+        and <a href="https://prefrontalcortex.de" target="_blank">prefrontal cortex</a></p>
+</div>
+
+<style>
+
+div {
+    margin-top: 2em;
+}
+
+p {
+    padding: 0;
+    margin: 0;
+    color: rgba(0, 0, 0, 0.3);
+}
+
+</style>
\ No newline at end of file
diff --git a/web/src/routes/[...path]/+page.server.ts b/web/src/routes/[...path]/+page.server.ts
index a876e027..645ce11f 100644
--- a/web/src/routes/[...path]/+page.server.ts
+++ b/web/src/routes/[...path]/+page.server.ts
@@ -57,7 +57,7 @@ export async function load({ params }) {
     const path = params.path;
 
     const currentDir = dirs?.find(child => child.path === path || child.path === path + "/");
-    const currentItem = items?.find(item => item.path === path);
+    const currentItem = items?.find(item => item.path === path || item.path + "/" === path);
 
     // console.log("Loading page: " + path + ", currentDir: " + currentDir + ", currentItem: " + currentItem);
 
diff --git a/web/src/routes/[...path]/+page.svelte b/web/src/routes/[...path]/+page.svelte
index bc4c5359..a3ef0ad5 100644
--- a/web/src/routes/[...path]/+page.svelte
+++ b/web/src/routes/[...path]/+page.svelte
@@ -1,9 +1,7 @@
 <script lang="ts">
 import { base } from '$app/paths';
-import type { HierarchyEntry, HierarchyItem } from '$lib/files';
-import { onMount } from 'svelte';
 import GridItem from '../GridItem.svelte';
-  import Breadcrumbs from '../Breadcrumbs.svelte';
+import Breadcrumbs from '../Breadcrumbs.svelte';
 export let data;
 
 $: currentPath = data.currentItem ? data.currentItem.path : data.currentDir ? data.currentDir.path : "";