New useContent composable to store global navigation state. Fixes for Markdown and Canvas

server/api/file/content/[path].get.ts

@@ -50,7 +50,7 @@ export default defineEventHandler(async (e) => {
             content.content = convertFromStorableLinks(content.content);
         }
 
-        return { content: content.content };
+        return content.content;
     }
     
     setResponseStatus(e, 404);

server/api/file/overview.get.ts

@@ -0,0 +1,41 @@
+import useDatabase from '~/composables/useDatabase';
+import { getTableColumns } from 'drizzle-orm';
+import { explorerContentTable } from '~/db/schema';
+
+export default defineEventHandler(async (e) => {
+    const { user } = await getUserSession(e);
+
+    const db = useDatabase();
+    const { content: _, ...columns } = getTableColumns(explorerContentTable);
+    const content = db.select(columns).from(explorerContentTable).all();
+
+    content.sort((a, b) => {
+        return a.path.split('/').length - b.path.split('/').length;
+    });
+
+    if(content.length > 0)
+    {
+        for(const idx in content)
+        {
+            const item = content[idx];
+            if(!!item.private && (user?.id ?? -1) !== item.owner)
+            {
+                delete content[idx];
+                continue;
+            }
+            
+            const parent = item.path.includes('/') ? item.path.substring(0, item.path.lastIndexOf('/')) : undefined;
+
+            if(parent && !content.find(e => e && e.path === parent))
+            {
+                delete content[idx];
+                continue;
+            }
+        }
+
+        return content.filter(e => !!e);
+    }
+    
+    setResponseStatus(e, 404);
+    return;
+});

server/api/project.post.ts

@@ -1,9 +1,11 @@
 import { hasPermissions } from "#shared/auth.util";
 import useDatabase from '~/composables/useDatabase';
 import { explorerContentTable } from '~/db/schema';
-import { project, type ProjectItem } from '~/schemas/project';
+import { project } from '~/schemas/project';
 import { parsePath } from "#shared/general.utils";
 import { eq, getTableColumns, sql } from "drizzle-orm";
+import type { ExploreContent } from "~/types/content";
+import type { TreeItemEditable } from "~/pages/explore/edit/index.vue";
 
 export default defineEventHandler(async (e) => {
     const { user } = await getUserSession(e);
@@ -20,7 +22,7 @@ export default defineEventHandler(async (e) => {
         throw body.error;
     }
 
-    const items = buildOrder(body.data.items) as Array<ProjectItem & { match?: number }>;
+    const items = buildOrder(body.data) as Array<TreeItemEditable & { match?: number }>;
 
     const db = useDatabase();
     const { ...cols } = getTableColumns(explorerContentTable);
@@ -78,6 +80,19 @@ export default defineEventHandler(async (e) => {
                 tx.delete(explorerContentTable).where(eq(explorerContentTable.path, full[i].path)).run();
         }
     });
+
+    return items.map(e => ({ 
+        path: e.path,
+        owner: e.owner,
+        title: e.title,
+        type: e.type,
+        content: e.content,
+        navigable: e.navigable,
+        private: e.private,
+        order: e.order,
+        visit: e.visit,
+        timestamp: e.timestamp,
+     })) as ExploreContent[];
 });
 
 function buildOrder(items: ProjectItem[]): ProjectItem[]

server/api/users/[id]/change-password.post.ts

@@ -45,7 +45,6 @@ export default defineEventHandler(async (e) => {
             throw body.error;
         
         const db = useDatabase();
-        console.log(body.data.oldPassword, await Bun.password.hash(body.data.oldPassword));
         const check = db.select({ hash: usersTable.hash }).from(usersTable).where(eq(usersTable.id, session.user.id)).get();
 
         if(!check || !check.hash)