lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: naming and redundancy issues

Browse source
This commit is contained in:
Sérgio Salgado 2021-04-06 00:39:52 +01:00 • committed by Josh Harvey
parent fff9523988
commit 40974dd501
15 changed files with 194 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

15
new-lamassu-admin/src/routing/routes.js
View file

@ -5,7 +5,6 @@ import * as R from 'ramda'
import React, { useContext } from 'react'
import {
matchPath,
Route,
Redirect,
Switch,
useHistory,
@ -398,11 +397,11 @@ const Routes = () => {
</PrivateRoute>
<PrivateRoute path="/machines" component={Machines} />
<PrivateRoute path="/wizard" component={Wizard} />
<Route path="/register" component={Register} />
{/* <Route path="/configmigration" component={ConfigMigration} /> */}
<PublicRoute path="/register" component={Register} />
{/* <PublicRoute path="/configmigration" component={ConfigMigration} /> */}
<PublicRoute path="/login" restricted component={Login} />
<Route path="/resetpassword" component={ResetPassword} />
<Route path="/reset2fa" component={Reset2FA} />
<PublicRoute path="/resetpassword" component={ResetPassword} />
<PublicRoute path="/reset2fa" component={Reset2FA} />
{getFilteredRoutes().map(({ route, component: Page, key }) => (
<PrivateRoute path={route} key={key}>
<Transition
@ -421,10 +420,10 @@ const Routes = () => {
/>
</PrivateRoute>
))}
<Route path="/404" />
<Route path="*">
<PublicRoute path="/404" />
<PublicRoute path="*">
<Redirect to={{ pathname: '/404' }} />
</Route>
</PublicRoute>
</Switch>
)
}