42/42_INT_14_transcendence
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
629 Commits 1 Branch 0 Tags
8bc82be1ff8e3e9bea25b1cedb54cb62669d2144
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
simplonco 8bc82be1ff handle conflict after merge with master 2023-01-18 06:13:52 +01:00
simplonco eb33f8f4fa merge with master but css broken 2023-01-18 05:55:05 +01:00
simplonco 78696b787f suppress console logs 2023-01-18 05:46:16 +01:00
simplonco 94f9213ac7 fixed admins when owner leaves 2023-01-18 05:42:26 +01:00
simplonco 4ccd3a4b93 history ok 2023-01-18 05:37:37 +01:00
simplonco 030dbb62a5 wip fixed history 2023-01-18 05:23:54 +01:00
simplonco 035eb2a46a fixed a mutitudes of errors in chat 2023-01-18 03:54:39 +01:00
simplonco 532576cb08 fixed pbm typescript socket chat is not iterable 2023-01-18 02:25:56 +01:00
simplonco 45a571b414 fixed double socket initialisation and room settings not updating password 2023-01-18 02:22:09 +01:00
simplonco 441ff5ef14 fixed messages when leaving and changing name 2023-01-17 22:22:18 +01:00
simplonco 4a075c452b socket and server are now in separate files 2023-01-17 21:42:53 +01:00
simplonco d1a3a6e120 wip still not resolved pbm with map socket 2023-01-17 19:39:55 +01:00
simplonco 1ff9653eac wip trying access map socket 2023-01-17 18:34:55 +01:00
simplonco c6492bcec5 change socket username 2023-01-17 17:50:10 +01:00
simplonco d0dfb4a533 room update names in db 2023-01-17 17:11:23 +01:00
simplonco 7d3382aa09 owner can leave room now 2023-01-17 13:45:30 +01:00
simplonco 7c437ef38c Merge branch 'master' into hugo 2023-01-17 11:53:01 +01:00
simplonco 0dbe255f26 smal service change 2023-01-17 11:52:02 +01:00
simplonco 61badedd21 wip protect get list blocked 2023-01-17 09:51:24 +01:00
simplonco cf05d242cd gros probleme resolu 2023-01-16 21:06:58 +01:00
simplonco 8b365968ac chat not on game 2023-01-16 17:57:37 +01:00
simplonco f9d4045f64 small css stye fix 2023-01-16 17:51:56 +01:00
simplonco 569ef89077 added severall protections 2023-01-16 17:43:13 +01:00
simplonco 5f0e733f55 Merge branch 'master' into hugo 2023-01-16 17:28:48 +01:00
simplonco ed2df0611e Merge branch 'master' of bitbucket.org:LuckyLaszlo/ft_transcendence 2023-01-16 17:28:33 +01:00
simplonco 15c53b17b3 blocked messages are not in hitory 2023-01-16 17:27:35 +01:00
simplonco 8b508063e8 will not show users in rooms if blocked 2023-01-16 16:46:04 +01:00
simplonco e52690d890 will not show direct rooms if blocked 2023-01-16 16:18:42 +01:00
simplonco 3cd9a0b52e will not show direct rooms if blocked 2023-01-16 16:08:56 +01:00
simplonco 61864af0a3 Merge branch 'master' into hugo 2023-01-16 14:11:22 +01:00
simplonco 4b81fb8331 Merge branch 'master' of bitbucket.org:LuckyLaszlo/ft_transcendence 2023-01-16 14:11:09 +01:00
simplonco d379b4da37 Merge branch 'master' of bitbucket.org:LuckyLaszlo/ft_transcendence 2023-01-16 14:10:54 +01:00
simplonco 9d5aa7f3a1 socket reconnecte automatically to last room and blocked users 2023-01-16 14:10:12 +01:00
simplonco 20ea0bcef5 interaction blocked users and view profile ok, still block message todo 2023-01-16 13:35:15 +01:00
simplonco 2a4e076f3f Merge branch 'master' into hugo 2023-01-16 09:19:30 +01:00
simplonco ebad66ed2a Merge branch 'master' of bitbucket.org:LuckyLaszlo/ft_transcendence 2023-01-16 09:19:13 +01:00
simplonco a643e6bb78 wip unblock socket 2023-01-16 09:18:50 +01:00
simplonco 3e4e0ce937 wip block socket ok 2023-01-16 08:52:04 +01:00
simplonco fe44a9b21c wip bock user 2023-01-16 08:13:10 +01:00
simplonco cc389a67b7 small style adjustment and admin view on user 2023-01-16 07:42:52 +01:00
simplonco 4cfac6bd25 merge with master 2023-01-16 07:22:51 +01:00
simplonco cc47a64b2a mute ok 2023-01-16 07:16:48 +01:00
simplonco 23d45db6ae mute almost done, still changing layout 2023-01-16 06:51:14 +01:00
simplonco 7433490ac6 mute user works, not forever so far 2023-01-16 05:36:23 +01:00
simplonco 9a08c305cb small ss adjusment 2023-01-16 00:40:45 +01:00
simplonco 134fa0fef4 admin messages and not in direct 2023-01-16 00:34:20 +01:00
simplonco d60f2f0c9f fixed user and room name pbm 
+ style ok
 2023-01-15 23:52:22 +01:00
