p2405951
|
f6b0cf4d4b
|
add glasscard
|
2025-12-10 14:22:39 +01:00 |
|
p2405951
|
bada53dc7f
|
cut into components
|
2025-12-10 14:01:38 +01:00 |
|
p2405951
|
8aff1ff31c
|
resolve conflicts
|
2025-12-10 14:00:17 +01:00 |
|
p2405951
|
b710669ead
|
rebase & resolve conflicts
|
2025-12-10 13:57:46 +01:00 |
|
T'JAMPENS QUENTIN p2406187
|
7a532492ea
|
Merge branch 'dev' of https://iutbg-gitlab.iutbourg.univ-lyon1.fr/sae-but2/2025-26/gestion-benevoles-association/frontend into dev
|
2025-12-10 12:17:56 +01:00 |
|
T'JAMPENS QUENTIN p2406187
|
2dd2cd2d4b
|
Disallow access to /admin if user is not admin
|
2025-12-10 12:15:52 +01:00 |
|
Giovanni
|
12c0af8190
|
add filter function import
|
2025-12-10 12:01:15 +01:00 |
|
JOSSERAND GIOVANNI p2405212
|
89c0f5c9f7
|
Merge branch 'features/volunteersTollBar' into 'dev'
Features/volunteerstollbar
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!34
|
2025-12-10 10:54:45 +00: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
|
c1a7db12e3
|
Change btn type
|
2025-12-10 11:52:48 +01:00 |
|
Giovanni
|
516277c77d
|
fix some responsive
|
2025-12-10 11:51:14 +01:00 |
|
T'JAMPENS QUENTIN p2406187
|
2373c0402c
|
Merge branch 'features/homePage' into 'dev'
Features/homepage
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!32
|
2025-12-10 09:58:22 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
64b3e9a868
|
Merge branch 'features/feedback' into 'dev'
Show error modal
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!31
|
2025-12-10 09:20:09 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
174d4f364c
|
Show error modal
|
2025-12-10 10:19:18 +01:00 |
|
T'JAMPENS QUENTIN p2406187
|
6bab503447
|
Add feedback error
|
2025-12-10 10:02:16 +01:00 |
|
T'JAMPENS QUENTIN p2406187
|
0749bed223
|
Redirect to / if connected
|
2025-12-10 09:40:09 +01:00 |
|
T'JAMPENS QUENTIN p2406187
|
5f8333e3f6
|
Update placeholder
|
2025-12-10 09:25:31 +01:00 |
|
T'JAMPENS QUENTIN p2406187
|
01457c4328
|
Add phone and password confirmation
|
2025-12-10 09:25:20 +01:00 |
|
T'JAMPENS QUENTIN p2406187
|
6c1d434a00
|
Change admin route
|
2025-12-10 09:25:03 +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 |
|
Antoine Ordonneau
|
2021220cfe
|
fin de la page
|
2025-12-09 12:04:11 +01:00 |
|
T'JAMPENS QUENTIN p2406187
|
417b9856ad
|
fix default theme icon
|
2025-12-09 11:52:57 +01:00 |
|
T'JAMPENS QUENTIN p2406187
|
50fda7076a
|
Merge branch 'features/updateProfile' into 'dev'
Features/updateprofile
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!30
|
2025-12-09 10:50:39 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
16e91eed9f
|
Add icon to ThemeSwitcher.jsx
|
2025-12-09 11:43:57 +01:00 |
|
T'JAMPENS QUENTIN p2406187
|
1c80e61329
|
Close modal on click
|
2025-12-09 11:20:00 +01:00 |
|
T'JAMPENS QUENTIN p2406187
|
255880d40d
|
Update user info
|
2025-12-09 11:15:40 +01:00 |
|
T'JAMPENS QUENTIN p2406187
|
dd4dda2957
|
Add update function
|
2025-12-09 11:15:26 +01:00 |
|
T'JAMPENS QUENTIN p2406187
|
eebb405e4a
|
fix modal height
|
2025-12-09 10:01:27 +01:00 |
|
T'JAMPENS QUENTIN p2406187
|
b9553aedf4
|
Remove sort
|
2025-12-09 09:46:03 +01:00 |
|
T'JAMPENS QUENTIN p2406187
|
d5f8e16ec3
|
Merge branch 'dev' of https://iutbg-gitlab.iutbourg.univ-lyon1.fr/sae-but2/2025-26/gestion-benevoles-association/frontend into dev
|
2025-12-09 09:41:17 +01:00 |
|
T'JAMPENS QUENTIN p2406187
|
6d8899c7de
|
Create settings modal
|
2025-12-09 09:40:20 +01:00 |
|
Giovanni
|
8275bd1643
|
remove unecessary code
|
2025-12-07 17:13:44 +01:00 |
|
JOSSERAND GIOVANNI p2405212
|
a0462450fd
|
Merge branch 'features/searchBar' into 'dev'
Features/searchbar
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!29
|
2025-12-07 15:43:47 +00: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
|
6f7e5b9258
|
use UI Button
|
2025-12-07 15:38:37 +01:00 |
|
Giovanni
|
22921f3da1
|
moving side buttons within a ToolBar component
|
2025-12-07 15:22:33 +01:00 |
|
T'JAMPENS QUENTIN p2406187
|
c556829bc5
|
use Passwordinput component
|
2025-12-07 15:02:52 +01:00 |
|
T'JAMPENS QUENTIN p2406187
|
31b2e36140
|
Add redirection to register page
|
2025-12-07 15:00:55 +01:00 |
|
T'JAMPENS QUENTIN p2406187
|
efbf234fb9
|
Create passwordInput component
|
2025-12-07 14:58:42 +01:00 |
|
T'JAMPENS QUENTIN p2406187
|
86305699ed
|
Fix border radius
|
2025-12-07 14:43:52 +01:00 |
|
Giovanni
|
7adc584199
|
add scroll-y lock on search
|
2025-12-07 14:35:17 +01:00 |
|
T'JAMPENS QUENTIN p2406187
|
a3ccbb9c13
|
Display message if user don't have tasks
|
2025-12-07 14:34:46 +01:00 |
|
T'JAMPENS QUENTIN p2406187
|
c66076f1ed
|
Create ThemeSwitcher btn
|
2025-12-07 14:32:26 +01:00 |
|
T'JAMPENS QUENTIN p2406187
|
e1f6663382
|
Merge branch 'features/darkTheme' into 'dev'
Features/darktheme
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!28
|
2025-12-07 00:55:17 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
b0de796c45
|
Switch theme btn
|
2025-12-07 01:54:32 +01:00 |
|
T'JAMPENS QUENTIN p2406187
|
0188ac43bf
|
Add dark theme
|
2025-12-07 01:39:46 +01:00 |
|
T'JAMPENS QUENTIN p2406187
|
10ac3cecc0
|
Merge branch 'features/linkEventsPage' into 'dev'
Features/linkeventspage
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!27
|
2025-12-07 00:30:22 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
fa2c112d7e
|
Remove useless login route
|
2025-12-07 01:22:27 +01:00 |
|