simplified layout logic

This commit is contained in:
Michael Freno
2025-12-22 20:57:26 -05:00
parent f9a7bbadd6
commit 33383381db
6 changed files with 274 additions and 328 deletions

View File

@@ -170,10 +170,8 @@ export function RightBarContent() {
}
export function LeftBar() {
const { setLeftBarSize, leftBarSize, leftBarVisible, setLeftBarVisible } =
useBars();
const { leftBarSize, leftBarVisible, setLeftBarVisible } = useBars();
let ref: HTMLDivElement | undefined;
let actualWidth = 0;
const [recentPosts, setRecentPosts] = createSignal<any[] | undefined>(
undefined
@@ -208,21 +206,6 @@ export function LeftBar() {
setIsMounted(true);
if (ref) {
const updateSize = () => {
actualWidth = ref?.offsetWidth || 0;
setLeftBarSize(leftBarVisible() ? actualWidth : 0);
};
updateSize();
const resizeObserver = new ResizeObserver((entries) => {
requestAnimationFrame(() => {
actualWidth = ref?.offsetWidth || 0;
setLeftBarSize(leftBarVisible() ? actualWidth : 0);
});
});
resizeObserver.observe(ref);
// Focus trap for accessibility on mobile
const handleKeyDown = (e: KeyboardEvent) => {
const isMobile = window.innerWidth < 768;
@@ -260,7 +243,6 @@ export function LeftBar() {
ref.addEventListener("keydown", handleKeyDown);
onCleanup(() => {
resizeObserver.disconnect();
ref?.removeEventListener("keydown", handleKeyDown);
});
}
@@ -303,10 +285,6 @@ export function LeftBar() {
}, 0);
});
createEffect(() => {
setLeftBarSize(leftBarVisible() ? actualWidth : 0);
});
return (
<nav
id="navigation"
@@ -320,7 +298,7 @@ export function LeftBar() {
}}
style={{
"transition-timing-function": "cubic-bezier(0.4, 0, 0.2, 1)",
"min-width": leftBarSize() > 0 ? `${leftBarSize()}px` : undefined,
"min-width": "250px",
"box-shadow": "inset -6px 0 16px -6px rgba(0, 0, 0, 0.1)",
"padding-top": "env(safe-area-inset-top)",
"padding-bottom": "env(safe-area-inset-bottom)"
@@ -484,36 +462,8 @@ export function LeftBar() {
}
export function RightBar() {
const { setRightBarSize, rightBarSize, rightBarVisible } = useBars();
const { rightBarSize, rightBarVisible } = useBars();
let ref: HTMLDivElement | undefined;
let actualWidth = 0;
onMount(() => {
if (ref) {
const updateSize = () => {
actualWidth = ref?.offsetWidth || 0;
setRightBarSize(rightBarVisible() ? actualWidth : 0);
};
updateSize();
const resizeObserver = new ResizeObserver((entries) => {
requestAnimationFrame(() => {
actualWidth = ref?.offsetWidth || 0;
setRightBarSize(rightBarVisible() ? actualWidth : 0);
});
});
resizeObserver.observe(ref);
return () => {
resizeObserver.disconnect();
};
}
});
createEffect(() => {
setRightBarSize(rightBarVisible() ? actualWidth : 0);
});
return (
<aside
@@ -525,8 +475,8 @@ export function RightBar() {
"translate-x-0": rightBarVisible()
}}
style={{
"transition-timing-function": "cubic-bezier(0.4, 0, 0.2, 1)", // Smooth for both revealing and hiding
"min-width": rightBarSize() > 0 ? `${rightBarSize()}px` : undefined,
"transition-timing-function": "cubic-bezier(0.4, 0, 0.2, 1)",
"min-width": "250px",
"box-shadow": "inset 6px 0 16px -6px rgba(0, 0, 0, 0.1)",
"padding-top": "env(safe-area-inset-top)",
"padding-bottom": "env(safe-area-inset-bottom)"

View File

@@ -63,61 +63,6 @@ export default function PostForm(props: PostFormProps) {
}
});
const autoSave = async () => {
const titleVal = title();
if (titleVal) {
try {
let bannerImageKey = "";
const bannerFile = bannerImageFile();
if (bannerFile) {
bannerImageKey = (await AddImageToS3(
bannerFile,
titleVal,
"blog"
)) as string;
}
if (props.mode === "edit" || createdPostId()) {
// Update existing post (either in edit mode or if already created)
await api.database.updatePost.mutate({
id: createdPostId() || props.postId!,
title: titleVal.replaceAll(" ", "_"),
subtitle: subtitle() || "",
body: body() || "Hello, World!",
banner_photo:
bannerImageKey !== ""
? bannerImageKey
: requestedDeleteImage()
? "_DELETE_IMAGE_"
: null,
published: published(),
tags: tags().length > 0 ? tags() : null,
author_id: props.userID
});
} else {
// Create mode: only save once (first autosave)
const result = await api.database.createPost.mutate({
category: "blog",
title: titleVal.replaceAll(" ", "_"),
subtitle: subtitle() || null,
body: body() || "Hello, World!",
banner_photo: bannerImageKey !== "" ? bannerImageKey : null,
published: published(),
tags: tags().length > 0 ? tags() : null,
author_id: props.userID
});
setCreatedPostId(result.data as number);
setHasSaved(true);
}
showAutoSaveTrigger();
} catch (err) {
console.error("Autosave failed:", err);
}
}
};
const showAutoSaveTrigger = () => {
setShowAutoSaveMessage(true);
setTimeout(() => {
@@ -125,27 +70,247 @@ export default function PostForm(props: PostFormProps) {
}, 5000);
};
// Debounced auto-save (1 second after last change)
const debouncedAutoSave = debounce(autoSave, 1000);
// Helper to ensure post exists (create if needed)
const ensurePostExists = async (): Promise<number> => {
const existingId = createdPostId() || props.postId;
if (existingId) return existingId;
// Track changes to trigger auto-save
// Create minimal post if it doesn't exist yet
const result = await api.database.createPost.mutate({
category: "blog",
title: title().replaceAll(" ", "_") || "Untitled",
subtitle: null,
body: "Hello, World!",
banner_photo: null,
published: false,
tags: null,
author_id: props.userID
});
const newId = result.data as number;
setCreatedPostId(newId);
setHasSaved(true);
return newId;
};
// Individual autosave functions for each field
const autoSaveTitle = async () => {
const currentTitle = title();
if (!currentTitle || currentTitle === props.initialData?.title) return;
try {
const postId = await ensurePostExists();
await api.database.updatePost.mutate({
id: postId,
title: currentTitle.replaceAll(" ", "_"),
subtitle: subtitle() || null,
body: body() || "Hello, World!",
banner_photo: null,
published: published(),
tags: tags().length > 0 ? tags() : null,
author_id: props.userID
});
showAutoSaveTrigger();
} catch (err) {
console.error("Title autosave failed:", err);
}
};
const autoSaveSubtitle = async () => {
const currentSubtitle = subtitle();
if (currentSubtitle === props.initialData?.subtitle) return;
if (!title()) return; // Need title to save
try {
const postId = await ensurePostExists();
await api.database.updatePost.mutate({
id: postId,
title: title().replaceAll(" ", "_"),
subtitle: currentSubtitle || null,
body: body() || "Hello, World!",
banner_photo: null,
published: published(),
tags: tags().length > 0 ? tags() : null,
author_id: props.userID
});
showAutoSaveTrigger();
} catch (err) {
console.error("Subtitle autosave failed:", err);
}
};
const autoSaveBody = async () => {
const currentBody = body();
if (currentBody === props.initialData?.body) return;
if (!title()) return;
try {
const postId = await ensurePostExists();
await api.database.updatePost.mutate({
id: postId,
title: title().replaceAll(" ", "_"),
subtitle: subtitle() || null,
body: currentBody || "Hello, World!",
banner_photo: null,
published: published(),
tags: tags().length > 0 ? tags() : null,
author_id: props.userID
});
showAutoSaveTrigger();
} catch (err) {
console.error("Body autosave failed:", err);
}
};
const autoSaveTags = async () => {
const currentTags = tags();
const initialTags = props.initialData?.tags || [];
if (JSON.stringify(currentTags) === JSON.stringify(initialTags)) return;
if (!title()) return;
try {
const postId = await ensurePostExists();
await api.database.updatePost.mutate({
id: postId,
title: title().replaceAll(" ", "_"),
subtitle: subtitle() || null,
body: body() || "Hello, World!",
banner_photo: null,
published: published(),
tags: currentTags.length > 0 ? currentTags : null,
author_id: props.userID
});
showAutoSaveTrigger();
} catch (err) {
console.error("Tags autosave failed:", err);
}
};
const autoSavePublished = async () => {
const currentPublished = published();
if (currentPublished === props.initialData?.published) return;
if (!title()) return;
try {
const postId = await ensurePostExists();
await api.database.updatePost.mutate({
id: postId,
title: title().replaceAll(" ", "_"),
subtitle: subtitle() || null,
body: body() || "Hello, World!",
banner_photo: null,
published: currentPublished,
tags: tags().length > 0 ? tags() : null,
author_id: props.userID
});
showAutoSaveTrigger();
} catch (err) {
console.error("Published autosave failed:", err);
}
};
const autoSaveBanner = async () => {
const bannerFile = bannerImageFile();
if (!bannerFile && !requestedDeleteImage()) return;
if (!title()) return;
try {
let bannerImageKey = "";
if (bannerFile) {
bannerImageKey = (await AddImageToS3(
bannerFile,
title(),
"blog"
)) as string;
}
const postId = await ensurePostExists();
await api.database.updatePost.mutate({
id: postId,
title: title().replaceAll(" ", "_"),
subtitle: subtitle() || null,
body: body() || "Hello, World!",
banner_photo:
bannerImageKey !== ""
? bannerImageKey
: requestedDeleteImage()
? "_DELETE_IMAGE_"
: null,
published: published(),
tags: tags().length > 0 ? tags() : null,
author_id: props.userID
});
showAutoSaveTrigger();
} catch (err) {
console.error("Banner autosave failed:", err);
}
};
// Debounced versions
const debouncedAutoSaveTitle = debounce(autoSaveTitle, 2500);
const debouncedAutoSaveSubtitle = debounce(autoSaveSubtitle, 2500);
const debouncedAutoSaveBody = debounce(autoSaveBody, 2500);
const debouncedAutoSaveTags = debounce(autoSaveTags, 2500);
const debouncedAutoSavePublished = debounce(autoSavePublished, 1000);
const debouncedAutoSaveBanner = debounce(autoSaveBanner, 2500);
// Individual effects for each field
createEffect(() => {
const titleVal = title();
const subtitleVal = subtitle();
const bodyVal = body();
const tagsVal = tags();
const publishedVal = published();
if (isInitialLoad()) return;
if (titleVal && titleVal !== props.initialData?.title) {
debouncedAutoSaveTitle();
}
});
// Only trigger auto-save if conditions are met
if (props.mode === "edit" && !isInitialLoad() && titleVal) {
debouncedAutoSave();
} else if (props.mode === "create" && titleVal) {
debouncedAutoSave();
createEffect(() => {
const subtitleVal = subtitle();
if (isInitialLoad()) return;
if (subtitleVal !== props.initialData?.subtitle) {
debouncedAutoSaveSubtitle();
}
});
createEffect(() => {
const bodyVal = body();
if (isInitialLoad()) return;
if (bodyVal !== props.initialData?.body) {
debouncedAutoSaveBody();
}
});
createEffect(() => {
const tagsVal = tags();
if (isInitialLoad()) return;
const initialTags = props.initialData?.tags || [];
if (JSON.stringify(tagsVal) !== JSON.stringify(initialTags)) {
debouncedAutoSaveTags();
}
});
createEffect(() => {
const publishedVal = published();
if (isInitialLoad()) return;
if (publishedVal !== props.initialData?.published) {
debouncedAutoSavePublished();
}
});
createEffect(() => {
const bannerFile = bannerImageFile();
const deleteRequested = requestedDeleteImage();
if (isInitialLoad()) return;
if (bannerFile || deleteRequested) {
debouncedAutoSaveBanner();
}
});
onCleanup(() => {
debouncedAutoSave.cancel();
debouncedAutoSaveTitle.cancel();
debouncedAutoSaveSubtitle.cancel();
debouncedAutoSaveBody.cancel();
debouncedAutoSaveTags.cancel();
debouncedAutoSavePublished.cancel();
debouncedAutoSaveBanner.cancel();
});
const handleBannerImageDrop = (acceptedFiles: File[]) => {