Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
Add account id in routing and improve the component structure
Hakan Shehuefe2734cd9ae
diff --git a/apps/desktop/src/renderer/app.tsx b/apps/desktop/src/renderer/app.tsxindex c62fccc8..fdb8a19a 100644--- a/apps/desktop/src/renderer/app.tsx+++ b/apps/desktop/src/renderer/app.tsx@@ -4,7 +4,6 @@ import { Outlet, useNavigate } from 'react-router-dom';import { DelayedComponent } from '@/renderer/components/ui/delayed-component';import { useQuery } from '@/renderer/hooks/use-query';import { AppContext } from '@/renderer/contexts/app';-import { AccountProvider } from '@/renderer/components/accounts/account-provider';import { AccountLogout } from '@/renderer/components/accounts/account-logout';import { AccountSettingsDialog } from '@/renderer/components/accounts/account-settings-dialog';import { RadarProvider } from '@/renderer/radar-provider';@@ -64,14 +63,7 @@ export const App = () => {return;}- const accountWorkspaces =- workspaces?.filter((w) => w.accountId === id) ?? [];-- if (accountWorkspaces.length === 0) {- return;- }-- navigate(`/${accountWorkspaces[0].userId}`);+ navigate(`/${id}`);},showWorkspaceSettings: (id) => {setWorkspaceSettingsId(id);@@ -79,9 +71,7 @@ export const App = () => {}}><RadarProvider>- <AccountProvider>- <Outlet />- </AccountProvider>+ <Outlet /></RadarProvider>{logoutId && (<AccountLogout@@ -92,15 +82,7 @@ export const App = () => {const activeAccounts =accounts?.filter((a) => a.id !== logoutId) ?? [];if (activeAccounts.length > 0) {- const activeWorkspaces =- workspaces?.filter((w) =>- activeAccounts.some((a) => a.id === w.accountId)- ) ?? [];-- if (activeWorkspaces.length > 0) {- navigate(`/${activeWorkspaces[0].userId}`);- return;- }+ navigate(`/${activeAccounts[0].id}`);}navigate('/login');diff --git a/apps/desktop/src/renderer/components/accounts/account-provider.tsx b/apps/desktop/src/renderer/components/accounts/account-provider.tsxdeleted file mode 100644index 75d078a2..00000000--- a/apps/desktop/src/renderer/components/accounts/account-provider.tsx+++ /dev/null@@ -1,48 +0,0 @@-import React from 'react';-import { AccountContext } from '@/renderer/contexts/account';-import { useApp } from '@/renderer/contexts/app';-import { Login } from '@/renderer/components/accounts/login';-import { useParams } from 'react-router-dom';--interface AccountProviderProps {- children: React.ReactNode;-}--export const AccountProvider = ({ children }: AccountProviderProps) => {- const app = useApp();- const { userId } = useParams<{ userId: string }>();-- if (app.accounts.length === 0) {- return <Login />;- }-- const workspace = app.workspaces.find(- (workspace) => workspace.userId === userId- );-- let account = app.accounts[0];- if (workspace) {- const workspaceAccount = app.accounts.find(- (account) => account.id === workspace.accountId- );-- if (workspaceAccount) {- account = workspaceAccount;- }- }-- const workspaces = app.workspaces.filter(- (workspace) => workspace.accountId === account.id- );-- return (- <AccountContext.Provider- value={{- ...account,- workspaces,- }}- >- {children}- </AccountContext.Provider>- );-};diff --git a/apps/desktop/src/renderer/components/accounts/account-redirect.tsx b/apps/desktop/src/renderer/components/accounts/account-redirect.tsxnew file mode 100644index 00000000..fe464a4c--- /dev/null+++ b/apps/desktop/src/renderer/components/accounts/account-redirect.tsx@@ -0,0 +1,19 @@+import React from 'react';+import { useNavigate } from 'react-router-dom';+import { useApp } from '@/renderer/contexts/app';++export const AccountRedirect = (): React.ReactNode => {+ const app = useApp();+ const navigate = useNavigate();++ React.useEffect(() => {+ if (app.accounts.length == 0) {+ navigate('/login');+ return;+ }++ navigate(`/${app.accounts[0].id}`);+ }, [app.accounts, navigate]);++ return null;+};diff --git a/apps/desktop/src/renderer/components/accounts/account.tsx b/apps/desktop/src/renderer/components/accounts/account.tsxnew file mode 100644index 00000000..ec7f061b--- /dev/null+++ b/apps/desktop/src/renderer/components/accounts/account.tsx@@ -0,0 +1,27 @@+import { AccountContext } from '@/renderer/contexts/account';+import { useApp } from '@/renderer/contexts/app';+import { Outlet, useParams } from 'react-router-dom';++export const Account = () => {+ const { accountId } = useParams<{ accountId: string }>();++ const app = useApp();+ const account = app.accounts.find((a) => a.id === accountId);++ if (!account) {+ return <p>Account not found</p>;+ }++ const workspaces = app.workspaces.filter((w) => w.accountId === account.id);++ return (+ <AccountContext.Provider+ value={{+ ...account,+ workspaces,+ }}+ >+ <Outlet />+ </AccountContext.Provider>+ );+};diff --git a/apps/desktop/src/renderer/components/accounts/email-login.tsx b/apps/desktop/src/renderer/components/accounts/email-login.tsxindex 172ec40d..784bb7e9 100644--- a/apps/desktop/src/renderer/components/accounts/email-login.tsx+++ b/apps/desktop/src/renderer/components/accounts/email-login.tsx@@ -47,11 +47,7 @@ export const EmailLogin = ({ server }: EmailLoginProps) => {},onSuccess(output) {if (output.success) {- if (output.workspaces.length > 0) {- navigate(`/${output.workspaces[0].user.id}`);- } else {- navigate('/create');- }+ navigate(`/${output.account.id}`);} else {toast({title: 'Failed to login',diff --git a/apps/desktop/src/renderer/components/accounts/email-register.tsx b/apps/desktop/src/renderer/components/accounts/email-register.tsxindex db443958..a33896d8 100644--- a/apps/desktop/src/renderer/components/accounts/email-register.tsx+++ b/apps/desktop/src/renderer/components/accounts/email-register.tsx@@ -50,11 +50,7 @@ export const EmailRegister = ({ server }: EmailRegisterProps) => {},onSuccess(output) {if (output.success) {- if (output.workspaces.length > 0) {- navigate(`/${output.workspaces[0].user.id}`);- } else {- navigate('/create');- }+ navigate(`/${output.account.id}`);} else {toast({title: 'Failed to register',diff --git a/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsx b/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsxindex f856d66f..2e59cbdc 100644--- a/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsx+++ b/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsx@@ -111,7 +111,7 @@ export const LayoutSidebarHeader = () => {key={workspaceItem.id}className="p-0"onClick={() => {- navigate(`/${workspaceItem.userId}`);+ navigate(`/${account.id}/${workspaceItem.id}`);}}><div className="w-full flex items-center gap-2 px-1 py-1.5 text-left text-sm">@@ -156,7 +156,7 @@ export const LayoutSidebarHeader = () => {<DropdownMenuItemclassName="gap-2 p-2 text-muted-foreground"onClick={() => {- navigate('/create');+ navigate(`/${account.id}/create`);}}><Plus className="size-4" />diff --git a/apps/desktop/src/renderer/components/layouts/layout.tsx b/apps/desktop/src/renderer/components/layouts/layout.tsxindex fb09e70e..f07268a0 100644--- a/apps/desktop/src/renderer/components/layouts/layout.tsx+++ b/apps/desktop/src/renderer/components/layouts/layout.tsx@@ -7,17 +7,17 @@ import { LayoutMain } from '@/renderer/components/layouts/layout-main';import { LayoutModal } from '@/renderer/components/layouts/layout-modal';interface LayoutProps {- nodeId?: string | null;+ main?: string | null;modal?: string | null;}-export const Layout = ({ nodeId, modal }: LayoutProps) => {+export const Layout = ({ main, modal }: LayoutProps) => {return (<SidebarProvider><LayoutSidebar /><SidebarInset><main className="h-full max-h-screen w-full min-w-128 flex-grow overflow-hidden bg-white">- {nodeId && <LayoutMain nodeId={nodeId} />}+ {main && <LayoutMain nodeId={main} />}</main>{modal && <LayoutModal nodeId={modal} />}</SidebarInset>diff --git a/apps/desktop/src/renderer/components/workspaces/workspace-create.tsx b/apps/desktop/src/renderer/components/workspaces/workspace-create.tsxindex 8fb0cdb3..b37ddf24 100644--- a/apps/desktop/src/renderer/components/workspaces/workspace-create.tsx+++ b/apps/desktop/src/renderer/components/workspaces/workspace-create.tsx@@ -32,7 +32,7 @@ export const WorkspaceCreate = () => {avatar: values.avatar ?? null,},onSuccess(output) {- navigate(`/${output.userId}`);+ navigate(`/${account.id}/${output.id}`);},onError() {toast({diff --git a/apps/desktop/src/renderer/components/workspaces/workspace-redirect.tsx b/apps/desktop/src/renderer/components/workspaces/workspace-redirect.tsxindex a15096a8..28688e03 100644--- a/apps/desktop/src/renderer/components/workspaces/workspace-redirect.tsx+++ b/apps/desktop/src/renderer/components/workspaces/workspace-redirect.tsx@@ -8,11 +8,11 @@ export const WorkspaceRedirect = (): React.ReactNode => {React.useEffect(() => {if (account.workspaces.length == 0) {- navigate('/create');+ navigate(`/${account.id}/create`);return;}- navigate(`/${account.workspaces[0].userId}`);+ navigate(`/${account.id}/${account.workspaces[0].id}`);}, [account.workspaces, navigate]);return null;diff --git a/apps/desktop/src/renderer/components/workspaces/workspace.tsx b/apps/desktop/src/renderer/components/workspaces/workspace.tsxindex 6bb0c98c..3f3b4c62 100644--- a/apps/desktop/src/renderer/components/workspaces/workspace.tsx+++ b/apps/desktop/src/renderer/components/workspaces/workspace.tsx@@ -1,43 +1,40 @@import { WorkspaceContext } from '@/renderer/contexts/workspace';-import { useNavigate, useParams, useSearchParams } from 'react-router-dom';+import { useParams, useSearchParams } from 'react-router-dom';import { useAccount } from '@/renderer/contexts/account';import { Layout } from '@/renderer/components/layouts/layout';export const Workspace = () => {- const { userId, nodeId } = useParams<{ userId: string; nodeId?: string }>();-+ const { workspaceId } = useParams<{ workspaceId: string }>();const account = useAccount();- const navigate = useNavigate();const [searchParams, setSearchParams] = useSearchParams();- const workspace = account.workspaces.find((w) => w.userId === userId);+ const workspace = account.workspaces.find((w) => w.id === workspaceId);if (!workspace) {return <p>Workspace not found</p>;}+ const main = searchParams.get('main');const modal = searchParams.get('modal');return (<WorkspaceContext.Providervalue={{...workspace,navigateToNode(nodeId) {- navigate(`/${userId}/${nodeId}`);- if (nodeId === modal) {- setSearchParams((prev) => {+ setSearchParams((prev) => {+ prev.set('main', nodeId);+ if (nodeId === modal) {prev.delete('modal');- return prev;- });- }+ }+ return prev;+ });},isNodeActive(id) {- return id === nodeId;+ return id === main;},openModal(modal) {setSearchParams((prev) => {- return {- ...prev,- modal: modal,- };+ prev.set('modal', modal);+ return prev;});},closeModal() {@@ -56,7 +53,7 @@ export const Workspace = () => {},}}>- <Layout nodeId={nodeId} modal={modal} />+ <Layout main={main} modal={modal} /></WorkspaceContext.Provider>);};diff --git a/apps/desktop/src/renderer/root.tsx b/apps/desktop/src/renderer/root.tsxindex d7dd6240..592f3b5f 100644--- a/apps/desktop/src/renderer/root.tsx+++ b/apps/desktop/src/renderer/root.tsx@@ -13,6 +13,9 @@ import { HTML5Backend } from 'react-dnd-html5-backend';import { Login } from '@/renderer/components/accounts/login';import { QueryClient, QueryClientProvider } from '@tanstack/react-query';import { useEventBus } from '@/renderer/hooks/use-event-bus';+import { Event } from '@/shared/types/events';+import { AccountRedirect } from '@/renderer/components/accounts/account-redirect';+import { Account } from '@/renderer/components/accounts/account';const router = createHashRouter([{@@ -21,20 +24,30 @@ const router = createHashRouter([children: [{path: '',- element: <WorkspaceRedirect />,+ element: <AccountRedirect />,},{- path: '/create',- element: <WorkspaceCreate />,+ path: ':accountId',+ element: <Account />,+ children: [+ {+ path: '',+ element: <WorkspaceRedirect />,+ },+ {+ path: 'create',+ element: <WorkspaceCreate />,+ },+ {+ path: ':workspaceId',+ element: <Workspace />,+ },+ ],},{path: '/login',element: <Login />,},- {- path: ':userId/:nodeId?',- element: <Workspace />,- },],},]);@@ -45,7 +58,7 @@ const Root = () => {const eventBus = useEventBus();React.useEffect(() => {- const id = eventBus.subscribe((event) => {+ const id = eventBus.subscribe((event: Event) => {if (event.type === 'query_result_updated' && event.id && event.result) {const result = event.result;const queryId = event.id;