generated from Pettor/template-web-app-react
-
Notifications
You must be signed in to change notification settings - Fork 0
feat: migrate from react router to tanstack router #181
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Pettor
wants to merge
1
commit into
main
Choose a base branch
from
feat/tanstack-router
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,3 +35,6 @@ storybook-static/ | |
| *.njsproj | ||
| *.sln | ||
| *.sw? | ||
|
|
||
| # Ai | ||
| .claude/ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| export type AuthStatus = "idle" | "authenticating" | "authenticated"; | ||
| export type AuthStatus = "idle" | "authenticating" | "authenticated" | "unauthenticated"; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| import type { ReactElement, ReactNode } from "react"; | ||
| import { useState, useEffect } from "react"; | ||
| import { usePostRefreshTokenMutate } from "@package/api"; | ||
|
|
||
| export interface AuthInitializerProps { | ||
| children: (authStatus: "authenticated" | "unauthenticated") => ReactNode; | ||
| fallback?: ReactNode; | ||
| } | ||
|
|
||
| /** | ||
| * Component that initializes authentication by attempting to refresh the token. | ||
| * Only renders children once auth status has been determined. | ||
| */ | ||
| export function AuthInitializer({ children, fallback = null }: AuthInitializerProps): ReactElement { | ||
| const [authStatus, setAuthStatus] = useState<"authenticated" | "unauthenticated" | null>(null); | ||
| const { mutateAsync: refreshToken } = usePostRefreshTokenMutate(); | ||
|
|
||
| useEffect(() => { | ||
| async function initializeAuth(): Promise<void> { | ||
| try { | ||
| // Attempt to refresh token on app load to check if user is logged in | ||
| await refreshToken(); | ||
| setAuthStatus("authenticated"); | ||
| } catch { | ||
| // If refresh fails, user is not authenticated | ||
| setAuthStatus("unauthenticated"); | ||
| } | ||
| } | ||
|
|
||
| void initializeAuth(); | ||
| }, [refreshToken]); | ||
|
|
||
| // Show fallback while determining auth status | ||
| if (authStatus === null) { | ||
| return <>{fallback}</>; | ||
| } | ||
|
|
||
| // Once auth status is determined, render children with the status | ||
| return <>{children(authStatus)}</>; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,38 @@ | ||
| import type { ReactElement } from "react"; | ||
| import type { QueryClient } from "@tanstack/react-query"; | ||
| import { useQueryClient } from "@tanstack/react-query"; | ||
| import { RouterProvider, Route, createHashRouter, createRoutesFromElements, Outlet } from "react-router-dom"; | ||
| import { PrivateRouteLogic } from "./logic/PrivateRouteLogic"; | ||
| import { PublicRouteLogic } from "./logic/PublicRouteLogic"; | ||
| import { PrivateRoutes } from "./PrivateRoutes"; | ||
| import { PublicRoutes } from "./PublicRoutes"; | ||
| import { RouterProvider, createHashHistory, createRouter } from "@tanstack/react-router"; | ||
| import { routeTree } from "../../routeTree.gen"; | ||
| import { useAuth } from "../auth/UseAuth"; | ||
| import type { AuthStatus } from "~/classes/auth/AuthStatus"; | ||
|
|
||
| export interface RouterContext { | ||
| queryClient: QueryClient; | ||
| authStatus: AuthStatus; | ||
| } | ||
|
|
||
| const hashHistory = createHashHistory(); | ||
|
|
||
| const router = createRouter({ | ||
| routeTree, | ||
| history: hashHistory, | ||
| context: { | ||
| queryClient: undefined!, | ||
| authStatus: undefined!, | ||
| }, | ||
| defaultPreload: "intent", | ||
| defaultPreloadStaleTime: 0, | ||
| }); | ||
|
|
||
| declare module "@tanstack/react-router" { | ||
| interface Register { | ||
| router: typeof router; | ||
| } | ||
| } | ||
|
|
||
| export function AppRoutes(): ReactElement { | ||
| const queryClient = useQueryClient(); | ||
| const { status } = useAuth(); | ||
|
|
||
| return ( | ||
| <RouterProvider | ||
| router={createHashRouter( | ||
| createRoutesFromElements( | ||
| <Route path="/" element={<Outlet />}> | ||
| <Route element={<PublicRouteLogic />}> | ||
| {PublicRoutes(queryClient).map((route) => ( | ||
| <Route key={route.path} {...route} /> | ||
| ))} | ||
| </Route> | ||
| <Route element={<PrivateRouteLogic />}> | ||
| {PrivateRoutes(queryClient).map((route) => ( | ||
| <Route key={route.path} {...route} /> | ||
| ))} | ||
| </Route> | ||
| <Route path="*" lazy={() => import("../../pages/not-found/NotFoundRoute")} /> | ||
| </Route> | ||
| ) | ||
| )} | ||
| /> | ||
| ); | ||
| return <RouterProvider router={router} context={{ queryClient, authStatus: status }} />; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The type assertion
as '/version'is unsafe asaboutRoutecould be any string value. Consider using proper type checking or constraining theaboutRouteparameter to only accept valid route paths.