Add error message to login, Fix Internal Error 500

Yeah i touched the rest api and fixed the internal favicon error :P
Cleaned up the pages and linked the error messages
This commit is contained in:
Modo 2023-10-17 23:44:10 +05:30 committed by Kosh
parent 22cbef5e0a
commit d7982e1e82
9 changed files with 210 additions and 124 deletions

View File

@ -20,6 +20,11 @@ def handle_first_launched():
mkdir(folder_path) mkdir(folder_path)
@app.route('/favicon.ico')
def favicon():
favicon_path = path.join(app.root_path, '../frontend/static', 'favicon.ico')
return send_file(favicon_path, mimetype='image/vnd.microsoft.icon')
@app.get("/") @app.get("/")
@app.get("/<path:url_path>") @app.get("/<path:url_path>")
def handle_get(url_path: str = "html/index.html") -> Response: def handle_get(url_path: str = "html/index.html") -> Response:

BIN
backend/static/favicon.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 66 KiB

1
frontend/arrow.svg Normal file
View File

@ -0,0 +1 @@
<?xml version="1.0" ?><!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg height="512px" id="Layer_1" style="enable-background:new 0 0 512 512;" version="1.1" viewBox="0 0 512 512" width="512px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><polygon points="352,128.4 319.7,96 160,256 160,256 160,256 319.7,416 352,383.6 224.7,256 "/></svg>

After

Width:  |  Height:  |  Size: 446 B

View File

@ -12,7 +12,7 @@
</div> </div>
</div> </div>
<script src="index.js"></script> <script src=""></script>
</body> </body>
<footer><p>© 2023 Password Manager</p></footer> <footer><p>© 2023 Password Manager</p></footer>

4
frontend/download.svg Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<svg viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg">
<polygon points="360.098 116.492 319.471 85.615 118.599 238.096 118.599 238.096 118.599 238.096 319.471 390.577 360.098 359.7 199.979 238.096" style="fill: rgb(255, 255, 255);" transform="matrix(1.0000000000000002, 0, 0, 1.0000000000000002, 0, 1.1102230246251565e-16)"/>
</svg>

After

Width:  |  Height:  |  Size: 381 B

View File

@ -9,7 +9,7 @@ body {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
background-image: url("bg.jpg"); background-image: url("bg.jpg");
background-size: cover; background-size: 200% auto;
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;
} }

View File

@ -47,32 +47,18 @@ console.log(formData)
try { try {
const response = await fetch('/login', { const response = await fetch('/login', {
method: "post", method: "post",
/* headers: {
'Content-Type': 'application/json'
}*/
body: formData body: formData
}); });
if(response.ok) { if(response.ok) {
window.location.href = "dashboard.html"; window.location.href = "dashboard.html";
} else if(!response.ok) { } else if(!response.ok) {
if (response.status === 403) { const errorMessage = await response.text();
const error = new Error('Access denied: You do not have permission to access this resource.'); document.getElementById("errlabel").innerHTML = errorMessage;
document.getElementById("errlabel").innerHTML = "Invalid Details!";
setTimeout(()=> { setTimeout(()=> {
document.getElementById("errlabel").innerHTML = ""; document.getElementById("errlabel").innerHTML = "";
},3000) },3000)
console.log(response) throw new Error(errorMessage);
throw error;
}
}
//error
const errorData = await response.json();
if (response.status === 401) {
throw new Error('Invalid username or password')
} else {
throw new Error(errorData.error)
} }
// const data = await response.json(); // const data = await response.json();
@ -83,10 +69,7 @@ console.log(formData)
} catch (error) { } catch (error) {
console.log(error); console.error('Error:', error.message);
if(error instanceof TypeError && error.message === 'Failed to fetch'){
console.log("Failed Server")
}
} }
} }

View File

@ -9,7 +9,7 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
background-image: url("bg.jpg"); background-image: url("bg.jpg");
background-size: cover; background-size: 200% auto;
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
@ -39,6 +39,16 @@
border-radius: 50px; border-radius: 50px;
} }
#register {
display: block;
text-align: center;
font-family: 'Pixelify Sans', cursive;
font-size: 50px;
text-shadow: 2px 2px 5px rgb(0, 0, 0);
color: white;
translate: 0px 10px;
}
.input { .input {
width: 300px; width: 300px;
height: 30px; height: 30px;
@ -68,6 +78,15 @@
padding-left: 5px; padding-left: 5px;
} }
#conpassword::placeholder {
color: rgb(255, 255, 255, 0.5);
padding-left: 5px;
}
.idiv input {
translate: 0px -20px;
}
.idiv { .idiv {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -100,3 +119,71 @@
#loginb:active { #loginb:active {
background-color: rgb(155, 155, 155, 0.3); background-color: rgb(155, 155, 155, 0.3);
} }
.help {
width: 100%;
display: flex;
justify-content: space-between;
align-items: center;
}
.help div{
display: flex;
width: 50%;
justify-content: center;
}
.error label {
position: absolute;
display: block;
justify-content: center;
translate: -50% 3px;
color: rgba(184, 156, 255, 0.9);
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
font-style: bold;
font-weight: bold;
}
a {
text-decoration: none;
color: rgba(255, 255, 255, 0.5);
text-align: center;
font-family: 'Poppins', sans-serif;
font-size: 12px;
}
a:active {
color: rgb(196, 196, 196, 10);
}
footer{
position: fixed;
bottom: 0px;
background-color: rgb(12, 12, 12);
height: 50px;
width: 100vw;
}
footer p{
color: white;
text-align: center;
}
#returnb {
position: absolute;
top: 30px;
left: 30px;
width: 35px;
height: 35px;
border-radius: 15px;
font-family: 'Pixelify Sans', cursive;
color: white;
background-color: transparent;
background-image: url('download.svg');
background-size: cover;
box-shadow: rgb(0, 0, 0) 0px 0px 10px;
}

View File

@ -4,22 +4,28 @@
<head> <head>
<meta http-equiv="CONTENT-TYPE" content="text/html; charset=UTF-8"> <meta http-equiv="CONTENT-TYPE" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="register.css"/> <link rel="stylesheet" href="register.css"/>
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Pixelify+Sans:wght@500&display=swap" rel="stylesheet">
<title>Register</title> <title>Register</title>
<body> <body>
<div class="wrapper"> <div class="wrapper">
<div class="container"> <div class="container">
<button onclick="location.href = 'index.html'" id="returnb"></button>
<div> <div>
<p id="login">Register</p> <p id="register">Register</p>
</div> </div>
<div class="idiv"> <div class="idiv">
<input class="input" id="username" type="text" placeholder="Username"> <input class="input" id="username" type="text" placeholder="Username">
<input class="input" id="password" type="password" placeholder="Pasword"> <input class="input" id="password" type="password" placeholder="Pasword">
<input class="input" id="conpassword" type="password" placeholder="Confirm Pasword">
</div> </div>
<div class="buttons"> <div class="buttons">
<button id="loginb">Login</button> <button id="loginb">Sign Up</button>
</div> </div>
</div> </div>