Merge pull request #277 from fccview/develop

Lift off!

Author: fccview

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "i18n-ally.localesPaths": [
+        "app/_translations"
+    ],
+    "i18n-ally.keystyle": "nested"
+}

README.md

@@ -258,7 +258,7 @@ I would like to thank the following members for raising issues and help test/deb
         <a href="https://github.com/Isotop7"><img width="100" height="100" src="https://avatars.githubusercontent.com/u/8883656?v=4&size=100"><br />Isotop7</a>
       </td>
       <td align="center" valign="top" width="20%">
-        <a href="https://github.com/bluegumcity"><img width="100" height="100" src="https://avatars.githubusercontent.com/u/142639670?v=4&size=100"><br />bluegumcity</a>
+        <a href="https://github.com/gavdgavd"><img width="100" height="100" src="https://avatars.githubusercontent.com/u/7753641?v=4&size=100"><br />gavdgavd</a>
       </td>
     </tr>
     <tr>
@@ -313,6 +313,9 @@ I would like to thank the following members for raising issues and help test/deb
       </td>
     </tr>
     <tr>
+      <td align="center" valign="top" width="20%">
+        <a href="https://github.com/bluegumcity"><img width="100" height="100" src="https://avatars.githubusercontent.com/u/142639670?v=4&size=100"><br />bluegumcity</a>
+      </td>
       <td align="center" valign="top" width="20%">
         <a href="https://github.com/4rft5"><img width="100" height="100" src="https://avatars.githubusercontent.com/u/74219775?s=100&v=4"><br />4rft5</a>
       </td>

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

@@ -0,0 +1,81 @@
+import { redirect } from "next/navigation";
+import {
+  getListById,
+  getUserChecklists,
+} from "@/app/_server/actions/checklist";
+import { getCategories } from "@/app/_server/actions/category";
+import { getCurrentUser, canAccessAllContent } from "@/app/_server/actions/users";
+import { ChecklistClient } from "@/app/_components/FeatureComponents/Checklists/Parts/ChecklistClient";
+import { Modes } from "@/app/_types/enums";
+import type { Metadata } from "next";
+import { getMedatadaTitle } from "@/app/_server/actions/config";
+import { PermissionsProvider } from "@/app/_providers/PermissionsProvider";
+import { MetadataProvider } from "@/app/_providers/MetadataProvider";
+
+interface AdminChecklistPageProps {
+  params: {
+    uuid: string;
+  };
+}
+
+export const dynamic = "force-dynamic";
+
+export async function generateMetadata({
+  params,
+}: AdminChecklistPageProps): Promise<Metadata> {
+  const { uuid } = params;
+  return getMedatadaTitle(Modes.CHECKLISTS, uuid, "Admin");
+}
+
+export default async function AdminChecklistPage({ params }: AdminChecklistPageProps) {
+  const { uuid } = params;
+  const user = await getCurrentUser();
+  const hasContentAccess = await canAccessAllContent();
+
+  if (!hasContentAccess) {
+    redirect("/");
+  }
+
+  const [listsResult, categoriesResult] = await Promise.all([
+    getUserChecklists({ username: user?.username }),
+    getCategories(Modes.CHECKLISTS),
+  ]);
+
+  if (!listsResult.success || !listsResult.data) {
+    redirect("/");
+  }
+
+  const checklist = await getListById(uuid);
+
+  if (!checklist) {
+    redirect("/");
+  }
+
+  const categories =
+    categoriesResult.success && categoriesResult.data
+      ? categoriesResult.data
+      : [];
+
+  const metadata = {
+    id: checklist.id,
+    uuid: checklist.uuid,
+    title: checklist.title,
+    category: checklist.category || "Uncategorized",
+    owner: checklist.owner,
+    createdAt: checklist.createdAt,
+    updatedAt: checklist.updatedAt,
+    type: "checklist" as const,
+  };
+
+  return (
+    <MetadataProvider metadata={metadata}>
+      <PermissionsProvider item={checklist}>
+        <ChecklistClient
+          checklist={checklist}
+          categories={categories}
+          user={user}
+        />
+      </PermissionsProvider>
+    </MetadataProvider>
+  );
+}

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

