diff --git a/front/src/App.js b/front/src/App.js index c6eaac4812034fd1cc29f84712ea2deb8a9e3be0..35618d88b2a08fc7c64e749f05380dc82c0f31e4 100644 --- a/front/src/App.js +++ b/front/src/App.js @@ -11,12 +11,16 @@ import logo from './image/logo.png' function App() { return ( - <div style={{verticalAlign:"center"}}> - <Image src={logo} alt="Logo" href="/" style={{marginLeft:'30%', width:'40%'}} /> + <div > + <div style={{textAlign:"center"}}> + <Image src={logo} alt="Logo" href="/" style={{ width:'40%'}} /> + </div> <Router > - <Link to="/admin" style={{float:"right", margin:"2em"}} > + <div style={{textAlign:"right"}}> + <Link to="/admin" style={{position:"absolute",top:'2em' ,right:"2em"}} > <Button icon="male" content="Espace admin"/> </Link> + </div> <Route exact path='/' component={AllToucanPage} /> <Route exact path='/admin' render={()=>isLogged() ? <AdminPage/> : window.location=`${env.backURL}/oauth/login`}/> <Route exact path='/login/:token' component={Login} /> diff --git a/front/src/view/Login.js b/front/src/view/Login.js index e1e3f456aa1a2420bc5f39617263568a5e5a8d06..f00008005729e90398c81ad6897887dda3a672c0 100644 --- a/front/src/view/Login.js +++ b/front/src/view/Login.js @@ -5,7 +5,7 @@ class Login extends Component { componentDidMount(){ localStorage.setItem("token",this.props.match.params.token); console.log(localStorage.getItem("token")); - window.location = '/'; + window.location = '/admin'; }