diff --git a/docker-compose/requirements/djangoserver/file/server/server/models.py b/docker-compose/requirements/djangoserver/file/server/server/models.py index 0de4e18..54a5009 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/models.py +++ b/docker-compose/requirements/djangoserver/file/server/server/models.py @@ -11,7 +11,6 @@ class User(models.Model): mail_verified = models.BooleanField(default=False) github_link = models.CharField(max_length=1024, null=True, blank=True, default=None) discord_username = models.CharField(max_length=1024, null=True, blank=True, default=None) - class Message(models.Model): id = models.AutoField(primary_key=True) diff --git a/docker-compose/requirements/nginx/static/javascript/lobbyPage/main.js b/docker-compose/requirements/nginx/static/javascript/lobbyPage/main.js index 34e7f0d..ee0f2e5 100644 --- a/docker-compose/requirements/nginx/static/javascript/lobbyPage/main.js +++ b/docker-compose/requirements/nginx/static/javascript/lobbyPage/main.js @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* main.js :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: marvin +#+ +:+ +#+ */ +/* By: edbernar { pageRenderer.changePage('profilPage', false, userMeInfo.id); - }) + }); buttons[2].addEventListener('click', () => { window.location.replace('/logout'); }); diff --git a/docker-compose/requirements/nginx/static/javascript/login/main.js b/docker-compose/requirements/nginx/static/javascript/login/main.js index 5e33819..e04bda0 100644 --- a/docker-compose/requirements/nginx/static/javascript/login/main.js +++ b/docker-compose/requirements/nginx/static/javascript/login/main.js @@ -6,13 +6,14 @@ /* By: edbernar { + pageRenderer.changePage('profilPage', false, userMeInfo.id); + }); buttons[2].addEventListener('click', () => { window.location.replace('/logout'); }) diff --git a/docker-compose/requirements/nginx/static/javascript/profilPage/main.js b/docker-compose/requirements/nginx/static/javascript/profilPage/main.js index 097287d..05493c9 100644 --- a/docker-compose/requirements/nginx/static/javascript/profilPage/main.js +++ b/docker-compose/requirements/nginx/static/javascript/profilPage/main.js @@ -6,7 +6,7 @@ /* By: edbernar { usernameText = userInfo.username; @@ -46,10 +47,15 @@ class ProfilPage banner.innerHTML = `` } }); - convButton.addEventListener('click', () => { - showChatMenu(); - showPrivateChat({id: userId, name: usernameText}); - }); + if (userId != userMeInfo.id) + { + convButton.addEventListener('click', () => { + showChatMenu(); + showPrivateChat({id: userId, name: usernameText}); + }); + } + else + convButton.remove(); } static dispose() diff --git a/docker-compose/requirements/nginx/static/javascript/typeErrorResponse/typeErrorConnectedElsewhere.js b/docker-compose/requirements/nginx/static/javascript/typeErrorResponse/typeErrorConnectedElsewhere.js new file mode 100644 index 0000000..52eb70e --- /dev/null +++ b/docker-compose/requirements/nginx/static/javascript/typeErrorResponse/typeErrorConnectedElsewhere.js @@ -0,0 +1,23 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* typeErrorConnectedElsewhere.js :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: edbernar { + document.body.style.color = 'white'; + document.body.style.textAlign = 'center'; + document.body.style.paddingTop = '10%'; + document.body.innerHTML = 'You are already connected somewhere...'; + }, 500); +} + +export { typeErrorConnectedElsewhere }; \ No newline at end of file diff --git a/docker-compose/requirements/nginx/static/javascript/websocket.js b/docker-compose/requirements/nginx/static/javascript/websocket.js index 89fab3f..e3324dc 100644 --- a/docker-compose/requirements/nginx/static/javascript/websocket.js +++ b/docker-compose/requirements/nginx/static/javascript/websocket.js @@ -6,10 +6,11 @@ /* By: edbernar { @@ -54,6 +57,7 @@ function launchSocket() } if (response.code >= 9000 && response.code <= 9999) { + lastError = response.code; if (response.code >= 9014 && response.code <= 9025) { console.log(response); @@ -84,9 +88,12 @@ function launchSocket() socket.onclose = () => { status = 0; console.log('Disconnected'); - setTimeout(() => { - launchSocket(); - }, 500); + if (lastError != 9013) + { + setTimeout(() => { + launchSocket(); + }, 500); + } }; }