diff --git a/front/public/favicon.ico b/front/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..79c5719e7a2a3976fe29220e20cbc178ee251baf Binary files /dev/null and b/front/public/favicon.ico differ diff --git a/front/src/App.js b/front/src/App.js index 2ae55663b39df71e70cda50f161dc61587aadf3c..396213f36fe21e665654b3210792a0254f771185 100644 --- a/front/src/App.js +++ b/front/src/App.js @@ -1,4 +1,5 @@ import React from 'react'; +import {Image} from 'semantic-ui-react' import { BrowserRouter as Router, Route } from 'react-router-dom'; import './App.css'; import AdminPage from './view/AdminPage/AdminPage'; @@ -6,14 +7,18 @@ import AllToucanPage from './view/AllToucanPage/AllToucanPage'; import Login from './view/Login'; import env from './.env'; import isLogged from './utils/Oauth'; +import logo from './image/logo.png' function App() { return ( + <div style={{verticalAlign:"center"}}> + <Image src={logo} alt="Logo" href="/" style={{marginLeft:'30%', width:'40%'}} /> <Router > <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} /> </Router> + </div> ); } diff --git a/front/src/image/logo.png b/front/src/image/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..886387dc7bad4f23a6493426679098d9ead11980 Binary files /dev/null and b/front/src/image/logo.png differ diff --git a/front/src/view/AllToucanPage/AllToucanPage.js b/front/src/view/AllToucanPage/AllToucanPage.js index e3d4e9a1f4dfc9a3a55bd3bffc5f5cd0da8cc3df..1a63ca9aa45399f48d66704a1fe0e7af78269ce7 100644 --- a/front/src/view/AllToucanPage/AllToucanPage.js +++ b/front/src/view/AllToucanPage/AllToucanPage.js @@ -20,7 +20,6 @@ class AllToucan extends Component { }) .then(toucans => { this.setState({toucans}) - console.log(toucans) }) .catch(err => console.log(err)) } @@ -34,6 +33,7 @@ class AllToucan extends Component { link={`${env.backURL}/toucan/pdf/${toucan["_id"]}`} header={toucan.title} date={(new Date(toucan.date).toLocaleDateString())} + key={toucan._id} /> })} </Card.Group> diff --git a/front/src/view/AllToucanPage/ToucanCard.js b/front/src/view/AllToucanPage/ToucanCard.js index a94c2ebe0a1363b0b4e055638da11f9ae5eb48ed..d13d80e3bcb322d01b519593f5cb1d041deda52c 100644 --- a/front/src/view/AllToucanPage/ToucanCard.js +++ b/front/src/view/AllToucanPage/ToucanCard.js @@ -7,7 +7,6 @@ const ToucanCard = ({...props}) => { href={props.link} link style={{margin:"1em"}} - description="On test" > <Card.Content> <Card.Header content={props.header}/>