kosh/unnamed-password-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'yash-priv' of https://gitlab.com/koshinhegde/unnamed-password-manager into yash-priv

Browse Source
This commit is contained in:
Modo 2023-10-25 23:08:45 +05:30
commit 7f6f73779c
7 changed files with 79 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -1,3 +1,8 @@
*__pycache__* *__pycache__*
/node_modules /node_modules
<<<<<<< HEAD
=======
/devfolder
.vscode
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a

BIN
backend/static/favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 66 KiB

16
frontend/html/dashboard.html
View File

@ -1,8 +1,12 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
p<!DOCTYPE html> p<!DOCTYPE html>
======= =======
<!DOCTYPE html> <!DOCTYPE html>
>>>>>>> a260428 (Dashboard Entry Update) >>>>>>> a260428 (Dashboard Entry Update)
=======
<!DOCTYPE html>
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
<html lang="en"> <html lang="en">
<head> <head>
<meta http-equiv="CONTENT-TYPE" content="text/html; charset=UTF-8"> <meta http-equiv="CONTENT-TYPE" content="text/html; charset=UTF-8">
@ -14,6 +18,9 @@ p<!DOCTYPE html>
<div class="wrapper"> <div class="wrapper">
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
<div class="container"> <div class="container">
@ -40,6 +47,9 @@ p<!DOCTYPE html>
<label id="displayname">Display</label> <label id="displayname">Display</label>
<button id="linkbutton"></button> <button id="linkbutton"></button>
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
</div> </div>
<div class="div_u"> <div class="div_u">
@ -151,6 +161,9 @@ p<!DOCTYPE html>
</div> </div>
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
<div class="popupdivparent"> <div class="popupdivparent">
<div class="popupdiv"> <div class="popupdiv">
<div> <div>
@ -166,6 +179,7 @@ p<!DOCTYPE html>
</div> </div>
</div> </div>
<<<<<<< HEAD
======= =======
======= =======
@ -340,6 +354,8 @@ p<!DOCTYPE html>
</div> </div>
>>>>>>> 19834dd (Add Change Password Function + Dashboard Complete) >>>>>>> 19834dd (Add Change Password Function + Dashboard Complete)
=======
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
</div> </div>
<script defer src="../scripts/dashboard.js"></script> <script defer src="../scripts/dashboard.js"></script>
</body> </body>

11
frontend/html/index.html
View File

@ -4,6 +4,7 @@
<head> <head>
<meta http-equiv="CONTENT-TYPE" content="text/html; charset=UTF-8"> <meta http-equiv="CONTENT-TYPE" content="text/html; charset=UTF-8">
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<link rel="stylesheet" href="../styles/index.css"/> <link rel="stylesheet" href="../styles/index.css"/>
======= =======
@ -12,6 +13,9 @@
======= =======
<link rel="stylesheet" href="../styles/index.css"/> <link rel="stylesheet" href="../styles/index.css"/>
>>>>>>> a260428 (Dashboard Entry Update) >>>>>>> a260428 (Dashboard Entry Update)
=======
<link rel="stylesheet" href="../styles/index.css"/>
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
<title>Login</title> <title>Login</title>
<link rel="preconnect" href="https://fonts.googleapis.com"> <link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin> <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
@ -35,6 +39,7 @@
<div> <div>
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
======= =======
<a href="" id="forgot_password">Forgot Password</a> <a href="" id="forgot_password">Forgot Password</a>
</div> </div>
@ -42,6 +47,8 @@
>>>>>>> 22cbef5 (Add all other pages) >>>>>>> 22cbef5 (Add all other pages)
======= =======
>>>>>>> 7afbaba (Finish Frontend) >>>>>>> 7afbaba (Finish Frontend)
=======
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
<a href="register.html" id="register">Register</a> <a href="register.html" id="register">Register</a>
</div> </div>
</div> </div>
@ -57,6 +64,7 @@
</div> </div>
</div> </div>
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<script defer src="../scripts/index.js"></script> <script defer src="../scripts/index.js"></script>
======= =======
@ -65,6 +73,9 @@
======= =======
<script defer src="../scripts/index.js"></script> <script defer src="../scripts/index.js"></script>
>>>>>>> 464820a (Add Entry List with Functionality) >>>>>>> 464820a (Add Entry List with Functionality)
=======
<script defer src="../scripts/index.js"></script>
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
</body> </body>
<footer><p>© 2023 Password Manager</p></footer> <footer><p>© 2023 Password Manager</p></footer>

20
frontend/html/register.html
View File

