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
Improve account sidebar footer
Hakan Shehua94feccc02a2
diff --git a/apps/desktop/src/renderer/app.tsx b/apps/desktop/src/renderer/app.tsxindex d8ae270a..ca04d1ca 100644--- a/apps/desktop/src/renderer/app.tsx+++ b/apps/desktop/src/renderer/app.tsx@@ -1,19 +1,11 @@-import React from 'react';import { AppLoading } from '@/renderer/app-loading';-import { Outlet, useNavigate } from 'react-router-dom';+import { Outlet } 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 { AccountLogout } from '@/renderer/components/accounts/account-logout';-import { AccountSettingsDialog } from '@/renderer/components/accounts/account-settings-dialog';import { RadarProvider } from '@/renderer/radar-provider';export const App = () => {- const navigate = useNavigate();- const [logoutId, setLogoutId] = React.useState<string | null>(null);- const [accountSettingsId, setSettingsId] = React.useState<string | null>(- null- );const { data: servers, isPending: isPendingServers } = useQuery({type: 'server_list',});@@ -43,51 +35,11 @@ export const App = () => {accounts: accounts ?? [],workspaces: workspaces ?? [],servers: servers ?? [],- showAccountLogin: () => {- navigate('/login');- },- showAccountLogout: (id) => {- setLogoutId(id);- },- showAccountSettings: (id) => {- setSettingsId(id);- },- setAccount: (id) => {- const account = accounts?.find((a) => a.id === id);- if (!account) {- return;- }-- navigate(`/${id}`);- },}}><RadarProvider><Outlet /></RadarProvider>- {logoutId && (- <AccountLogout- id={logoutId}- onCancel={() => setLogoutId(null)}- onLogout={() => {- setLogoutId(null);- const activeAccounts =- accounts?.filter((a) => a.id !== logoutId) ?? [];- if (activeAccounts.length > 0) {- navigate(`/${activeAccounts[0].id}`);- }-- navigate('/login');- }}- />- )}- {accountSettingsId && (- <AccountSettingsDialog- id={accountSettingsId}- open={true}- onOpenChange={() => setSettingsId(null)}- />- )}</AppContext.Provider>);};diff --git a/apps/desktop/src/renderer/components/accounts/account-logout.tsx b/apps/desktop/src/renderer/components/accounts/account-logout.tsxindex e410b7c2..47fad341 100644--- a/apps/desktop/src/renderer/components/accounts/account-logout.tsx+++ b/apps/desktop/src/renderer/components/accounts/account-logout.tsx@@ -9,20 +9,17 @@ import {} from '@/renderer/components/ui/alert-dialog';import { Button } from '@/renderer/components/ui/button';import { Spinner } from '@/renderer/components/ui/spinner';+import { useAccount } from '@/renderer/contexts/account';import { useMutation } from '@/renderer/hooks/use-mutation';import { toast } from '@/renderer/hooks/use-toast';interface AccountLogoutProps {- id: string;onCancel: () => void;onLogout: () => void;}-export const AccountLogout = ({- id,- onCancel,- onLogout,-}: AccountLogoutProps) => {+export const AccountLogout = ({ onCancel, onLogout }: AccountLogoutProps) => {+ const account = useAccount();const { mutate, isPending } = useMutation();return (<AlertDialog@@ -49,7 +46,7 @@ export const AccountLogout = ({mutate({input: {type: 'logout',- accountId: id,+ accountId: account.id,},onSuccess() {onLogout();diff --git a/apps/desktop/src/renderer/components/accounts/account-settings-dialog.tsx b/apps/desktop/src/renderer/components/accounts/account-settings-dialog.tsxindex db199f37..4d639465 100644--- a/apps/desktop/src/renderer/components/accounts/account-settings-dialog.tsx+++ b/apps/desktop/src/renderer/components/accounts/account-settings-dialog.tsx@@ -13,25 +13,18 @@ import { VisuallyHidden } from '@radix-ui/react-visually-hidden';import { Avatar } from '@/renderer/components/avatars/avatar';import { Info, Trash2 } from 'lucide-react';import { AccountUpdate } from '@/renderer/components/accounts/account-update';-import { useApp } from '@/renderer/contexts/app';+import { useAccount } from '@/renderer/contexts/account';interface AccountSettingsDialogProps {- id: string;open: boolean;onOpenChange: (open: boolean) => void;}export const AccountSettingsDialog = ({- id,open,onOpenChange,}: AccountSettingsDialogProps) => {- const app = useApp();- const account = app.accounts.find((a) => a.id === id);-- if (!account) {- return null;- }+ const account = useAccount();return (<Dialog open={open} onOpenChange={onOpenChange}>diff --git a/apps/desktop/src/renderer/components/accounts/account.tsx b/apps/desktop/src/renderer/components/accounts/account.tsxindex ec7f061b..063adc95 100644--- a/apps/desktop/src/renderer/components/accounts/account.tsx+++ b/apps/desktop/src/renderer/components/accounts/account.tsx@@ -1,11 +1,18 @@+import React from 'react';import { AccountContext } from '@/renderer/contexts/account';import { useApp } from '@/renderer/contexts/app';-import { Outlet, useParams } from 'react-router-dom';+import { Outlet, useNavigate, useParams } from 'react-router-dom';+import { AccountLogout } from './account-logout';+import { AccountSettingsDialog } from './account-settings-dialog';export const Account = () => {const { accountId } = useParams<{ accountId: string }>();-+ const navigate = useNavigate();const app = useApp();++ const [openSettings, setOpenSettings] = React.useState(false);+ const [openLogout, setOpenLogout] = React.useState(false);+const account = app.accounts.find((a) => a.id === accountId);if (!account) {@@ -19,9 +26,33 @@ export const Account = () => {value={{...account,workspaces,+ openSettings: () => setOpenSettings(true),+ openLogout: () => setOpenLogout(true),}}><Outlet />+ {openSettings && (+ <AccountSettingsDialog+ open={true}+ onOpenChange={() => setOpenSettings(false)}+ />+ )}+ {openLogout && (+ <AccountLogout+ onCancel={() => setOpenLogout(false)}+ onLogout={() => {+ setOpenLogout(false);+ const activeAccounts =+ app.accounts?.filter((a) => a.id !== account.id) ?? [];+ if (activeAccounts.length > 0) {+ navigate(`/${activeAccounts[0].id}`);+ return;+ }++ navigate('/login');+ }}+ />+ )}</AccountContext.Provider>);};diff --git a/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx b/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsxindex adcae6a0..b18347bf 100644--- a/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx+++ b/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx@@ -13,23 +13,22 @@ import {SidebarMenuItem,useSidebar,} from '@/renderer/components/ui/sidebar';-import {- Tooltip,- TooltipContent,- TooltipTrigger,-} from '@/renderer/components/ui/tooltip';import { Avatar } from '@/renderer/components/avatars/avatar';import { useAccount } from '@/renderer/contexts/account';import { ChevronsUpDown, LogOut, Plus, Settings } from 'lucide-react';import { useApp } from '@/renderer/contexts/app';+import { useNavigate } from 'react-router-dom';export function LayoutSidebarFooter() {const app = useApp();const account = useAccount();const sidebar = useSidebar();+ const navigate = useNavigate();const [open, setOpen] = React.useState(false);+ const otherAccounts = app.accounts.filter((a) => a.id !== account.id);+return (<SidebarMenu><SidebarMenuItem>@@ -58,68 +57,79 @@ export function LayoutSidebarFooter() {align="end"sideOffset={4}>- <DropdownMenuLabel className="mb-1">Accounts</DropdownMenuLabel>- {app.accounts.map((account) => (- <DropdownMenuItem- key={account.id}- className="p-0"- onClick={() => {- app.setAccount(account.id);- }}- >- <div className="w-full flex items-center gap-2 px-1 py-1.5 text-left text-sm">- <Avatar- className="h-8 w-8 rounded-lg"- id={account.id}- name={account.name}- avatar={account.avatar}- />- <div className="grid flex-1 text-left text-sm leading-tight">- <span className="truncate font-semibold">- {account.name}- </span>- <span className="truncate text-xs">{account.email}</span>- </div>- <div className="ml-auto flex items-center gap-2 text-muted-foreground mr-1">- <Tooltip>- <TooltipTrigger asChild>- <LogOut- className="size-4 hover:cursor-pointer hover:text-red-500"- onClick={(e) => {- e.stopPropagation();- app.showAccountLogout(account.id);- setOpen(false);- }}- />- </TooltipTrigger>- <TooltipContent className="flex flex-row items-center gap-2">- Log out- </TooltipContent>- </Tooltip>- <Tooltip>- <TooltipTrigger asChild>- <Settings- className="size-4 hover:cursor-pointer hover:text-sidebar-accent-foreground"- onClick={(e) => {- e.stopPropagation();- app.showAccountSettings(account.id);- setOpen(false);- }}- />- </TooltipTrigger>- <TooltipContent className="flex flex-row items-center gap-2">- Settings- </TooltipContent>- </Tooltip>- </div>+ <DropdownMenuItem key={account.id} className="p-0">+ <div className="w-full flex items-center gap-2 px-1 py-1.5 text-left text-sm">+ <Avatar+ className="h-8 w-8 rounded-lg"+ id={account.id}+ name={account.name}+ avatar={account.avatar}+ />+ <div className="grid flex-1 text-left text-sm leading-tight">+ <span className="truncate font-semibold">{account.name}</span>+ <span className="truncate text-xs">{account.email}</span></div>- </DropdownMenuItem>- ))}+ </div>+ </DropdownMenuItem>+ <DropdownMenuSeparator />+ <DropdownMenuItem+ className="gap-2 p-2"+ onClick={() => {+ account.openSettings();+ }}+ >+ <Settings className="size-4" />+ <p className="font-medium">Settings</p>+ </DropdownMenuItem>+ <DropdownMenuItem+ className="gap-2 p-2"+ onClick={() => {+ account.openLogout();+ }}+ >+ <LogOut className="size-4" />+ <p className="font-medium">Logout</p>+ </DropdownMenuItem>+ {otherAccounts.length > 0 && (+ <React.Fragment>+ <DropdownMenuSeparator />+ <DropdownMenuLabel className="mb-1">+ Other accounts+ </DropdownMenuLabel>+ {otherAccounts.map((otherAccount) => (+ <DropdownMenuItem+ key={otherAccount.id}+ className="p-0"+ onClick={() => {+ navigate(`/${otherAccount.id}`);+ }}+ >+ <div className="w-full flex items-center gap-2 px-1 py-1.5 text-left text-sm">+ <Avatar+ className="h-8 w-8 rounded-lg"+ id={otherAccount.id}+ name={otherAccount.name}+ avatar={otherAccount.avatar}+ />+ <div className="grid flex-1 text-left text-sm leading-tight">+ <span className="truncate font-semibold">+ {otherAccount.name}+ </span>+ <span className="truncate text-xs">+ {otherAccount.email}+ </span>+ </div>+ </div>+ </DropdownMenuItem>+ ))}+ </React.Fragment>+ )}+<DropdownMenuSeparator className="my-1" /><DropdownMenuItem- className="flex items-center gap-2"+ className="flex items-center gap-2 text-muted-foreground hover:text-foreground"onClick={() => {- app.showAccountLogin();+ navigate(`/login`);}}><Plus className="size-4" />diff --git a/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsx b/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsxindex 010cbd47..3054a4c0 100644--- a/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsx+++ b/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsx@@ -17,7 +17,7 @@ import {SidebarMenuItem,useSidebar,} from '@/renderer/components/ui/sidebar';-import { ChevronsUpDown, Settings, Plus } from 'lucide-react';+import { ChevronsUpDown, Settings, Plus, Bell } from 'lucide-react';import { useRadar } from '@/renderer/contexts/radar';interface WorkspaceStateIndicatorProps {@@ -112,7 +112,7 @@ export const LayoutSidebarHeader = () => {</DropdownMenuItem><DropdownMenuSeparator /><DropdownMenuItem- className="gap-2 p-2 text-muted-foreground"+ className="gap-2 p-2"onClick={() => {workspace.openSettings();}}@@ -120,9 +120,13 @@ export const LayoutSidebarHeader = () => {<Settings className="size-4" /><p className="font-medium">Settings</p></DropdownMenuItem>- <DropdownMenuSeparator />+ <DropdownMenuItem className="gap-2 p-2" disabled={true}>+ <Bell className="size-4" />+ <p className="font-medium">Notifications</p>+ </DropdownMenuItem>{otherWorkspaces.length > 0 && (<React.Fragment>+ <DropdownMenuSeparator /><DropdownMenuLabel className="mb-1">Other workspaces</DropdownMenuLabel>@@ -160,7 +164,7 @@ export const LayoutSidebarHeader = () => {)}<DropdownMenuSeparator className="my-1" /><DropdownMenuItem- className="gap-2 p-2 text-muted-foreground"+ className="gap-2 p-2 text-muted-foreground hover:text-foreground"onClick={() => {navigate(`/${account.id}/create`);}}diff --git a/apps/desktop/src/renderer/contexts/account.ts b/apps/desktop/src/renderer/contexts/account.tsindex aaed6c8e..8787065f 100644--- a/apps/desktop/src/renderer/contexts/account.ts+++ b/apps/desktop/src/renderer/contexts/account.ts@@ -4,6 +4,8 @@ import { Workspace } from '@/shared/types/workspaces';interface AccountContext extends Account {workspaces: Workspace[];+ openSettings: () => void;+ openLogout: () => void;}export const AccountContext = createContext<AccountContext>(diff --git a/apps/desktop/src/renderer/contexts/app.ts b/apps/desktop/src/renderer/contexts/app.tsindex e11eccc5..a44c3d6c 100644--- a/apps/desktop/src/renderer/contexts/app.ts+++ b/apps/desktop/src/renderer/contexts/app.ts@@ -7,10 +7,6 @@ interface AppContext {accounts: Account[];workspaces: Workspace[];servers: Server[];- showAccountLogin: () => void;- setAccount: (id: string) => void;- showAccountLogout: (id: string) => void;- showAccountSettings: (id: string) => void;}export const AppContext = createContext<AppContext>({} as AppContext);