 Me
|
68bf406834
|
Merge remote-tracking branch 'origin/master' into eric_front_and_back
|
2023-01-16 21:47:20 +01:00 |
|
|
Me
|
86f7add6ed
|
a few small fixes, about to add 404 exceptions most places i do fetches
|
2023-01-16 21:47:02 +01:00 |
|
|
Me
|
0499d92818
|
merged luke's branch into mine, he fixed all the fetches to catch stuff, need to test
|
2023-01-16 19:23:32 +01:00 |
|
|
Me
|
af872eafc5
|
removed the cached .env that was lurking about
|
2023-01-16 18:53:14 +01:00 |
|
|
Me
|
49ffa74bb4
|
small update to ProfileUsers, make it so buttons don't load if user doesn't
|
2023-01-16 18:48:13 +01:00 |
|
|
Me
|
ae34fd1cb6
|
a few small fixes
|
2023-01-16 13:44:49 +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 |
|
|
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 |
|
|
Me
|
99cc341286
|
merged
|
2023-01-15 20:28:26 +01:00 |
|
|
Me
|
4a8b64f74f
|
merged
|
2023-01-13 04:30:26 +01:00 |
|
|
Me
|
9e53ed140a
|
minor modifications, header now tells you which page you are on, slightly fewer comments
|
2023-01-11 00:47:05 +01:00 |
|
|
Me
|
f44170338a
|
scrapping my attempt at a new version of the SplashPage, we'll just use Cherif's, it's way better
|
2023-01-09 21:27:28 +01:00 |
|
|
Me
|
9eececb045
|
Merge remote-tracking branch 'origin/master' into eric_front_and_back
|
2023-01-09 21:17:01 +01:00 |
|
|
Me
|
9b8e0e8890
|
attempts at a better splash page, not the best results
|
2023-01-09 21:14:10 +01:00 |
|
|
Me
|
f7c728a009
|
So i added a check to make it so you can't change your username to someone else's, also turns out Cherif already has a check so that if you change your username to someone else's 42 username who isn't a user yet and then they try to become a user, their username will have a random string attached to the end so it is also unique, then fixed a few minor things, and made it so all UnauthorizedPages take you back to / as in the SplashPage rather than a special page from which you navigate to /, that said, i think feedback for the user is kinda nice, will decide with team eventually
|
2023-01-07 01:41:06 +01:00 |
|
|
Me
|
0470676c5d
|
added the thing so you can see other people's avatars, fixed checks on frontend routes like game and such that other people created, need help understanding ValidationPipe() to make it so a user must have a unique username. TBH this shit is still being held together by Duct Tape and Holy Water
|
2023-01-05 22:37:56 +01:00 |
|
|
Me
|
b35082148c
|
merge stuff
|
2023-01-05 12:33:51 +01:00 |
|
|
Me
|
730b8c4e4a
|
sorting out merge stuff
|
2023-01-05 12:31:47 +01:00 |
|
|
Me
|
9889eae77f
|
seems like the merge worked
|
2023-01-05 12:30:54 +01:00 |
|
|
Me
|
46090b1e33
|
ok the friendship and user refactor is done, there are still a lot of comments but that's fine, it's duct taped together, but it works, time to merge
|
2023-01-05 11:21:34 +01:00 |
|
|
Me
|
d3be6e5fe8
|
ok gotta test all the paths but we more or less have the friendships and users modules working the new way
|
2023-01-04 16:04:48 +01:00 |
|
|
Me
|
000987fbde
|
ok after talking with cherif we decided not to send things like the user.id so i need to recreate more or less what i had before, but i'm gonna keep using the user.id everywhere in the back and keep my better simpler friendship.entity, working on all that now, got a thing that compiles in the front and back, a few more things to fix and then test everything
|
2023-01-03 19:42:14 +01:00 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Me
|
d2f45ba86a
|
Merge remote-tracking branch 'origin' into eric_front_and_back
|
2022-12-07 20:47:34 +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 |
|
|
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 |
|
|
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 |
|
|
Me
|
ce7d75a954
|
ok everything still works, now can see the avatar, working on better ProfileSettings
|
2022-12-01 22:46:34 +01:00 |
|
|
Me
|
042053ee2b
|
great news, the new svelte store that is connected to the local storage works great, not only do i always know if a user is logged in but i have their user data too
|
2022-12-01 21:48:38 +01:00 |
|
|
Me
|
92acf36962
|
so far this works, in the middle of adding a new store that connects to local storage
|
2022-12-01 21:02:43 +01:00 |
|
|
Me
|
f8095c7ec6
|
oops i did some work directly on master, but it's still stable so should be fine
|
2022-12-01 16:27:56 +01:00 |
|
|
Me
|
4cff63e264
|
moved files around make more logical folders, got some 502 errors turns out VSCode isn't magic, you just need to go through all the files and make sure the import paths are right
|
2022-12-01 00:06:34 +01:00 |
|
|
Me
|
6f7361a5dd
|
well i tried a bunch of things to fix the CSS, most did not work, will need some help
|
2022-11-30 23:32:11 +01:00 |
|
|
Me
|
fc9c72b6b3
|
well i finally got the glittery stars animation to work for the ProfileDisplay page, cool
|
2022-11-30 22:42:43 +01:00 |
|
|
Me
|
effb1740f5
|
everything still works, and i cleaned more stuff up, better flow, disabled features that i need imput to make work
|
2022-11-30 19:29:29 +01:00 |
|
|
Me
|
e7f0c08bb9
|
good progress, working on 2FA, adding conditions to limit access to certain Routes, need to find out more about the back to settle these things
|
2022-11-30 01:13:23 +01:00 |
|
|
Me
|
d01f92a366
|
Things still work, and i'm cleaning up my work cuz it's hard to know what's going on otherwise
|
2022-11-29 20:49:41 +01:00 |
|
|
Me
|
53faba7f69
|
ok works atm, hopefully this will also remove all the nonsense node modules
|
2022-11-29 19:13:50 +01:00 |
|
|
Me
|
693c78b43c
|
Merge remote-tracking branch 'origin/master' into eric_front_and_back
|
2022-11-29 19:12:05 +01:00 |
|
|
Me
|
9d1580dcd6
|
well part of the custome svelte store works, the essential part at least
|
2022-11-29 14:54:58 +01:00 |
|
|
Me
|
214d2cee49
|
everything still works, trying to add 2fa and figure out Custom Stores
|
2022-11-25 00:30:55 +00:00 |
|
|
Me
|
b4240f48f7
|
still nothing broken, i started adding a glittery star effect to the rank in ProfileDisplay, fun stuff, figured it out but need to complete it
|
2022-11-24 02:05:42 +00:00 |
|
|
Me
|
11234545bc
|
in theory everything still works but could use some testing, adding profile settings fetch
|
2022-11-23 16:55:41 +00:00 |
|
|
Me
|
16e477b874
|
Eveything still works, cool, adding fetch user to the ProfileDisplay, good stuff, so far so good
|
2022-11-23 03:31:13 +00:00 |
|
|
Me
|
9f3dbd4de9
|
everything still works, no 502 and livereload does work, just not for CSS stuff apparently, but for DOM elems we gucci, added a tmp /profile/fetch path and button to the header to test fetching
|
2022-11-23 03:12:22 +00:00 |
|
|
Me
|
78687a3daa
|
added a few things back that i had deleted before when fixing 502, mainly looking at login fetch, so far everything works, no 502 and livereload is sorta a thing
|
2022-11-23 02:53:32 +01:00 |
|
|
Me
|
c35bbcefa6
|
Ok so Cherif and i figured out the reason livereload wasn't working, needed to expose the port in the docker compose.yml, committing now to have a save point
|
2022-11-22 16:34:56 +01:00 |
|
|
Me
|
c646f9b67b
|
inital commit, we are basically identical to master, no 502 bad gateway, but no livereload either, i think cuz of that line we deleted from the nginx config
|
2022-11-22 02:52:54 +01:00 |
|
|
Me
|
75fe33693c
|
removed a thing from nginx
|
2022-11-21 18:14:49 +01:00 |
|
|
Me
|
573b5aa511
|
some Svelte Resources
|
2022-10-12 04:14:58 +02:00 |
|