Commit Graph

91 Commits

Author SHA1 Message Date
Lucàs 70974c4f0e add button to Map in Chat
Took 44 minutes
2023-05-21 20:17:29 +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 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
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 6950bb7176 fix(bg color profile): bg color profile 2023-05-20 15:11:45 +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 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 00a214f576 Merge branch 'dev' of github.com:LucasVbr/projet-web4 into dev 2023-05-08 17:49:26 +02:00
Laurian-Dufrechou c84fc2886d fix(Bar map / profile): filtered bar where name != null / fix prefgender 2023-05-08 17:49:14 +02:00
Lucàs e0dbda70a8 refactor: Set default colorScheme to purple
Took 1 hour 12 minutes
2023-05-06 12:51:28 +02:00
Lucàs 20e9c9bd0e refactor: Chat
Took 2 minutes
2023-05-05 20:49:41 +02:00
Lucàs 6eba0d5785 feat: getting-start form
Took 7 hours 1 minute
2023-05-05 20:48:30 +02:00
Laurian-Dufrechou db8e513ceb refactor(useless useState dashboard): removed useless usestate of dashboard
likedUser et dislikedUser
2023-05-03 23:25:46 +02:00
Lucàs a9ca7bd79b feat(MessageList, Message): Start /getting-start page
Took 4 hours 41 minutes
2023-05-03 01:56:51 +02:00
Laurian-Dufrechou 3ca0062dfa refactor(userProfile -> profile): refactor userProfile to profile (page + folder) 2023-05-03 00:51:18 +02:00
Laurian-Dufrechou a2ffdf1edb feat(Like / dislike API ): more efficient api + checks and returns if match 2023-05-03 00:35:40 +02:00
Laurian-Dufrechou edcf469c29 refactor(Dashboard api): changed api to fetch potential match
api now asks only the userID and fetches everything itself
2023-05-02 22:30:08 +02:00
Laurian-Dufrechou e4d89a0fa1 fix(userProfile): comment custom distance 2023-05-01 14:18:07 +02:00
Laurian-Dufrechou c5da6c9730 refactor(userProfile + tsx instead of jsx): created custom components for form userProfile 2023-04-30 19:57:01 +02:00
Laurian-Dufrechou c78b6e67c8 feat(map geolocation error ): showing error when geolocation disabled 2023-04-28 18:51:50 +02:00
Laurian-Dufrechou 6da8d263f6 fix(BUG Carte): error first load map 2023-04-28 18:31:34 +02:00
Laurian-Dufrechou 57f97b8e22 feat(Map with bars): added the map with bars provided by opendatasoft
TODO: -modal to invite match to bar

-use overpass ? (openStreetMap API)
2023-04-24 22:38:08 +02:00
Lucàs 66d20e156d fix: add types and cleanup code 2023-04-11 22:02:33 +02:00
Laurian-Dufrechou d10c7fcc71 feat(Preferences): Choose preferences -- Fetch user from pref 2023-04-09 14:27:49 +02:00
Laurian-Dufrechou b2325fee0f feat(like / dislike): Added possibility to like and dislike 2023-04-08 15:20:38 +02:00
Laurian-Dufrechou 53c61b71fc fix(fix api userDashboard): fix api userDashboard 2023-04-04 19:03:09 +02:00
Laurian-Dufrechou 4a47cec0c3 feat(cardUser with listOfUserFetched): cardUser with listOfUserFetched
users fetched using following parameters :

preference (HOMME en dur
2023-04-04 18:10:52 +02:00
Laurian-Dufrechou 055a778c98 fix(redirect when unauthenthicated): authenticated 2023-04-04 16:00:48 +02:00
Laurian-Dufrechou 13b8a0481c feat(UserData fecthed in userProfile): tanstack query 2023-04-03 21:35:03 +02:00
Laurian-Dufrechou 05ae0eedd8 Merge branch 'dev' of github.com:LucasVbr/projet-web4 into dev 2023-04-03 19:17:42 +02:00
Laurian-Dufrechou 018af6890c feat(Choose passions): Can now choose passion
Todo : fetch userData in useEffect and using userData for userProfile
2023-04-03 19:17:01 +02:00
Lucàs c91f5f3dfb Send messages with sockets ❤️
Took 3 hours 51 minutes
2023-04-03 16:35:25 +02:00
Laurian Dufrechou 7b7ded3648 admin passion form 2023-04-03 15:21:57 +02:00