Commit Graph

122 Commits

Author SHA1 Message Date
Me
b7b9b3d645 ok changing everything again, decided to simplify the Friendship.entity, so i made a class that returns the stuff we need from a Friendship 2022-12-25 05:53:29 +01:00
Me
2b5f8a9667 ok seems like the back is running, have yet to test, but first i need to fix like basically all the front... 2022-12-24 23:20:59 +01:00
Me
5cd5ffc24c ok have changed the entities and DTOs but not as much as expected, changed Friendship module, now working on User module 2022-12-24 23:09:44 +01:00
Me
4aa186fb48 ok so i'm changing the Friendship and User modules in the back, and i've already started changing entites and DTO's so i'm saving now... 2022-12-24 22:06:02 +01:00
Me
7e906de128 ok so i think i need to change a whole bunch of stuff all over in the User module and Friendship module, namely that we should be searching the DB by ID's not Usernames... currently my Blocking of a user doesn't wquite work cuz findAll() sends ID to findIfUserIsBlockedOrHasBlocked() when it should be sending usernames, but everything else sends Usernames so i'm saving now in case changing everything fucks everything up... 2022-12-23 23:36:04 +01:00
Me
139da075da so i implemented user blocking but something about the flow in the frontend is broken now, will investigate 2022-12-23 19:49:25 +01:00
Me
beeaf1fb27 better findAll() in user module, no pagination tho, could add but would be hella annoying 2022-12-22 03:34:53 +01:00
Me
670936e4a1 cleaned up friendship module in backend, still haven't tested blocking feature 2022-12-21 23:58:36 +01:00
Me
84488ee407 cherif helped me fix the queryBuilder, so much better now 2022-12-20 04:37:12 +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
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
batche
bd4938b64b changement mineur fonction pour chercher ami via username 2022-12-13 17:47:29 +01:00
batche
aa171bd844 ajout de deux fonctions afin de trouver une relation amicale ou non via le username de ladite relation 2022-12-13 17:25:00 +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
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
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
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
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
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
baa9465018 merging 2022-12-07 11:56:27 +01:00