@@ -0,0 +1,79 @@
+import { redirect } from "next/navigation";
+import {
+  CheckForNeedsMigration,
+  getNoteById,
+  getUserNotes,
+} from "@/app/_server/actions/note";
+import { getCurrentUser, canAccessAllContent } from "@/app/_server/actions/users";
+import { NoteClient } from "@/app/_components/FeatureComponents/Notes/NoteClient";
+import { Modes } from "@/app/_types/enums";
+import { getCategories } from "@/app/_server/actions/category";
+import type { Metadata } from "next";
+import { getMedatadaTitle } from "@/app/_server/actions/config";
+import { PermissionsProvider } from "@/app/_providers/PermissionsProvider";
+import { MetadataProvider } from "@/app/_providers/MetadataProvider";
+
+interface AdminNotePageProps {
+  params: {
+    uuid: string;
+  };
+}
+
+export const dynamic = "force-dynamic";
+
+export async function generateMetadata({
+  params,
+}: AdminNotePageProps): Promise<Metadata> {
+  const { uuid } = params;
+  return getMedatadaTitle(Modes.NOTES, uuid, "Admin");
+}
+
+export default async function AdminNotePage({ params }: AdminNotePageProps) {
+  const { uuid } = params;
+  const hasContentAccess = await canAccessAllContent();
+
+  if (!hasContentAccess) {
+    redirect("/");
+  }
+
+  await CheckForNeedsMigration();
+
+  const [docsResult, categoriesResult] = await Promise.all([
+    getUserNotes({ isRaw: true }),
+    getCategories(Modes.NOTES),
+  ]);
+
+  if (!docsResult.success || !docsResult.data) {
+    redirect("/");
+  }
+
+  const note = await getNoteById(uuid);
+
+  if (!note) {
+    redirect("/");
+  }
+
+  const docsCategories =
+    categoriesResult.success && categoriesResult.data
+      ? categoriesResult.data
+      : [];
+
+  const metadata = {
+    id: note.id,
+    uuid: note.uuid,
+    title: note.title,
+    category: note.category || "Uncategorized",
+    owner: note.owner,
+    createdAt: note.createdAt,
+    updatedAt: note.updatedAt,
+    type: "note" as const,
+  };
+
+  return (
+    <MetadataProvider metadata={metadata}>
+      <PermissionsProvider item={note}>
+        <NoteClient note={note} categories={docsCategories} />
+      </PermissionsProvider>
+    </MetadataProvider>
+  );
+}

app/(loggedInRoutes)/admin/page.tsx

@@ -5,7 +5,7 @@ import {
 } from "@/app/_server/actions/checklist";
 import { getCategories } from "@/app/_server/actions/category";
 import { getAllLists } from "@/app/_server/actions/checklist";
-import { getCurrentUser } from "@/app/_server/actions/users";
+import { getCurrentUser, canAccessAllContent } from "@/app/_server/actions/users";
 import { ChecklistClient } from "@/app/_components/FeatureComponents/Checklists/Parts/ChecklistClient";
 import { Modes } from "@/app/_types/enums";
 import type { Metadata } from "next";
