diff --git a/src/app.html b/src/app.html index 2bd8b1c..f3455af 100644 --- a/src/app.html +++ b/src/app.html @@ -17,10 +17,8 @@ ::-webkit-scrollbar-thumb { background: linear-gradient(45deg, var(--blue), var(--purple)); background-repeat: no-repeat; - background-attachment: fixed; + background-attachment: fixed; border-radius: 15px; - - } ::-webkit-scrollbar { @@ -38,7 +36,7 @@ :root{ --bg: #101010; --gradient: linear-gradient(to bottom, #3C53FF, #7734AA); - --fontColor: #FFFFFF; + --fontColor: #FFFFFF; --purple: #7734AA; --blue: #3C53FF; --disable: #D15555; @@ -52,6 +50,7 @@ margin: 0; padding: 0; + background-color: var(--bg); } diff --git a/src/app.pcss b/src/app.pcss deleted file mode 100644 index 1a7b7cf..0000000 --- a/src/app.pcss +++ /dev/null @@ -1,4 +0,0 @@ -/* Write your global styles here, in PostCSS syntax */ -@tailwind base; -@tailwind components; -@tailwind utilities; diff --git a/src/lib/chat.js b/src/lib/chat.js index 7fdc3de..b87e878 100644 --- a/src/lib/chat.js +++ b/src/lib/chat.js @@ -20,19 +20,7 @@ export async function getLastMessages(chatId,msgLoaded){ if(msgMassive === null){ return [] - } - else{ - msgMassive.reverse(); - - // for(let i = 0; i < msgMassive.length; i++){ - // let utc = msgMassive[i].created_at - // let newutc = new Date(utc) - // //console.log(utc) - // const formattedDate = formatDistanceToNow(new Date(newutc), { addSuffix: true, locale: ruLocale }); - // //console.log(newutc) - // console.log(formattedDate) - // msgMassive[i].created_at = formattedDate - // } + } else { return msgMassive } } diff --git a/src/lib/login.js b/src/lib/login.js index dc9ef37..f99d164 100644 --- a/src/lib/login.js +++ b/src/lib/login.js @@ -18,18 +18,16 @@ export async function handleLogin(username, password) { { console.log("залогинен") - const data = await response.json() - const token = data.authorization - localStorage.setItem('BPChat', token) - - window.location.href = '/chat' - return "" // чтобы ничего не выводилось в качестве ошибки + const data = await response.json() + const token = data.authorization + localStorage.setItem('BPChat', token) + window.location.href = '/chat' + return "" // чтобы ничего не выводилось в качестве ошибки } else if(response.status === 401) { return "Неправильный логин или пароль" - } - else{ - console.log(response) + } else { + console.log(response) } } \ No newline at end of file diff --git a/src/lib/register.js b/src/lib/register.js index c57eab0..b039c3f 100644 --- a/src/lib/register.js +++ b/src/lib/register.js @@ -1,19 +1,20 @@ -export async function checkName(username) { - const response = await fetch('https://docs.black-phoenix.ru/api/users/check_existing_username', { +export async function checkExsistingUser(username, email) { + const response = await fetch('https://docs.black-phoenix.ru/api/users/check_existing_user', { method:'POST', credentials:"include", headers:{ 'Content-Type': 'application/json', }, body: JSON.stringify({ - "username": username + "username": username, + "email": email }) }) if(response.status === 200){ return "" } else if(response.status === 409){ - let data = "ник занят" + let data = "ЗАНЯТО НАХУЙ" return data } else if(response.status === 422){ @@ -25,30 +26,6 @@ export async function checkName(username) { } } -export async function checkMail(mail) { - const response = await fetch('https://docs.black-phoenix.ru/api/users/check_existing_email', { - method:'POST', - credentials:"include", - headers:{ - 'Content-Type': 'application/json' - }, - body: JSON.stringify({ - "email": mail - }) - }) - if(response.status === 200){ - return "" - } - - else if(response.status === 409){ - return "почта занята" - } - - else if(response.status === 422){ - return "не похоже на почту" - } -} - export async function VerificationEmail(Code){ const response = await fetch('https://docs.black-phoenix.ru/api/users/email_verification',{ method:'POST', @@ -70,26 +47,40 @@ export async function VerificationEmail(Code){ } } +export async function resendVerification(token){ + const response = await fetch(`https://docs.black-phoenix.ru/api/users/resend_email_verification`,{ + method:'POST', + credentials:'include', + headers: {'Authorization': token } + }) - export async function handleRegister(username,password,email,date_of_birth){ + if(response.ok){ + return "Отправлено" + } else { + console.log(response) + return "Произошла ошибка" + } +} + + export async function handleRegister(username,password,password2,email,date_of_birth){ const response = await fetch('https://docs.black-phoenix.ru/api/users/register',{ method:'POST', credentials:"include", - headers:{ - 'Content-Type': 'application/json' - }, + headers:{ 'Content-Type': 'application/json' }, body: JSON.stringify({ "email": email, "username": username, "password": password, + "password2": password2, "date_of_birth": date_of_birth }) }) if(response.status === 201){ const data = await response.json(); - console.log(data) - return data; + const token = data.authorization + localStorage.setItem('BPChat', token) + return "" } else if(response.status === 422){ console.log(response.status) diff --git a/src/lib/settings.js b/src/lib/settings.js index 9a8b9ce..d3a43db 100644 --- a/src/lib/settings.js +++ b/src/lib/settings.js @@ -11,8 +11,7 @@ export async function getAvatarHistory(token){ data = data.user_avatars data.reverse(); return data; - } - else{ + } else { console.log(response) } } @@ -22,21 +21,19 @@ export async function getConfirmationCode(token, email){ const response = await fetch(`https://docs.black-phoenix.ru/api/users/send_confirmation_code`,{ method: 'POST', credentials:'include', - headers: {'Content-Type': 'application/json', - 'Authorization': token}, + headers: { 'Content-Type': 'application/json', + 'Authorization': token }, body: JSON.stringify({'email': email}) }) if(response.ok){ return true - } - else{ + } else { console.log(response) } } export async function changeUserData(token, username, email, password, avatar, code){ - let response = await fetch(`https://docs.black-phoenix.ru/api/users/change_data`,{ method: 'POST', @@ -52,9 +49,9 @@ export async function changeUserData(token, username, email, password, avatar, c if(response.ok){ return true - } - - else{ + } else if (response.status == 409){ + + } else { console.log(response) } } \ No newline at end of file diff --git a/src/routes/Header.svelte b/src/routes/Header.svelte index b785c55..e56348a 100644 --- a/src/routes/Header.svelte +++ b/src/routes/Header.svelte @@ -31,9 +31,7 @@
{#if isOpen } -
- Профиль +
Настройки Выйти
@@ -57,13 +54,13 @@ background: linear-gradient(#101010, #101010) padding-box, var(--gradient) border-box; - //background-repeat: no-repeat; - //background-attachment: fixed; - border-bottom-left-radius: 15px; - border-bottom-right-radius: 15px; - border-bottom: 0; + border-top-right-radius: 0; border-top-left-radius: 0; + border-bottom-right-radius: 15px; + border-bottom-left-radius: 15px; + border-bottom: 0; + } @@ -90,13 +87,22 @@ text-decoration: none; } - .buttonUser { + .buttonUser, + .buttonUser2 { width: 230px; height: 100%; + display: flex; justify-content: space-around; align-items: center; + margin-top: -1px; + + transition: all 300ms ease-in !important; + } + .buttonUser2{ + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; } .dropdown { @@ -120,14 +126,16 @@ } .listItem { - text-decoration: none; font-size: 16px; - color: white; + text-decoration: none; text-shadow: 0 0 20px white; - background: transparent; + border: 0; padding-left: 5px; padding-bottom: 3px; + background: transparent; + + color: white; } .avatarDiv { diff --git a/src/routes/Settings/+page.svelte b/src/routes/Settings/+page.svelte index 25c74b6..84e0779 100644 --- a/src/routes/Settings/+page.svelte +++ b/src/routes/Settings/+page.svelte @@ -4,6 +4,7 @@ import { fade, slide, fly, scale } from 'svelte/transition'; import { getAvatarHistory, changeUserData, getConfirmationCode } from '$lib/settings' + import { checkExsistingUser } from '$lib/register' import { UserCheck } from '$lib/userFunction'; import { uploadImages } from '$lib/chat'; import Header from './../Header.svelte'; @@ -25,10 +26,17 @@ let newName = "" let newEmail = "" let newPassword = "" - let newAvatar = "" + let newAvatar = null let code = "" let showSubmitDiv = false + + let nameError = "" + let emailError = "" + let passwordError = "" + + let submitButton + onMount(async () => { token = localStorage.getItem('BPChat') @@ -44,16 +52,6 @@ async function changingData(){ - if(newName == "") - newName = oldName; console.log(newName, "новое имя") - if(newEmail == "") - newEmail = oldEmail; console.log(newEmail, "новая почта") - if(newPassword == "") - newPassword = null; console.log(newPassword, " новый пароль") - if(newAvatar == "") - newAvatar = null; console.log(newAvatar, "ава") - console.log(newName, newEmail, newPassword, newAvatar, " - измененные данные") - confCode = await getConfirmationCode(token, oldEmail) if(confCode == true) showSubmitDiv = true @@ -68,19 +66,52 @@ newAvatar = await uploadImages(newAvatar) } - let changing = afterChanging = await changeUserData(token, newName, newEmail, newPassword, newAvatar, code) + let nName = "" + let nEmail = "" + let nPassword = "" + + if(newName != ""){ + nName = newName + } else { + nName = oldName + } + + if(newEmail != ""){ + nEmail = newEmail + } else { + nEmail = oldEmail + } + + if(newPassword != ""){ + nPassword = newPassword + } else { + nPassword = null + } + if(newAvatar == undefined){ + newAvatar = null + } + + console.log(nName, nEmail,nPassword,newAvatar) + let changing = afterChanging = await changeUserData(token, nName, nEmail, nPassword, newAvatar, code) console.log(changing) if (changing == true){ showSubmitDiv = false location.reload() + } else { + let changingError = "ник или почта уже занята" } } + function cancelSubmitting(){ + showSubmitDiv = false + code = "" + } + function cancel(){ newName = "" newEmail = "" newPassword = "" - newAvatar = "" + newAvatar = null newAvatarVisualize = "" } @@ -145,6 +176,43 @@ function PickOldAvatar(oldAvatarUrl){ pickedImg = oldAvatarUrl } + + async function existingUser(){ + if((newName.length <= 2) && (newName != "")){ + nameError = "ник от 2 символов" + } else{ + nameError = "" + } + + if((newName != "") && (newName.length > 2)){ + nameError = await checkExsistingUser(newName, null) + } + + const emailPattern = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; + let isValidEmail = emailPattern.test(newEmail) + console.log(isValidEmail) + + if((newEmail != "") && (isValidEmail == true)){ + emailError = await checkExsistingUser(null, newEmail) + } + + if((newPassword.length < 8) && (newPassword != "")){ + passwordError = "пароль от 8 символов" + submitButton.disabled = true + } else { + passwordError = "" + submitButton.disabled = false + } + + if((nameError || emailError || passwordError) != ""){ + submitButton.disabled = true + } else { + submitButton.disabled = false + } + } + + + @@ -167,7 +235,10 @@

Подтвердите кодом из почты

- +
+ + +
{/if} @@ -211,22 +282,31 @@
-
+

ник

- + + {#if nameError != ""} +

{nameError}

+ {/if}
-
+

почта

- + + {#if emailError != ""} +

{emailError}

+ {/if}
-
+

новый пароль

- + + {#if passwordError != ""} +

Пароль от 8 символов

+ {/if}
- +
@@ -239,6 +319,30 @@ - \ No newline at end of file diff --git a/src/routes/register/+page.svelte b/src/routes/register/+page.svelte index 0039596..3ec189b 100644 --- a/src/routes/register/+page.svelte +++ b/src/routes/register/+page.svelte @@ -1,5 +1,5 @@ @@ -110,7 +128,6 @@
-

Регистрация

@@ -206,9 +223,7 @@
-
-
@@ -220,7 +235,7 @@

{codeError}

- +
@@ -228,6 +243,7 @@
+