diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index aea623b..567514f 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -3,6 +3,7 @@ import Home from "./pages/Home"; import NavBar from "./components/NavBar"; import NavBarM from "./components/NavBarM"; import "./styles/commons.scss"; +import logo from "./assets/Logo.svg"; function App() { const isMobile = useMediaQuery("only screen and (max-width: 600px)"); @@ -11,6 +12,9 @@ function App() {
{isMobile ? ( <> +
+ logo +
diff --git a/frontend/src/components/Login.jsx b/frontend/src/components/Login.jsx index 8d37c4c..7d2f396 100644 --- a/frontend/src/components/Login.jsx +++ b/frontend/src/components/Login.jsx @@ -2,6 +2,7 @@ import { useState } from "react"; import { Link, useNavigate } from "react-router-dom"; import "../styles/modals.scss"; import axios from "axios"; +import CrossButton from "../assets/picto/yellow/cross_yell.svg"; function Login() { const [loginInfo, setLoginInfo] = useState({ @@ -52,10 +53,7 @@ function Login() {
- close-window + close-window

Connexion

diff --git a/frontend/src/components/NavBar.jsx b/frontend/src/components/NavBar.jsx index b58d5cb..10d7e66 100644 --- a/frontend/src/components/NavBar.jsx +++ b/frontend/src/components/NavBar.jsx @@ -2,6 +2,8 @@ import { Link } from "react-router-dom"; import "./NavBar.scss"; import "../styles/commons.scss"; +import login from "../assets/picto/white/connexion_white.svg"; +import register from "../assets/picto/white/profil_white.svg"; function NavBar() { return ( @@ -18,11 +20,11 @@ function NavBar() {

CARTE

- +

Inscription

- +

Connexion

diff --git a/frontend/src/components/NavBar.scss b/frontend/src/components/NavBar.scss index c3deea0..e7185ec 100644 --- a/frontend/src/components/NavBar.scss +++ b/frontend/src/components/NavBar.scss @@ -5,7 +5,6 @@ border-bottom: 3px solid $yellow; background-color: $deep-purple; padding: 15px; - // color: white; font-family: "Roboto"; display: flex; justify-content: space-around; @@ -18,7 +17,6 @@ .nav-link { @include flex-center; text-decoration: none; - // color: white; } .img-nav-link { text-decoration: none; diff --git a/frontend/src/components/NavBarM.jsx b/frontend/src/components/NavBarM.jsx index 0db4e5c..86407fb 100644 --- a/frontend/src/components/NavBarM.jsx +++ b/frontend/src/components/NavBarM.jsx @@ -2,24 +2,29 @@ import { Link } from "react-router-dom"; import "./NavBarM.scss"; import "../styles/commons.scss"; +import home from "../assets/picto/white/home_white.svg"; +import map from "../assets/picto/white/map_white.svg"; +import gallery from "../assets/picto/white/galery_white.svg"; +import register from "../assets/picto/white/profil_white.svg"; +import login from "../assets/picto/white/connexion_white.svg"; function NavBar() { return ( ); diff --git a/frontend/src/components/Register.jsx b/frontend/src/components/Register.jsx index beebf3f..1d970ef 100644 --- a/frontend/src/components/Register.jsx +++ b/frontend/src/components/Register.jsx @@ -2,6 +2,7 @@ import { useState } from "react"; import { useNavigate, Link } from "react-router-dom"; import axios from "axios"; import "../styles/modals.scss"; +import CrossButton from "../assets/picto/yellow/cross_yell.svg"; function Register() { const [registerInfo, setRegisterInfo] = useState({ @@ -49,10 +50,7 @@ function Register() {
- close-window + close-window

Inscription

diff --git a/frontend/src/pages/Admin.jsx b/frontend/src/pages/Admin.jsx index b7fe124..38d1ff4 100644 --- a/frontend/src/pages/Admin.jsx +++ b/frontend/src/pages/Admin.jsx @@ -1,5 +1,11 @@ import NavBar from "../components/NavBar"; import "./Admin.scss"; +import MapAndFlag from "../assets/panel-admin/maps-and-flags-map-svgrepo-com.svg"; +import Avatar from "../assets/panel-admin/avatar-svgrepo-com.svg"; +import Hourglass from "../assets/panel-admin/hourglass-not-done-svgrepo-com.svg"; +import badge from "../assets/panel-admin/badge-award-svgrepo-com.svg"; +import strafari from "../assets/panel-admin/strafari-street-art-hunter.webp"; +import light from "../assets/panel-admin/light-bulb-idea-svgrepo-com.svg"; function admin() { return ( @@ -7,25 +13,16 @@ function admin() {

Notifications

- ampoule + ampoule

12 Street Art en attente de validation

- Sablier + Sablier

3 Street Art sont portés disparus

- Carte + Carte

Utilisateurs

@@ -43,16 +40,8 @@ function admin() {
- avatar du profil - badge du profil + avatar du profil + badge du profil

Pseudo

Prénom Nom

@@ -66,16 +55,8 @@ function admin() {

- avatar du profil - badge du profil + avatar du profil + badge du profil

Pseudo

Prénom Nom

@@ -89,16 +70,8 @@ function admin() {

- avatar du profil - badge du profil + avatar du profil + badge du profil

Pseudo

Prénom Nom

@@ -112,16 +85,8 @@ function admin() {

- avatar du profil - badge du profil + avatar du profil + badge du profil

Pseudo

Prénom Nom

@@ -135,16 +100,8 @@ function admin() {

- avatar du profil - badge du profil + avatar du profil + badge du profil

Pseudo

Prénom Nom

@@ -158,16 +115,8 @@ function admin() {

- avatar du profil - badge du profil + avatar du profil + badge du profil

Pseudo

Prénom Nom

@@ -183,11 +132,7 @@ function admin() {

Street Art

- Street Art + Street Art

Posté par{" "} Pseudo de l'utilisateur @@ -198,11 +143,7 @@ function admin() { - Street Art + Street Art

Oeuvre Originale

Ajouter un artiste

diff --git a/frontend/src/pages/Home.scss b/frontend/src/pages/Home.scss index fb2b1de..1093342 100644 --- a/frontend/src/pages/Home.scss +++ b/frontend/src/pages/Home.scss @@ -1,7 +1,7 @@ @import "../styles/commons.scss"; .home-page { - margin: 8vh 8vw; + margin: 0vh 8vw 20vh 8vw; button { margin-top: 4vh; margin-bottom: 10vh; @@ -69,18 +69,11 @@ } } } - // ol { - // padding: 0; - // margin: 0; - // list-style-position: inside; - // li::before { - // padding-right: 8px; - // text-align: center; - // }} } @media screen and (min-width: 768px) and (max-width: 1024px) { .home-page { + margin: 8vh 8vw; .kesako-content, .instructions { display: flex; @@ -108,6 +101,7 @@ @media screen and (min-width: 1024px) { .home-page { + margin: 8vh 8vw; .kesako-content, .instructions { display: flex; diff --git a/frontend/src/styles/commons.scss b/frontend/src/styles/commons.scss index e9c9494..9944065 100644 --- a/frontend/src/styles/commons.scss +++ b/frontend/src/styles/commons.scss @@ -16,6 +16,18 @@ $light-yellow: #f1f370; $light-cyan: #9beeda; $light-red: #ff8bb5; +// Logo +.logo-container { + display: flex; + justify-content: center; + + .logo-mobile { + max-width: 30vh; + margin-bottom: 3vh; + margin-top: 3vh; + } +} + // TEXTS %h1 { font-family: "Knewave";