@ -3,6 +3,7 @@
<html> <html>
<head> <head>
<meta http-equiv="CONTENT-TYPE" content="text/html; charset=UTF-8"> <meta http-equiv="CONTENT-TYPE" content="text/html; charset=UTF-8">
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<link rel="stylesheet" href="register.css"/> <link rel="stylesheet" href="register.css"/>
<<<<<<< HEAD <<<<<<< HEAD
@ -20,6 +21,12 @@
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin> <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"> <link href="https://fonts.googleapis.com/css2?family=Pixelify+Sans:wght@500&display=swap" rel="stylesheet">
>>>>>>> d7982e1 (Add error message to login, Fix Internal Error 500) >>>>>>> d7982e1 (Add error message to login, Fix Internal Error 500)
=======
<link rel="stylesheet" href="../styles/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">
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
<title>Register</title> <title>Register</title>
<body> <body>
<div class="wrapper"> <div class="wrapper">
@ -27,10 +34,14 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
<button onclick="location.href = 'index.html'" id="returnb"></button> <button onclick="location.href = 'index.html'" id="returnb"></button>
<div> <div>
<p id="register">Register</p> <p id="register">Register</p>
<<<<<<< HEAD
======= =======
<div> <div>
<p id="login">Register</p> <p id="login">Register</p>
@ -41,6 +52,8 @@
<div> <div>
<p id="register">Register</p> <p id="register">Register</p>
>>>>>>> d7982e1 (Add error message to login, Fix Internal Error 500) >>>>>>> d7982e1 (Add error message to login, Fix Internal Error 500)
=======
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
</div> </div>
<div class="idiv"> <div class="idiv">
@ -48,6 +61,9 @@
<input class="input" id="password" type="password" placeholder="Pasword"> <input class="input" id="password" type="password" placeholder="Pasword">
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
<input class="input" id="conpassword" type="password" placeholder="Confirm Pasword"> <input class="input" id="conpassword" type="password" placeholder="Confirm Pasword">
</div> </div>
@ -56,6 +72,7 @@
</div> </div>
<div class="buttons"> <div class="buttons">
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<button id="loginb">Sign Up</button> <button id="loginb">Sign Up</button>
======= =======
@ -74,6 +91,9 @@
======= =======
<button id="loginb" onclick="validateRegister()">Sign Up</button> <button id="loginb" onclick="validateRegister()">Sign Up</button>
>>>>>>> 7afbaba (Finish Frontend) >>>>>>> 7afbaba (Finish Frontend)
=======
<button id="loginb" onclick="validateRegister()">Sign Up</button>
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
</div> </div>
</div> </div>

20
frontend/scripts/index.js
View File

@ -49,6 +49,7 @@ formData.append('password', _password);
try { try {
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
const response = await fetch('http://127.0.0.1:5000/', { const response = await fetch('http://127.0.0.1:5000/', {
method: 'POST', method: 'POST',
@ -71,6 +72,10 @@ formData.append('password', _password);
const response = await fetch('/login', { const response = await fetch('/login', {
method: "post", method: "post",
>>>>>>> a260428 (Dashboard Entry Update) >>>>>>> a260428 (Dashboard Entry Update)
=======
const response = await fetch('/login', {
method: "post",
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
body: formData body: formData
}); });
@ -92,6 +97,7 @@ formData.append('password', _password);
// handleAuthRes(data); // handleAuthRes(data);
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
console.log(`Got token: ${token}`) console.log(`Got token: ${token}`)
} catch (error) { } catch (error) {
@ -107,6 +113,10 @@ formData.append('password', _password);
======= =======
console.error('Error:', error.message); console.error('Error:', error.message);
>>>>>>> d7982e1 (Add error message to login, Fix Internal Error 500) >>>>>>> d7982e1 (Add error message to login, Fix Internal Error 500)
=======
} catch (error) {
console.error('Error:', error.message);
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
} }
} }
@ -114,6 +124,7 @@ formData.append('password', _password);
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
function handleAuthRes(data) { function handleAuthRes(data) {
if(data.token){ if(data.token){
localStorage.setItem('token', token.data); localStorage.setItem('token', token.data);
@ -127,6 +138,9 @@ function handleAuthRes(data) {
======= =======
>>>>>>> 106888c (Add input boxes for Add entry page) >>>>>>> 106888c (Add input boxes for Add entry page)
=======
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
const register = document.getElementById("register"); const register = document.getElementById("register");
register.addEventListener("click", function(event) { register.addEventListener("click", function(event) {
@ -158,6 +172,7 @@ window.onload = async function() {
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
@ -175,6 +190,8 @@ window.onload = async function() {
>>>>>>> 22cbef5 (Add all other pages) >>>>>>> 22cbef5 (Add all other pages)
======= =======
>>>>>>> 7afbaba (Finish Frontend) >>>>>>> 7afbaba (Finish Frontend)
=======
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
// function handleAuthRes(data) { // function handleAuthRes(data) {
// if(data.token){ // if(data.token){
// localStorage.setItem('token', data.token); // localStorage.setItem('token', data.token);
@ -184,6 +201,9 @@ window.onload = async function() {
// } // }
// } // }
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b1b896f (Add api request changes) >>>>>>> b1b896f (Add api request changes)
======= =======
>>>>>>> a260428 (Dashboard Entry Update) >>>>>>> a260428 (Dashboard Entry Update)
=======
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a

7
frontend/styles/register.css
View File

@ -1,6 +1,9 @@
* { * {
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
box-sizing: border-box; box-sizing: border-box;
} }
@ -202,6 +205,7 @@ footer p{
background-image: url('../assets/download.svg'); background-image: url('../assets/download.svg');
background-size: cover; background-size: cover;
box-shadow: rgb(0, 0, 0) 0px 0px 10px; box-shadow: rgb(0, 0, 0) 0px 0px 10px;
<<<<<<< HEAD
} }
======= =======
box-sizing: border-box; box-sizing: border-box;
@ -469,3 +473,6 @@ footer p{
box-shadow: rgb(0, 0, 0) 0px 0px 10px; box-shadow: rgb(0, 0, 0) 0px 0px 10px;
} }
>>>>>>> d7982e1 (Add error message to login, Fix Internal Error 500) >>>>>>> d7982e1 (Add error message to login, Fix Internal Error 500)
=======
}
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a