batche
|
fb8368cc63
|
Merge branch 'master' of bitbucket.org:LuckyLaszlo/ft_transcendence into cherif_back_and_game
|
2022-12-11 17:32:39 +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 |
|
batche
|
98fe5e0bd6
|
je dois refaire toute l'amitié :(
|
2022-12-09 10:01:41 +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
|
a3aaedb1fd
|
début création du jeu
|
2022-12-08 18:04:59 +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 |
|
LuckyLaszlo
|
abf5c45aa7
|
spectator mode WIP, working so far
|
2022-12-08 14:43:07 +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 |
|
LuckyLaszlo
|
c88a6145eb
|
minor refactoring
|
2022-12-08 07:35:20 +01:00 |
|
LuckyLaszlo
|
75925b5f84
|
messages refactoring
|
2022-12-08 04:42:31 +01:00 |
|
LuckyLaszlo
|
b3bd43c423
|
added victory by forfeit
|
2022-12-08 04:08:16 +01:00 |
|
Me
|
d2f45ba86a
|
Merge remote-tracking branch 'origin' into eric_front_and_back
|
2022-12-07 20:47:34 +01:00 |
|
batche
|
365bac36ef
|
2A la suite
|
2022-12-07 20:38:11 +01:00 |
|
batche
|
081a3c1dc2
|
Merge branch 'master' of bitbucket.org:LuckyLaszlo/ft_transcendence into inclusion_jeu_a_partir_de_master
|
2022-12-07 20:02:42 +01:00 |
|
batche
|
bccb342043
|
amélioration de la 2Fa
|
2022-12-07 19:59:05 +01:00 |
|
LuckyLaszlo
|
d2cdc564ac
|
Match abort if all players not ready in time (5s)
+ HTML Keys instructions
|
2022-12-07 19:33:56 +01:00 |
|
Me
|
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
|
2022-12-07 19:20:55 +01:00 |
|
Me
|
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
|
2022-12-07 18:49:31 +01:00 |
|
Me
|
6c3cad3b3d
|
mucking about trying to solve the weird 2fa issues, putting a pin in it for now tho
|
2022-12-07 18:25:15 +01:00 |
|
Me
|
1a584483e7
|
trying to work out 2fa
|
2022-12-07 12:12:33 +01:00 |
|
Me
|
baa9465018
|
merging
|
2022-12-07 11:56:27 +01:00 |
|
batche
|
f835f74443
|
Ajout des fichiers de lucky + quelques corrections mineures sur l'auth (2FA) et le flow pour le user
|
2022-12-07 11:50:39 +01:00 |
|
Me
|
263d117d1a
|
about to pull new updates from Cherif
|
2022-12-07 11:50:33 +01:00 |
|
Me
|
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
|
2022-12-06 16:56:35 +01:00 |
|
LuckyLaszlo
|
6985d2218f
|
minor wsServer changes
("for...of" loop replace a "map.forEach" to make early break possible)
|
2022-12-06 07:40:15 +01:00 |
|
LuckyLaszlo
|
38c0acb917
|
mp3 replaced by ogg
+ value of radio button discared, because never used
|
2022-12-06 04:12:25 +01:00 |
|
LuckyLaszlo
|
4be38c59e8
|
HTML sound selector
|
2022-12-06 03:53:44 +01:00 |
|
LuckyLaszlo
|
9dde821f67
|
HTML game modes selector
+ pong.css in a separate file
|
2022-12-06 01:56:39 +01:00 |
|
Me
|
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
|
2022-12-05 05:55:43 +01:00 |
|
Me
|
450f6873a6
|
ok so it still works, the settings work more or less properly, and they look better, tho still kinda shit
|
2022-12-05 03:15:57 +01:00 |
|
Me
|
e9e4f564eb
|
Ok about to do some clean up
|
2022-12-04 21:55:14 +01:00 |
|