chore: update router

This commit is contained in:
Steven
2022-09-15 22:00:40 +08:00
parent 874b7768c8
commit b5d1ed0ee7
11 changed files with 59 additions and 55 deletions

View File

@@ -23,12 +23,12 @@ const Home: React.FC = () => {
<div className="mx-auto max-w-4xl w-full px-3 py-6 flex flex-col justify-start items-start">
<div className="mb-4 w-full flex flex-row justify-between items-center">
<span className="font-mono text-gray-400">Workspace List</span>
<div
<button
className="text-sm flex flex-row justify-start items-center border px-3 py-2 rounded-lg cursor-pointer hover:shadow"
onClick={() => showCreateWorkspaceDialog()}
>
<Icon.Plus className="w-5 h-auto mr-1" /> Create Workspace
</div>
</button>
</div>
{loadingState.isLoading ? (
<div className="py-4 w-full flex flex-row justify-center items-center">

View File

@@ -1,5 +1,5 @@
import { useEffect, useState } from "react";
import { useNavigate, useParams } from "react-router-dom";
import { Link, useParams } from "react-router-dom";
import { shortcutService, workspaceService } from "../services";
import { useAppSelector } from "../store";
import useLoading from "../hooks/useLoading";
@@ -15,7 +15,6 @@ interface State {
}
const WorkspaceDetail: React.FC = () => {
const navigate = useNavigate();
const params = useParams();
const { shortcutList } = useAppSelector((state) => state.shortcut);
const [state, setState] = useState<State>({
@@ -24,7 +23,7 @@ const WorkspaceDetail: React.FC = () => {
const loadingState = useLoading();
useEffect(() => {
const workspace = workspaceService.getWorkspaceById(Number(params.workspaceId));
const workspace = workspaceService.getWorkspaceByName(params.workspaceName ?? "");
if (!workspace) {
toastHelper.error("workspace not found");
return;
@@ -39,29 +38,25 @@ const WorkspaceDetail: React.FC = () => {
});
}, []);
const handleBackToHome = () => {
navigate("/");
};
return (
<div className="w-full h-full flex flex-col justify-start items-start">
<Header />
<div className="mx-auto max-w-4xl w-full px-3 py-6 flex flex-col justify-start items-start">
<div className="w-full flex flex-row justify-start items-center mb-4">
<span className="font-mono text-gray-600 cursor-pointer hover:underline" onClick={() => handleBackToHome()}>
<Link to={"/"} className="font-mono text-gray-600 cursor-pointer hover:underline">
Home
</span>
</Link>
<span className="font-mono text-gray-200 mx-4">/</span>
<span className="font-mono text-gray-600">Workspace: {state?.workspace.name}</span>
</div>
<div className="w-full flex flex-row justify-between items-center mb-4">
<span className="font-mono text-gray-400">Shortcut List</span>
<div
<button
className="text-sm flex flex-row justify-start items-center border px-3 py-2 rounded-lg cursor-pointer hover:shadow"
onClick={() => showCreateShortcutDialog(state.workspace.id)}
>
<Icon.Plus className="w-5 h-auto mr-1" /> Create Shortcut
</div>
</button>
</div>
{loadingState.isLoading ? (
<div className="py-4 w-full flex flex-row justify-center items-center">