Commit Graph

Select branches

Hide Pull Requests

hugo

Mono Color

• 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 Me 2022-12-16 04:14:44 +01:00
• 3241a9dc0f wip new panel lenovo 2022-12-15 20:56:23 +01:00
• 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 Me 2022-12-15 05:42:09 +01:00
• 9bddde40c7 wip layout added line under ontrols lenovo 2022-12-14 22:45:43 +01:00
• 17d3fff002 wip layout home room list lenovo 2022-12-14 21:55:53 +01:00
• c1c7a0ce6a layout titles ok lenovo 2022-12-14 21:04:10 +01:00
• e18010a1ef wip style of chat layouts, alreade done home and room lenovo 2022-12-14 20:32:41 +01:00
• c2242c481b Le jeu fonctionne yipa ! batche 2022-12-14 12:12:10 +01:00
• 0877cd284f connection upgrade with nginx batche 2022-12-14 11:18:02 +01:00
• fd8435b632 travail avec lucky - suite batche 2022-12-14 11:01:11 +01:00
• f1f94cb9bc serveur de jeu - work in progress batche 2022-12-14 10:45:10 +01:00
• 6eaf28d4d8 working on accepting friend requests, have to muck about with the DB, i have to learn how to use .find() Me 2022-12-14 08:59:00 +01:00
• 3a6729b9a3 adding the ability to add and delete friends, in progress Me 2022-12-14 06:31:09 +01:00
• fb4fbbaf18 suppression de dossier inutile batche 2022-12-13 19:29:09 +01:00
• bd4938b64b changement mineur fonction pour chercher ami via username batche 2022-12-13 17:47:29 +01:00
• aa171bd844 ajout de deux fonctions afin de trouver une relation amicale ou non via le username de ladite relation batche 2022-12-13 17:25:00 +01:00
• 51125eee0f minor fixes to Friendpage Me 2022-12-13 17:09:17 +01:00
• 6ca35ccaa7 la galère continue batche 2022-12-13 16:57:00 +01:00
• 44074af237 Cleaned up ProfileFriends page, but i need some input about the backend, might need to change some things Me 2022-12-13 07:06:08 +01:00
• 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 Me 2022-12-13 03:26:38 +01:00
• a8743940a5 dockerfile batche 2022-12-12 15:13:59 +01:00
• 302a2409fc style button back lenovo 2022-12-12 15:08:54 +01:00
• 7ab4aca458 base layout ok lenovo 2022-12-12 14:14:37 +01:00
• b04cd0aa48 Implémentation du jeu dans svelte HOPE batche 2022-12-12 12:37:47 +01:00
• 9392c81fa2 start all new architecture for chat lenovo 2022-12-12 11:41:10 +01:00
• fb8368cc63 Merge branch 'master' of bitbucket.org:LuckyLaszlo/ft_transcendence into cherif_back_and_game batche 2022-12-11 17:32:39 +01:00
• 34bdcad3a2 pendant req batche 2022-12-11 16:46:13 +01:00
• a9460fb41c Changements amitiés batche 2022-12-11 15:30:30 +01:00
• db1e269e2e Stuggling a bit to get components to rerender when a prop updates in the Friendship page, will sort out tomorrow Me 2022-12-11 08:12:22 +01:00
• 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 Me 2022-12-11 06:04:03 +01:00
• 3ced0ee2f2 renamed html for css, before full refont lenovo 2022-12-10 22:37:46 +01:00
• 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 Me 2022-12-10 07:13:28 +01:00
• 15ea27955b trying to push again Me 2022-12-09 16:53:00 +01:00
• b75bce4212 this merge with master should come with the right backend stuff to make friendship requests work Me 2022-12-09 15:46:40 +01:00
• 87fe4bbbf4 correction mineure batche 2022-12-09 11:42:58 +01:00
• f2e57bef79 petite erreur batche 2022-12-09 11:35:17 +01:00
• 86e007d6c0 Merge branch 'master' of bitbucket.org:LuckyLaszlo/ft_transcendence into inclusion_jeu_a_partir_de_master batche 2022-12-09 11:29:38 +01:00
• 3802973dfa corrections mineures batche 2022-12-09 11:29:19 +01:00
• 98fe5e0bd6 je dois refaire toute l'amitié :( batche 2022-12-09 10:01:41 +01:00
• 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 Me 2022-12-09 05:33:32 +01:00
• 302ebd674c working on friendships in teh frontend but having to do some debuging in the backend Me 2022-12-09 05:19:12 +01:00
• 999b40430d was mucking about with trying to integerate the game but will leave that for some other time Me 2022-12-09 02:23:58 +01:00
• 8d640ae4ab début de la mise en place du jeu (partie client uniquement). batche 2022-12-08 19:08:07 +01:00
• a3aaedb1fd début création du jeu batche 2022-12-08 18:04:59 +01:00
• 3afc0996ac début création du jeu batche 2022-12-08 17:56:46 +01:00
• 58787215ad Merge branch 'master' of bitbucket.org:LuckyLaszlo/ft_transcendence batche 2022-12-08 17:13:29 +01:00
• 8953a0c09b réforme de l'amitié batche 2022-12-08 17:13:12 +01:00
• c777fb3592 merged with master Me 2022-12-08 17:09:02 +01:00
• 8688f3b48f pushing to master, only minor changes Me 2022-12-08 17:04:50 +01:00
• abf5c45aa7 spectator mode WIP, working so far LuckyLaszlo 2022-12-08 14:43:07 +01:00
• 46fcb423e5 changements mineurs batche 2022-12-08 14:34:14 +01:00
• b00c9e1474 changements mineurs batche 2022-12-08 14:01:07 +01:00
• 8c2df71cde les redirections fonctionnent batche 2022-12-08 13:51:56 +01:00
• c88a6145eb minor refactoring LuckyLaszlo 2022-12-08 07:35:20 +01:00
• 75925b5f84 messages refactoring LuckyLaszlo 2022-12-08 04:42:31 +01:00
• b3bd43c423 added victory by forfeit LuckyLaszlo 2022-12-08 04:08:16 +01:00
• d2f45ba86a Merge remote-tracking branch 'origin' into eric_front_and_back Me 2022-12-07 20:47:34 +01:00
• 365bac36ef 2A la suite batche 2022-12-07 20:38:11 +01:00
• 99016519ee added arrow to drop menu lenovo 2022-12-07 20:22:30 +01:00
• 081a3c1dc2 Merge branch 'master' of bitbucket.org:LuckyLaszlo/ft_transcendence into inclusion_jeu_a_partir_de_master batche 2022-12-07 20:02:42 +01:00
• bccb342043 amélioration de la 2Fa batche 2022-12-07 19:59:05 +01:00
• e65695cc5c added new room pannel lenovo 2022-12-07 19:54:15 +01:00
• d2cdc564ac Match abort if all players not ready in time (5s) + HTML Keys instructions LuckyLaszlo 2022-12-07 19:33:56 +01:00
• 3cdedc921c ok now it actually works, had a few imports left over that i needed to get rid of, also added extra protection in my ProfileSettings so you can not change the username and it's still ok Me 2022-12-07 19:20:55 +01:00
• 59bc893173 removed the userStore, didn't make sense and now we don't even need to use local storage so no security vulnerability, cool, oh and everything still works Me 2022-12-07 18:49:31 +01:00
• 6c3cad3b3d mucking about trying to solve the weird 2fa issues, putting a pin in it for now tho Me 2022-12-07 18:25:15 +01:00
• 556c16e3f2 wip chat rooms can now create new room with prompt lenovo 2022-12-07 15:42:36 +01:00
• 1a584483e7 trying to work out 2fa Me 2022-12-07 12:12:33 +01:00
• baa9465018 merging Me 2022-12-07 11:56:27 +01:00
• f835f74443 Ajout des fichiers de lucky + quelques corrections mineures sur l'auth (2FA) et le flow pour le user batche 2022-12-07 11:50:39 +01:00
• 263d117d1a about to pull new updates from Cherif Me 2022-12-07 11:50:33 +01:00
• 3b60f3952c wip chat adding room lenovo 2022-12-06 19:48:19 +01:00
• 657460b8ae ok so i added the fetch(user) in the conditions of the routing, works just fine, but still need to add some stuff, like passing on params and special conditions for special pages Me 2022-12-06 16:56:35 +01:00
• d0b39dbb82 wip chat users and rooms base lenovo 2022-12-06 14:59:18 +01:00
• 6985d2218f minor wsServer changes ("for...of" loop replace a "map.forEach" to make early break possible) LuckyLaszlo 2022-12-06 07:40:15 +01:00
• 38c0acb917 mp3 replaced by ogg + value of radio button discared, because never used LuckyLaszlo 2022-12-06 04:12:25 +01:00
• 4be38c59e8 HTML sound selector LuckyLaszlo 2022-12-06 03:53:44 +01:00
• 9dde821f67 HTML game modes selector + pong.css in a separate file LuckyLaszlo 2022-12-06 01:56:39 +01:00
• 5510861c63 small improvment in css lenovo 2022-12-05 22:05:33 +01:00
• 7fd77539f4 chat controls css kind of working lenovo 2022-12-05 21:47:09 +01:00
• c79d6f9b7d ok so trying to get the {wrap} to do what i want for the routing, but the store and local storage aren't complying, something about a Forbidden Resource, either way seems like i need to scrap the store entirely and go with the fetch(user) in the {wrap} each time anyway, for security, and also cuz that works Me 2022-12-05 05:55:43 +01:00
• 450f6873a6 ok so it still works, the settings work more or less properly, and they look better, tho still kinda shit Me 2022-12-05 03:15:57 +01:00
• 3d9c9f56f4 wip drop down menu lenovo 2022-12-04 22:50:43 +01:00
• e9e4f564eb Ok about to do some clean up Me 2022-12-04 21:55:14 +01:00
• 7355a70821 minors GameComponents changes LuckyLaszlo 2022-12-04 19:05:21 +01:00
• 823e1dc588 save befor format dell dell 2022-12-04 14:52:33 +01:00
• 59c7ae2a16 added alternate game mode "movingWalls" LuckyLaszlo 2022-12-02 21:01:06 +01:00
• ce7d75a954 ok everything still works, now can see the avatar, working on better ProfileSettings Me 2022-12-01 22:46:34 +01:00
• 042053ee2b great news, the new svelte store that is connected to the local storage works great, not only do i always know if a user is logged in but i have their user data too Me 2022-12-01 21:48:38 +01:00
• 92acf36962 so far this works, in the middle of adding a new store that connects to local storage Me 2022-12-01 21:02:43 +01:00
• 93a40f2ad9 memo.txt update LuckyLaszlo 2022-12-01 18:20:58 +01:00
• f73932c131 multiBalls refactoring with ballsArr[] LuckyLaszlo 2022-12-01 17:48:34 +01:00
• f8095c7ec6 oops i did some work directly on master, but it's still stable so should be fine Me 2022-12-01 16:27:56 +01:00
• c8c3111ed4 WIP multiBalls (need refactoring) LuckyLaszlo 2022-12-01 15:55:40 +01:00
• 6e572f2fb5 matchmaking rework for multiples game modes LuckyLaszlo 2022-12-01 05:50:31 +01:00
• 4cff63e264 moved files around make more logical folders, got some 502 errors turns out VSCode isn't magic, you just need to go through all the files and make sure the import paths are right Me 2022-12-01 00:06:34 +01:00
• 6f7361a5dd well i tried a bunch of things to fix the CSS, most did not work, will need some help Me 2022-11-30 23:32:11 +01:00
• fc9c72b6b3 well i finally got the glittery stars animation to work for the ProfileDisplay page, cool Me 2022-11-30 22:42:43 +01:00
• 7020b6b67e auto focus on text area after hit button lenovo 2022-11-30 19:50:10 +01:00
• e3fd130729 GameSession delete + log LuckyLaszlo 2022-11-30 19:42:16 +01:00