schiwagoa/tianji
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add logout button in switch workspace page

Browse Source
This commit is contained in:
moonrailgun 2024-09-14 22:14:11 +08:00
parent 2b9a14c969
commit 6ce2f7fd4d
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/routes/settings/profile.tsx
View File

@ -37,7 +37,7 @@ function PageComponent() {
<Form layout="vertical"> <Form layout="vertical">
<Form.Item label={t('Current Workspace Id')}> <Form.Item label={t('Current Workspace Id')}>
<Typography.Text copyable={true} code={true}> <Typography.Text copyable={true} code={true}>
{userInfo?.currentWorkspace?.id} {userInfo?.currentWorkspaceId}
</Typography.Text> </Typography.Text>
</Form.Item> </Form.Item>
<Form.Item label={t('User Id')}> <Form.Item label={t('User Id')}>

17
src/client/routes/switchWorkspace.tsx
View File

@ -16,6 +16,7 @@ import {
import { WorkspaceSwitcher } from '@/components/WorkspaceSwitcher'; import { WorkspaceSwitcher } from '@/components/WorkspaceSwitcher';
import { Button } from '@/components/ui/button'; import { Button } from '@/components/ui/button';
import { useEvent } from '@/hooks/useEvent'; import { useEvent } from '@/hooks/useEvent';
import { useAuth } from '@/api/authjs/useAuth';
export const Route = createFileRoute('/switchWorkspace')({ export const Route = createFileRoute('/switchWorkspace')({
validateSearch: z.object({ validateSearch: z.object({
@ -45,6 +46,7 @@ function PageComponent() {
const currentWorkspace = useCurrentWorkspaceSafe(); const currentWorkspace = useCurrentWorkspaceSafe();
const search = Route.useSearch(); const search = Route.useSearch();
const navigate = useNavigate(); const navigate = useNavigate();
const { logout } = useAuth();
const handleEnter = useEvent(() => { const handleEnter = useEvent(() => {
navigate({ navigate({
@ -66,13 +68,14 @@ function PageComponent() {
<WorkspaceSwitcher isCollapsed={false} /> <WorkspaceSwitcher isCollapsed={false} />
</CardContent> </CardContent>
{currentWorkspace && ( <CardFooter className="justify-end gap-2">
<CardFooter className="justify-end"> <Button size="sm" variant="outline" onClick={logout}>
<Button size="sm" onClick={handleEnter}> {t('Logout')}
{t('Enter')} </Button>
</Button> <Button disabled={!currentWorkspace} size="sm" onClick={handleEnter}>
</CardFooter> {t('Enter')}
)} </Button>
</CardFooter>
</Card> </Card>
</div> </div>
); );