diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5ed7c7a..bbca028 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,4 @@
{
"liveServer.settings.port": 8081,
- "java.configuration.updateBuildConfiguration": "interactive"
+ "java.configuration.updateBuildConfiguration": "automatic"
}
\ No newline at end of file
diff --git a/Back-end/pom.xml b/Back-end/pom.xml
index 5d0ce82..b221038 100644
--- a/Back-end/pom.xml
+++ b/Back-end/pom.xml
@@ -88,10 +88,10 @@
0.9.0
- io.vertx
- vertx-auth-jwt
- 4.5.13
-
+ io.vertx
+ vertx-auth-jwt
+ 4.5.13
+
diff --git a/Back-end/src/main/java/com/example/starter/AuthHandler.java b/Back-end/src/main/java/com/example/starter/AuthHandler.java
index 2052b71..549be0e 100644
--- a/Back-end/src/main/java/com/example/starter/AuthHandler.java
+++ b/Back-end/src/main/java/com/example/starter/AuthHandler.java
@@ -4,7 +4,6 @@ import io.vertx.core.json.JsonObject;
import io.vertx.ext.web.RoutingContext;
import at.favre.lib.crypto.bcrypt.BCrypt;
import io.vertx.ext.auth.jwt.JWTAuth;
-import com.example.starter.auth.JwtAuthProvider;
import io.vertx.sqlclient.Tuple;
public class AuthHandler {
diff --git a/Back-end/src/main/java/com/example/starter/DatabaseService.java b/Back-end/src/main/java/com/example/starter/DatabaseService.java
index f4e05d5..8742f41 100644
--- a/Back-end/src/main/java/com/example/starter/DatabaseService.java
+++ b/Back-end/src/main/java/com/example/starter/DatabaseService.java
@@ -3,8 +3,7 @@ package com.example.starter;
import io.vertx.core.Vertx;
import io.vertx.jdbcclient.JDBCConnectOptions;
import io.vertx.jdbcclient.JDBCPool;
-import io.vertx.ext.auth.jwt.JWTAuth;
-import io.vertx.ext.auth.jwt.JWTAuthOptions;
+
import io.vertx.sqlclient.PoolOptions;
public class DatabaseService {
@@ -13,7 +12,7 @@ public class DatabaseService {
public DatabaseService(Vertx vertx) {
pool = JDBCPool.pool(vertx,
new JDBCConnectOptions()
- .setJdbcUrl("jdbc:postgresql://localhost:5432/users?useUnicode=true&characterEncoding=UTF-8") //Url de la bdd
+ .setJdbcUrl("jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=UTF-8") //Url de la bdd
.setUser("postgres") // Nom d'utilisateur PostgreSQL
.setPassword("admin"), // Mot de passe PostgreSQL
new PoolOptions()
diff --git a/Back-end/src/main/java/com/example/starter/JwtAuthProvider.java b/Back-end/src/main/java/com/example/starter/JwtAuthProvider.java
index 01d26d9..6c3cd38 100644
--- a/Back-end/src/main/java/com/example/starter/JwtAuthProvider.java
+++ b/Back-end/src/main/java/com/example/starter/JwtAuthProvider.java
@@ -1,10 +1,10 @@
-package com.example.starter.auth;
+package com.example.starter;
import io.vertx.core.Vertx;
import io.vertx.ext.auth.jwt.JWTAuth;
import io.vertx.ext.auth.jwt.JWTAuthOptions;
import io.vertx.ext.auth.KeyStoreOptions;
-import com.example.starter.auth.JwtAuthProvider;
+import com.example.starter.JwtAuthProvider;
public class JwtAuthProvider {
diff --git a/Back-end/src/main/java/com/example/starter/MainVerticle.java b/Back-end/src/main/java/com/example/starter/MainVerticle.java
index 00a2cd1..629aded 100644
--- a/Back-end/src/main/java/com/example/starter/MainVerticle.java
+++ b/Back-end/src/main/java/com/example/starter/MainVerticle.java
@@ -7,7 +7,6 @@ import io.vertx.ext.web.Router;
import io.vertx.ext.web.handler.BodyHandler;
import io.vertx.ext.web.handler.CorsHandler;
import io.vertx.ext.auth.jwt.JWTAuth;
-import com.example.starter.auth.JwtAuthProvider;
import io.vertx.ext.web.handler.JWTAuthHandler;
diff --git a/Front-end/index.html b/Front-end/index.html
index e0bb005..63968ac 100644
--- a/Front-end/index.html
+++ b/Front-end/index.html
@@ -4,7 +4,7 @@
-
+
Projet Dev Web
diff --git a/Front-end/src/components/Header.jsx b/Front-end/src/components/Header.jsx
index 9bbd666..4bb7148 100644
--- a/Front-end/src/components/Header.jsx
+++ b/Front-end/src/components/Header.jsx
@@ -1,58 +1,128 @@
import React, { useState, useEffect } from "react";
-import { LogIn, UserPlus, LogOut, Settings } from "lucide-react";
+import { X, Menu, LogIn, UserPlus, LogOut, Settings } from "lucide-react";
import { Link } from "react-router-dom";
import { useAuth } from "../AuthContext";
function Header() {
const { token, logout } = useAuth();
+ const [isMenuOpen, setIsMenuOpen] = useState(false);
return (
-
-
-
VigiMétéo
-
-
-
- Accueil
-
-
- A propos
-
-
- Gestion
-
-
-
-
- {token ? (
- <>
-
-
-
-
-
+ VigiMétéo
+ setIsMenuOpen(!isMenuOpen)}
+ >
+ {isMenuOpen ? : }
+
+
+
+
+
+
+ Accueil
+
+
+
+
+ A propos
+
+
+
+
-
- Déconnexion
-
+ Gestion
+
+
+ {!token ? (
+ <>
+
+
+
+ Connexion
+
+
+
+
+
+ Inscription
+
+
>
) : (
<>
-
-
-
Connexion
-
-
-
-
Inscription
-
+
+
+
+
+
+
+
+
+
+ Déconnexion
+
+
>
)}
+
+
+
+ {!token ? (
+
+
+
+ Connexion
+
+
+
+ Inscription
+
-
+ ) : (
+
+
+
+
+
+
+
+ Déconnexion
+
+
+ )}
);
diff --git a/Front-end/src/img/cloud-alert.svg b/Front-end/src/img/cloud-alert.svg
deleted file mode 100644
index a7ea487..0000000
--- a/Front-end/src/img/cloud-alert.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/Front-end/src/img/cloud-sun-rain.svg b/Front-end/src/img/cloud-sun-rain.svg
new file mode 100644
index 0000000..9892ac6
--- /dev/null
+++ b/Front-end/src/img/cloud-sun-rain.svg
@@ -0,0 +1 @@
+
\ No newline at end of file