1.20.0

.gitignore

@@ -47,3 +47,7 @@ next-env.d.ts
 
 *.test.yml
 .claude
+
+# serwist (auto-generated service worker)
+public/sw*
+public/swe-worker*

Dockerfile

@@ -27,7 +27,7 @@ WORKDIR /app
 ENV NODE_ENV=production
 ENV NEXT_TELEMETRY_DISABLED=1
 
-RUN apk add --no-cache su-exec git
+RUN apk add --no-cache su-exec git grep sed
 
 RUN if ! getent group 1000 > /dev/null 2>&1; then \
         addgroup --system --gid 1000 appgroup; \

README.md

@@ -79,6 +79,7 @@ A self-hosted app for your checklists and notes.
 - **Customisable:** 14 built-in themes plus custom theme support with custom emojis and icons.
 - **Encryption:** Full on PGP encryption, read more about it in [howto/ENCRYPTION.md](howto/ENCRYPTION.md)
 - **API Access:** Programmatic access to your checklists and notes via REST API with authentication.
+- **PWA** Jotty doesn't have a native app, but it's built mobile first. Once installed the PWA on your device it will feel like you installed it from the app store. There's also partial offline caching, as long as you visited a page while online Jotty will allow you to re-visit it while offline. At the moment there's no current support for offline CRUD operation.
 
 <a id="getting-started"></a>
 

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

@@ -14,21 +14,21 @@ import { MetadataProvider } from "@/app/_providers/MetadataProvider";
 import { sanitizeUserForClient } from "@/app/_utils/user-sanitize-utils";
 
 interface AdminChecklistPageProps {
-  params: {
+  params: Promise<{
     uuid: string;
-  };
+  }>;
 }
 
 export const dynamic = "force-dynamic";
 
