From 0ad720f3f7cb1410ac33336c59538efb30f77ecd Mon Sep 17 00:00:00 2001 From: MuslemRahimi Date: Fri, 14 Jun 2024 14:38:44 +0200 Subject: [PATCH] update login/register page && bugfixing error 500 in register page --- src/routes/login/+page.svelte | 71 ++++++++++-------------- src/routes/oauth/+server.ts | 8 ++- src/routes/register/+page.server.ts | 7 +++ src/routes/register/+page.svelte | 86 ++++++++++++++--------------- 4 files changed, 83 insertions(+), 89 deletions(-) diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte index 2c7d4500..c02731b0 100644 --- a/src/routes/login/+page.svelte +++ b/src/routes/login/+page.svelte @@ -106,48 +106,8 @@ -
-
- - -
-
- -
-
- - -
-
- - - -
- OR -
- - - Do it smarter, not harder! -
- Login in seconds and see how much your trading improves! - +
@@ -169,14 +129,41 @@
Forgot Password?
+
+ + +
+ Or login using +
+ +
+
+ + +
+
+ + +
+

You don't have an account? - Sign up + Sign up

diff --git a/src/routes/oauth/+server.ts b/src/routes/oauth/+server.ts index 488c7e3c..44a3a199 100644 --- a/src/routes/oauth/+server.ts +++ b/src/routes/oauth/+server.ts @@ -71,9 +71,13 @@ export const GET = async ({locals, url, cookies}) => { } - const path = cookies?.get('path'); - redirect(301, path?.length !== 0 ? path : "/"); + try { + const path = cookies?.get('path'); + redirect(301, path?.length !== 0 ? path : "/"); + } catch(e) { + redirect(301,"/"); + } //Login user automatically //const avatarUrl = newUser['meta']['avatarUrl']; diff --git a/src/routes/register/+page.server.ts b/src/routes/register/+page.server.ts index d51de1de..2b6d0362 100644 --- a/src/routes/register/+page.server.ts +++ b/src/routes/register/+page.server.ts @@ -96,6 +96,13 @@ export const actions = { path: '/', maxAge: 60*60 }); + + cookies.set('path', "/", {httpOnly: true, + sameSite: 'lax', + secure: true, + path: '/', + maxAge: 60 + }); oauthState.update( value => state); oauthVerifier.update( value => verifier); diff --git a/src/routes/register/+page.svelte b/src/routes/register/+page.svelte index d94bb847..a38de1dd 100644 --- a/src/routes/register/+page.svelte +++ b/src/routes/register/+page.svelte @@ -113,45 +113,7 @@ Create an account to get started -
-
- - -
-
- -
-
- - -
-
- - -
- OR -
- +
@@ -191,27 +153,61 @@ />
-
-

By registering you agree to stocknear's +

+ +
+ Or register using +
+ +
+ + + + +
+ + +
+

You already have an account? - Sign in + Sign in

- - -
+ + + + + +
+

By registering you agree to stocknear's + Terms of Use + and acknowledge that you've read our Privacy Policy. +

+
+