@@ -46,7 +46,7 @@ export default async function ChecklistPage({ params }: ChecklistPageProps) {
       : decodeCategoryPath(encodedCategoryPath);
   const user = await getCurrentUser();
   const username = user?.username || "";
-  const isAdminUser = user?.isAdmin || false;
+  const hasContentAccess = await canAccessAllContent();
 
   const [listsResult, categoriesResult] = await Promise.all([
     getUserChecklists({ username }),
@@ -59,7 +59,7 @@ export default async function ChecklistPage({ params }: ChecklistPageProps) {
 
   let checklist = await getListById(id, username, category);
 
-  if (!checklist && isAdminUser) {
+  if (!checklist && hasContentAccess) {
     const allListsResult = await getAllLists();
     if (allListsResult.success && allListsResult.data) {
       checklist = allListsResult.data.find(

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

@@ -0,0 +1,23 @@
+import { ChecklistsClient } from "@/app/_components/FeatureComponents/Checklists/ChecklistsClient";
+import { getCategories } from "@/app/_server/actions/category";
+import { getCurrentUser } from "@/app/_server/actions/users";
+import { Modes } from "@/app/_types/enums";
+
+export default async function ChecklistsLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  const [checklistCategories, user] = await Promise.all([
+    getCategories(Modes.CHECKLISTS),
+    getCurrentUser(),
+  ]);
+
+  const categories = checklistCategories.data || [];
+
+  return (
+    <ChecklistsClient categories={categories} user={user}>
+      {children}
+    </ChecklistsClient>
+  );
+}

app/(loggedInRoutes)/checklists/layout.tsx

@@ -1,29 +1,21 @@
 import { getUserChecklists } from "@/app/_server/actions/checklist";
-import { getCategories } from "@/app/_server/actions/category";
 import { getCurrentUser } from "@/app/_server/actions/users";
-import { Modes } from "@/app/_types/enums";
 import { ChecklistsPageClient } from "@/app/_components/FeatureComponents/Checklists/ChecklistsPageClient";
 import { Checklist } from "@/app/_types";
 
 export const dynamic = "force-dynamic";
 
 export default async function ChecklistsPage() {
-  const [listsResult, categoriesResult] = await Promise.all([
+  const [listsResult, user] = await Promise.all([
     getUserChecklists(),
-    getCategories(Modes.CHECKLISTS),
+    getCurrentUser(),
   ]);
 
   const lists = listsResult.success && listsResult.data ? listsResult.data : [];
-  const categories =
-    categoriesResult.success && categoriesResult.data
-      ? categoriesResult.data
-      : [];
-  const user = await getCurrentUser();
 
   return (
     <ChecklistsPageClient
       initialLists={lists as Checklist[]}
-      initialCategories={categories}
       user={user}
     />
   );

app/(loggedInRoutes)/checklists/page.tsx

@@ -0,0 +1,74 @@
+import { redirect } from "next/navigation";
+import { UnifiedMarkdownRenderer } from "@/app/_components/FeatureComponents/Notes/Parts/UnifiedMarkdownRenderer";
+import { readFile } from "@/app/_server/actions/file";
+import { convertMarkdownToHtml } from "@/app/_utils/markdown-utils";
+import type { Metadata } from "next";
+import { getTranslations } from "next-intl/server";
+import { getHowtoGuideById, getHowtoFilePath, isValidHowtoGuide } from "@/app/_utils/howto-utils";
+
+interface HowtoPageProps {
+  params: {
+    path: string;
+  };
+}
+
+export const dynamic = "force-dynamic";
+
+export async function generateMetadata({
+  params,
+}: HowtoPageProps): Promise<Metadata> {
+  const { path } = params;
+  const t = await getTranslations();
+  const guide = getHowtoGuideById(path, t);
+
+  if (!guide) {
+    return {
+      title: "How To - jotty·page",
+    };
+  }
+
+  return {
+    title: `${guide.name} - How To - jotty·page`,
+    description: `Learn about ${guide.name.toLowerCase()} in jotty·page`,
+  };
+}
+
+export default async function HowtoPage({ params }: HowtoPageProps) {
+  const { path } = params;
+  const t = await getTranslations();
+
+  if (!isValidHowtoGuide(path, t)) {
+    redirect("/howto/shortcuts");
+  }
+
+  const guide = getHowtoGuideById(path, t);
+  if (!guide) {
+    redirect("/howto/shortcuts");
+  }
+
+  const filePath = getHowtoFilePath(guide.filename);
+  const markdownContent = await readFile(filePath);
+
+  if (!markdownContent) {
+    return (
+      <div>
+        <div className="mb-6">
+          <h1 className="text-3xl font-bold text-foreground">{guide.name}</h1>
+        </div>
+        <div className="prose prose-sm sm:prose-base lg:prose-lg xl:prose-2xl dark:prose-invert max-w-none">
+          <p>{t("errors.notFound")}</p>
+        </div>
+      </div>
+    );
+  }
+
+  const htmlContent = convertMarkdownToHtml(markdownContent);
+
+  return (
+    <div>
+      <div className="prose prose-sm sm:prose-base lg:prose-lg xl:prose-2xl dark:prose-invert max-w-none">
+        <UnifiedMarkdownRenderer content={htmlContent} />
+      </div>
+    </div>
+  );
+}

app/(loggedInRoutes)/howto/[path]/page.tsx

@@ -0,0 +1,27 @@
+import { HowtoClient } from "@/app/_components/FeatureComponents/Howto/HowtoClient";
+import { getCategories } from "@/app/_server/actions/category";
+import { getCurrentUser } from "@/app/_server/actions/users";
+import { Modes } from "@/app/_types/enums";
+
+export default async function HowtoLayout({
+    children,
+}: {
+    children: React.ReactNode;
+}) {
+    const [checklistCategories, noteCategories, user] = await Promise.all([
+        getCategories(Modes.CHECKLISTS),
+        getCategories(Modes.NOTES),
+        getCurrentUser(),
+    ]);
+
+    const categories = [
+        ...(checklistCategories.data || []),
+        ...(noteCategories.data || []),
+    ];
+
+    return (
+        <HowtoClient categories={categories} user={user}>
+            {children}
+        </HowtoClient>
+    );
+}