-export async function generateMetadata({
-  params,
-}: AdminChecklistPageProps): Promise<Metadata> {
+export async function generateMetadata(props: AdminChecklistPageProps): Promise<Metadata> {
+  const params = await props.params;
   const { uuid } = params;
   return getMedatadaTitle(Modes.CHECKLISTS, uuid, "Admin");
 }
 
-export default async function AdminChecklistPage({ params }: AdminChecklistPageProps) {
+export default async function AdminChecklistPage(props: AdminChecklistPageProps) {
+  const params = await props.params;
   const { uuid } = params;
   const userRecord = await getCurrentUser();
   const hasContentAccess = await canAccessAllContent();

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

@@ -14,21 +14,21 @@ import { PermissionsProvider } from "@/app/_providers/PermissionsProvider";
 import { MetadataProvider } from "@/app/_providers/MetadataProvider";
 
 interface AdminNotePageProps {
-  params: {
+  params: Promise<{
     uuid: string;
-  };
+  }>;
 }
 
 export const dynamic = "force-dynamic";
 
-export async function generateMetadata({
-  params,
-}: AdminNotePageProps): Promise<Metadata> {
+export async function generateMetadata(props: AdminNotePageProps): Promise<Metadata> {
+  const params = await props.params;
   const { uuid } = params;
   return getMedatadaTitle(Modes.NOTES, uuid, "Admin");
 }
 
-export default async function AdminNotePage({ params }: AdminNotePageProps) {
+export default async function AdminNotePage(props: AdminNotePageProps) {
+  const params = await props.params;
   const { uuid } = params;
   const hasContentAccess = await canAccessAllContent();
 

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

@@ -16,16 +16,15 @@ import { MetadataProvider } from "@/app/_providers/MetadataProvider";
 import { sanitizeUserForClient } from "@/app/_utils/user-sanitize-utils";
 
 interface ChecklistPageProps {
-  params: {
+  params: Promise<{
     categoryPath: string[];
-  };
+  }>;
 }
 
 export const dynamic = "force-dynamic";
 
-export async function generateMetadata({
-  params,
-}: ChecklistPageProps): Promise<Metadata> {
+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("/");
@@ -37,7 +36,8 @@ export async function generateMetadata({
   return getMedatadaTitle(Modes.CHECKLISTS, id, category);
 }
 
-export default async function ChecklistPage({ params }: ChecklistPageProps) {
+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("/");

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

@@ -7,16 +7,15 @@ import { getTranslations } from "next-intl/server";
 import { getHowtoGuideById, getHowtoFilePath, isValidHowtoGuide } from "@/app/_utils/howto-utils";
 
 interface HowtoPageProps {
-  params: {
+  params: Promise<{
     path: string;
-  };
+  }>;
 }
 
 export const dynamic = "force-dynamic";
 
-export async function generateMetadata({
-  params,
-}: HowtoPageProps): Promise<Metadata> {
+export async function generateMetadata(props: HowtoPageProps): Promise<Metadata> {
+  const params = await props.params;
   const { path } = params;
   const t = await getTranslations();
   const guide = getHowtoGuideById(path, t);
@@ -33,7 +32,8 @@ export async function generateMetadata({
   };
 }
 
-export default async function HowtoPage({ params }: HowtoPageProps) {
+export default async function HowtoPage(props: HowtoPageProps) {
+  const params = await props.params;
   const { path } = params;
   const t = await getTranslations();
 

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

@@ -19,16 +19,15 @@ import { PermissionsProvider } from "@/app/_providers/PermissionsProvider";
 import { MetadataProvider } from "@/app/_providers/MetadataProvider";
 
 interface NotePageProps {
-  params: {
+  params: Promise<{
     categoryPath: string[];
-  };
+  }>;
 }
 
 export const dynamic = "force-dynamic";
 
-export async function generateMetadata({
-  params,
-}: NotePageProps): Promise<Metadata> {
+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("/");
@@ -40,7 +39,8 @@ export async function generateMetadata({
   return getMedatadaTitle(Modes.NOTES, id, category);
 }
 
-export default async function NotePage({ params }: NotePageProps) {
+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("/");
@@ -55,7 +55,7 @@ export default async function NotePage({ params }: NotePageProps) {
   await CheckForNeedsMigration();
 
   const [docsResult, categoriesResult] = await Promise.all([
-    getUserNotes({ isRaw: true }),
+    getUserNotes({ isRaw: true, metadataOnly: true }),
     getCategories(Modes.NOTES),
   ]);
 
@@ -69,7 +69,7 @@ export default async function NotePage({ params }: NotePageProps) {
     const allDocsResult = await getAllNotes();
     if (allDocsResult.success && allDocsResult.data) {
       note = allDocsResult.data.find(
-        (doc) => doc.id === id && doc.category === category
+        (doc) => doc.id === id && doc.category === category,
       );
     }
   }

app/(loggedInRoutes)/page.tsx

@@ -1,11 +1,15 @@
 import { getCategories } from "@/app/_server/actions/category";
 import { getUserChecklists } from "@/app/_server/actions/checklist";
-import { getUserNotes, CheckForNeedsMigration } from "@/app/_server/actions/note";
+import {
+  getUserNotes,
+  CheckForNeedsMigration,
+} from "@/app/_server/actions/note";
 import { HomeClient } from "@/app/_components/FeatureComponents/Home/HomeClient";
 import { getCurrentUser } from "@/app/_server/actions/users";
 import { Modes } from "@/app/_types/enums";
 import { Checklist, Note } from "../_types";
 import { sanitizeUserForClient } from "@/app/_utils/user-sanitize-utils";
+import { HOMEPAGE_ITEMS_LIMIT } from "@/app/_consts/files";
 
 export const dynamic = "force-dynamic";
 
@@ -14,22 +18,25 @@ export default async function HomePage() {
 
   const [listsResult, notesResult, categoriesResult, notesCategoriesResult] =
     await Promise.all([
-      getUserChecklists({ isRaw: true }),
-      getUserNotes({ isRaw: true }),
+      getUserChecklists({ limit: HOMEPAGE_ITEMS_LIMIT }),
+      getUserNotes({ limit: HOMEPAGE_ITEMS_LIMIT }),
       getCategories(Modes.CHECKLISTS),
       getCategories(Modes.NOTES),
     ]);
 
   const lists = listsResult.success && listsResult.data ? listsResult.data : [];
+  const notes = notesResult.success && notesResult.data ? notesResult.data : [];
+
   const categories =
     categoriesResult.success && categoriesResult.data
       ? categoriesResult.data
       : [];
-  const notes = notesResult.success && notesResult.data ? notesResult.data : [];
+
   const notesCategories =
     notesCategoriesResult.success && notesCategoriesResult.data
       ? notesCategoriesResult.data
       : [];
+
   const user = sanitizeUserForClient(await getCurrentUser());
 
   return (

app/(loggedInRoutes)/settings/connections/page.tsx

@@ -1,13 +1,18 @@
 import { LinksTab } from "@/app/_components/FeatureComponents/Profile/Parts/LinksTab";
-import { readLinkIndex, LinkIndex } from "@/app/_server/actions/link";
+import { readLinkIndex } from "@/app/_server/actions/link";
+import { LinkIndex } from "@/app/_types";
 import { getUsername } from "@/app/_server/actions/users";
 import { getArchivedItems } from "@/app/_server/actions/archived";
+import { getUserNotes } from "@/app/_server/actions/note";
+import { getUserChecklists } from "@/app/_server/actions/checklist";
 
 export default async function ConnectionsPage() {
     const username = await getUsername();
-    const [linkIndex, archivedResult] = await Promise.all([
+    const [linkIndex, archivedResult, notesResult, checklistsResult] = await Promise.all([
         readLinkIndex(username),
         getArchivedItems(),
+        getUserNotes({ username }),
+        getUserChecklists({ username }),
     ]);
 
     const archivedItems = archivedResult.success ? archivedResult.data : [];
@@ -57,6 +62,8 @@ export default async function ConnectionsPage() {
     };
 
     const filteredLinkIndex = filterArchivedItems(linkIndex, archivedItems || []);
+    const notes = notesResult.success ? notesResult.data || [] : [];
+    const checklists = checklistsResult.success ? checklistsResult.data || [] : [];
 
-    return <LinksTab linkIndex={filteredLinkIndex} />;
+    return <LinksTab linkIndex={filteredLinkIndex} notes={notes} checklists={checklists} />;
 }

app/(loggedOutRoutes)/auth/login/page.tsx

@@ -4,19 +4,17 @@ import LoginForm from "@/app/_components/GlobalComponents/Auth/LoginForm";
 import { AuthShell } from "@/app/_components/GlobalComponents/Auth/AuthShell";
 import { getTranslations } from "next-intl/server";
 import { SsoOnlyLogin } from "@/app/_components/GlobalComponents/Auth/SsoOnlyLogin";
+import { isEnvEnabled } from "@/app/_utils/env-utils";
 
 export const dynamic = "force-dynamic";
 
 export default async function LoginPage() {
   const t = await getTranslations("auth");
   const ssoEnabled = process.env.SSO_MODE === "oidc";
-  const allowLocal =
-    process.env.SSO_FALLBACK_LOCAL &&
-    process.env.SSO_FALLBACK_LOCAL !== "no" &&
-    process.env.SSO_FALLBACK_LOCAL !== "false";
+  const allowLocal = isEnvEnabled(process.env.SSO_FALLBACK_LOCAL);
 
   const hasExistingUsers = await hasUsers();
-  if (!hasExistingUsers && !ssoEnabled || !hasExistingUsers && allowLocal) {
+  if ((!hasExistingUsers && !ssoEnabled) || (!hasExistingUsers && allowLocal)) {
     redirect("/auth/setup");
   }
 

app/(loggedOutRoutes)/auth/setup/page.tsx

@@ -2,15 +2,13 @@ import { redirect } from "next/navigation";
 import { hasUsers } from "@/app/_server/actions/users";
 import SetupForm from "@/app/(loggedOutRoutes)/auth/setup/setup-form";
 import { AuthShell } from "@/app/_components/GlobalComponents/Auth/AuthShell";
+import { isEnvEnabled } from "@/app/_utils/env-utils";
 
 export const dynamic = "force-dynamic";
 
 export default async function SetupPage() {
   const ssoEnabled = process.env.SSO_MODE === "oidc";
-  const allowLocal =
-    process.env.SSO_FALLBACK_LOCAL &&
-    process.env.SSO_FALLBACK_LOCAL !== "no" &&
-    process.env.SSO_FALLBACK_LOCAL !== "false";
+  const allowLocal = isEnvEnabled(process.env.SSO_FALLBACK_LOCAL);
 
   if (ssoEnabled && !allowLocal) {
     redirect("/auth/login");