From 8eed9dc208725ed054361b35f030140a7f81be85 Mon Sep 17 00:00:00 2001 From: ORDONNEAU Antoine Date: Fri, 13 Mar 2026 17:21:30 +0100 Subject: [PATCH 1/5] correction alignement modal --- src/components/ui/Modal/Modal.module.css | 2 +- src/components/ui/Modal/Modal.tsx | 2 +- .../EventDetail/components/CreateTaskBtn/CreateTaskBtn.jsx | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/ui/Modal/Modal.module.css b/src/components/ui/Modal/Modal.module.css index fa3566f..cdb564a 100644 --- a/src/components/ui/Modal/Modal.module.css +++ b/src/components/ui/Modal/Modal.module.css @@ -15,7 +15,7 @@ .modal { padding: 20px 20px 20px 20px; - border-radius: 8px; + border-radius: 20px; min-width: 300px; max-width: 70%; max-height: none; diff --git a/src/components/ui/Modal/Modal.tsx b/src/components/ui/Modal/Modal.tsx index b1203ed..3c1ecea 100644 --- a/src/components/ui/Modal/Modal.tsx +++ b/src/components/ui/Modal/Modal.tsx @@ -59,7 +59,7 @@ const Modal = ({ open, onClose, children, title }: ModalProps) => { {title &&

{title}

} {children}
- +
, diff --git a/src/pages/EventDetail/components/CreateTaskBtn/CreateTaskBtn.jsx b/src/pages/EventDetail/components/CreateTaskBtn/CreateTaskBtn.jsx index 4a0f47b..81704a9 100644 --- a/src/pages/EventDetail/components/CreateTaskBtn/CreateTaskBtn.jsx +++ b/src/pages/EventDetail/components/CreateTaskBtn/CreateTaskBtn.jsx @@ -80,7 +80,7 @@ export default function CreateTaskBtn({ id }) {
-

Nombre maximum de participants

+

Nombre de participants max

- + From 08f4926fb83c0aedd9786ca0854dc8b69dff83e9 Mon Sep 17 00:00:00 2001 From: ORDONNEAU Antoine Date: Tue, 17 Mar 2026 08:36:33 +0100 Subject: [PATCH 2/5] correction css modal --- src/components/ui/Modal/Modal.module.css | 1 - src/components/ui/Modal/Modal.tsx | 32 ------------------- src/index.css | 24 ++++++++++---- .../SettingsModal/SettingsModal.module.css | 13 ++------ .../SettingsModal/SettingsModal.tsx | 15 ++++----- 5 files changed, 27 insertions(+), 58 deletions(-) diff --git a/src/components/ui/Modal/Modal.module.css b/src/components/ui/Modal/Modal.module.css index cdb564a..5d38f53 100644 --- a/src/components/ui/Modal/Modal.module.css +++ b/src/components/ui/Modal/Modal.module.css @@ -34,5 +34,4 @@ display: flex; align-items: center; justify-content: center; - margin-top: 20px; } diff --git a/src/components/ui/Modal/Modal.tsx b/src/components/ui/Modal/Modal.tsx index 3c1ecea..772b6dc 100644 --- a/src/components/ui/Modal/Modal.tsx +++ b/src/components/ui/Modal/Modal.tsx @@ -1,35 +1,3 @@ -/*import { createPortal } from "react-dom"; -import styles from "./modal.module.css"; -import Button from "../button/button.jsx"; - -const Modal = ({ open, onClose, children, title }) => { - - if (!open) return null; - - const handleOverlayClick = () => { - onClose(); - }; - - const handleModalClick = (e) => { - e.stopPropagation(); - }; - - return createPortal( -
-
- {title &&

{title}

} - {children} -
- -
-
-
, - document.body - ); -}; - -export default Modal;*/ - import { createPortal } from "react-dom"; import styles from "./Modal.module.css"; import Button from "../Button/Button"; diff --git a/src/index.css b/src/index.css index c18fc90..601e888 100644 --- a/src/index.css +++ b/src/index.css @@ -17,6 +17,13 @@ html { text-rendering: optimizeLegibility; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; + + --glass-back: rgba(255, 255, 255, 0.54); + --glass-border: rgba(255, 255, 255, 0.2); + --glass-shadow: 0 8px 32px rgba(0, 0, 0, 0.1), + inset 0 1px 0 rgba(255, 255, 255, 0.3), + inset 0 -1px 0 rgba(255, 255, 255, 0.05), + inset 0 0 8px 4px rgba(255, 255, 255, 0.2); } @media screen and (max-width: 768px) { @@ -51,18 +58,23 @@ body { min-height: 100vh; } +body.dark { + --glass-back: rgba(191, 191, 191, 0.54); + --glass-border: rgba(191, 191, 191, 0.2); + --glass-shadow: 0 8px 32px rgba(0, 0, 0, 0.1), + inset 0 1px 0 rgba(191, 191, 191, 0.3), + inset 0 -1px 0 rgba(191, 191, 191, 0.05), + inset 0 0 8px 4px rgba(191, 191, 191, 0.2); +} .glassCard { padding: 10px 20px 10px 20px; - background: rgba(255, 255, 255, 0.54); + background: var(--glass-back); backdrop-filter: blur(3px); -webkit-backdrop-filter: blur(3px); border-radius: 20px; - border: 1px solid rgba(255, 255, 255, 0.2); - box-shadow: 0 8px 32px rgba(0, 0, 0, 0.1), - inset 0 1px 0 rgba(255, 255, 255, 0.3), - inset 0 -1px 0 rgba(255, 255, 255, 0.05), - inset 0 0 8px 4px rgba(255, 255, 255, 0.2); + border: 1px solid var(--glass-border); + box-shadow: var(--glass-shadow); } .glassBorder{ diff --git a/src/pages/Profile/components/SettingsModal/SettingsModal.module.css b/src/pages/Profile/components/SettingsModal/SettingsModal.module.css index 7808db3..5a1b7ac 100644 --- a/src/pages/Profile/components/SettingsModal/SettingsModal.module.css +++ b/src/pages/Profile/components/SettingsModal/SettingsModal.module.css @@ -3,9 +3,9 @@ padding: 20px; display: flex; flex-direction: column; - gap: 28px; } + .modifyIcon { height: 26px; width: 26px; @@ -22,9 +22,6 @@ flex-direction: column; gap: 16px; padding: 18px; - border-radius: 12px; - background: var(--glass-bg, rgba(255, 255, 255, 0.25)); - backdrop-filter: blur(6px); } .section h3 { @@ -43,7 +40,7 @@ } .submitBtn { - width: 100%; + align-self: center; text-align: center; margin-top: 10px; } @@ -65,14 +62,10 @@ } .section { - padding: 22px; - gap: 18px; } .submitBtn { width: auto; - align-self: center; - min-width: 220px; } .section button { @@ -87,8 +80,6 @@ } .section { - padding: 26px; - border-radius: 16px; } .modifyIcon { diff --git a/src/pages/Profile/components/SettingsModal/SettingsModal.tsx b/src/pages/Profile/components/SettingsModal/SettingsModal.tsx index bec3d67..6bb2320 100644 --- a/src/pages/Profile/components/SettingsModal/SettingsModal.tsx +++ b/src/pages/Profile/components/SettingsModal/SettingsModal.tsx @@ -88,7 +88,7 @@ export default function SettingsModal() { onClose={() => setOpen(false)} >
-
+

Compte

- -
+

Changer de Prénom

-
-

Changer de nom

+
+

Changer de nom

-
-

Changer de numéro de téléphone

+
+

Changer de numéro de téléphone

-
+

Apparence

From e07a6cba68ea55a151c255ed256f3b552c844cc6 Mon Sep 17 00:00:00 2001 From: ORDONNEAU Antoine Date: Tue, 17 Mar 2026 09:46:18 +0100 Subject: [PATCH 3/5] recuip stash --- .../components/SettingsModal/SettingsModal.module.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/Profile/components/SettingsModal/SettingsModal.module.css b/src/pages/Profile/components/SettingsModal/SettingsModal.module.css index 5a1b7ac..3589449 100644 --- a/src/pages/Profile/components/SettingsModal/SettingsModal.module.css +++ b/src/pages/Profile/components/SettingsModal/SettingsModal.module.css @@ -1,6 +1,5 @@ .content { width: 100%; - padding: 20px; display: flex; flex-direction: column; } @@ -57,7 +56,6 @@ @media (min-width: 640px) { .content { - padding: 28px; gap: 32px; } @@ -71,6 +69,7 @@ .section button { width: fit-content; } +<<<<<<< Updated upstream } @media (min-width: 900px) { @@ -86,4 +85,6 @@ height: 30px; width: 30px; } +======= +>>>>>>> Stashed changes } \ No newline at end of file From ac00cf90e6c1289e94cd1db1809294e31d43e53a Mon Sep 17 00:00:00 2001 From: ORDONNEAU Antoine Date: Tue, 17 Mar 2026 10:18:58 +0100 Subject: [PATCH 4/5] fin fix css reglage --- .../SettingsModal/SettingsModal.module.css | 27 ++----------------- src/utils/getXSRF.ts | 20 -------------- 2 files changed, 2 insertions(+), 45 deletions(-) diff --git a/src/pages/Profile/components/SettingsModal/SettingsModal.module.css b/src/pages/Profile/components/SettingsModal/SettingsModal.module.css index 3589449..24a6246 100644 --- a/src/pages/Profile/components/SettingsModal/SettingsModal.module.css +++ b/src/pages/Profile/components/SettingsModal/SettingsModal.module.css @@ -2,6 +2,8 @@ width: 100%; display: flex; flex-direction: column; + padding: 10px 20px 10px 20px; + gap: 20px; } @@ -55,13 +57,6 @@ } @media (min-width: 640px) { - .content { - gap: 32px; - } - - .section { - } - .submitBtn { width: auto; } @@ -69,22 +64,4 @@ .section button { width: fit-content; } -<<<<<<< Updated upstream -} - -@media (min-width: 900px) { - .content { - padding: 36px; - gap: 36px; - } - - .section { - } - - .modifyIcon { - height: 30px; - width: 30px; - } -======= ->>>>>>> Stashed changes } \ No newline at end of file diff --git a/src/utils/getXSRF.ts b/src/utils/getXSRF.ts index f96606d..c7b8048 100644 --- a/src/utils/getXSRF.ts +++ b/src/utils/getXSRF.ts @@ -1,23 +1,3 @@ -/*export default async function getXSRFToken() { - const response = await fetch(`${import.meta.env.VITE_API_URL}/sanctum/csrf-cookie`, { - method: 'GET', - credentials: 'include' - }); - - if (!response.ok && response.status !== 204) { - throw new Error(`Error : ${response.status}`); - } - - const name = 'XSRF-TOKEN'; - const value = `; ${document.cookie}`; - const parts = value.split(`; ${name}=`); - if (parts.length === 2) { - return decodeURIComponent(parts.pop().split(';').shift()); - } - - throw new Error('Error: Invalid XSRF-TOKEN'); -}*/ - export default async function getXSRFToken(): Promise { const response = await fetch(`${import.meta.env.VITE_API_URL}/sanctum/csrf-cookie`, { method: 'GET', From bed21f834ec54e8b0ba81bad95cb24d43d74df5d Mon Sep 17 00:00:00 2001 From: ORDONNEAU Antoine Date: Tue, 17 Mar 2026 11:44:18 +0100 Subject: [PATCH 5/5] fix reglage css --- src/components/ui/Modal/Modal.module.css | 5 ---- src/components/ui/Modal/Modal.tsx | 2 +- src/pages/Profile/ProfilePage.module.css | 4 +-- src/pages/Profile/ProfilePage.tsx | 10 +++---- .../SettingsModal/SettingsModal.tsx | 28 +++++++++++-------- 5 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/components/ui/Modal/Modal.module.css b/src/components/ui/Modal/Modal.module.css index 5d38f53..8e97c9d 100644 --- a/src/components/ui/Modal/Modal.module.css +++ b/src/components/ui/Modal/Modal.module.css @@ -14,19 +14,14 @@ } .modal { - padding: 20px 20px 20px 20px; border-radius: 20px; min-width: 300px; max-width: 70%; max-height: none; position: relative; - box-shadow: 0 4px 15px rgba(0,0,0,0.2); width: clamp(300px, 50vw, 600px); - border: 1px solid rgba(200, 200, 200, 0.3); - background: rgba(255, 255, 255, 0.5); backdrop-filter: blur(10px); -webkit-backdrop-filter: blur(10px); - color: #000; outline: none; } diff --git a/src/components/ui/Modal/Modal.tsx b/src/components/ui/Modal/Modal.tsx index 772b6dc..9cffb35 100644 --- a/src/components/ui/Modal/Modal.tsx +++ b/src/components/ui/Modal/Modal.tsx @@ -23,7 +23,7 @@ const Modal = ({ open, onClose, children, title }: ModalProps) => { return createPortal(
-
+
{title &&

{title}

} {children}
diff --git a/src/pages/Profile/ProfilePage.module.css b/src/pages/Profile/ProfilePage.module.css index 288c0d1..1e3cc3a 100644 --- a/src/pages/Profile/ProfilePage.module.css +++ b/src/pages/Profile/ProfilePage.module.css @@ -12,7 +12,7 @@ box-sizing: border-box; } -.settingImage { +.settingAccount { display: flex; justify-content: center; align-items: center; @@ -126,7 +126,7 @@ box-sizing: border-box; } -.settingImage { +.settingAcount { width: 100%; display: flex; justify-content: center; diff --git a/src/pages/Profile/ProfilePage.tsx b/src/pages/Profile/ProfilePage.tsx index 8eaa107..f43ece6 100644 --- a/src/pages/Profile/ProfilePage.tsx +++ b/src/pages/Profile/ProfilePage.tsx @@ -144,6 +144,11 @@ function ProfilePage() { {user?.isAdmin && profileUser && !isOwnProfile && ( )} + {isOwnProfile && ( +
+ +
+ )}
@@ -157,11 +162,6 @@ function ProfilePage() {

Téléphone : {profileUser?.phone ?? "Non renseigné"}

- {isOwnProfile && ( -
- -
- )}

Tâches :

diff --git a/src/pages/Profile/components/SettingsModal/SettingsModal.tsx b/src/pages/Profile/components/SettingsModal/SettingsModal.tsx index 118f430..7d39830 100644 --- a/src/pages/Profile/components/SettingsModal/SettingsModal.tsx +++ b/src/pages/Profile/components/SettingsModal/SettingsModal.tsx @@ -89,18 +89,7 @@ export default function SettingsModal() { >
-

Compte

- - - - +

Modifier les informations du compte

Changer de Prénom

Apparence
+ +
+

Sécurité du compte

+ + + + +