diff --git a/src/app.html b/src/app.html index a1123df..724a781 100644 --- a/src/app.html +++ b/src/app.html @@ -10,11 +10,6 @@
%sveltekit.body%
diff --git a/src/lib/userFunction.js b/src/lib/userFunction.js index af58320..a1233e6 100644 --- a/src/lib/userFunction.js +++ b/src/lib/userFunction.js @@ -128,16 +128,19 @@ export async function VerificationEmail(Code){ }) }) - if(!response.ok) + + if(response.status === 200) { - console.log(response.status) - } - else - { - console.log('лох залогинен!'); window.location.href = '/chatPage' } -} + else if(response.status === 401) + { + return "Неправильный логин или парль" + } + else{ + console.log(response.status) + } + } export async function handleLogout() { try{ diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte index 6585b46..da2b5b5 100644 --- a/src/routes/login/+page.svelte +++ b/src/routes/login/+page.svelte @@ -1,39 +1,294 @@ + + +
+
+
+
+
+

Дарова

+

{greeting}

+
+
+

никнейм или почта

+ {#if usernameError && usernameError !== ''} +

{usernameError}

+ {/if} +
+ + + +
+

пароль

+ {#if usernameError && usernameError !== ''} +

{passwordError}

+ {/if} +
+ +
+ + +
+
+
+
+
+
+

Нет аккаунта? Лох!

+ +
+
+
+
-
- - +
- - +
+

не жопа

+
- - + - + \ No newline at end of file diff --git a/src/routes/register/+page.svelte b/src/routes/register/+page.svelte index 1cdfe66..fb50826 100644 --- a/src/routes/register/+page.svelte +++ b/src/routes/register/+page.svelte @@ -110,7 +110,6 @@ console.log(`name=${nameError} mail=${mailError} password=${passwordError} passw -
@@ -379,7 +378,7 @@ console.log(`name=${nameError} mail=${mailError} password=${passwordError} passw var(--gradient) border-box; border-radius: 10px; width: 100%; - height: 1.8em; + height: 2em; font-size: 24px; font-weight: 600; box-shadow: