diff --git a/src/lib/chat.js b/src/lib/chat.js index 8f4f4ed..822eabb 100644 --- a/src/lib/chat.js +++ b/src/lib/chat.js @@ -15,7 +15,7 @@ export async function getLastMessages(chatId,msgLoaded){ if(response.ok){ let data = await response.json() let msgMassive = data.messages - console.log(msgMassive, " аа сообщения", chatId, " - айди") + //console.log(msgMassive, " аа сообщения", chatId, " - айди") if(msgMassive === null){ return [] @@ -73,7 +73,7 @@ export async function getLastMessages(chatId,msgLoaded){ if(response.ok){ const data = await response.json(); - console.log("картинка принята") + //console.log("картинка принята") return data.image_url; } @@ -91,7 +91,7 @@ export async function getLastMessages(chatId,msgLoaded){ if(response.ok){ let data = await response.json(); data = data.allowed_chats - console.log(data) + //console.log(data) if(data == null) return [] @@ -209,7 +209,9 @@ export async function getLastMessages(chatId,msgLoaded){ if(response.ok){ let data = await response.json() let id = data.chat_id - return id + let chats = await getAllChats(token) + window.location.href = `/c#id=${id}` + return chats } else{ console.log(response) diff --git a/src/lib/login.js b/src/lib/login.js index e522a0f..3e1de63 100644 --- a/src/lib/login.js +++ b/src/lib/login.js @@ -23,7 +23,7 @@ export async function handleLogin(username, password) { const data = await response.json() const token = data.authorization localStorage.setItem('BPChat', token) - window.location.href = '/' + window.location.href = '/c' return "" // чтобы ничего не выводилось в качестве ошибки } else if(response.status === 401) diff --git a/src/lib/register.js b/src/lib/register.js index d86da20..bd95672 100644 --- a/src/lib/register.js +++ b/src/lib/register.js @@ -21,7 +21,7 @@ export async function checkExsistingUser(username, email) { } else if(response.status === 422){ let data = await response.json(); - return data + return "не похоже на почту" } else{ console.log(response.status) diff --git a/src/lib/settings.js b/src/lib/settings.js index e2fcf9e..8823266 100644 --- a/src/lib/settings.js +++ b/src/lib/settings.js @@ -19,7 +19,6 @@ export async function getAvatarHistory(token){ } export async function getConfirmationCode(token, email){ - console.log(token, email, "<-- лох") const response = await fetch(`${PUBLIC_URL}/api/users/send_confirmation_code`,{ method: 'POST', credentials:'include', diff --git a/src/lib/websocket.js b/src/lib/websocket.js index 41d2a05..ca1b821 100644 --- a/src/lib/websocket.js +++ b/src/lib/websocket.js @@ -14,9 +14,8 @@ export default function createWebSocket(url, token, onMessageCallback) { }); socket.onopen = () => { - console.log('WebSocket is open now.') - console.log(socket) - retries = 0 //сброс попыток + //console.log('WebSocket is open .') + //console.log(socket) while (messageQueue.length > 0) { socket.send(messageQueue.shift()); @@ -24,11 +23,11 @@ export default function createWebSocket(url, token, onMessageCallback) { }; socket.onclose = (event) => { - console.log('WebSocket is closed now.', event) + //console.log('WebSocket is closed .', event) }; socket.onerror = (error) => { - console.error('WebSocket error observed:', error) + //console.error('WebSocket error observed:', error) }; diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte new file mode 100644 index 0000000..d8dfb54 --- /dev/null +++ b/src/routes/+error.svelte @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 5bac317..e69de29 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,1351 +0,0 @@ - - - - - - - {#if createNewChatShow == true} -
- -
-

Новый чат

-
- -

Название чата

- - -

заблокируйте доступ к чату одному из пользователей

- - -
- {#each users as user} -
- - - - ава -

{user.username}

- -
- {/each} -
- -
- -
- - -
- -
- {/if} - -
- -
- -
- -
-
- {#if createNewChatButton == true} - - {/if} - - - {#each chats as chat} - - {/each} - -
-
-
-
-
- -
- - {#if msgTimeShow == true} -
-

{msgTime}

-
- {/if} - -
- - - - {#if helperDivBoolShow == true} - -
event.preventDefault()} - transition:slide={{ duration: 500 }}> - - - {#if pinOrNot == true} - - {:else} - - {/if} - - -
- {/if} - - {#if warningMessage.length != 0} -
-

{warningMessage}

-
- {/if} - - - {#if ((chatId != null) && (messages.length === 0))} -
-

В этом чате еще нет сообщений.

-

Кто же напишет первый?

-
- {/if} - -
- {#each messages as message} - - -
- - ава - - -
- -
-

{message.username}

- - {#if message.answer_message != null} - - {#if message.answer_image_url != null} - ответная картинка - {/if} -

{message.answer_message.substr(0, 20)}

- {/if} - -
- -
-

{message.message}

- {#if message.image_url != null} - пикча - {/if} -
- -
-
- {/each} -
- - {#if (chatId != null)} - -
- - {#if (answerMessageTextShow == true) || (answerMessageImgShow == true)} -
- - {#if answerMessageImgShow == true} - картинка - {/if} - -
- - {#if answerMessageTextShow == true} -

{answerMessage.substr(0, 50)}

- {/if} -

{PickedName}

- -
- -
- {/if} - - {#if imageShow == true} -
- - -
- {/if} - - -
- - - -
- fdsafds document.getElementById('fileInput').click()}> -
- -
- - - -
- {/if} -
- -
-
-
-
-
- {#if pinnedMsg == null} -
-

Тут ничего нет

-

Но если ты закрепишь сообщение,
тут что то изменится

-
- {:else} - -
- {#each pinnedMsg as msg} -
-

{msg.username}

-
-

{msg.message}

- -
-
-
- {/each} -
- {/if} - -
-
- - -

-

- -

Made by:

-

Uniknow and urec56

-
-
- - - diff --git a/src/routes/Header.svelte b/src/routes/Header.svelte index a690efb..be76b2b 100644 --- a/src/routes/Header.svelte +++ b/src/routes/Header.svelte @@ -8,7 +8,6 @@ let Nickname; let userImage; - let jopa = 0; onMount(async () => { const UserData = await UserCheck(); @@ -24,8 +23,8 @@
- - лого + + лого

BP Chat

diff --git a/src/routes/Settings/+page.svelte b/src/routes/Settings/+page.svelte index b77b23e..21e1f31 100644 --- a/src/routes/Settings/+page.svelte +++ b/src/routes/Settings/+page.svelte @@ -90,7 +90,7 @@ console.log(nName, nEmail,nPassword,newAvatar) let changing = afterChanging = await changeUserData(token, nName, nEmail, nPassword, newAvatar, code) - + if (changing == true){ showSubmitDiv = false location.reload() @@ -188,7 +188,6 @@ const emailPattern = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; let isValidEmail = emailPattern.test(newEmail) - console.log(isValidEmail) if((newEmail != "") && (isValidEmail == true)){ emailError = await checkExsistingUser(null, newEmail) diff --git a/src/routes/chat/+page.svelte b/src/routes/c/+page.svelte similarity index 97% rename from src/routes/chat/+page.svelte rename to src/routes/c/+page.svelte index d151598..271a0a0 100644 --- a/src/routes/chat/+page.svelte +++ b/src/routes/c/+page.svelte @@ -56,7 +56,7 @@ window.addEventListener('keydown', onEnterPress); chats = await getAllChats(token) - console.log([] == false) + //console.log([] == false) // true if(chats === false){ chats = [] warningMessage = "чтобы пользоваться чатом, подтверди почту" @@ -66,16 +66,16 @@ async function handleChatUrlChange() { if (window.location.hash.startsWith('#id=')) { - console.log(location.hash.substring(1), "FFFFFFFFFFFFFFFFFFFFFFFFFFFF") chatId = window.location.hash.slice(4); - msgLoaded = 0 //console.log(chatId, " chatId") + msgLoaded = 0 + currentChat = chats.find(chat => chat.chat_id == chatId) - if(currentChat == undefined){ - window.location.href = '/' - } + //if(currentChat == undefined){ + // window.location.href = '/c' + //} //console.log(currentChat, " текущий чат") pickedChatName = currentChat.chat_name pickedChatImg = currentChat.avatar_image @@ -87,7 +87,7 @@ const websocketUrl = `${PUBLIC_WSS}/api/chat/ws/${chatId}` if (socket){ - console.log("Сокет есть") + //console.log("Сокет есть") socket.close(); socket = null } @@ -122,6 +122,8 @@ messages = messages }) + } else { + messages = [] } } handleChatUrlChange(); @@ -182,6 +184,7 @@ if(!isLoaded) sendMessage() } + } let rows = 1 @@ -191,9 +194,9 @@ const textarea = document.getElementById("msg"); //console.log(textarea.scrollHeight) if (textarea) { - textarea.style.height = '1em'; //?? + textarea.style.height = '20px'; //?? textarea.style.height = (textarea.scrollHeight > maxRows * 18) ? `${maxRows * 18}px` : `${textarea.scrollHeight}px`; - console.log(textarea.scrollHeight) + //console.log(textarea.scrollHeight) } } @@ -380,15 +383,8 @@ let pinOrNot = false } async function submtiCreateNewChat(){ - token = localStorage.getItem('BPChat') - let newChatId = await createNewChat(newChatName, selectedUserId, token) - window.location.href = `/#id=${newChatId}` - - //createNewChatShow = false - - //history.pushState(null, null, `/#id=${newChatId}`); - //handleRouteChange(); - //chats = await getAllChats() + chats = await createNewChat(newChatName, selectedUserId, token) + createNewChatShow = false } function cancelCreateNewChat(){ @@ -426,11 +422,11 @@ let pinOrNot = false async function deleteChatButt(chatId){ let result = await deleteChat(chatId,token) - const index = chats.findIndex(chat => chat.chat_id === chatId); - chats.splice(index, 1); + //const index = chats.findIndex(chat => chat.chat_id === chatId); + //chats.splice(index, 1); //console.log(index) //console.log(result) - chats = await getAllChats() + //chats = await getAllChats(token) } @@ -494,7 +490,7 @@ let pinOrNot = false {#each chats as chat}