Commit Graph

334 Commits

Author SHA1 Message Date
LuckyLaszlo
de00a4fdcd last update before merge with Cherif 2022-12-20 16:49:01 +01:00
Me
84488ee407 cherif helped me fix the queryBuilder, so much better now 2022-12-20 04:37:12 +01:00
LuckyLaszlo
c29db6d5f3 WIP token identification 2022-12-19 21:48:16 +01:00
batche
8a11d9c591 Suite du jeu et toujours pas fin 2022-12-19 21:37:58 +01:00
batche
dbd95089a8 Game, suite et presque fin ? 2022-12-19 20:58:46 +01:00
batche
27a4bfae7a lien serveur de jeu => serveur nestjs 2022-12-19 09:34:34 +01:00
LuckyLaszlo
04029c9988 fix sound selector
+ favicon
+ temporary debug log for sound in RectangleClient
2022-12-17 20:33:58 +01:00
LuckyLaszlo
42f2d76f30 Wip fetch() from gameServer to nestServer
+ miscs (html, css, svelte warning, ...)
2022-12-17 17:22:42 +01:00
batche
67f7d0e8ec Suite de l'intégratyion du jeu. De nombreux paquets sont indisponibles. 2022-12-16 10:51:40 +01:00
Me
de06007d60 fixed some stuff in the Friendship backend, but had to cut some corners, it's kinda gross, will fix later, better flow to frontend friendship page, most stuff works, still a few kinks to work out 2022-12-16 04:14:44 +01:00
Me
db02946268 Query Builder, more specifically an orWhere, is being difficult... hard to test the friendships flow in the frontend without it, still have a good bit of work as a result 2022-12-15 05:42:09 +01:00
lenovo
e18010a1ef wip style of chat layouts, alreade done home and room 2022-12-14 20:32:41 +01:00
batche
c2242c481b Le jeu fonctionne yipa ! 2022-12-14 12:12:10 +01:00
batche
0877cd284f connection upgrade with nginx 2022-12-14 11:18:02 +01:00
batche
fd8435b632 travail avec lucky - suite 2022-12-14 11:01:11 +01:00
batche
f1f94cb9bc serveur de jeu - work in progress 2022-12-14 10:45:10 +01:00
Me
6eaf28d4d8 working on accepting friend requests, have to muck about with the DB, i have to learn how to use .find() 2022-12-14 08:59:00 +01:00
Me
3a6729b9a3 adding the ability to add and delete friends, in progress 2022-12-14 06:31:09 +01:00
batche
bd4938b64b changement mineur fonction pour chercher ami via username 2022-12-13 17:47:29 +01:00
batche
aa171bd844 ajout de deux fonctions afin de trouver une relation amicale ou non via le username de ladite relation 2022-12-13 17:25:00 +01:00
Me
51125eee0f minor fixes to Friendpage 2022-12-13 17:09:17 +01:00
batche
6ca35ccaa7 la galère continue 2022-12-13 16:57:00 +01:00
Me
44074af237 Cleaned up ProfileFriends page, but i need some input about the backend, might need to change some things 2022-12-13 07:06:08 +01:00
Me
913a81ef0a ok so we fixed the button problem i was having, turns out i'm dumb, but we knew that, and i got reactive component loading, good news, not sprucing up the FriendPage, adding more functionality 2022-12-13 03:26:38 +01:00
batche
a8743940a5 dockerfile 2022-12-12 15:13:59 +01:00
batche
b04cd0aa48 Implémentation du jeu dans svelte HOPE 2022-12-12 12:37:47 +01:00
batche
34bdcad3a2 pendant req 2022-12-11 16:46:13 +01:00
batche
a9460fb41c Changements amitiés 2022-12-11 15:30:30 +01:00
Me
db1e269e2e Stuggling a bit to get components to rerender when a prop updates in the Friendship page, will sort out tomorrow 2022-12-11 08:12:22 +01:00
Me
6eeb2b5474 ok so i fixed the get user by username issue, left all the comments in the back so Cherif and I can go over what i changed just to make sure i didn't break something else, but yea that and my front work just fine 2022-12-11 06:04:03 +01:00
Me
61828e5be7 much progress on layout the foundations of the Friendship page in the front, also refactored some code to reuse displaying a users profile info 2022-12-10 07:13:28 +01:00
Me
15ea27955b trying to push again 2022-12-09 16:53:00 +01:00
Me
b75bce4212 this merge with master should come with the right backend stuff to make friendship requests work 2022-12-09 15:46:40 +01:00
batche
87fe4bbbf4 correction mineure 2022-12-09 11:42:58 +01:00
batche
f2e57bef79 petite erreur 2022-12-09 11:35:17 +01:00
batche
86e007d6c0 Merge branch 'master' of bitbucket.org:LuckyLaszlo/ft_transcendence into inclusion_jeu_a_partir_de_master 2022-12-09 11:29:38 +01:00
batche
3802973dfa corrections mineures 2022-12-09 11:29:19 +01:00
Me
58234c8a6c ok so the problem seems to be that i was sending a username not an ID (which is unique), so i made a way to do that, bu t it's still a work in progress figuring out the restults 2022-12-09 05:33:32 +01:00
Me
302ebd674c working on friendships in teh frontend but having to do some debuging in the backend 2022-12-09 05:19:12 +01:00
Me
999b40430d was mucking about with trying to integerate the game but will leave that for some other time 2022-12-09 02:23:58 +01:00
batche
8d640ae4ab début de la mise en place du jeu (partie client uniquement). 2022-12-08 19:08:07 +01:00
batche
3afc0996ac début création du jeu 2022-12-08 17:56:46 +01:00
batche
58787215ad Merge branch 'master' of bitbucket.org:LuckyLaszlo/ft_transcendence 2022-12-08 17:13:29 +01:00
batche
8953a0c09b réforme de l'amitié 2022-12-08 17:13:12 +01:00
Me
c777fb3592 merged with master 2022-12-08 17:09:02 +01:00
Me
8688f3b48f pushing to master, only minor changes 2022-12-08 17:04:50 +01:00
batche
46fcb423e5 changements mineurs 2022-12-08 14:34:14 +01:00
batche
b00c9e1474 changements mineurs 2022-12-08 14:01:07 +01:00
batche
8c2df71cde les redirections fonctionnent 2022-12-08 13:51:56 +01:00
Me
d2f45ba86a Merge remote-tracking branch 'origin' into eric_front_and_back 2022-12-07 20:47:34 +01:00