lucasvbr/meeting-app
1
0
Fork 0
mirror of https://github.com/LucasVbr/meeting-app.git synced 2026-05-13 17:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
140 Commits 2 Branches 0 Tags
30178b807c3e4167d96810c77febba73d88c6ace
Commit Graph

140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurian-Dufrechou 30178b807c fix(pieChart labels en francais): labels francais 2023-05-22 17:18:45 +02:00
Laurian-Dufrechou 944ecf1061 Merge branch 'dev' of github.com:LucasVbr/projet-web4 into dev 2023-05-22 17:12:52 +02:00
Laurian-Dufrechou 7070b4f6ae fix(Api sending error when no user found): Api sending error when no user found 2023-05-22 17:12:44 +02:00
burgu 01982db445 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/pages/graphique.tsx
#	src/pages/map.tsx
 2023-05-22 17:03:35 +02:00
burgu 9dfe0cedff Création de la pages graphiques et des liens pour y acceder 2023-05-22 17:03:06 +02:00
Lucàs 8cbbbc3c0f Add container to admin/settings.tsx 
Took 2 minutes
 2023-05-22 15:01:06 +02:00
Lucàs f3468f40d1 Add LoadingPage in Graphique during auth 
Took 2 minutes
 2023-05-22 14:59:45 +02:00
Lucàs eb1e3e08bd Add picture in chat and button to dashboard 
Took 28 minutes
 2023-05-22 14:41:49 +02:00
Laurian-Dufrechou 68f377ce37 fix(multiple bugs (map, dashboard, carousel)): multiple bugs (map, dashboard, carousel) 2023-05-22 13:21:49 +02:00
Laurian-Dufrechou fcb305285b Merge branch 'dev' of github.com:LucasVbr/projet-web4 into dev 2023-05-21 21:39:04 +02:00
Laurian-Dufrechou 25910175d8 fix(modalImage Size): modalModifyImage image size 2023-05-21 21:36:48 +02:00
Lucàs 1624109337 Edit map button in chat 
Took 13 minutes
 2023-05-21 20:31:05 +02:00
Lucàs 70974c4f0e add button to Map in Chat 
Took 44 minutes
 2023-05-21 20:17:29 +02:00
Lucàs bb92a9525b Make map 100% width on message 
Took 4 minutes
 2023-05-21 16:50:59 +02:00
Lucàs b59a871182 Show marker on invite in Chat 
Took 34 minutes
 2023-05-21 16:46:37 +02:00
Laurian-Dufrechou 366d6abf86 feat(map in message): Added map in message of invite 2023-05-21 00:41:50 +02:00
Lucàs 5d0b0747b6 Merge branch 'dev' of https://github.com/LucasVbr/projet-web4 into dev 2023-05-21 00:03:09 +02:00
Lucàs dc23dce758 Parse invitation in messages 
Took 1 hour 33 minutes
 2023-05-21 00:03:06 +02:00
Laurian-Dufrechou 484b3d6167 Merge branch 'dev' of github.com:LucasVbr/projet-web4 into dev 2023-05-20 22:30:17 +02:00
Laurian-Dufrechou 8082fb5dff fix(display no match): display no match on modalInviteMatch 2023-05-20 22:30:10 +02:00
Lucàs cde6569028 Add Navbar to chat 
Took 5 minutes
 2023-05-20 22:17:09 +02:00
Lucàs 57a0c057ab Display Chats in dashboard + autoscroll chat to bottom 
Took 1 hour 11 minutes
 2023-05-20 22:10:27 +02:00
