Compare commits

...
10 Commits
Author SHA1 Message Date
ginnoir 4ea9b86f8e chore: release v0.6.10
CI / checks (push) Skipped
Release Image / build-and-push (push) Successful in 7m45s
2026-07-18 17:25:59 -05:00
ginnoir 9b3bd02b0b feat: open notes in view mode with optional editor
default to reading the note; edit opens the form alone without a
side preview since the rich text editor already shows live content.
2026-07-18 17:25:50 -05:00
ginnoir 0be93d088b chore: release v0.6.9
CI / checks (push) Skipped
Release Image / build-and-push (push) Successful in 8m21s
2026-07-18 17:23:06 -05:00
ginnoir 832e7265c9 fix: build share urls from auth_url instead of localhost
docker build sets next_public_app_url to localhost; preferring it over
runtime auth_url made prod share links point at localhost:3000.
2026-07-18 17:22:58 -05:00
ginnoir d1e295165a chore: release v0.6.8
CI / checks (push) Skipped
Release Image / build-and-push (push) Successful in 9m8s
2026-07-18 17:19:56 -05:00
ginnoir 969521ac3f fix: restore share and note scrolling on ios pwa
bare routes lacked a scrollport under overflow:hidden html/body.
wide rich-text tables used overflow-x:auto alone, which computes
overflow-y:auto and traps vertical touch on iphone. force ink palette
on /s/* for a consistent public share look.
2026-07-18 17:19:41 -05:00
ginnoir 908764873f chore: release v0.6.7
CI / checks (push) Has been skipped
Release Image / build-and-push (push) Successful in 7m37s
2026-07-12 22:28:20 -05:00
ginnoir 043d28539e fix(garden): add ikea cabinet and acrylic case container types 2026-07-12 22:28:10 -05:00
ginnoir 3efbf75179 chore: release v0.6.6
CI / checks (push) Has been skipped
Release Image / build-and-push (push) Successful in 7m7s
2026-07-12 22:18:50 -05:00
ginnoir b8229eb9b5 fix(garden): add carnivore plant category 2026-07-12 22:18:26 -05:00
13 changed files with 180 additions and 34 deletions
+30
View File
@@ -1,5 +1,35 @@
# Changelog
## [0.6.10](https://github.com/ginnoir/famapp/compare/v0.6.9...v0.6.10) (2026-07-18)
### Features
- open notes in view mode with optional editor ([9b3bd02](https://github.com/ginnoir/famapp/commit/9b3bd02b0bafc89a514ca8fd4434f9659b9ee4c2))
## [0.6.9](https://github.com/ginnoir/famapp/compare/v0.6.8...v0.6.9) (2026-07-18)
### Bug Fixes
- build share urls from auth_url instead of localhost ([832e726](https://github.com/ginnoir/famapp/commit/832e7265c9354edf86f28f72f129ee34da8c3d04))
## [0.6.8](https://github.com/ginnoir/famapp/compare/v0.6.7...v0.6.8) (2026-07-18)
### Bug Fixes
- restore share and note scrolling on ios pwa ([969521a](https://github.com/ginnoir/famapp/commit/969521ac3f527a939988053b453881ed3560eb61))
## [0.6.7](https://github.com/ginnoir/famapp/compare/v0.6.6...v0.6.7) (2026-07-13)
### Bug Fixes
- **garden:** add ikea cabinet and acrylic case container types ([043d285](https://github.com/ginnoir/famapp/commit/043d28539ec08dd46a097970b4e876bfb1ba7aa1))
## [0.6.6](https://github.com/ginnoir/famapp/compare/v0.6.5...v0.6.6) (2026-07-13)
### Bug Fixes
- **garden:** add carnivore plant category ([b8229eb](https://github.com/ginnoir/famapp/commit/b8229eb9b5550cde98e5446615873e727ead05a8))
## [0.6.5](https://github.com/ginnoir/famapp/compare/v0.6.4...v0.6.5) (2026-07-09)
### Bug Fixes
+2
View File
@@ -16,7 +16,9 @@ ENV CI=true
ENV NEXT_TELEMETRY_DISABLED=1
ENV DATABASE_URL=postgres://build:build@localhost:5432/build
ENV AUTH_SECRET=build-time-placeholder
# Build-only placeholder. Runtime public URL is AUTH_URL from stack.env — never prefer this.
ENV NEXT_PUBLIC_APP_URL=http://localhost:3000
ENV AUTH_URL=http://localhost:3000
COPY . .
RUN pnpm install --offline --frozen-lockfile
RUN --mount=type=cache,id=famapp-nextjs,target=/app/.next/cache \
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "famapp",
"version": "0.6.5",
"version": "0.6.10",
"private": true,
"type": "module",
"packageManager": "pnpm@10.33.3",
+13 -2
View File
@@ -725,9 +725,19 @@
.scroll-area {
flex: 1;
overflow: auto;
overflow-x: hidden;
overflow-y: auto;
padding: 20px 24px 60px;
}
/* Bare routes (/s/*, /login, signed-out) — same scrollport as .scroll-area
without app chrome padding. Needed because html/body are overflow:hidden. */
.bare-scroll {
height: 100%;
height: 100dvh;
overflow-x: hidden;
overflow-y: auto;
}
:where(html[data-nav="bottom"]) .scroll-area,
:where(html[data-nav="fab"]) .scroll-area {
padding: 12px 14px 74px;
@@ -1617,7 +1627,8 @@ select {
}
/* Momentum scrolling + prevent page bounce fighting in-app scroll */
.scroll-area {
.scroll-area,
.bare-scroll {
-webkit-overflow-scrolling: touch;
overscroll-behavior-y: contain;
}
+14 -1
View File
@@ -1,4 +1,5 @@
import type { Metadata, Viewport } from "next";
import { headers } from "next/headers";
import "./globals.css";
import { Inter, Source_Serif_4, Newsreader, Fraunces, JetBrains_Mono } from "next/font/google";
import { cn } from "@/lib/utils";
@@ -71,9 +72,13 @@ export const metadata: Metadata = {
// Pre-paint: read user's theme prefs from localStorage and apply data-* + .dark.
// Falls back to clay/serif-sans/regular/sidebar/system if nothing is stored.
// Public share pages always use ink so guests get a neutral, consistent look.
const prePaintScript = `(function(){
try {
var palette = localStorage.getItem('themePalette') || localStorage.getItem('theme') || 'clay';
var isShare = location.pathname.indexOf('/s/') === 0;
var palette = isShare
? 'ink'
: (localStorage.getItem('themePalette') || localStorage.getItem('theme') || 'clay');
var mode = localStorage.getItem('themeMode') || 'system';
var fontPair = localStorage.getItem('themeFontPair') || 'serif-sans';
var density = localStorage.getItem('themeDensity') || 'regular';
@@ -106,6 +111,10 @@ export default async function RootLayout({ children }: { children: React.ReactNo
let assistantName = DEFAULT_ASSISTANT_NAME;
let assistantModel: string | null = null;
const headersList = await headers();
const pathname = headersList.get("x-pathname") ?? "";
const isSharePage = pathname === "/s" || pathname.startsWith("/s/");
const session = await auth();
if (session?.user?.id) {
signedIn = true;
@@ -146,6 +155,10 @@ export default async function RootLayout({ children }: { children: React.ReactNo
.orderBy(asc(dashboards.position), asc(dashboards.createdAt));
}
if (isSharePage) {
palette = "ink";
}
// Server-side initial dark guess: only for `dark` mode (system mode is corrected
// before paint by the inline script). Avoids a flash on signed-in users.
const isDark = mode === "dark";
+2 -1
View File
@@ -24,7 +24,8 @@ export async function AppShell({ signedIn, navStyle, children }: Props) {
if (bare || !signedIn) {
// No shell — share viewer and signed-out pages render bare.
return <>{children}</>;
// html/body are overflow:hidden for the app grid; bare pages need their own scroller.
return <div className="bare-scroll">{children}</div>;
}
const useTopVariant = navStyle === "top-nav";
+8
View File
@@ -64,6 +64,9 @@
margin: 0.8em 0;
max-width: 100%;
overflow-x: auto;
overflow-y: hidden;
-webkit-overflow-scrolling: touch;
overscroll-behavior-x: contain;
padding: 0.75rem 0.9rem;
}
@@ -91,7 +94,12 @@
display: block;
margin: 0.8em 0;
max-width: 100%;
/* overflow-x alone computes overflow-y to auto, which traps vertical
touch scrolling on iOS when a wide table fills the viewport. */
overflow-x: auto;
overflow-y: hidden;
-webkit-overflow-scrolling: touch;
overscroll-behavior-x: contain;
width: max-content;
}
+8
View File
@@ -0,0 +1,8 @@
/** Public origin for absolute links. AUTH_URL wins — Docker build sets NEXT_PUBLIC to localhost. */
export function getAppPublicUrl(): string {
const raw =
process.env.AUTH_URL?.trim() ||
process.env.NEXT_PUBLIC_APP_URL?.trim() ||
"http://localhost:3000";
return raw.replace(/\/$/, "");
}
+2 -3
View File
@@ -1,6 +1,7 @@
import { createHash, randomBytes } from "crypto";
import { and, eq, isNull } from "drizzle-orm";
import type { ApiAuthContext } from "@/lib/api-auth";
import { getAppPublicUrl } from "@/lib/app-url";
import { db } from "@/lib/db";
import { getEntityType, getRegistry } from "./registry";
import { shareLinks } from "./schema";
@@ -27,9 +28,7 @@ function hashToken(raw: string): string {
}
function buildUrl(token: string): string {
const base =
process.env["NEXT_PUBLIC_APP_URL"] ?? process.env["AUTH_URL"] ?? "http://localhost:3000";
return `${base}/s/${token}`;
return `${getAppPublicUrl()}/s/${token}`;
}
export function listShareableEntityTypes() {
+2 -3
View File
@@ -2,6 +2,7 @@
import { createHash, randomBytes } from "crypto";
import { and, eq, isNull } from "drizzle-orm";
import { getAppPublicUrl } from "@/lib/app-url";
import { db } from "@/lib/db";
import { getCurrentSession } from "@/lib/session";
import { getEntityType } from "./registry";
@@ -21,9 +22,7 @@ function hashToken(raw: string): string {
}
function buildUrl(token: string): string {
const base =
process.env["NEXT_PUBLIC_APP_URL"] ?? process.env["AUTH_URL"] ?? "http://localhost:3000";
return `${base}/s/${token}`;
return `${getAppPublicUrl()}/s/${token}`;
}
export async function createShareLink(
@@ -10,6 +10,8 @@ const CONTAINER_TYPES = [
{ value: "raised-bed", label: "Raised bed" },
{ value: "window-box", label: "Window box" },
{ value: "single-pot", label: "Single pot" },
{ value: "ikea-cabinet", label: "Ikea Cabinet" },
{ value: "acrylic-case", label: "Acrylic Case" },
{ value: "outdoor", label: "Outdoor" },
{ value: "other", label: "Other" },
];
@@ -14,6 +14,7 @@ const CATEGORIES = [
{ value: "flower", label: "Flower" },
{ value: "succulent", label: "Succulent" },
{ value: "cactus", label: "Cactus" },
{ value: "carnivore", label: "Carnivore" },
{ value: "tropical", label: "Tropical" },
{ value: "tree", label: "Tree" },
{ value: "shrub", label: "Shrub" },
+90 -18
View File
@@ -2,10 +2,9 @@
import dynamic from "next/dynamic";
import { useRouter } from "next/navigation";
import { Pin, PinOff, Save, Trash2 } from "lucide-react";
import { Bell, Pencil, Pin, PinOff, Save, Trash2, X } from "lucide-react";
import { useState, useTransition } from "react";
import { EntityComments } from "@/components/comments/entity-comments";
import { RichTextContent } from "@/components/rich-text";
import { DetailBackLink } from "@/components/detail-back-link";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
@@ -13,6 +12,7 @@ import { Label } from "@/components/ui/label";
import { ShareButton } from "@/components/share-button";
import type { NoteDto } from "../server/queries";
import { createNote, deleteNote, setNotePinned, updateNote } from "../server/actions";
import { NoteRichTextBody } from "./note-rich-text-body";
const RichTextEditor = dynamic(
() => import("@/components/rich-text/rich-text-editor").then((mod) => mod.RichTextEditor),
@@ -29,6 +29,7 @@ const RichTextEditor = dynamic(
export function NoteEditor({ note, currentUserId }: { note?: NoteDto; currentUserId?: string }) {
const router = useRouter();
const [currentNote, setCurrentNote] = useState(note);
const [editing, setEditing] = useState(!note);
const [title, setTitle] = useState(note?.title ?? "");
const [body, setBody] = useState(note?.body ?? "");
const [remindAt, setRemindAt] = useState(toLocalDateTimeValue(note?.remindAt ?? null));
@@ -36,6 +37,25 @@ export function NoteEditor({ note, currentUserId }: { note?: NoteDto; currentUse
const pinned = currentNote?.pinned ?? false;
function beginEdit() {
if (!currentNote) return;
setTitle(currentNote.title);
setBody(currentNote.body);
setRemindAt(toLocalDateTimeValue(currentNote.remindAt));
setEditing(true);
}
function cancelEdit() {
if (!currentNote) {
router.push("/notes");
return;
}
setTitle(currentNote.title);
setBody(currentNote.body);
setRemindAt(toLocalDateTimeValue(currentNote.remindAt));
setEditing(false);
}
function saveNote() {
startTransition(async () => {
if (currentNote) {
@@ -46,6 +66,7 @@ export function NoteEditor({ note, currentUserId }: { note?: NoteDto; currentUse
remindAt: remindAt ? new Date(remindAt) : null,
});
setCurrentNote(updated);
setEditing(false);
return;
}
@@ -73,38 +94,87 @@ export function NoteEditor({ note, currentUserId }: { note?: NoteDto; currentUse
});
}
const displayTitle = currentNote?.title || title || "New note";
const updatedLabel = currentNote
? new Date(currentNote.updatedAt).toLocaleDateString(undefined, {
year: "numeric",
month: "long",
day: "numeric",
})
: null;
const reminderLabel = currentNote?.remindAt
? new Date(currentNote.remindAt).toLocaleString(undefined, {
year: "numeric",
month: "short",
day: "numeric",
hour: "numeric",
minute: "2-digit",
})
: null;
return (
<div className="mx-auto grid w-full max-w-6xl gap-4 min-w-0">
<div className="mx-auto grid w-full max-w-3xl gap-4 min-w-0">
<DetailBackLink href="/notes" label="Notes" />
<header className="flex flex-col gap-3 sm:flex-row sm:items-start sm:justify-between">
<div className="flex items-center gap-2 min-w-0 flex-1">
{pinned && <Pin className="size-3.5 text-[var(--accent)]" />}
<div className="min-w-0 flex-1">
<div className="flex items-center gap-2 min-w-0">
{pinned ? <Pin className="size-3.5 shrink-0 text-[var(--accent)]" /> : null}
<h2 className="serif text-[24px] font-medium tracking-tight truncate">
{currentNote ? currentNote.title : "New note"}
{displayTitle}
</h2>
</div>
{!editing && currentNote ? (
<p className="muted text-[13px] mt-1 inline-flex flex-wrap items-center gap-x-2 gap-y-1">
{pinned ? <span>Pinned</span> : null}
{pinned && updatedLabel ? <span>·</span> : null}
{updatedLabel ? <span>Updated {updatedLabel}</span> : null}
{reminderLabel ? (
<>
<span>·</span>
<span className="inline-flex items-center gap-1">
<Bell className="size-3" />
{reminderLabel}
</span>
</>
) : null}
</p>
) : null}
</div>
<div className="flex flex-wrap gap-2">
{currentNote ? (
<Button variant="outline" size="sm" onClick={togglePinned} disabled={isPending}>
{pinned ? <PinOff className="size-3.5" /> : <Pin className="size-3.5" />}
{pinned ? "Unpin note" : "Pin note"}
{pinned ? "Unpin" : "Pin"}
</Button>
) : null}
{currentNote ? <ShareButton entityType="notes.note" entityId={currentNote.id} /> : null}
{currentNote ? (
<Button variant="destructive" size="sm" onClick={removeNote} disabled={isPending}>
<Trash2 className="size-3.5" />
Delete note
Delete
</Button>
) : null}
{editing ? (
<>
<Button variant="outline" size="sm" onClick={cancelEdit} disabled={isPending}>
<X className="size-3.5" />
Cancel
</Button>
<Button size="sm" onClick={saveNote} disabled={!title.trim() || isPending}>
<Save className="size-3.5" />
Save note
Save
</Button>
</>
) : (
<Button size="sm" onClick={beginEdit}>
<Pencil className="size-3.5" />
Edit
</Button>
)}
</div>
</header>
<div className="grid gap-4 lg:grid-cols-[minmax(0,1fr)_minmax(280px,420px)] min-w-0">
{editing ? (
<section
className="grid gap-4 rounded-[var(--r-lg)] border-[0.5px] bg-[var(--card)] p-4 shadow-[var(--shadow-1)] min-w-0"
style={{ borderColor: "var(--hair)" }}
@@ -138,16 +208,18 @@ export function NoteEditor({ note, currentUserId }: { note?: NoteDto; currentUse
/>
</div>
</section>
<aside
className="rounded-[var(--r-lg)] border-[0.5px] bg-[var(--card)] p-4 text-[var(--ink)] shadow-[var(--shadow-1)] min-w-0"
) : currentNote ? (
<section
className="rounded-[var(--r-lg)] border-[0.5px] bg-[var(--card)] p-4 shadow-[var(--shadow-1)] min-w-0 text-[var(--ink)]"
style={{ borderColor: "var(--hair)" }}
aria-label="Preview"
>
<div className="eyebrow mb-3">Preview</div>
<RichTextContent html={body} />
</aside>
</div>
{currentNote.body ? (
<NoteRichTextBody noteId={currentNote.id} body={currentNote.body} />
) : (
<p className="text-sm muted">No body text.</p>
)}
</section>
) : null}
{currentNote && currentUserId ? (
<EntityComments