From 64577d7d0af6d2b591a01f3b0f5f602c09c4818d Mon Sep 17 00:00:00 2001
From: Thomas Bouquet <thomas.bouquet@student-cs.fr>
Date: Sun, 30 May 2021 11:50:16 +0200
Subject: [PATCH] logo
---
front/src/App.js | 4 ++--
front/src/components/CheerUp.js | 10 +++++-----
front/src/components/Navbar/Navbar.js | 3 +--
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/front/src/App.js b/front/src/App.js
index 33aeb81..33bbc7b 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 52d120d..186209e 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 dbf0ff7..48cb52e 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>
--
GitLab