Skip to content

Commit 2e85ebb

Browse files
committed
chore: update react-router
1 parent 798b444 commit 2e85ebb

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

src/authenticated-app.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { ReactComponent as SoftwareLogo } from "assets/software-logo.svg";
55
import styled from "@emotion/styled";
66
import { ButtonNoPadding, Row } from "components/lib";
77
import { Button, Dropdown, Menu } from "antd";
8-
import { Navigate, Route, Routes } from "react-router";
8+
import { Route, Routes } from "react-router";
99
import { ProjectScreen } from "screens/project";
1010
import { resetRoute } from "utils";
1111
import { ProjectModal } from "screens/project-list/project-modal";
@@ -32,9 +32,9 @@ export default function AuthenticatedApp() {
3232
<PageHeader />
3333
<Main>
3434
<Routes>
35-
<Route path={"/projects"} element={<ProjectListScreen />} />
36-
<Route path={"/projects/:projectId/*"} element={<ProjectScreen />} />
37-
<Navigate to={"/projects"} />
35+
<Route path={"projects"} element={<ProjectListScreen />} />
36+
<Route path={"projects/:projectId/*"} element={<ProjectScreen />} />
37+
<Route index element={<ProjectListScreen />} />
3838
</Routes>
3939
</Main>
4040
<ProjectModal />

src/screens/project-list/list.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ export const List = ({ users, ...props }: ListProps) => {
4141
title: "名称",
4242
sorter: (a, b) => a.name.localeCompare(b.name),
4343
render(value, project) {
44-
return <Link to={String(project.id)}>{project.name}</Link>;
44+
return (
45+
<Link to={`projects/${String(project.id)}`}>{project.name}</Link>
46+
);
4547
},
4648
},
4749
{

src/screens/project/index.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22
import { Link } from "react-router-dom";
3-
import { Navigate, Route, Routes, useLocation } from "react-router";
3+
import { Route, Routes, useLocation } from "react-router";
44
import { KanbanScreen } from "screens/kanban";
55
import { EpicScreen } from "screens/epic";
66
import styled from "@emotion/styled";
@@ -28,10 +28,10 @@ export const ProjectScreen = () => {
2828
<Main>
2929
<Routes>
3030
{/*projects/:projectId/kanban*/}
31-
<Route path={"/kanban"} element={<KanbanScreen />} />
31+
<Route path={"kanban"} element={<KanbanScreen />} />
3232
{/*projects/:projectId/epic*/}
33-
<Route path={"/epic"} element={<EpicScreen />} />
34-
<Navigate to={window.location.pathname + "/kanban"} replace={true} />
33+
<Route path={"epic"} element={<EpicScreen />} />
34+
<Route index element={<KanbanScreen />} />
3535
</Routes>
3636
</Main>
3737
</Container>

0 commit comments

Comments
 (0)