Laurian-Dufrechou 6cb47c25e9 fix(Modal invite / image fix ): fix display : scrollable horizontaly 2023-05-20 20:13:09 +02:00
Laurian-Dufrechou f8308254ae fix(admin and normal user): admin and normal user 2023-05-20 19:38:10 +02:00
Laurian-Dufrechou ace8284c6a fix(react-chartjs version ): Fixed react-chartjs version outdated 2023-05-20 19:27:52 +02:00
Laurian-Dufrechou 97be61a48d feat(better modalInviteMatch): Better modal match 2023-05-20 18:46:13 +02:00
Lucàs 0eaac821e3 Merge branch 'dev' of https://github.com/LucasVbr/projet-web4 into dev 2023-05-20 16:20:01 +02:00
Lucàs aa94b9467f Edit Chat communication and require to be logged 
Took 44 seconds
 2023-05-20 16:19:51 +02:00
Lucàs 8bb94d85f2 Better Chat List 
Took 23 seconds
 2023-05-20 16:19:07 +02:00
Lucàs 0fd31048d8 Add Link to Chats from dashboard 
Took 1 hour 15 minutes
 2023-05-20 16:18:43 +02:00
Laurian-Dufrechou 9f9595f94f fix(position api bar): position api bar 2023-05-20 15:49:22 +02:00
Laurian-Dufrechou 36182eb47b feat(Distance bar search): Distance in preference is used in api bar 2023-05-20 15:29:17 +02:00
Laurian-Dufrechou 8187506b1e Merge branch 'dev' of github.com:LucasVbr/projet-web4 into dev 2023-05-20 15:12:11 +02:00
Laurian-Dufrechou 6950bb7176 fix(bg color profile): bg color profile 2023-05-20 15:11:45 +02:00
Lucàs 5921bb4596 Remove unused imports from FormMessage.tsx 
Took 1 minute
 2023-05-20 15:01:53 +02:00
Lucàs afe3899457 Remove Birthdate from GettingStartForm.tsx 
Took 5 minutes
 2023-05-20 15:00:37 +02:00
Lucàs 95059f21ac Edit Profile into Profil in Navbar.tsx 
Took 2 hours 22 minutes
 2023-05-20 14:55:10 +02:00
Laurian-Dufrechou 97dd0d1888 fix(Bug retour after invite): bug that crashed app when retour after invite 2023-05-20 14:17:52 +02:00
burgu 7bd6c59af5 Create Line Pie Bar Chart 2023-05-19 17:36:29 +02:00
Laurian-Dufrechou 96da92a34f feat(Saluer on matchNotification ): Saluer bring you to chat with the user 2023-05-19 12:23:57 +02:00
Laurian-Dufrechou 61df566dcf fix(disconnect from map issue): require to be connected to reach /map 2023-05-18 17:31:54 +02:00
Laurian-Dufrechou b1b5c8720c fix(error merge): fixed error induced with wrong merge 2023-05-18 17:12:15 +02:00
Laurian-Dufrechou 32ef129a9b Merge branch 'dev' of github.com:LucasVbr/projet-web4 into dev 2023-05-18 17:08:39 +02:00
Laurian-Dufrechou 8e021a833d feat(invite Match to bar / create chat on match): Modal to invite match to bar/ create chat on match 2023-05-18 17:03:45 +02:00
Lucàs 31666d9698 fix(map): Fix logout 
Took 1 hour 16 minutes
 2023-05-18 13:59:33 +02:00
Laurian-Dufrechou 5b2e9ebafc Merge branch 'dev' of github.com:LucasVbr/projet-web4 into dev 2023-05-16 01:06:20 +02:00
Laurian-Dufrechou dbb60bd9f1 feat(UserMatch): Logique des matchs et notifications 
Affichage d'un modal lorsqu'une notification de match n'est pas consulté
 2023-05-16 01:05:16 +02:00
Laurian-Dufrechou 01e70ceb0a feat(UserMatch): Logique des matchs et notifications 
Affichage d'un modal lorsqu'une notification de match n'est pas consulté
 2023-05-16 00:59:05 +02:00
Lucàs 9b4676f769 Update schema.prisma 
Took 2 hours 1 minute
 2023-05-09 19:54:07 +02:00
Laurian-Dufrechou 00a214f576 Merge branch 'dev' of github.com:LucasVbr/projet-web4 into dev 2023-05-08 17:49:26 +02:00