From 64561978190d2c2ee2a78332904cf19b35c551d2 Mon Sep 17 00:00:00 2001 From: Maxime Dumont Date: Fri, 5 Jan 2024 10:32:52 +0100 Subject: [PATCH] avatarchange --- backend/database/schema.sql | 3 +- frontend/src/assets/icons/FemaleAvatar.svg | 97 +++++++++++++++++++ .../assets/icons/{avatar.svg => avatar1.svg} | 0 frontend/src/components/NavBar.jsx | 24 ++++- frontend/src/components/NavBarDesktop.jsx | 24 ++++- frontend/src/main.jsx | 5 +- frontend/src/pages/Inscription.jsx | 2 +- frontend/src/pages/SettingUser.jsx | 0 frontend/src/sass/index.scss | 1 + 9 files changed, 140 insertions(+), 16 deletions(-) create mode 100644 frontend/src/assets/icons/FemaleAvatar.svg rename frontend/src/assets/icons/{avatar.svg => avatar1.svg} (100%) delete mode 100644 frontend/src/pages/SettingUser.jsx diff --git a/backend/database/schema.sql b/backend/database/schema.sql index a57ba5c..70c7768 100644 --- a/backend/database/schema.sql +++ b/backend/database/schema.sql @@ -25,7 +25,8 @@ CREATE TABLE `naissance` DATE NOT NULL, `civility` BOOLEAN NOT NULL, `password` varchar(50) not null, - `IsAdmin` bool not null + `IsAdmin` bool not null, + `avatar` varchar(255) not null ); DROP TABLE IF EXISTS `Film`; diff --git a/frontend/src/assets/icons/FemaleAvatar.svg b/frontend/src/assets/icons/FemaleAvatar.svg new file mode 100644 index 0000000..c344985 --- /dev/null +++ b/frontend/src/assets/icons/FemaleAvatar.svg @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + diff --git a/frontend/src/assets/icons/avatar.svg b/frontend/src/assets/icons/avatar1.svg similarity index 100% rename from frontend/src/assets/icons/avatar.svg rename to frontend/src/assets/icons/avatar1.svg diff --git a/frontend/src/components/NavBar.jsx b/frontend/src/components/NavBar.jsx index 0484873..3258b31 100644 --- a/frontend/src/components/NavBar.jsx +++ b/frontend/src/components/NavBar.jsx @@ -1,6 +1,8 @@ import { NavLink } from "react-router-dom"; +import { useUser } from "../contexts/UserContext"; function NavBar() { + const { user } = useUser(); return (
@@ -23,11 +25,23 @@ function NavBar() {
- profile icon + {user ? ( + avatar + ) : ( + connexion + )}
diff --git a/frontend/src/components/NavBarDesktop.jsx b/frontend/src/components/NavBarDesktop.jsx index d5257a7..a3eeb93 100644 --- a/frontend/src/components/NavBarDesktop.jsx +++ b/frontend/src/components/NavBarDesktop.jsx @@ -1,6 +1,8 @@ import { NavLink } from "react-router-dom"; +import { useUser } from "../contexts/UserContext"; function NavBarDesktop() { + const { user } = useUser(); return (
logo @@ -14,11 +16,23 @@ function NavBarDesktop() {
- connexion + {user ? ( + avatar + ) : ( + connexion + )} diff --git a/frontend/src/main.jsx b/frontend/src/main.jsx index 90df64e..e86fc1c 100644 --- a/frontend/src/main.jsx +++ b/frontend/src/main.jsx @@ -16,6 +16,7 @@ import Connection from "./pages/Connection"; import "./sass/index.scss"; import { SerieProvider } from "./contexts/SerieContext"; + const router = createBrowserRouter([ { path: "/", @@ -57,10 +58,6 @@ const router = createBrowserRouter([ path: "/Inscription", element: , }, - { - path: "/settingUser", - element: , - }, ], }, ]); diff --git a/frontend/src/pages/Inscription.jsx b/frontend/src/pages/Inscription.jsx index 57d010b..68faa96 100644 --- a/frontend/src/pages/Inscription.jsx +++ b/frontend/src/pages/Inscription.jsx @@ -48,7 +48,7 @@ function Inscription() { return (
{error &&

Error

} - {succes &&

Sicces

} + {succes &&

Succes

}
diff --git a/frontend/src/pages/SettingUser.jsx b/frontend/src/pages/SettingUser.jsx deleted file mode 100644 index e69de29..0000000 diff --git a/frontend/src/sass/index.scss b/frontend/src/sass/index.scss index 934849e..4297964 100644 --- a/frontend/src/sass/index.scss +++ b/frontend/src/sass/index.scss @@ -19,3 +19,4 @@ @import "movieGenreTabsContainer"; @import "logOut"; @import "logoContainer"; +// @import "settingUser"