Develop

Dockerfile

@@ -27,7 +27,7 @@ WORKDIR /app
 ENV NODE_ENV=production
 ENV NEXT_TELEMETRY_DISABLED=1
 
-RUN apk add --no-cache su-exec git grep sed
+RUN apk add --no-cache su-exec git grep sed tzdata
 
 RUN if ! getent group 1000 > /dev/null 2>&1; then \
         addgroup --system --gid 1000 appgroup; \
@@ -51,6 +51,10 @@ COPY --from=builder /app/public ./public
 
 COPY --from=builder /app/howto ./howto
 
+COPY --from=builder /app/scripts/apply-patches.js ./scripts/apply-patches.js
+COPY --from=builder /app/patches ./patches
+RUN mkdir -p /app/user_patches && chown -R 1000:1000 /app/scripts /app/patches /app/user_patches
+
 COPY docker-entrypoint.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/docker-entrypoint.sh
 
@@ -60,4 +64,4 @@ ENV PORT=3000
 ENV HOSTNAME="0.0.0.0"
 
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
-CMD ["node", "server.js"] 
+CMD ["node", "server.js"] 

app/_components/FeatureComponents/Admin/Parts/AppSettingsTab.tsx

@@ -203,6 +203,41 @@ export const AppSettingsTab = () => {
             </span>
           </span>
         </div>
+        <div>
+          <Label htmlFor="defaultDateFormat" className="block mb-3">
+            {t("admin.defaultDateFormat")}
+          </Label>
+          <Dropdown
+            value={settings?.defaultDateFormat || "dd/mm/yyyy"}
+            onChange={(value) => handleInputChange("defaultDateFormat", value)}
+            options={[
+              { id: "dd/mm/yyyy", name: "DD/MM/YYYY" },
+              { id: "mm/dd/yyyy", name: "MM/DD/YYYY" },
+              { id: "yyyy/mm/dd", name: "YYYY/MM/DD" },
+            ]}
+            disabled={!isSuperAdmin}
+          />
+          <span className="text-md lg:text-xs text-muted-foreground">
+            {t("admin.defaultDateFormatDescription")}
+          </span>
+        </div>
+        <div>
+          <Label htmlFor="defaultTimeFormat" className="block mb-3">
+            {t("admin.defaultTimeFormat")}
+          </Label>
+          <Dropdown
+            value={settings?.defaultTimeFormat || "12-hours"}
+            onChange={(value) => handleInputChange("defaultTimeFormat", value)}
+            options={[
+              { id: "12-hours", name: t("settings.hours12") },
+              { id: "24-hours", name: t("settings.hours24") },
+            ]}
+            disabled={!isSuperAdmin}
+          />
+          <span className="text-md lg:text-xs text-muted-foreground">
+            {t("admin.defaultTimeFormatDescription")}
+          </span>
+        </div>
         <div>
           <Label htmlFor="hideLanguageSelector" className="block mb-3">
             {t("admin.hideLanguageSelector")}

app/_components/FeatureComponents/Checklists/Parts/Simple/NestedChecklistItem.tsx

@@ -327,13 +327,13 @@ const NestedChecklistItemComponent = ({
           className={cn(
             "relative my-1",
             hasChildren &&
-              !isChild &&
-              "border-l-2 bg-muted/30 border-l-primary/70 rounded-jotty border-dashed border-t",
+            !isChild &&
+            "border-l-2 bg-muted/30 border-l-primary/70 rounded-jotty border-dashed border-t",
             !hasChildren &&
-              !isChild &&
-              "border-l-2 bg-muted/30 border-l-primary/70 rounded-jotty border-dashed border-t",
+            !isChild &&
+            "border-l-2 bg-muted/30 border-l-primary/70 rounded-jotty border-dashed border-t",
             isChild &&
-              "ml-4 rounded-jotty border-dashed border-l border-border border-l-primary/70",
+            "ml-4 rounded-jotty border-dashed border-l border-border border-l-primary/70",
             "first:mt-0 transition-colors duration-150",
             isActive && "bg-muted/20",
             isDragging && "opacity-50 z-50",
@@ -352,7 +352,7 @@ const NestedChecklistItemComponent = ({
               isChild ? "px-2.5 py-1.5 lg:py-2" : "p-1.5 lg:p-2",
               completed && "opacity-80",
               !permissions?.canEdit &&
-                "opacity-50 cursor-not-allowed pointer-events-none",
+              "opacity-50 cursor-not-allowed pointer-events-none",
             )}
           >
             {!isPublicView && !isDragDisabled && permissions?.canEdit && (
@@ -434,7 +434,7 @@ const NestedChecklistItemComponent = ({
                 )}
               </div>
             ) : (
-              <div className="flex-1 flex items-center justify-between gap-2 max-w-[85%] lg:max-w-full">
+              <div className="flex-1 flex items-center justify-between gap-2 min-w-0">
                 <div className="flex-1 flex gap-1.5 max-w-full">
                   <label
                     htmlFor={item.id}
@@ -459,10 +459,47 @@ const NestedChecklistItemComponent = ({
                       <RecurrenceIndicator recurrence={item.recurrence} />
                     )}
 
-                    <span className="break-words max-w-[85%] lg:max-w-full">
-                      {tagsEnabled ? renderTextWithHashtags(displayText) : displayText}
-                    </span>
+                    {!(
+                      user?.checklistItemClickAction === "edit" &&
+                      permissions?.canEdit &&
+                      onEdit &&
+                      !isPublicView
+                    ) && (
+                      <span className="break-words min-w-0">
+                        {tagsEnabled ? renderTextWithHashtags(displayText) : displayText}
+                      </span>
+                    )}
                   </label>
+                  {user?.checklistItemClickAction === "edit" &&
+                    permissions?.canEdit &&
+                    onEdit &&
+                    !isPublicView && (
+                      <span
+                        role="button"
+                        tabIndex={0}
+                        onClick={(e) => {
+                          if (e.metaKey || e.ctrlKey) {
+                            onToggle(item.id, !(item.completed || completed));
+                            return;
+                          }
+                          handleEdit();
+                        }}
+                        onKeyDown={(e) => {
+                          if (e.key === "Enter") {
+                            e.preventDefault();
+                            handleEdit();
+                          }
+                        }}
+                        className={cn(
+                          "text-md lg:text-sm transition-all duration-200 cursor-text break-words min-w-0 flex items-center select-text",
+                          item.completed || completed
+                            ? "line-through text-muted-foreground"
+                            : "text-foreground",
+                        )}
+                      >
+                        {tagsEnabled ? renderTextWithHashtags(displayText) : displayText}
+                      </span>
+                    )}
                 </div>
 
                 <LastModifiedCreatedInfo
@@ -651,9 +688,8 @@ const NestedChecklistItemComponent = ({
             <div className={cn("pt-1")}>
               {draggedItemId !== item.id && (
                 <DropIndicator
-                  id={`drop-before-child::${
-                    item.children![0]?.id || `${item.id}-start`
-                  }`}
+                  id={`drop-before-child::${item.children![0]?.id || `${item.id}-start`
+                    }`}
                   data={{
                     type: "drop-indicator",
                     position: "before",

app/_components/FeatureComponents/Howto/HowtoSidebar.tsx

@@ -7,86 +7,84 @@ import { useNavigationGuard } from "@/app/_providers/NavigationGuardProvider";
 import { useTranslations } from "next-intl";
 import { getHowtoGuides } from "@/app/_utils/howto-utils";
 import {
-    HelpCircleIcon,
-    SquareLock01Icon,
-    SmartPhone01Icon,
-    PaintBrush04Icon,
-    LaptopProgrammingIcon,
-    LockKeyIcon,
-    TranslationIcon,
-    ComputerPhoneSyncIcon,
-    ZapIcon,
-    GridIcon,
-    CodeIcon,
-    RainIcon
+  HelpCircleIcon,
+  SquareLock01Icon,
+  SmartPhone01Icon,
+  PaintBrush04Icon,
+  LaptopProgrammingIcon,
+  LockKeyIcon,
+  TranslationIcon,
+  ComputerPhoneSyncIcon,
+  ZapIcon,
+  GridIcon,
+  CodeIcon,
+  RainIcon,
+  Wrench01Icon,
 } from "hugeicons-react";
 
 interface HowtoSidebarProps {
-    isOpen: boolean;
-    onClose: () => void;
+  isOpen: boolean;
+  onClose: () => void;
 }
 
 const iconMap: Record<string, any> = {
-    zap: ZapIcon,
-    hash: GridIcon,
-    code: CodeIcon,
-    paintbrush: PaintBrush04Icon,
-    laptop: LaptopProgrammingIcon,
-    key: LockKeyIcon,
-    computerphone: ComputerPhoneSyncIcon,
-    smartphone: SmartPhone01Icon,
-    lock: LockKeyIcon,
-    squarelock: SquareLock01Icon,
-    translation: TranslationIcon,
-    rain: RainIcon,
+  zap: ZapIcon,
+  hash: GridIcon,
+  code: CodeIcon,
+  paintbrush: PaintBrush04Icon,
+  laptop: LaptopProgrammingIcon,
+  key: LockKeyIcon,
+  computerphone: ComputerPhoneSyncIcon,
+  smartphone: SmartPhone01Icon,
+  lock: LockKeyIcon,
+  squarelock: SquareLock01Icon,
+  translation: TranslationIcon,
+  rain: RainIcon,
+  patch: Wrench01Icon,
 };
 
 export const HowtoSidebar = ({ isOpen, onClose }: HowtoSidebarProps) => {
-    const t = useTranslations();
-    const pathname = usePathname();
-    const router = useRouter();
-    const { checkNavigation } = useNavigationGuard();
+  const t = useTranslations();
+  const pathname = usePathname();
+  const router = useRouter();
+  const { checkNavigation } = useNavigationGuard();
 
-    const guides = getHowtoGuides(t);
+  const guides = getHowtoGuides(t);
 
-    const handleNavigate = (path: string) => {
-        checkNavigation(() => {
-            router.push(path);
-            if (window.innerWidth < 1024) {
-                onClose();
-            }
-        });
-    };
+  const handleNavigate = (path: string) => {
+    checkNavigation(() => {
+      router.push(path);
+      if (window.innerWidth < 1024) {
+        onClose();
+      }
+    });
+  };
 
-    const isItemActive = (path: string) => {
-        return pathname === path;
-    };
+  const isItemActive = (path: string) => {
+    return pathname === path;
+  };
 
-    return (
-        <SidebarWrapper
-            isOpen={isOpen}
-            onClose={onClose}
-            title={t("help.howTo")}
-        >
-            <div className="space-y-1">
-                <div className="space-y-0.5 pl-2">
-                    {guides.map((guide) => {
-                        const Icon = iconMap[guide.icon] || HelpCircleIcon;
-                        const isActive = isItemActive(`/howto/${guide.id}`);
+  return (
+    <SidebarWrapper isOpen={isOpen} onClose={onClose} title={t("help.howTo")}>
+      <div className="space-y-1">
+        <div className="space-y-0.5 pl-2">
+          {guides.map((guide) => {
+            const Icon = iconMap[guide.icon] || HelpCircleIcon;
+            const isActive = isItemActive(`/howto/${guide.id}`);
 
-                        return (
-                            <SidebarItem
-                                href={`/howto/${guide.id}`}
-                                key={guide.id}
-                                icon={Icon}
-                                label={guide.name}
-                                isActive={isActive}
-                                onClick={() => handleNavigate(`/howto/${guide.id}`)}
-                            />
-                        );
-                    })}
-                </div>
-            </div>
-        </SidebarWrapper>
-    );
+            return (
+              <SidebarItem
+                href={`/howto/${guide.id}`}
+                key={guide.id}
+                icon={Icon}
+                label={guide.name}
+                isActive={isActive}
+                onClick={() => handleNavigate(`/howto/${guide.id}`)}
+              />
+            );
+          })}
+        </div>
+      </div>
+    </SidebarWrapper>
+  );
 };

app/_components/FeatureComponents/Notes/NoteClient.tsx

@@ -119,7 +119,7 @@ export const NoteClient = ({ note, categories }: NoteClientProps) => {
       <SwipeNavigationWrapper
         noteId={localNote.id}
         noteCategory={localNote.category}
-        enabled={!viewModel.isEditing}
+        enabled={!viewModel.isEditMode}
       >
         <NoteEditor
           note={localNote}

app/_components/FeatureComponents/Notes/Parts/NoteEditor/NoteEditor.tsx

@@ -10,6 +10,7 @@ import { TableOfContents } from "../TableOfContents";
 import { useSearchParams } from "next/navigation";
 import { usePermissions } from "@/app/_providers/PermissionsProvider";
 import { useNotesStore } from "@/app/_utils/notes-store";
+import { useAppMode } from "@/app/_providers/AppModeProvider";
 
 export interface NoteEditorProps {
   note: Note;
@@ -31,6 +32,12 @@ export const NoteEditor = ({
   const { showTOC, setShowTOC } = useNotesStore();
   const decryptModalRef = useRef<(() => void) | null>(null);
   const viewModalRef = useRef<(() => void) | null>(null);
+  const { user } = useAppMode();
+  const searchParams = useSearchParams();
+  const _isEditMode =
+    viewModel.isEditing ||
+    user?.notesDefaultMode === "edit" ||
+    searchParams?.get("editor") === "true";
 
   return (
     <div className="flex-1 flex flex-col overflow-hidden bg-background h-full">
@@ -47,8 +54,8 @@ export const NoteEditor = ({
         onOpenViewModal={viewModalRef}
       />
 
-      <div className="flex h-full w-full relative">
-        <div className="flex-1 overflow-y-auto jotty-scrollable-content max-h-[95vh]">
+      <div className="flex flex-1 w-full relative min-h-0">
+        <div className="flex-1 overflow-y-auto jotty-scrollable-content min-h-0">
           <NoteEditorContent
             isEditing={viewModel.isEditing}
             noteContent={note.content}
@@ -67,11 +74,11 @@ export const NoteEditor = ({
           <div className="w-64 border-l border-border">
             <TableOfContents
               content={
-                viewModel.isEditing
+                _isEditMode
                   ? viewModel.derivedMarkdownContent
                   : note.content || ""
               }
-              isEditing={viewModel.isEditing}
+              isEditing={_isEditMode}
             />
           </div>
         )}

app/_components/FeatureComponents/Notes/Parts/NoteEditor/NoteEditorContent.tsx

@@ -175,9 +175,8 @@ export const NoteEditorContent = ({
         <>
           <ReadingProgressBar />
           <div
-            className={`px-6 pt-6 pb-24 ${
-              compactMode ? "max-w-[900px] mx-auto" : ""
-            }`}
+            className={`px-6 pt-6 pb-4 ${compactMode ? "max-w-[900px] mx-auto" : ""
+              }`}
           >
             <UnifiedMarkdownRenderer
               content={encrypted ? editorContent : noteContent || ""}