Commit Graph
105 Commits
Author SHA1 Message Date
p2405951 46d6a8ab60 Merge branch 'dev' into features/adminImplement 2026-01-13 12:10:33 +01:00
T'JAMPENS QUENTIN p2406187 28cc9c13eb Modify role 2026-01-13 11:51:05 +01:00
p2405951 b0f0aec16e validate + delete user + last event + prototype chart 2026-01-13 11:49:11 +01:00
T'JAMPENS QUENTIN p2406187 0ff475a86d Create delete user btn 2026-01-12 23:47:45 +01:00
T'JAMPENS QUENTIN p2406187 23dbbf0d09 Add delete event method 2026-01-12 22:19:23 +01:00
T'JAMPENS QUENTIN p2406187 1c10240b8d Fix backend url conf 2026-01-12 21:50:03 +01:00
T'JAMPENS QUENTIN p2406187 2def96dd18 Merge branch 'dev' into 'features/linkEventsPage'
# Conflicts:
#   src/pages/Profile/ProfilePage.jsx
2026-01-12 14:55:23 +00:00
T'JAMPENS QUENTIN p2406187 6165978ef3 Add unassign btn 2026-01-12 15:50:48 +01:00
T'JAMPENS QUENTIN p2406187 6d15582819 Show task is assigned to user + fix assign user 2026-01-12 15:35:22 +01:00
p2405951 e38fdc11ab add responsive+ delete inline style 2026-01-12 14:56:01 +01:00
T'JAMPENS QUENTIN p2406187 00142f1e3e Allow user to assign to a task 2026-01-12 14:11:51 +01:00
Giovanni 6da4880f0d Merge branch 'dev' into features/notifications
# Conflicts:
#	package-lock.json
#	package.json
#	src/components/Header/Header.jsx
2026-01-12 00:15:16 +01:00
Giovanni 69e7fdb35c correct created_at attribute of notifications 2026-01-11 23:24:15 +01:00
Giovanni b0d7d3c0af update notifications css 2026-01-11 20:05:20 +01:00
Giovanni c906cb733e multiplex user notifications over a single private channel 2026-01-11 12:10:44 +01:00
Giovanni 5fb97ccd90 split notification listeners into separate files 2026-01-09 14:39:19 +01:00
Giovanni 42748ad722 add read notifications route and update notifications behavior 2026-01-08 15:00:43 +01:00
T'JAMPENS QUENTIN p2406187 b58a1a321d Add date to event create 2026-01-07 17:04:10 +01:00
T'JAMPENS QUENTIN p2406187 d6cff2d474 Format date 2026-01-07 15:18:52 +01:00
T'JAMPENS QUENTIN p2406187 7f5be9ea32 Link hompeage eventlist to backend 2026-01-07 14:55:17 +01:00
p2405951 a90d52b44b récupération modifs dev sur new branch 2026-01-06 09:32:20 +01:00
p2405951 6ac1522be8 resolve conflicts 2025-12-27 17:55:31 +01:00
Antoine Ordonneau 32bde03254 correction erreur et découpage en composant 2025-12-19 15:32:43 +01:00
Giovanni 21259f2838 update notification routes call 2025-12-17 17:22:10 +01:00
T'JAMPENS QUENTIN p2406187 c2f4c9fa55 Redirect to 404 page if user not found 2025-12-17 15:20:51 +01:00
Giovanni 0aaafed26a move utils files 2025-12-17 14:16:08 +01:00
Giovanni 883b9b6c4b dynamic display of notifications 2025-12-15 16:31:41 +01:00
T'JAMPENS QUENTIN p2406187 67b02c297f Create event function 2025-12-15 15:31:56 +01:00
T'JAMPENS QUENTIN p2406187 0027bfc5f2 Update login test 2025-12-10 15:41:12 +01:00
T'JAMPENS QUENTIN p2406187 95a167c663 Handle login errors 2025-12-10 15:35:12 +01:00
T'JAMPENS QUENTIN p2406187 562a570dda Add unit test 2025-12-10 14:57:50 +01:00
T'JAMPENS QUENTIN p2406187 9767b4029f Change login path 2025-12-10 14:57:43 +01:00
JOSSERAND GIOVANNI p2405212 cac2ef2c3e Merge branch 'dev' into 'features/volunteersTollBar'
# Conflicts:
#   src/pages/Events/EventsPage.jsx
#   src/pages/Volunteers/VolunteerCard.jsx
2025-12-10 10:54:24 +00:00
T'JAMPENS QUENTIN p2406187 174d4f364c Show error modal 2025-12-10 10:19:18 +01:00
T'JAMPENS QUENTIN p2406187 01457c4328 Add phone and password confirmation 2025-12-10 09:25:20 +01:00
Giovanni 6a416abadb add search bar to volunteer page 2025-12-10 09:12:41 +01:00
T'JAMPENS QUENTIN p2406187 5c48f1918e fix searchEvent route 2025-12-10 09:01:53 +01:00
T'JAMPENS QUENTIN p2406187 255880d40d Update user info 2025-12-09 11:15:40 +01:00
JOSSERAND GIOVANNI p2405212 c233d4cda3 Merge branch 'dev' into 'features/searchBar'
# Conflicts:
#   src/components/Event/Event.jsx
#   src/index.css
#   src/pages/Events/EventsPage.jsx
#   src/utils/getUser.js
#   src/utils/getXSRF.js
#   src/utils/login.js
#   src/utils/register.js
2025-12-07 15:43:03 +00:00
Giovanni a3c62b6933 moving filter function within a dedicated file 2025-12-07 15:49:03 +01:00
T'JAMPENS QUENTIN p2406187 d2e95744b8 get db events 2025-12-07 01:07:27 +01:00
T'JAMPENS QUENTIN p2406187 79df0f5ab1 get database users 2025-12-05 14:34:33 +01:00
T'JAMPENS QUENTIN p2406187 22065fbd16 Add logout btn 2025-12-04 18:18:31 +01:00
T'JAMPENS QUENTIN p2406187 ad58a36707 Add vitest 2025-12-04 11:21:35 +01:00
T'JAMPENS QUENTIN p2406187 98518be813 Link backend to profile page 2025-12-02 17:40:52 +01:00
Giovanni adcd0933d2 add searchEvents utils function to call the events/search route 2025-11-30 16:16:44 +01:00
Giovanni b0d8eca5a3 correction of API routes url 2025-11-29 17:54:27 +01:00
T'JAMPENS QUENTIN p2406187 3816d3a296 Add .env api url 2025-11-29 01:17:43 +01:00
T'JAMPENS QUENTIN p2406187 db4ef74699 Merge branch 'dev' into 'feature/auth'
# Conflicts:
#   src/router.js
#   src/utils/login.js
2025-11-28 08:27:56 +00:00
Giovanni b7ef0e5ab4 update of login.js input 2025-11-16 12:25:51 +01:00