Skip to content

Commit

Permalink
feat: add hash routing
Browse files Browse the repository at this point in the history
  • Loading branch information
AKharytonchyk committed Apr 16, 2024
1 parent 8824d8f commit 366bcc7
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "git-dashboard",
"version": "0.1.0",
"private": true,
"homepage": "https://akharytonchyk.github.io/git-pull-request-dashboard/",
"dependencies": {
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.0",
Expand Down
9 changes: 6 additions & 3 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { AppBar, Box, Toolbar } from "@mui/material";
import { SettingsDrawer } from "./SettingsDrawer";
import { AuthHeader } from "./components/AuthHeader";
import { UnAuthHeader } from "./components/UnAuthHeader";
import { Outlet } from "react-router-dom";
import { Outlet, useNavigate } from "react-router-dom";

export const ConfigContext = React.createContext<{
octokit: GitService | null;
Expand All @@ -23,6 +23,7 @@ function App() {
const [token, setToken] = React.useState<string>();
const [octokit, setOctokit] = React.useState<GitService | null>(null);
const [openSettings, setOpenSettings] = React.useState<boolean>(false);
const navigate = useNavigate();

const onLogin = React.useCallback(() => {
if (token) {
Expand All @@ -42,9 +43,10 @@ function App() {
setUser(user.data);
localStorage.setItem("token", token);
localStorage.setItem("user", JSON.stringify(user.data));
navigate("/");
});
}
}, [token]);
}, [token, navigate]);

React.useEffect(() => {
setToken(localStorage.getItem("token") ?? undefined);
Expand All @@ -64,7 +66,8 @@ function App() {
localStorage.removeItem("user");
setUser(undefined);
setOctokit(null);
}, []);
navigate("/login");
}, [navigate]);

const [repositorySettings, setRepositorySettings] = React.useState<
Record<string, boolean>
Expand Down
4 changes: 2 additions & 2 deletions src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import ReactDOM from "react-dom/client";
import "./index.css";
import App from "./App";
import reportWebVitals from "./reportWebVitals";
import { RouterProvider, createBrowserRouter } from "react-router-dom";
import { RouterProvider, createHashRouter } from "react-router-dom";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { ScopedCssBaseline } from "@mui/material";
import LandingPage from "./pages/LandingPage";
import { Coverage } from "./pages/Coverage";
import { Dashboard } from "./components/Dashboard";

const router = createBrowserRouter([
const router = createHashRouter([
{
path: "/",
element: <App />,
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Coverage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const Coverage: React.FC = () => {
const { data, isLoading, isError } = useQuery({
queryKey: ["coverage"],
queryFn: async () => {
const coverage = await fetch("/coverage.json", {
const coverage = await fetch("coverage.json", {
headers: {
Accept: "application/json",
},
Expand Down

0 comments on commit 366bcc7

Please sign in to comment.