Ryan/docmost-ryan
1
0
Fork 0
mirror of https://github.com/Shadowfita/docmost.git synced 2025-11-13 16:22:32 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix header and redirect home

Browse Source
This commit is contained in:
Philipinho
2024-06-04 21:48:01 +01:00
parent dfb34fd90d
commit 4501a40c29
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/client/src/App.tsx
View File

@ -1,4 +1,4 @@
import { Route, Routes } from "react-router-dom"; import { Navigate, Route, Routes } from "react-router-dom";
import { Welcome } from "@/pages/welcome"; import { Welcome } from "@/pages/welcome";
import SignUpPage from "@/pages/auth/signup"; import SignUpPage from "@/pages/auth/signup";
import LoginPage from "@/pages/auth/login"; import LoginPage from "@/pages/auth/login";
@ -59,7 +59,7 @@ export default function App() {
return ( return (
<> <>
<Routes> <Routes>
<Route index element={<Welcome />} /> <Route index element={<Navigate to="/home" />} />
<Route path={"/login"} element={<LoginPage />} /> <Route path={"/login"} element={<LoginPage />} />
<Route path={"/signup"} element={<SignUpPage />} /> <Route path={"/signup"} element={<SignUpPage />} />
<Route path={"/invites/:invitationId"} element={<InviteSignUpForm />} /> <Route path={"/invites/:invitationId"} element={<InviteSignUpForm />} />

4
apps/client/src/components/layouts/global/top-menu.tsx
View File

@ -20,6 +20,10 @@ export default function TopMenu() {
const user = currentUser.user; const user = currentUser.user;
const workspace = currentUser.workspace; const workspace = currentUser.workspace;
if (!user || !workspace) {
return <></>;
}
return ( return (
<Menu width={250} position="bottom-end" withArrow shadow={"lg"}> <Menu width={250} position="bottom-end" withArrow shadow={"lg"}>
<Menu.Target> <Menu.Target>