Commit Graph

88 Commits

Author SHA1 Message Date
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
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
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
lenovo
740ba83d01 suppresion node_modules first attempt 2022-11-28 18:24:56 +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
batche
6cea1369ff ajout du bind sur 0.0.0.0 pour svelte. Tout semble bien fonctionner (pour l'instant) 2022-11-21 17:44:41 +01:00
batche
c50e97d34b suppression fichier inutile 2022-11-21 17:33:20 +01:00
batche
392726649b Merge branch 'cherif_0.01' into eric-cherif-front-and-back
OK
2022-11-21 17:24:48 +01:00
batche
6e94fc4d2e Fichier de test 2022-11-21 17:20:46 +01:00
batche
711a75e88d Publication de la nouvelle branche au propre. Reste à tester. 2022-11-21 17:19:10 +01:00