Feature/deprecate category id combo

app/(loggedInRoutes)/admin/checklist/[uuid]/page.tsx

@@ -58,7 +58,7 @@ export default async function AdminChecklistPage(props: AdminChecklistPageProps)
       : [];
 
   const metadata = {
-    id: checklist.id,
+    id: checklist.slug,
     uuid: checklist.uuid,
     title: checklist.title,
     category: checklist.category || "Uncategorized",

app/(loggedInRoutes)/admin/note/[uuid]/page.tsx

@@ -59,7 +59,7 @@ export default async function AdminNotePage(props: AdminNotePageProps) {
       : [];
 
   const metadata = {
-    id: note.id,
+    id: note.slug,
     uuid: note.uuid,
     title: note.title,
     category: note.category || "Uncategorized",

app/(loggedInRoutes)/checklist/[...categoryPath]/page.tsx → app/(loggedInRoutes)/checklist/[user]/[uuid]/page.tsx

@@ -13,44 +13,42 @@ import { sanitizeUserForClient } from "@/app/_utils/user-sanitize-utils";
 
 interface ChecklistPageProps {
   params: Promise<{
-    categoryPath: string[];
+    user: string;
+    uuid: string;
   }>;
+  searchParams: Promise<{ [key: string]: string | string[] | undefined }>;
 }
 
 export const dynamic = "force-dynamic";
 
 export async function generateMetadata(props: ChecklistPageProps): Promise<Metadata> {
   const params = await props.params;
-  const { categoryPath } = params;
-  const id = decodeId(categoryPath[categoryPath.length - 1]);
-  const encodedCategoryPath = categoryPath.slice(0, -1).join("/");
-  const category =
-    categoryPath.length === 1
-      ? "Uncategorized"
-      : decodeCategoryPath(encodedCategoryPath);
-
-  return getMedatadaTitle(Modes.CHECKLISTS, id, category);
+  const { user, uuid } = params;
+  return getMedatadaTitle(Modes.CHECKLISTS, decodeId(uuid), decodeURIComponent(user));
 }
 
 export default async function ChecklistPage(props: ChecklistPageProps) {
   const params = await props.params;
-  const { categoryPath } = params;
-  const id = decodeId(categoryPath[categoryPath.length - 1]);
-  const encodedCategoryPath = categoryPath.slice(0, -1).join("/");
-  const category =
-    categoryPath.length === 1
-      ? "Uncategorized"
-      : decodeCategoryPath(encodedCategoryPath);
+  const searchParams = await props.searchParams;
+  const { user: ownerUsername, uuid } = params;
+  const id = decodeId(uuid);
+  const owner = decodeURIComponent(ownerUsername);
+
+  const categoryFallbackRaw = searchParams?.c;
+  const categoryFallback = Array.isArray(categoryFallbackRaw) 
+    ? categoryFallbackRaw[0] 
+    : categoryFallbackRaw;
+
   const userRecord = await getCurrentUser();
   const username = userRecord?.username || "";
   const hasContentAccess = await canAccessAllContent();
 
   const categoriesResult = await getCategories(Modes.CHECKLISTS);
 
-  let checklist = await getListById(id, username, category);
+  let checklist = await getListById(id, owner, username, false, categoryFallback);
 
   if (!checklist && hasContentAccess) {
-    checklist = await getListById(id, undefined, category);
+    checklist = await getListById(id, owner, undefined, false, categoryFallback);
   }
 
   if (!checklist) {
@@ -63,7 +61,7 @@ export default async function ChecklistPage(props: ChecklistPageProps) {
       : [];
 
   const metadata = {
-    id: checklist.id,
+    id: checklist.slug,
     uuid: checklist.uuid,
     title: checklist.title,
     category: checklist.category || "Uncategorized",

app/(loggedInRoutes)/note/[...categoryPath]/page.tsx → app/(loggedInRoutes)/note/[user]/[uuid]/page.tsx

@@ -18,34 +18,32 @@ import { MetadataProvider } from "@/app/_providers/MetadataProvider";
 
 interface NotePageProps {
   params: Promise<{
-    categoryPath: string[];
+    user: string;
+    uuid: string;
   }>;
+  searchParams: Promise<{ [key: string]: string | string[] | undefined }>;
 }
 
 export const dynamic = "force-dynamic";
 
 export async function generateMetadata(props: NotePageProps): Promise<Metadata> {
   const params = await props.params;
-  const { categoryPath } = params;
-  const id = decodeId(categoryPath[categoryPath.length - 1]);
-  const encodedCategoryPath = categoryPath.slice(0, -1).join("/");
-  const category =
-    categoryPath.length === 1
-      ? "Uncategorized"
-      : decodeCategoryPath(encodedCategoryPath);
-
-  return getMedatadaTitle(Modes.NOTES, id, category);
+  const { user, uuid } = params;
+  return getMedatadaTitle(Modes.NOTES, decodeId(uuid), decodeURIComponent(user));
 }
 
 export default async function NotePage(props: NotePageProps) {
   const params = await props.params;
-  const { categoryPath } = params;
-  const id = decodeId(categoryPath[categoryPath.length - 1]);
-  const encodedCategoryPath = categoryPath.slice(0, -1).join("/");
-  const category =
-    categoryPath.length === 1
-      ? "Uncategorized"
-      : decodeCategoryPath(encodedCategoryPath);
+  const searchParams = await props.searchParams;
+  const { user: ownerUsername, uuid } = params;
+  const id = decodeId(uuid);
+  const owner = decodeURIComponent(ownerUsername);
+
+  const categoryFallbackRaw = searchParams?.c;
+  const categoryFallback = Array.isArray(categoryFallbackRaw) 
+    ? categoryFallbackRaw[0] 
+    : categoryFallbackRaw;
+
   const user = await getCurrentUser();
   const username = user?.username || "";
   const hasContentAccess = await canAccessAllContent();
@@ -54,10 +52,10 @@ export default async function NotePage(props: NotePageProps) {
 
   const categoriesResult = await getCategories(Modes.NOTES);
 
-  let note = await getNoteById(id, category, username);
+  let note = await getNoteById(id, owner, username, false, categoryFallback);
 
   if (!note && hasContentAccess) {
-    note = await getNoteById(id, category);
+    note = await getNoteById(id, owner, undefined, false, categoryFallback);
   }
 
   if (!note) {
@@ -70,7 +68,7 @@ export default async function NotePage(props: NotePageProps) {
       : [];
 
   const metadata = {
-    id: note.id,
+    id: note.slug,
     uuid: note.uuid,
     title: note.title,
     category: note.category || "Uncategorized",

app/(loggedInRoutes)/page.tsx

@@ -52,8 +52,8 @@ export default async function HomePage() {
     <HomeClient
       initialLists={lists as Checklist[]}
       initialCategories={categories}
-      initialDocs={notes as Note[]}
-      initialDocsCategories={notesCategories}
+      initialNotes={notes as Note[]}
+      initialNotesCategories={notesCategories}
       user={userForClient}
     />
   );

app/(loggedInRoutes)/settings/admin/content/page.tsx

@@ -7,21 +7,21 @@ import { canAccessAllContent } from "@/app/_server/actions/users";
 import { notFound } from "next/navigation";
 
 export default async function AdminContentPage() {
-    const hasAccess = await canAccessAllContent();
+  const hasAccess = await canAccessAllContent();
 
-    if (!hasAccess) {
-        return notFound();
-    }
+  if (!hasAccess) {
+    return notFound();
+  }
 
-    const [usersData, listsData, docsData] = await Promise.all([
-        readJsonFile(USERS_FILE),
-        getAllLists(),
-        getAllNotes(),
-    ]);
+  const [usersData, listsData, docsData] = await Promise.all([
+    readJsonFile(USERS_FILE),
+    getAllLists(),
+    getAllNotes(),
+  ]);
 
-    const users = usersData;
-    const allLists = listsData.success && listsData.data ? listsData.data : [];
-    const allDocs = docsData.success && docsData.data ? docsData.data : [];
+  const users = usersData;
+  const allLists = listsData.success && listsData.data ? listsData.data : [];
+  const allNotes = docsData.success && docsData.data ? docsData.data : [];
 
-    return <AdminContent allLists={allLists} allDocs={allDocs} users={users} />;
+  return <AdminContent allLists={allLists} allNotes={allNotes} users={users} />;
 }

app/(loggedInRoutes)/settings/admin/overview/page.tsx

@@ -7,28 +7,28 @@ import { getAllLists } from "@/app/_server/actions/checklist";
 import { getAllNotes } from "@/app/_server/actions/note";
 
 export default async function AdminOverviewPage() {
-    const admin = await isAdmin();
+  const admin = await isAdmin();
 
-    if (!admin) {
-        return notFound();
-    }
+  if (!admin) {
+    return notFound();
+  }
 
-    const [usersData, listsData, docsData] = await Promise.all([
-        readJsonFile(USERS_FILE),
-        getAllLists(),
-        getAllNotes(),
-    ]);
+  const [usersData, listsData, docsData] = await Promise.all([
+    readJsonFile(USERS_FILE),
+    getAllLists(),
+    getAllNotes(),
+  ]);
 
-    const users = usersData;
-    const allLists = listsData.success && listsData.data ? listsData.data : [];
-    const allDocs = docsData.success && docsData.data ? docsData.data : [];
+  const users = usersData;
+  const allLists = listsData.success && listsData.data ? listsData.data : [];
+  const allNotes = docsData.success && docsData.data ? docsData.data : [];
 
-    const stats = {
-        totalUsers: users.length,
-        totalChecklists: allLists.length,
-        totalNotes: allDocs.length,
-        adminUsers: users.filter((u: any) => u.isAdmin).length,
-    };
+  const stats = {
+    totalUsers: users.length,
+    totalChecklists: allLists.length,
+    totalNotes: allNotes.length,
+    adminUsers: users.filter((u: any) => u.isAdmin).length,
+  };
 
-    return <AdminOverview stats={stats} />;
+  return <AdminOverview stats={stats} />;
 }

app/(loggedInRoutes)/settings/admin/users/page.tsx

@@ -7,29 +7,29 @@ import { isAdmin, getUsername } from "@/app/_server/actions/users";
 import { notFound } from "next/navigation";
 
 export default async function AdminUsersPage() {
-    const admin = await isAdmin();
-    const username = await getUsername();
+  const admin = await isAdmin();
+  const username = await getUsername();
 
-    if (!admin) {
-        return notFound();
-    }
+  if (!admin) {
+    return notFound();
+  }
 
-    const [usersData, listsData, docsData] = await Promise.all([
-        readJsonFile(USERS_FILE),
-        getAllLists(),
-        getAllNotes(),
-    ]);
+  const [usersData, listsData, docsData] = await Promise.all([
+    readJsonFile(USERS_FILE),
+    getAllLists(),
+    getAllNotes(),
+  ]);
 
-    const users = usersData;
-    const allLists = listsData.success && listsData.data ? listsData.data : [];
-    const allDocs = docsData.success && docsData.data ? docsData.data : [];
+  const users = usersData;
+  const allLists = listsData.success && listsData.data ? listsData.data : [];
+  const allNotes = docsData.success && docsData.data ? docsData.data : [];
 
-    return (
-        <AdminUsersClient
-            initialUsers={users}
-            initialLists={allLists}
-            initialDocs={allDocs}
-            username={username}
-        />
-    );
+  return (
+    <AdminUsersClient
+      initialUsers={users}
+      initialLists={allLists}
+      initialNotes={allNotes}
+      username={username}
+    />
+  );
 }