Skip to content

feat: route workspace sections and add bulk public publishing #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WangEn merged 8 commits into from
Sep 18, 2026
Merged

feat: route workspace sections and add bulk public publishing #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d4e365e
feat: route workspace sections by URL
WangEn Sep 18, 2026
c059105
feat: keep workspace utility state active on subroutes
WangEn Sep 18, 2026
b0a7a6a
feat: add filtered bulk public bookmark publishing
WangEn Sep 18, 2026
947b4cd
fix: lock public row actions during mutations
WangEn Sep 18, 2026
4458abc
style: add public publishing search filters and bulk controls
WangEn Sep 18, 2026
7f86036
fix: serialize public page mutations across views
WangEn Sep 18, 2026
5032a28
fix: separate selection styling from publication state
WangEn Sep 18, 2026
e028339
fix: clear row selection after individual publication changes
WangEn Sep 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 44 additions & 12 deletions apps/web/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,31 @@ const sourceLabel: Record<CommandResult["source"], string> = {

type View = "launcher" | "workspaces" | "sessions" | "bookmarks" | "search" | "transfer" | "extension";

const viewPaths: Record<View, string> = {
launcher: "/app",
workspaces: "/app/workspaces",
sessions: "/app/sessions",
bookmarks: "/app/bookmarks",
search: "/app/search",
transfer: "/app/transfer",
extension: "/app/extension",
};

function viewFromPath(pathname: string): View {
for (const [view, path] of Object.entries(viewPaths) as Array<[View, string]>) {
if (view === "launcher") continue;
if (pathname === path || pathname.startsWith(`${path}/`)) return view;
}
return "launcher";
}

function navigateView(view: View) {
const path = viewPaths[view];
if (window.location.pathname === path) return;
window.history.pushState({}, "", path);
window.dispatchEvent(new PopStateEvent("popstate"));
}

function openUrls(urls: string[]) {
for (const url of urls) {
const opened = window.open(url, "_blank", "noopener,noreferrer");
Expand All @@ -72,7 +97,7 @@ function collectionResultId(id: string) {
}

export function App() {
const [view, setView] = useState<View>("launcher");
const [view, setView] = useState<View>(() => viewFromPath(window.location.pathname));
const [query, setQuery] = useState("");
const [selectedIndex, setSelectedIndex] = useState(0);
const [bookmarks, setBookmarks] = useState<Bookmark[]>([]);
Expand Down Expand Up @@ -146,6 +171,12 @@ export function App() {
void refresh();
}, [refresh]);

useEffect(() => {
const onPopState = () => setView(viewFromPath(window.location.pathname));
window.addEventListener("popstate", onPopState);
return () => window.removeEventListener("popstate", onPopState);
}, []);

useEffect(() => {
const unsubscribe = onBridgeEvent((event) => {
if (event === "ready" || event === "tabs-changed") void refreshBridge();
Expand All @@ -161,6 +192,7 @@ export function App() {

useEffect(() => {
const focusLauncher = () => {
navigateView("launcher");
setView("launcher");
void refreshBridge();
requestAnimationFrame(() => commandInputRef.current?.focus());
Expand Down Expand Up @@ -361,7 +393,7 @@ export function App() {
}

if (item.source === "navigation" && item.id === "navigation:extension") {
setView("extension");
navigateView("extension");
return;
}

Expand Down Expand Up @@ -493,18 +525,18 @@ export function App() {
return (
<main className="shell">
<header className="topbar">
<button className="brand brand-button" type="button" onClick={() => setView("launcher")} aria-label="Dockmark home">
<button className="brand brand-button" type="button" onClick={() => navigateView("launcher")} aria-label="Dockmark home">
<span className="brand-mark">D·</span>
<span>Dockmark</span>
</button>
<nav className="workspace-section-nav" aria-label="Workspace sections">
<button className={`ghost ${view === "launcher" ? "active" : ""}`} type="button" aria-current={view === "launcher" ? "page" : undefined} onClick={() => setView("launcher")}>Launcher</button>
<button className={`ghost ${view === "workspaces" ? "active" : ""}`} type="button" aria-current={view === "workspaces" ? "page" : undefined} onClick={() => setView("workspaces")}>Workspaces</button>
<button className={`ghost ${view === "sessions" ? "active" : ""}`} type="button" aria-current={view === "sessions" ? "page" : undefined} onClick={() => setView("sessions")}>Sessions</button>
<button className={`ghost ${view === "bookmarks" ? "active" : ""}`} type="button" aria-current={view === "bookmarks" ? "page" : undefined} onClick={() => setView("bookmarks")}>Bookmarks</button>
<button className={`ghost ${view === "search" ? "active" : ""}`} type="button" aria-current={view === "search" ? "page" : undefined} onClick={() => setView("search")}>Search</button>
<button className={`ghost ${view === "transfer" ? "active" : ""}`} type="button" aria-current={view === "transfer" ? "page" : undefined} onClick={() => setView("transfer")}>Transfer</button>
<button className={`ghost ${view === "extension" ? "active" : ""}`} type="button" aria-current={view === "extension" ? "page" : undefined} onClick={() => setView("extension")}>Extension</button>
<button className={`ghost ${view === "launcher" ? "active" : ""}`} type="button" aria-current={view === "launcher" ? "page" : undefined} onClick={() => navigateView("launcher")}>Launcher</button>
<button className={`ghost ${view === "workspaces" ? "active" : ""}`} type="button" aria-current={view === "workspaces" ? "page" : undefined} onClick={() => navigateView("workspaces")}>Workspaces</button>
<button className={`ghost ${view === "sessions" ? "active" : ""}`} type="button" aria-current={view === "sessions" ? "page" : undefined} onClick={() => navigateView("sessions")}>Sessions</button>
<button className={`ghost ${view === "bookmarks" ? "active" : ""}`} type="button" aria-current={view === "bookmarks" ? "page" : undefined} onClick={() => navigateView("bookmarks")}>Bookmarks</button>
<button className={`ghost ${view === "search" ? "active" : ""}`} type="button" aria-current={view === "search" ? "page" : undefined} onClick={() => navigateView("search")}>Search</button>
<button className={`ghost ${view === "transfer" ? "active" : ""}`} type="button" aria-current={view === "transfer" ? "page" : undefined} onClick={() => navigateView("transfer")}>Transfer</button>
<button className={`ghost ${view === "extension" ? "active" : ""}`} type="button" aria-current={view === "extension" ? "page" : undefined} onClick={() => navigateView("extension")}>Extension</button>
</nav>
</header>

Expand All @@ -530,7 +562,7 @@ export function App() {
) : view === "search" ? (
<SearchEngineManager engines={searchEngines} loading={loading} onChanged={refresh} />
) : view === "transfer" ? (
<TransferManager bookmarks={bookmarks} categories={categories} onChanged={refresh} onOpenExtension={() => setView("extension")} />
<TransferManager bookmarks={bookmarks} categories={categories} onChanged={refresh} onOpenExtension={() => navigateView("extension")} />
) : view === "extension" ? (
<BrowserExtensionManager />
) : (
Expand Down Expand Up @@ -603,7 +635,7 @@ export function App() {
</section>

{!bridgeConnected && (
<button className="extension-nudge" type="button" onClick={() => setView("extension")}>
<button className="extension-nudge" type="button" onClick={() => navigateView("extension")}>
<span className="extension-nudge-copy">
<strong>Unlock browser integration</strong>
<span>Install Dockmark Extension for open tabs, pinned Session restore and native bookmark import.</span>
Expand Down
10 changes: 9 additions & 1 deletion apps/web/src/PrivateRoot.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@ function navigate(path: string) {
window.dispatchEvent(new PopStateEvent("popstate"));
}

function isWorkspacePath(pathname: string) {
return pathname.startsWith("/app") &&
!pathname.startsWith("/app/settings") &&
!pathname.startsWith("/app/inbox") &&
!pathname.startsWith("/app/collections") &&
!pathname.startsWith("/app/duplicates");
}

function PrivateNavigation({ children, onLogout }: { children: ReactNode; onLogout: () => Promise<void> }) {
const [path, setPath] = useState(window.location.pathname);
const [inboxCount, setInboxCount] = useState<number | null>(null);
Expand Down Expand Up @@ -69,7 +77,7 @@ function PrivateNavigation({ children, onLogout }: { children: ReactNode; onLogo
<div className="private-utility-bar">
<a href="/" className="private-utility-brand"><span>D·</span> Public page</a>
<nav>
<button className={path === "/app" ? "active" : ""} type="button" onClick={() => navigate("/app")}>Workspace</button>
<button className={isWorkspacePath(path) ? "active" : ""} type="button" onClick={() => navigate("/app")}>Workspace</button>
<button
className={`${path.startsWith("/app/inbox") ? "active " : ""}private-inbox-nav`}
type="button"
Expand Down
Loading
Loading