setIsExpanded(!isExpanded))}>
diff --git a/src/pages/eventDetail/eventDetail.module.css b/src/pages/eventDetail/eventDetail.module.css
index 11ca271..af8a9de 100644
--- a/src/pages/eventDetail/eventDetail.module.css
+++ b/src/pages/eventDetail/eventDetail.module.css
@@ -67,4 +67,15 @@
display: flex;
flex-direction: row;
gap: 10px;
+}
+
+@media screen and (max-width: 768px) {
+
+ .eventContent {
+ flex-direction: column;
+ }
+
+ .textImage {
+ flex-direction: column;
+ }
}
\ No newline at end of file
diff --git a/src/pages/waitValidationPage/ValidationErrorPage.jsx b/src/pages/waitValidationPage/ValidationErrorPage.jsx
index 15995e9..7ca38f9 100644
--- a/src/pages/waitValidationPage/ValidationErrorPage.jsx
+++ b/src/pages/waitValidationPage/ValidationErrorPage.jsx
@@ -3,7 +3,7 @@ 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";
+import { Navigate, useNavigate, Link } from "react-router";
export default function ValidationErrorPage() {
@@ -22,7 +22,11 @@ export default function ValidationErrorPage() {
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
+
Contact :
+
+ https://comite.beaupont.fr/contactez-nous
+
+
diff --git a/src/utils/echo/listeners/userCreatedListener.js b/src/utils/echo/listeners/userCreatedListener.js
index dddab10..e2bb017 100644
--- a/src/utils/echo/listeners/userCreatedListener.js
+++ b/src/utils/echo/listeners/userCreatedListener.js
@@ -1,5 +1,5 @@
export const userCreatedListener = (echo, userData, setNotifications, setunreadNotification) => {
- if (userData.isAdmin || userData.role === "Gérant") {
+ if (userData.isAdmin) {
const channelName = "users.registration";
echo.private(channelName)
.listen(".users.registration", (event) => {
diff --git a/src/utils/echo/listeners/userNotificationsListener.js b/src/utils/echo/listeners/userNotificationsListener.js
index 6b07beb..7d94483 100644
--- a/src/utils/echo/listeners/userNotificationsListener.js
+++ b/src/utils/echo/listeners/userNotificationsListener.js
@@ -1,5 +1,4 @@
export const userNotificationsListener = (echo, userData, setNotifications, setunreadNotification) => {
- if (!userData?.id) return null;
const channelName = `user.${userData.id}`;
diff --git a/src/utils/users/deactivateUser.js b/src/utils/users/deactivateUser.js
new file mode 100644
index 0000000..61ac0c7
--- /dev/null
+++ b/src/utils/users/deactivateUser.js
@@ -0,0 +1,34 @@
+import getXSRFToken from "../getXSRF.js";
+
+export default async function deactivateUser(userId) {
+ const csrfToken = await getXSRFToken();
+
+ try {
+ const response = await fetch(`${import.meta.env.VITE_API_URL}/api/users/${userId}/deactivate`, {
+ method: 'POST',
+ credentials: 'include',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-XSRF-TOKEN': csrfToken,
+ 'Accept': 'application/json'
+ },
+ body: JSON.stringify({
+ id: userId
+ })
+ });
+
+ const data = await response.json();
+
+ if (!response.ok) {
+ return {
+ status: response.status,
+ errors: data.errors || data.message
+ };
+ }
+
+ return { status: response.status, data };
+
+ } catch (error) {
+ return { status: 500, error };
+ }
+}
diff --git a/src/utils/users/deleteOtherUser.js b/src/utils/users/deleteOtherUser.js
new file mode 100644
index 0000000..101cf94
--- /dev/null
+++ b/src/utils/users/deleteOtherUser.js
@@ -0,0 +1,34 @@
+import getXSRFToken from "../getXSRF.js";
+
+export default async function deleteOtherUser(userId) {
+ const csrfToken = await getXSRFToken();
+
+ try {
+ const response = await fetch(`${import.meta.env.VITE_API_URL}/api/users/${userId}`, {
+ method: 'DELETE',
+ credentials: 'include',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-XSRF-TOKEN': csrfToken,
+ 'Accept': 'application/json'
+ },
+ body: JSON.stringify({
+ id: userId
+ })
+ });
+
+ const data = await response.json();
+
+ if (!response.ok) {
+ return {
+ status: response.status,
+ errors: data.errors || data.message
+ };
+ }
+
+ return { status: response.status, data };
+
+ } catch (error) {
+ return { status: 500, error };
+ }
+}
diff --git a/src/utils/users/deleteUser.js b/src/utils/users/deleteUser.js
index 4e3f24d..932167d 100644
--- a/src/utils/users/deleteUser.js
+++ b/src/utils/users/deleteUser.js
@@ -1,20 +1,17 @@
import getXSRFToken from "../getXSRF.js";
-export default async function deleteUser(userId) {
+export default async function deleteUser() {
const csrfToken = await getXSRFToken();
try {
- const response = await fetch(`${import.meta.env.VITE_API_URL}/api/users/${userId}`, {
+ const response = await fetch(`${import.meta.env.VITE_API_URL}/api/users`, {
method: 'DELETE',
credentials: 'include',
headers: {
'Content-Type': 'application/json',
'X-XSRF-TOKEN': csrfToken,
'Accept': 'application/json'
- },
- body: JSON.stringify({
- id: userId
- })
+ }
});
const data = await response.json();