diff --git a/front/src/App.js b/front/src/App.js index 33aeb81dd899096b505d21d40a7dec01f096e71b..33bbc7b8a3f9f3aaa56213eb109139c96df0ab56 100644 --- a/front/src/App.js +++ b/front/src/App.js @@ -4,7 +4,7 @@ import './App.css'; import { BrowserRouter as Router, Switch, Route, Link } from "react-router-dom"; import HomePage from './components/Leaderboard'; import Classement from './components/Classement'; -import CheerUp from './components/CheerUp'; +import Cheerup from './components/CheerUp'; import Partenaires from "./components/Partenaires"; import Leaderboard from './components/LeaderboardSB'; import Formulaire from "./components/Login/Kilometrage"; @@ -46,7 +46,7 @@ function App() { <Classement /> </Route> <Route exact path="/CheerUp"> - <CheerUp /> + <Cheerup /> </Route> <Route exact path="/Partenaires"> <Partenaires /> diff --git a/front/src/components/CheerUp.js b/front/src/components/CheerUp.js index 52d120df809f4a8f4895400f6e3d0aefe7c08a49..186209e18fae93fa0b139c7205071361bc0324c0 100644 --- a/front/src/components/CheerUp.js +++ b/front/src/components/CheerUp.js @@ -1,8 +1,8 @@ import React, { Component } from "react"; import { MDBContainer, MDBRow, MDBCol, MDBTabPane, MDBTabContent, MDBNav, MDBNavItem, MDBNavLink, MDBIcon, MDBView , MDBCardImage} from "mdbreact"; -import Logo from "../logo-cheer-up.png"; +//import Logo from "../logo-cheer-up.png"; -const CheerUp = () => { +const Cheerup = () => { return ( <> @@ -16,7 +16,7 @@ const CheerUp = () => { hover overlay='white-slight' className='card-img-top' - src={Logo} + src="../../logo-cheer-up.png" alt='Cheer Up!' /> </MDBView> @@ -75,5 +75,5 @@ const CheerUp = () => { </> ); } - -export default CheerUp; \ No newline at end of file + +export default Cheerup; \ No newline at end of file diff --git a/front/src/components/Navbar/Navbar.js b/front/src/components/Navbar/Navbar.js index dbf0ff79751ef03e32417300cbe7d213316e87f6..48cb52eb9a15d699acf6c8a14c44e8a29cb0614b 100644 --- a/front/src/components/Navbar/Navbar.js +++ b/front/src/components/Navbar/Navbar.js @@ -2,7 +2,6 @@ import React, { Component, useState } from "react"; import { MDBNavbar, MDBNavbarBrand, MDBNavbarNav, MDBNavItem, MDBNavLink, MDBNavbarToggler, MDBCollapse} from "mdbreact"; import Dropdown from "./Dropdown"; import axios from 'axios'; -import logo from "../../humaviron_svg.svg" export default function NavigationBar (props){ @@ -27,7 +26,7 @@ export default function NavigationBar (props){ <> <MDBNavbar color="blue-gradient" dark expand="md"> <MDBNavbarBrand href="/"> - <img src={logo} alt="Logo Cheer Up!" height={px}/> + <img src="../../logo-cheer-up.png" alt="Logo Cheer Up!" height={px}/> </MDBNavbarBrand> <MDBNavbarToggler onClick={props.toggle.toggleCollapse} /> <MDBCollapse id="navbarCollapse3" isOpen={props.toggle.state.isOpen} navbar>