Skip to content

chore(routing): Switch to new react-router syntax #638

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.

Sign up for GitHub

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

Merged
afonsojramos merged 1 commit into from
Oct 2, 2023
Merged

chore(routing): Switch to new react-router syntax #638

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 30 additions & 20 deletions src/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
HashRouter as Router,
Route,
Switch,
useLocation,
} from 'react-router-dom';

import { AppContext, AppProvider } from './context/App';
Expand All @@ -15,24 +16,16 @@ import { NotificationsRoute } from './routes/Notifications';
import { SettingsRoute } from './routes/Settings';
import { Sidebar } from './components/Sidebar';

export const PrivateRoute = ({ component: Component, ...rest }) => {
function RequireAuth({ children }) {
const { isLoggedIn } = useContext(AppContext);
const location = useLocation();

return (
<Route
{...rest}
render={(props) =>
isLoggedIn ? (
<Component {...props} />
) : (
<Redirect
to={{ pathname: '/login', state: { from: props.location } }}
/>
)
}
/>
return isLoggedIn ? (
children
) : (
<Redirect to={{ pathname: '/login', state: { from: location } }} />
);
};
}

export const App = () => {
return (
Expand All @@ -43,11 +36,28 @@ export const App = () => {
<Sidebar />

<Switch>
<PrivateRoute path="/" exact component={NotificationsRoute} />
<PrivateRoute path="/settings" exact component={SettingsRoute} />
<Route path="/login" component={LoginRoute} />
<Route path="/login-enterprise" component={LoginEnterpriseRoute} />
<Route path="/login-token" component={LoginWithToken} />
<Route path="/" exact>
<RequireAuth>
<NotificationsRoute />
</RequireAuth>
</Route>
<Route path="/settings" exact>
<RequireAuth>
<SettingsRoute />
</RequireAuth>
</Route>
<Route path="/login">
<LoginRoute />
</Route>
<Route path="/login">
<LoginRoute />
</Route>
<Route path="/login-enterprise">
<LoginEnterpriseRoute />
</Route>
<Route path="/login-token">
<LoginWithToken />
</Route>
</Switch>
</div>
</Router>
Expand Down