lunastella
/
lilachat-frontend
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: lunastella:1c09b5020e312d3b0a6ea3bb56dc7e128d03a1ac
Branches Tags
lunastella:main
...
compare: lunastella:0ac58d622bfa44cf9f3ce1a9de4150f149baa9b2
Branches Tags
lunastella:main

4 Commits
1c09b5020e ... 0ac58d622b

Author SHA1 Message Date
Luna 0ac58d622b Merge branch 'main' of lavender.software:luna/lilachat-frontend 2021-07-28 09:29:31 -07:00
Luna f3b2ca64ff Error Messages are now printed in chat instead of below the chat. 2021-07-28 09:26:54 -07:00
Luna 4db3d71f68 Changed the layout 2021-07-27 13:10:23 -07:00
Luna 5b80b2a819 Fixed registering 2021-07-27 13:10:14 -07:00
5 changed files with 6 additions and 10 deletions
Show Stats Expand all files Collapse all files

4
css/chat.css
View File

@ -64,7 +64,3 @@ button {
#loggeduser { #loggeduser {
padding-top: 2% padding-top: 2%
} }
#errormessage {
padding-top: 2.5%;
}

6
css/index.css
View File

@ -28,7 +28,7 @@ a {
height: 540px; height: 540px;
margin-right: 0.3em; margin-right: 0.3em;
margin-left: -40%; margin-left: -40%;
margin-top: auto; margin-top: 5%;
margin-bottom: 20%; margin-bottom: 20%;
font-size: 250%; font-size: 250%;
text-align: center; text-align: center;
@ -44,16 +44,18 @@ a {
height: 53rem; height: 53rem;
margin-left: 0.3em; margin-left: 0.3em;
margin-right: -30%; margin-right: -30%;
margin-top: -8%;
border: none; border: none;
} }
.navigation-list { .navigation-list {
display: flex; display: inline-flex;
list-style-type: none; list-style-type: none;
flex-wrap: wrap; flex-wrap: wrap;
gap: 10px; gap: 10px;
justify-content: center; justify-content: center;
padding: 0; padding: 0;
margin-left: 5%;
} }
.buttons { .buttons {

2
html/chat.html
View File

@ -32,8 +32,6 @@
<button type="button" id="logoutbutton" onclick="logout()">Logout</button> <button type="button" id="logoutbutton" onclick="logout()">Logout</button>
<div id="errormessage"></div>
<script src="../js/chat.js"></script> <script src="../js/chat.js"></script>
<script src="../js/logout.js"></script> <script src="../js/logout.js"></script>

2
js/logout.js
View File

@ -13,7 +13,7 @@ async function logout() {
}, },
body: JSON.stringify(sendLogoutInfo), body: JSON.stringify(sendLogoutInfo),
}); });
document.querySelector("#errormessage").innerHTML = 'Logged out.' printText('Logged out.')
document.getElementById("logoutbutton").style.display = "none"; document.getElementById("logoutbutton").style.display = "none";
localStorage.removeItem('username') localStorage.removeItem('username')
username = null; username = null;

2
js/register.js
View File

@ -52,7 +52,7 @@ form.addEventListener("submit", async function (event) {
//CHECKS IF A USERNAME IS TAKEN //CHECKS IF A USERNAME IS TAKEN
async function isUnameTaken() { async function isUnameTaken() {
const response = await fetch(`../api/users/${uname}/`); const response = await fetch(`/api/users/${uname}/`);
const isTaken = await response.json(); const isTaken = await response.json();
//YES THIS IS CONFUSING I KNOW. //YES THIS IS CONFUSING I KNOW.