{filter(users, filters, "user").map((user, index) => (
diff --git a/src/pages/waitValidationPage/ValidationErrorPage.jsx b/src/pages/waitValidationPage/ValidationErrorPage.jsx
new file mode 100644
index 0000000..15995e9
--- /dev/null
+++ b/src/pages/waitValidationPage/ValidationErrorPage.jsx
@@ -0,0 +1,30 @@
+import styles from "./validationErrorPage.module.css"
+import Background from "../../components/background/background.jsx";
+import Button from "../../components/ui/button/button.jsx";
+import { useContext } from "react";
+import { AuthContext } from "../../contexts/auth/AuthContext.js";
+import { Navigate, useNavigate } from "react-router";
+
+export default function ValidationErrorPage() {
+
+ const { logout, user } = useContext(AuthContext);
+ const navigate = useNavigate();
+
+ const handleLogout = async () => {
+ await logout();
+ navigate("/login");
+ }
+
+ if(user && user.validate === 1) return
;
+
+ return
+
+
Votre compte n'a pas été validé
+
+
Votre compte n'a pas encore été validé, veuillez attendre la vérification de votre compte par un membre autorisé.
+
Contact : contact@example.com
+
+
+
+}
\ No newline at end of file
diff --git a/src/pages/waitValidationPage/validationErrorPage.module.css b/src/pages/waitValidationPage/validationErrorPage.module.css
new file mode 100644
index 0000000..e4a398d
--- /dev/null
+++ b/src/pages/waitValidationPage/validationErrorPage.module.css
@@ -0,0 +1,25 @@
+.title {
+ color: white;
+ font-size: xx-large;
+ margin-bottom: 20px;
+}
+
+.content {
+ display: flex;
+ flex-direction: column;
+ z-index: 2;
+ padding: 10px;
+}
+
+.container {
+ padding: 20px;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ gap: 15px;
+
+ p {
+ font-size: large;
+ }
+}
\ No newline at end of file
diff --git a/src/router.js b/src/router.js
index f3fdef6..73e049e 100644
--- a/src/router.js
+++ b/src/router.js
@@ -2,11 +2,14 @@ import { createBrowserRouter } from "react-router";
import Layout from "./layout.jsx";
import HomePage from "./pages/Home/HomePage";
import LoginPage from "./pages/Login/LoginPage";
-import StatPage from "./pages/Stat/StatPage";
import RegisterPage from "./pages/Register/RegisterPage.jsx";
import VolunteersPage from "./pages/Volunteers/VolunteersPage";
import ProfilePage from "./pages/Profile/ProfilePage";
import EventsPage from "./pages/Events/EventsPage.jsx";
+import AdminPage from "./pages/Admin/AdminPage.jsx";
+import ValidationErrorPage from "./pages/waitValidationPage/ValidationErrorPage.jsx";
+import VolunteerProfilePage from "./pages/VolunteerProfile/VolunteerProfilePage.jsx";
+import PageNotFound from "./pages/PageNotFound/PageNotFound.jsx";
const router = createBrowserRouter([
{
@@ -17,6 +20,18 @@ const router = createBrowserRouter([
path: "/register",
Component: RegisterPage,
},
+ {
+ path: "/error/validation",
+ Component: ValidationErrorPage
+ },
+ {
+ path: "/*",
+ Component: PageNotFound,
+ },
+ {
+ path: "/404",
+ Component: PageNotFound,
+ },
{
path: "/",
Component: Layout,
@@ -27,7 +42,7 @@ const router = createBrowserRouter([
},
{
path: "/admin",
- Component:StatPage,
+ Component:AdminPage,
},
{
path:"/profile",
@@ -40,6 +55,10 @@ const router = createBrowserRouter([
{
path: "/volunteers",
Component: VolunteersPage,
+ },
+ {
+ path: "/profile/:id",
+ Component: VolunteerProfilePage,
}
]
}
diff --git a/src/stories/ThemeSwitcher.stories.jsx b/src/stories/ThemeSwitcher.stories.jsx
new file mode 100644
index 0000000..f285b15
--- /dev/null
+++ b/src/stories/ThemeSwitcher.stories.jsx
@@ -0,0 +1,20 @@
+import ThemeSwitcher from "../components/ui/themeSwitcher/ThemeSwitcher.jsx";
+import Background from "../components/background/background.jsx";
+
+export default {
+ title: 'UI/ThemeSwitcher',
+ component: ThemeSwitcher,
+ parameters: {
+ layout: 'centered',
+ },
+ tags: ['autodocs'],
+};
+
+const ThemeSwitcherRender = () => {
+ return
+
+
+};
+
+export const Default = () =>
;
+
diff --git a/src/utils/login.js b/src/utils/auth/login.js
similarity index 72%
rename from src/utils/login.js
rename to src/utils/auth/login.js
index 161268c..c925521 100644
--- a/src/utils/login.js
+++ b/src/utils/auth/login.js
@@ -1,4 +1,4 @@
-import getXSRFToken from "./getXSRF.js";
+import getXSRFToken from "../getXSRF.js";
export default async function login(email, password) {
const csrfToken = await getXSRFToken();
@@ -15,17 +15,18 @@ export default async function login(email, password) {
body: JSON.stringify({ email, password })
});
- console.log('Code HTTP :', response.status);
+ const data = await response.json();
if (!response.ok) {
- throw new Error(`Erreur HTTP ${response.status}`);
+ return {
+ status: response.status,
+ errors: data.errors || data.message
+ };
}
- const data = await response.json();
- console.log('Connexion réussie ! Données utilisateur :', data);
-
return { status: response.status, data };
+
} catch (error) {
- return error;
+ return { status: 500, error };
}
}
diff --git a/src/utils/auth/login.test.js b/src/utils/auth/login.test.js
new file mode 100644
index 0000000..aa20121
--- /dev/null
+++ b/src/utils/auth/login.test.js
@@ -0,0 +1,69 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import login from './login';
+
+vi.mock('../getXSRF.js', () => ({
+ default: vi.fn(() => Promise.resolve('fake-csrf-token'))
+}));
+
+describe('login()', () => {
+
+ beforeEach(() => {
+ vi.clearAllMocks();
+ global.fetch = vi.fn();
+ });
+
+ it('envoie la requête de login et retourne les données utilisateur', async () => {
+ global.fetch.mockResolvedValue({
+ ok: true,
+ status: 200,
+ json: async () => ({ id: 1, name: 'John Doe' })
+ });
+
+ const result = await login('test@example.com', 'secret');
+
+ expect(global.fetch).toHaveBeenCalledOnce();
+ expect(global.fetch).toHaveBeenCalledWith(
+ `http://${import.meta.env.VITE_API_URL}/api/users/login`,
+ {
+ method: 'POST',
+ credentials: 'include',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-XSRF-TOKEN': 'fake-csrf-token',
+ 'Accept': 'application/json'
+ },
+ body: JSON.stringify({ email: 'test@example.com', password: 'secret' })
+ }
+ );
+
+ expect(result).toEqual({
+ status: 200,
+ data: { id: 1, name: 'John Doe' }
+ });
+ });
+
+ it('retourne un objet avec status et erreurs quand la réponse HTTP est mauvaise', async () => {
+ global.fetch.mockResolvedValue({
+ ok: false,
+ status: 401,
+ json: async () => ({ message: 'Unauthorized' })
+ });
+
+ const result = await login('x', 'y');
+
+ expect(result).toEqual({
+ status: 401,
+ errors: 'Unauthorized'
+ });
+ });
+
+ it('retourne un objet avec status 500 en cas d’exception', async () => {
+ global.fetch.mockImplementation(() => { throw new Error('Network Error') });
+
+ const result = await login('x', 'y');
+
+ expect(result.status).toBe(500);
+ expect(result.error).toBeInstanceOf(Error);
+ expect(result.error.message).toBe('Network Error');
+ });
+});
diff --git a/src/utils/auth/logout.test.js b/src/utils/auth/logout.test.js
new file mode 100644
index 0000000..f553e2e
--- /dev/null
+++ b/src/utils/auth/logout.test.js
@@ -0,0 +1,53 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import logout from './logout';
+
+vi.mock('../getXSRF.js', () => {
+ return {
+ default: vi.fn(() => Promise.resolve('fake-csrf-token'))
+ };
+});
+
+describe('logout()', () => {
+
+ beforeEach(() => {
+ vi.clearAllMocks();
+ global.fetch = vi.fn();
+ });
+
+ it('envoie bien la requête de logout', async () => {
+ global.fetch.mockResolvedValue({
+ ok: true,
+ status: 200
+ });
+
+ const result = await logout();
+
+ expect(global.fetch).toHaveBeenCalledOnce();
+ expect(global.fetch).toHaveBeenCalledWith(
+ `http://${import.meta.env.VITE_API_URL}/api/users/logout`,
+ {
+ method: 'POST',
+ credentials: 'include',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'Accept': 'application/json',
+ 'X-XSRF-TOKEN': 'fake-csrf-token'
+ },
+ }
+ );
+
+ expect(result).toEqual({ status: 200 });
+ });
+
+ it('renvoie une erreur quand la réponse HTTP est mauvaise', async () => {
+ global.fetch.mockResolvedValue({
+ ok: false,
+ status: 500
+ });
+
+ const result = await logout();
+
+ expect(result).toBeInstanceOf(Error);
+ expect(result.message).toBe('Erreur HTTP 500');
+ });
+});
diff --git a/src/utils/event/createEvent.js b/src/utils/event/createEvent.js
new file mode 100644
index 0000000..4098dd7
--- /dev/null
+++ b/src/utils/event/createEvent.js
@@ -0,0 +1,36 @@
+import getXSRFToken from "../getXSRF.js";
+
+export default async function createEvent(name, description) {
+ const csrfToken = await getXSRFToken();
+
+ try {
+ const response = await fetch(`http://${import.meta.env.VITE_API_URL}/api/events/create`, {
+ method: 'POST',
+ credentials: 'include',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-XSRF-TOKEN': csrfToken,
+ 'Accept': 'application/json'
+ },
+ body: JSON.stringify({ name, description }),
+ });
+
+ const data = await response.json();
+
+ if (!response.ok) {
+ if (response.status === 422) {
+ return {
+ status: 422,
+ errors: data.errors
+ };
+ }
+
+ throw new Error(`Erreur HTTP ${response.status}`);
+ }
+
+ return { status: response.status, data };
+
+ } catch (error) {
+ return { status: "error", error };
+ }
+}
diff --git a/src/utils/users/getUserById.js b/src/utils/users/getUserById.js
index 59af94a..1fad659 100644
--- a/src/utils/users/getUserById.js
+++ b/src/utils/users/getUserById.js
@@ -1,4 +1,4 @@
-export default async function getUserById (id) {
+export default async function getUserById(id) {
try {
const res = await fetch(`http://${import.meta.env.VITE_API_URL}/api/users/${id}`, {
method: 'GET',
@@ -9,12 +9,15 @@ export default async function getUserById (id) {
});
if (!res.ok) {
+ if (res.status === 404) {
+ return { error: 'not_found' };
+ }
throw new Error(`Erreur serveur : ${res.status}`);
}
return await res.json();
} catch (err) {
console.error('Erreur :', err);
- return null;
+ return { error: 'server_error' };
}
-}
\ No newline at end of file
+}