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

..

components

Merge branch 'dev' into 'features/searchBar'

2025-12-07 15:43:03 +00:00

contexts/auth

Add logout btn

2025-12-04 18:18:31 +01:00

pages

Merge branch 'dev' into 'features/searchBar'

2025-12-07 15:43:03 +00:00

stories

Create modal component stories

2025-11-30 17:47:10 +01:00

utils

Merge branch 'dev' into 'features/searchBar'

2025-12-07 15:43:03 +00:00

index.css

Merge branch 'dev' into 'features/searchBar'

2025-12-07 15:43:03 +00:00

layout.jsx

Protect routes

2025-11-15 23:28:09 +01:00

main.jsx

Set auth context

2025-11-15 23:27:53 +01:00

router.js

Remove useless login route

2025-12-07 01:22:27 +01:00