Alexander/FitTrackee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Client - deactivate administration for now

Browse Source
This commit is contained in:
Sam 2018-06-20 11:24:04 +02:00
parent 541f853cf8
commit 09e1e52e16
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
fittrackee_client/e2e/admin-sports.test.js → fittrackee_client/e2e/admin-sports.test
View File

0
fittrackee_client/e2e/admin.test.js → fittrackee_client/e2e/admin.test
View File

4
fittrackee_client/src/components/App.jsx
View File

@ -2,7 +2,7 @@ import React from 'react'
import { Redirect, Route, Switch } from 'react-router-dom' import { Redirect, Route, Switch } from 'react-router-dom'
import './App.css' import './App.css'
import Admin from './Admin' // import Admin from './Admin'
import Activity from './Activity' import Activity from './Activity'
import Activities from './Activities' import Activities from './Activities'
import Dashboard from './Dashboard' import Dashboard from './Dashboard'
@ -90,7 +90,7 @@ export default class App extends React.Component {
component={Activities} component={Activities}
/> />
<Route path="/activities" component={Activity} /> <Route path="/activities" component={Activity} />
<Route path="/admin" component={Admin} /> {/* <Route path="/admin" component={Admin} /> */}
<Route component={NotFound} /> <Route component={NotFound} />
</Switch> </Switch>
</div> </div>

24
fittrackee_client/src/components/NavBar/index.jsx
View File

@ -58,18 +58,18 @@ function NavBar(props) {
</Link> </Link>
</li> </li>
)} )}
{props.user.admin && ( {/* {props.user.admin && ( */}
<li className="nav-item"> {/* <li className="nav-item"> */}
<Link {/* <Link */}
className="nav-link" {/* className="nav-link" */}
to={{ {/* to={{ */}
pathname: '/admin', {/* pathname: '/admin', */}
}} {/* }} */}
> {/* > */}
Admin {/* Admin */}
</Link> {/* </Link> */}
</li> {/* </li> */}
)} {/* )} */}
</ul> </ul>
<ul className="navbar-nav flex-row ml-md-auto d-none d-md-flex"> <ul className="navbar-nav flex-row ml-md-auto d-none d-md-flex">
{!props.user.isAuthenticated && ( {!props.user.isAuthenticated && (