-
Notifications
You must be signed in to change notification settings - Fork 1
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
Routes refactor #7
Draft
dalejh
wants to merge
2
commits into
main
Choose a base branch
from
refactor-routes
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.
Draft
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
There are no files selected for viewing
This file contains 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,7 @@ | ||
enum Role { | ||
Administrator = "ADMINISTRATOR", | ||
Reviewer = "REVIEWER", | ||
Reader = "READER" | ||
} | ||
|
||
export { Role }; |
This file contains 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,7 @@ | ||
interface User { | ||
id: string; | ||
email: string; | ||
roles?: string[]; | ||
}; | ||
|
||
export type { User }; |
This file contains 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 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,7 @@ | ||
import { useRoutes } from "react-router-dom"; | ||
|
||
import { routes } from "./routes"; | ||
|
||
export const Main = () => { | ||
return useRoutes(routes); | ||
}; |
This file contains 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,115 @@ | ||
import * as React from "react"; | ||
import { useEffect } from "react"; | ||
import { useLocation } from "react-router"; | ||
import { RouteObject, useNavigate } from "react-router-dom"; | ||
import { Article } from "./administration/Article"; | ||
import { User } from "./administration/User"; | ||
import { Analytics } from "./core/Analytics"; | ||
import { Request as PassphraseResetRequest } from "./identification/Passphrase/Reset/Request"; | ||
import { Confirm as PassphraseResetConfirm } from "./identification/Passphrase/Reset/Confirm"; | ||
import { Change as PassphraseChange } from "./identification/Passphrase/Change"; | ||
import { Register } from "./identification/Register"; | ||
import { Arad } from "./Arad"; | ||
import { Login } from "./identification/Login"; | ||
import { Redirect } from "./core/Redirect"; | ||
|
||
export enum RoutesEnum { | ||
HOME, | ||
REGISTER, | ||
LOGIN, | ||
PASSPHRASE, | ||
RESET, | ||
CONFIRM, | ||
SEARCH, | ||
ARTICLES, | ||
USERS, | ||
CODE, | ||
} | ||
|
||
const ROUTE_MAP: { | ||
[key in RoutesEnum]: RouteObject & { | ||
element: JSX.Element; | ||
isProtected?: boolean; | ||
}; | ||
} = { | ||
[RoutesEnum.HOME]: { | ||
path: "/", | ||
element: <Arad />, | ||
}, | ||
[RoutesEnum.REGISTER]: { | ||
path: "register", | ||
element: <Register />, | ||
}, | ||
[RoutesEnum.LOGIN]: { | ||
path: "login", | ||
element: <Login />, | ||
}, | ||
[RoutesEnum.PASSPHRASE]: { | ||
path: "passphrase", | ||
element: <PassphraseChange />, | ||
}, | ||
[RoutesEnum.RESET]: { | ||
path: "reset", | ||
element: <PassphraseResetRequest />, | ||
}, | ||
[RoutesEnum.CONFIRM]: { | ||
path: "confirm", | ||
element: <PassphraseResetConfirm />, | ||
}, | ||
[RoutesEnum.SEARCH]: { | ||
path: "search/:articleId", | ||
element: <Analytics />, | ||
isProtected: true, | ||
}, | ||
[RoutesEnum.ARTICLES]: { | ||
path: "articles/:articleId", | ||
element: <Article />, | ||
isProtected: true, | ||
}, | ||
[RoutesEnum.USERS]: { | ||
path: "users/:userId", | ||
element: <User />, | ||
isProtected: true, | ||
}, | ||
[RoutesEnum.CODE]: { | ||
path: "code", | ||
element: <Redirect url="https://github.com/jasoncolburne/arad" />, | ||
isProtected: true, | ||
}, | ||
}; | ||
|
||
export const RequireAuth: React.FC<{ children: JSX.Element }> = ({ | ||
children, | ||
}) => { | ||
const navigate = useNavigate(); | ||
const location = useLocation(); | ||
useEffect(() => { | ||
// TODO: get the user object here... | ||
if (!user.isAuthenticated) { | ||
// save where they were going originally | ||
const query = new URLSearchParams(); | ||
query.set("to", encodeURIComponent(location.pathname)); | ||
// navigate to login with original query | ||
navigate(`/login?${query.toString()}`); | ||
} | ||
}, [location.pathname, navigate]); | ||
|
||
return children; | ||
}; | ||
|
||
export const getPathByRoute = (route: RoutesEnum): string => { | ||
return ROUTE_MAP[route].path!; | ||
}; | ||
|
||
const makeRoutes = (): RouteObject[] => { | ||
return Object.values(ROUTE_MAP).map((route) => ({ | ||
path: route.path, | ||
element: route.isProtected ? ( | ||
<RequireAuth>{route.element}</RequireAuth> | ||
) : ( | ||
route.element | ||
), | ||
})); | ||
}; | ||
|
||
export const routes = makeRoutes(); |
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.
What about like, /search (list articles from search view) /articles (list articles from admin view for bulk action) /users (list users)? Are those omitted here or does this logic somehow allow rendering those routes?
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.
Yeah -- omitted. I hadn't used Outlet before and wasn't entirely sure what was going on. I'll refactor this tmmrw to account for those things