Commit Graph

398 Commits

Author SHA1 Message Date
simplonco
ebad66ed2a Merge branch 'master' of bitbucket.org:LuckyLaszlo/ft_transcendence 2023-01-16 09:19:13 +01:00
Me
b9e93bda17 Merge remote-tracking branch 'origin/master' into eric_front_and_back 2023-01-16 08:52:50 +01:00
Me
139703e867 fixed a whole bunch of things, better logic for blocking, more reactive front, you can't double friend someone who has friended you anymore, path to display just one user other than you, cleaned up comments and commented out console.logs 2023-01-16 08:52:27 +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
LuckyLaszlo
102d03c4bb fetch() in Game.svelte
+ fix .dim_background
+ Header in App,svelte
2023-01-16 00:08:50 +01:00
simplonco
d60f2f0c9f fixed user and room name pbm
+ style ok
2023-01-15 23:52:22 +01:00
Me
48d4ff3dee Merge remote-tracking branch 'origin/master' into eric_front_and_back 2023-01-15 22:07:48 +01:00
Me
e546723263 a temporary solution to displaying just a user 2023-01-15 22:07:30 +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
LuckyLaszlo
c6d034b9f7 css small fix 2023-01-15 21:11:38 +01:00
LuckyLaszlo
1a07065f6a CSS smalls changes (headers, ranking colors)
+ mode "cinema" in Game.svelte
2023-01-15 20:52:08 +01:00
simplonco
b4bdc2080b user admin visible 2023-01-15 20:45:03 +01:00
Me
99cc341286 merged 2023-01-15 20:28:26 +01:00
simplonco
77c420a174 make admin ok 2023-01-15 19:50:27 +01:00
LuckyLaszlo
b2b54f1fdc Merge branch 'master' into luke 2023-01-15 19:34:58 +01:00
simplonco
164581b655 wip style according to pages 2023-01-15 19:16:06 +01:00
LuckyLaszlo
e3407b8a9d Invitations changes.
Now require confirmation from both side to start game.
2023-01-15 19:02:16 +01:00
simplonco
acd480e332 chat is on every pages 2023-01-15 18:43:13 +01:00
cherif
fa8e3d7473 changements de le couleur et de la font sur l'ensemble du site. 2023-01-15 18:07:23 +01:00
cherif
99c02ea0ab changements de le couleur et de la font sur l'ensemble du site. 2023-01-15 17:55:52 +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
LuckyLaszlo
a2b2168884 improved fetch in gameServer 2023-01-15 02:00:42 +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
LuckyLaszlo
4318b8a707 Merge branch 'master' into luke 2023-01-15 00:09:33 +01:00
LuckyLaszlo
fcb23c84e1 fetchAvatar() return default avatar if failed. 2023-01-15 00:01:32 +01:00
LuckyLaszlo
b72042a263 Game invitation from chat WIP (missing username)
+ fetchUser() and fetchAllUsers()
+ changes accept/declineInvitation()
2023-01-15 00:00:35 +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
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
LuckyLaszlo
52f48ae305 bugfix generateToken() for invitation 2023-01-14 18:34:03 +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