simplonco 170a1f0cd1 wip styles 2023-01-15 22:02:32 +01:00
simplonco eacdb5636a wip styles 2023-01-15 21:23:34 +01:00
simplonco b4bdc2080b user admin visible 2023-01-15 20:45:03 +01:00
simplonco 77c420a174 make admin ok 2023-01-15 19:50:27 +01:00
simplonco 164581b655 wip style according to pages 2023-01-15 19:16:06 +01:00
simplonco acd480e332 chat is on every pages 2023-01-15 18:43:13 +01:00
simplonco 7622812e3b passed all console log in a function 2023-01-15 17:06:17 +01:00
simplonco 83c07451f9 added is admin 2023-01-15 16:26:53 +01:00
simplonco ffdc3839b9 abord trying to live informe for new rooms 2023-01-15 14:07:34 +01:00
simplonco 804cab9c8d if password changed, other users cannot continue to send message 2023-01-15 13:38:12 +01:00
simplonco d9652a5eab Merge branch 'master' into hugo 2023-01-15 02:12:50 +01:00
simplonco 4342da6749 modify password ok 2023-01-15 02:11:45 +01:00
simplonco f364d82f8e forgot to add : deleted temp buttons to access layout in front 2023-01-15 01:08:39 +01:00
simplonco 1a7091679b wip change password 
+ little clean in files, delete some
 2023-01-15 01:05:57 +01:00
simplonco f3d0af4738 separate password add 2023-01-15 00:21:12 +01:00
simplonco 0496b34577 wip add and change password 
+ changed on_click
 2023-01-14 23:05:01 +01:00
simplonco a060ddf4e9 changed default behavior of arrows in game 
+ small css improvments in game
 2023-01-14 21:34:53 +01:00
simplonco 888255c810 update todo list 2023-01-14 19:56:45 +01:00
simplonco b19031a8f0 clean some console 2023-01-14 19:51:39 +01:00
simplonco 78e6bbcac4 Merge branch 'master' into hugo 2023-01-14 19:35:08 +01:00
simplonco 3889a7b434 changed all back http error status 2023-01-14 19:28:57 +01:00
simplonco 81b67a54e6 protected room working at least 2023-01-14 19:17:46 +01:00
simplonco efc836eac0 wip password, and better catch error http request 2023-01-14 18:40:18 +01:00
simplonco 0449262398 fetch error consolidate 2023-01-14 15:27:57 +01:00
simplonco d07b13b749 exported function fetch with catch 2023-01-14 14:23:02 +01:00
simplonco 356e1caac3 wip protected, already solved error http handling for createroom 2023-01-14 13:07:18 +01:00
simplonco 8e4ce8e9a8 wip password protected 2023-01-14 01:14:10 +01:00
simplonco ee98fdabc1 wip protected room 2023-01-14 00:26:25 +01:00
simplonco 7a80cf6310 pbm double message join fixed 2023-01-13 11:59:59 +01:00
simplonco 23d1810226 wip private 2023-01-13 01:07:39 +01:00
simplonco 27bbb6346f invitation is working 2023-01-13 00:08:00 +01:00
simplonco a605a4a09e wip pbm join room return wrong room 2023-01-12 13:18:49 +01:00
simplonco 83aa46f80c wip invite users 2023-01-12 12:47:53 +01:00
simplonco 61191d23b4 direct message cannot leave client side 2023-01-12 11:27:42 +01:00
simplonco 6be1f32fa8 directs have good names and cannot leave server side 2023-01-12 11:25:14 +01:00
simplonco 8e99a764f7 Merge branch 'master' into hugo 2023-01-12 00:52:59 +01:00
simplonco ff90c9d1fb pull fixed conflicts 2023-01-12 00:52:43 +01:00
simplonco b27e9b1cc9 wip gitignore 2023-01-12 00:50:55 +01:00
simplonco c737435579 wip gitignore 2023-01-12 00:49:41 +01:00
simplonco 8cc7d30a1a wip gitignore 2023-01-12 00:47:21 +01:00
simplonco 4f810b5df3 wip gitignore 2023-01-12 00:45:50 +01:00
simplonco b851613f0f creation of directs messages 
+ can choose myrooms fields
+ trying to make type validation without success
 2023-01-12 00:36:38 +01:00
simplonco aa86299e73 wip direct messages 2023-01-11 18:20:48 +01:00
simplonco 8e7efbb65a wip validation dto 2023-01-11 13:16:27 +01:00
simplonco dcf129b4f1 fixed pbm if messages return null 2023-01-11 12:42:38 +01:00
simplonco 9db3c053ea changed return value of controller for void 2023-01-11 10:59:54 +01:00
simplonco e97de4f137 wip directs 2023-01-11 10:07:38 +01:00
simplonco 9aad7019ab small cleanup 2023-01-10 23:03:43 +01:00
simplonco 7f01ccdb78 created querybuilder for direct users 2023-01-10 19:49:53 +01:00
simplonco 4af3654e58 added promise return type in service 2023-01-10 17:11:48 +01:00
simplonco 8f07be709e store sockets in a map so controller can access them 2023-01-10 16:45:16 +01:00
simplonco 239b16bfa8 moving gateway logic in service 2023-01-10 15:36:41 +01:00
simplonco 1594ab6f05 added socket dto 2023-01-10 15:21:18 +01:00