hugogogo
|
9c2a8ce2f7
|
Merge branch 'master' into hugo
|
2022-12-21 16:09:16 +01:00 |
|
batche
|
cc797d1118
|
Le multijoueur fonctionne enfin. Mise à jour des scores. Et de la partie.
|
2022-12-21 15:22:07 +01:00 |
|
batche
|
d6da8bf70b
|
Suite intégration jeu
|
2022-12-21 10:05:36 +01:00 |
|
batche
|
77857a873d
|
Vive le rouge !
|
2022-12-20 20:23:15 +01:00 |
|
batche
|
fb7bfa0097
|
jeu suite
|
2022-12-20 17:56:18 +01:00 |
|
batche
|
bd66fe60ff
|
Merge branch 'luke' into cherif_back_and_game
|
2022-12-20 17:51:18 +01:00 |
|
batche
|
c26ea0bb3c
|
suppression de fonctions inutiles dans la partie svelte
|
2022-12-20 17:45:15 +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 |
|
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 |
|
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 |
|
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 |
|
Me
|
51125eee0f
|
minor fixes to Friendpage
|
2022-12-13 17:09:17 +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
|
b04cd0aa48
|
Implémentation du jeu dans svelte HOPE
|
2022-12-12 12:37:47 +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 |
|
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 |
|
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
|
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 |
|
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 |
|
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
|
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 |
|
lenovo
|
7fd77539f4
|
chat controls css kind of working
|
2022-12-05 21:47:09 +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 |
|