dungnh/Face_Classify_frontend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/TKA-29-' of gitea.beetai.com:huyt/fsi_project into feature/TKA-29-

Browse Source
This commit is contained in:
bi 2022-12-16 16:30:44 +07:00
commit 39e09df490
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/App.js
View File

@ -16,6 +16,7 @@ import { Provider } from 'react-redux';
import store from './store'; import store from './store';
import ReactRouter from './router/ReactRouter'; import ReactRouter from './router/ReactRouter';
import { BrowserRouter as Router, Link, Route, Switch } from 'react-router-dom'; import { BrowserRouter as Router, Link, Route, Switch } from 'react-router-dom';
import AutoLogin from 'components/AutoLogin/AutoLogin';
@ -26,6 +27,7 @@ function App() {
<Switch> <Switch>
{/* <Route path={"/login"} exact render={() => <Login />} /> */} {/* <Route path={"/login"} exact render={() => <Login />} /> */}
<Route path={"/login"} exact render={() => <Login />} /> <Route path={"/login"} exact render={() => <Login />} />
<Route path={'/auth/:token?'} render={(props) => <AutoLogin {...props} />} />
<ReactRouter /> <ReactRouter />
</Switch> </Switch>
</Router> </Router>

4
app/src/router/ReactRouter.js
View File

@ -47,9 +47,7 @@ class ReactRouter extends Component {
: :
'' ''
} }
<>
<Route path={'/auth/:token?'} render={(props) => <AutoLogin {...props} />} />
</>
{ {
this.state.dataRole?.indexOf('search:view') !== -1 this.state.dataRole?.indexOf('search:view') !== -1
? ?