Rebase changes
This commit is contained in:
parent
53544492a8
commit
b1ef6a6b8f
@ -19,14 +19,11 @@ def handle_first_launched():
|
||||
if not path.exists(folder_path):
|
||||
mkdir(folder_path)
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
@app.route('/favicon.ico')
|
||||
def favicon() -> Response:
|
||||
favicon_path: str = path.join(app.root_path, '../frontend/static', 'favicon.ico')
|
||||
return send_file(favicon_path, mimetype='image/vnd.microsoft.icon')
|
||||
>>>>>>> d7982e1 (Add error message to login, Fix Internal Error 500)
|
||||
|
||||
|
||||
@app.route("/index.html")
|
||||
@ -469,10 +466,3 @@ class QueryHandler:
|
||||
)
|
||||
return Response(status=200)
|
||||
|
||||
import os
|
||||
from os import path
|
||||
|
||||
@app.route('/favicon.ico')
|
||||
def favicon():
|
||||
favicon_path = os.path.join(app.root_path, 'static', 'favicon.ico')
|
||||
return send_file(favicon_path, mimetype='image/vnd.microsoft.icon')
|
||||
@ -1,12 +1,4 @@
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
p<!DOCTYPE html>
|
||||
=======
|
||||
<!DOCTYPE html>
|
||||
>>>>>>> a260428 (Dashboard Entry Update)
|
||||
=======
|
||||
<!DOCTYPE html>
|
||||
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta http-equiv="CONTENT-TYPE" content="text/html; charset=UTF-8">
|
||||
@ -16,11 +8,6 @@ p<!DOCTYPE html>
|
||||
</head>
|
||||
<body>
|
||||
<div class="wrapper">
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
|
||||
|
||||
<div class="container">
|
||||
|
||||
@ -46,10 +33,6 @@ p<!DOCTYPE html>
|
||||
<div>
|
||||
<label id="displayname">Display</label>
|
||||
<button id="linkbutton"></button>
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
|
||||
</div>
|
||||
|
||||
<div class="div_u">
|
||||
@ -160,10 +143,6 @@ p<!DOCTYPE html>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
|
||||
<div class="popupdivparent">
|
||||
<div class="popupdiv">
|
||||
<div>
|
||||
@ -179,183 +158,6 @@ p<!DOCTYPE html>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
=======
|
||||
|
||||
>>>>>>> 2a10814 (Add Display For Information + Logic)
|
||||
<div class="container">
|
||||
|
||||
<button id="logout"></button>
|
||||
|
||||
<div class="innerwrapper">
|
||||
|
||||
<div class="contentbox">
|
||||
|
||||
<div class="searchbar">
|
||||
<input type="text" id="search">
|
||||
</div>
|
||||
|
||||
<div class="objcontainer"></div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="querybox">
|
||||
<div class="infobox">
|
||||
<img src="../assets/icon.jpg">
|
||||
</div>
|
||||
<div class="infopanel">
|
||||
<div>
|
||||
<label id="displayname">Display</label>
|
||||
<button></button>
|
||||
=======
|
||||
>>>>>>> 3fbcabc (Add Data Edit Page UI)
|
||||
</div>
|
||||
|
||||
<div class="div_u">
|
||||
<label for="dusername">Username:</label>
|
||||
<div>
|
||||
<input id="dusername" disabled>
|
||||
<button id="bdusername"></button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="div_e">
|
||||
<label for="demail">Email:</label>
|
||||
<div>
|
||||
<input id="demail" disabled>
|
||||
<button id="bdemail"></button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="div_ph">
|
||||
<label for="dphnumber">Ph. Number:</label>
|
||||
<div>
|
||||
<input id="dphnumber" disabled>
|
||||
<button id="bdphnumber"></button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="div_p">
|
||||
<label for="dpassword">Password:</label>
|
||||
<div>
|
||||
<input id="dpassword" type="password" disabled>
|
||||
<button id="bdpassword"></button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="buttonbox">
|
||||
|
||||
<div> <!-- Panel -->
|
||||
|
||||
<div> <!--Holder -->
|
||||
|
||||
<div>
|
||||
<!-- Image -->
|
||||
</div>
|
||||
<div>
|
||||
<label id="greetname"></label>
|
||||
<a href="#" onclick="changePassConfirm()">Change Password</a>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="buttonpanel">
|
||||
|
||||
<div>
|
||||
<button id="addentry"></button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> a260428 (Dashboard Entry Update)
|
||||
=======
|
||||
|
||||
=======
|
||||
>>>>>>> 69bfc65 (Add Form Logic)
|
||||
<div id="entrycontainer" class="hidden">
|
||||
|
||||
<div class="addentrydiv">
|
||||
|
||||
<div>
|
||||
<button id="backbtn"></button>
|
||||
</div>
|
||||
|
||||
<div class="fieldcontainer">
|
||||
<form id="formdata">
|
||||
<div>
|
||||
<input type="text" name="sitename" placeholder="Site Name" id="sitenamefield" >
|
||||
<input type="text" name="url" placeholder="Site URL" id="urlfield" value="https://">
|
||||
<label></label>
|
||||
<button type="button" onclick="validateData()" id="submitdatabtn"></button>
|
||||
<button type="button" onclick="deleteEntryConfirm()" id="deletedata"></button>
|
||||
<button type="button" onclick="validateDataEdit()" id="submiteditdatabtn">Save</button>
|
||||
</div>
|
||||
|
||||
<div class="inputfieldpanel">
|
||||
<div>
|
||||
<input type="checkbox" id="u_checkbox">
|
||||
<input type="text" name="Username" placeholder="Username" id="u_input" disabled><br>
|
||||
</div>
|
||||
<div>
|
||||
<input type="checkbox" id="p_checkbox">
|
||||
<input type="text" name="Password" placeholder="Password" id="p_input" disabled><br>
|
||||
</div>
|
||||
<div>
|
||||
<input type="checkbox" id="e_checkbox">
|
||||
<input type="text" name="Email" placeholder="Email Address" id="e_input" disabled><br>
|
||||
</div>
|
||||
<div>
|
||||
<input type="checkbox" id="n_checkbox">
|
||||
<input type="text" name="PhNumber" placeholder="Phone Number" id="n_input" disabled><br>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="confirmdivparent">
|
||||
<div class="confirmdiv">
|
||||
<img src="../assets/tick.svg">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> b6d960f (Add Add Entry Page & CSS Animations)
|
||||
=======
|
||||
=======
|
||||
>>>>>>> 7afbaba (Finish Frontend)
|
||||
<div class="popupdivparent">
|
||||
<div class="popupdiv">
|
||||
<div>
|
||||
<button onclick="closePopup()" id="closepopup"></button>
|
||||
</div>
|
||||
<div class="popupdivchild"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="confirmdivparent">
|
||||
<div class="confirmdiv">
|
||||
<img src="../assets/tick.svg">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
>>>>>>> 19834dd (Add Change Password Function + Dashboard Complete)
|
||||
=======
|
||||
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
|
||||
</div>
|
||||
<script defer src="../scripts/dashboard.js"></script>
|
||||
</body>
|
||||
@ -363,3 +165,4 @@ p<!DOCTYPE html>
|
||||
<footer><p>© 2023 Password Manager</p></footer>
|
||||
|
||||
</html>
|
||||
|
||||
|
||||
@ -3,19 +3,7 @@
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="CONTENT-TYPE" content="text/html; charset=UTF-8">
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<link rel="stylesheet" href="../styles/index.css"/>
|
||||
=======
|
||||
<link rel="stylesheet" href="index.css"/>
|
||||
>>>>>>> 22cbef5 (Add all other pages)
|
||||
=======
|
||||
<link rel="stylesheet" href="../styles/index.css"/>
|
||||
>>>>>>> a260428 (Dashboard Entry Update)
|
||||
=======
|
||||
<link rel="stylesheet" href="../styles/index.css"/>
|
||||
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
|
||||
<title>Login</title>
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||
@ -37,18 +25,9 @@
|
||||
|
||||
<div class="help">
|
||||
<div>
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<a href="" id="forgot_password">Forgot Password</a>
|
||||
</div>
|
||||
<div>
|
||||
>>>>>>> 22cbef5 (Add all other pages)
|
||||
=======
|
||||
>>>>>>> 7afbaba (Finish Frontend)
|
||||
=======
|
||||
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
|
||||
<a href="register.html" id="register">Register</a>
|
||||
</div>
|
||||
</div>
|
||||
@ -63,19 +42,7 @@
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<script defer src="../scripts/index.js"></script>
|
||||
=======
|
||||
<script src="../scripts/index.js"></script>
|
||||
>>>>>>> a260428 (Dashboard Entry Update)
|
||||
=======
|
||||
<script defer src="../scripts/index.js"></script>
|
||||
>>>>>>> 464820a (Add Entry List with Functionality)
|
||||
=======
|
||||
<script defer src="../scripts/index.js"></script>
|
||||
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
|
||||
</body>
|
||||
|
||||
<footer><p>© 2023 Password Manager</p></footer>
|
||||
|
||||
@ -3,67 +3,24 @@
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="CONTENT-TYPE" content="text/html; charset=UTF-8">
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<link rel="stylesheet" href="register.css"/>
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<link rel="stylesheet" href="../styles/register.css"/>
|
||||
>>>>>>> a260428 (Dashboard Entry Update)
|
||||
<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">
|
||||
=======
|
||||
>>>>>>> 22cbef5 (Add all other pages)
|
||||
=======
|
||||
<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">
|
||||
>>>>>>> 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>
|
||||
<body>
|
||||
<div class="wrapper">
|
||||
<div class="container">
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
|
||||
<button onclick="location.href = 'index.html'" id="returnb"></button>
|
||||
|
||||
<div>
|
||||
<p id="register">Register</p>
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<div>
|
||||
<p id="login">Register</p>
|
||||
>>>>>>> 22cbef5 (Add all other pages)
|
||||
=======
|
||||
<button onclick="location.href = 'index.html'" id="returnb"></button>
|
||||
|
||||
<div>
|
||||
<p id="register">Register</p>
|
||||
>>>>>>> d7982e1 (Add error message to login, Fix Internal Error 500)
|
||||
=======
|
||||
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
|
||||
</div>
|
||||
|
||||
<div class="idiv">
|
||||
<input class="input" id="username" type="text" placeholder="Username">
|
||||
<input class="input" id="password" type="password" placeholder="Pasword">
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
|
||||
<input class="input" id="conpassword" type="password" placeholder="Confirm Pasword">
|
||||
</div>
|
||||
|
||||
@ -72,28 +29,7 @@
|
||||
</div>
|
||||
|
||||
<div class="buttons">
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<button id="loginb">Sign Up</button>
|
||||
=======
|
||||
</div>
|
||||
|
||||
<div class="buttons">
|
||||
<button id="loginb">Login</button>
|
||||
>>>>>>> 22cbef5 (Add all other pages)
|
||||
=======
|
||||
<input class="input" id="conpassword" type="password" placeholder="Confirm Pasword">
|
||||
</div>
|
||||
|
||||
<div class="buttons">
|
||||
<button id="loginb">Sign Up</button>
|
||||
>>>>>>> d7982e1 (Add error message to login, Fix Internal Error 500)
|
||||
=======
|
||||
<button id="loginb" onclick="validateRegister()">Sign Up</button>
|
||||
>>>>>>> 7afbaba (Finish Frontend)
|
||||
=======
|
||||
<button id="loginb" onclick="validateRegister()">Sign Up</button>
|
||||
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
const PORT = 5000;
|
||||
|
||||
let loginb = document.getElementById("loginb");
|
||||
|
||||
loginb.addEventListener("click", validateLogin);
|
||||
@ -48,34 +50,8 @@ formData.append('password', _password);
|
||||
// console.log(formData)
|
||||
|
||||
try {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
const response = await fetch('http://127.0.0.1:5000/', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
=======
|
||||
const response = await fetch('/login', {
|
||||
const response = await fetch(`http://127.0.0.1:${PORT}/login`, {
|
||||
method: "post",
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
/*headers: {
|
||||
>>>>>>> b1b896f (Add api request changes)
|
||||
=======
|
||||
/* headers: {
|
||||
>>>>>>> 22cbef5 (Add all other pages)
|
||||
'Content-Type': 'application/json'
|
||||
}*/
|
||||
=======
|
||||
>>>>>>> d7982e1 (Add error message to login, Fix Internal Error 500)
|
||||
=======
|
||||
const response = await fetch('/login', {
|
||||
method: "post",
|
||||
>>>>>>> a260428 (Dashboard Entry Update)
|
||||
=======
|
||||
const response = await fetch('/login', {
|
||||
method: "post",
|
||||
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
|
||||
body: formData
|
||||
});
|
||||
|
||||
@ -97,50 +73,13 @@ formData.append('password', _password);
|
||||
// handleAuthRes(data);
|
||||
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
console.log(`Got token: ${token}`)
|
||||
} catch (error) {
|
||||
console.error('Error:', error.message);
|
||||
=======
|
||||
} catch (error) {
|
||||
<<<<<<< HEAD
|
||||
console.log(error);
|
||||
if(error instanceof TypeError && error.message === 'Failed to fetch'){
|
||||
console.log("Failed Server")
|
||||
}
|
||||
>>>>>>> b1b896f (Add api request changes)
|
||||
=======
|
||||
console.error('Error:', error.message);
|
||||
>>>>>>> d7982e1 (Add error message to login, Fix Internal Error 500)
|
||||
=======
|
||||
} catch (error) {
|
||||
console.error('Error:', error.message);
|
||||
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
function handleAuthRes(data) {
|
||||
if(data.token){
|
||||
localStorage.setItem('token', token.data);
|
||||
console.log("Logged In...")
|
||||
} else {
|
||||
console.error('Login Failed:', data.error)
|
||||
}
|
||||
}
|
||||
=======
|
||||
=======
|
||||
=======
|
||||
|
||||
>>>>>>> 106888c (Add input boxes for Add entry page)
|
||||
=======
|
||||
|
||||
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
|
||||
const register = document.getElementById("register");
|
||||
|
||||
register.addEventListener("click", function(event) {
|
||||
@ -151,7 +90,7 @@ register.addEventListener("click", function(event) {
|
||||
|
||||
window.onload = async function() {
|
||||
try {
|
||||
let response = await fetch('/get_data', {
|
||||
let response = await fetch(`http://127.0.0.1:${PORT}/get_data`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
@ -171,27 +110,6 @@ window.onload = async function() {
|
||||
};
|
||||
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
>>>>>>> 22cbef5 (Add all other pages)
|
||||
=======
|
||||
>>>>>>> 7afbaba (Finish Frontend)
|
||||
=======
|
||||
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
|
||||
// function handleAuthRes(data) {
|
||||
// if(data.token){
|
||||
// localStorage.setItem('token', data.token);
|
||||
@ -200,10 +118,5 @@ window.onload = async function() {
|
||||
// console.error('Login Failed:', data.error)
|
||||
// }
|
||||
// }
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> b1b896f (Add api request changes)
|
||||
=======
|
||||
>>>>>>> a260428 (Dashboard Entry Update)
|
||||
=======
|
||||
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
|
||||
|
||||
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
|
||||
const errlabel = document.getElementById('errlabel')
|
||||
|
||||
function validateRegister() {
|
||||
@ -29,7 +28,7 @@ async function createUser(username,password) {
|
||||
formData.append("password", password)
|
||||
|
||||
try {
|
||||
const response = await fetch('/add_user', {
|
||||
const response = await fetch(`http://127.0.0.1:${PORT}/add_user`, {
|
||||
method: "POST",
|
||||
body: formData
|
||||
});
|
||||
@ -55,7 +54,7 @@ async function Login(username,password){
|
||||
formData.append('password', password);
|
||||
|
||||
try {
|
||||
const response = await fetch('/login', {
|
||||
const response = await fetch(`http://127.0.0.1:${PORT}/login`, {
|
||||
method: "post",
|
||||
body: formData
|
||||
});
|
||||
@ -75,4 +74,4 @@ async function Login(username,password){
|
||||
} catch (error) {
|
||||
console.error('Error:', error.message);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,9 +1,4 @@
|
||||
* {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
@ -205,274 +200,4 @@ footer p{
|
||||
background-image: url('../assets/download.svg');
|
||||
background-size: cover;
|
||||
box-shadow: rgb(0, 0, 0) 0px 0px 10px;
|
||||
<<<<<<< HEAD
|
||||
}
|
||||
=======
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
body {
|
||||
background-color: dimgrey;
|
||||
display: flex;
|
||||
margin-top: 25px;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
background-image: url("bg.jpg");
|
||||
background-size: cover;
|
||||
background-position: center;
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
|
||||
.wrapper {
|
||||
display: flex;
|
||||
width: 90vw;
|
||||
height: 90vh;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
|
||||
.container {
|
||||
display: flex;
|
||||
background-color: transparent;
|
||||
backdrop-filter: blur(20px);
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
width: 450px;
|
||||
height: 400px;
|
||||
flex-direction: column;
|
||||
padding: 70px;
|
||||
padding-bottom: 90px;
|
||||
box-shadow: 0px 0px 20px rgba(0, 0, 0, 0.6);
|
||||
row-gap: 8px;
|
||||
border-radius: 50px;
|
||||
}
|
||||
=======
|
||||
box-sizing: border-box;
|
||||
}
|
||||
>>>>>>> d7982e1 (Add error message to login, Fix Internal Error 500)
|
||||
|
||||
body {
|
||||
background-color: dimgrey;
|
||||
display: flex;
|
||||
margin-top: 25px;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
background-image: url("bg.jpg");
|
||||
background-size: 200% auto;
|
||||
background-position: center;
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
.idiv {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
row-gap: 10px;
|
||||
justify-content: center;
|
||||
padding: 7px;
|
||||
}
|
||||
|
||||
.idiv p{
|
||||
padding: none;
|
||||
margin: none;
|
||||
display: absolute;
|
||||
translate: 0px 12px;
|
||||
}
|
||||
|
||||
#loginb {
|
||||
background-color: transparent;
|
||||
color: rgb(255, 255, 255, 0.8);
|
||||
padding: 7px;
|
||||
margin-top: 20px;
|
||||
margin-bottom: 20px;
|
||||
width: 150px;
|
||||
box-shadow: 2px 2px 5px rgb(0, 0, 0, 0.5);
|
||||
translate: 0px -5px;
|
||||
font-family: 'Pixelify Sans', cursive;
|
||||
font-size: 20px;
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
#loginb:active {
|
||||
background-color: rgb(155, 155, 155, 0.3);
|
||||
}
|
||||
>>>>>>> 22cbef5 (Add all other pages)
|
||||
=======
|
||||
.wrapper {
|
||||
display: flex;
|
||||
width: 90vw;
|
||||
height: 90vh;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
|
||||
.container {
|
||||
display: flex;
|
||||
background-color: transparent;
|
||||
backdrop-filter: blur(20px);
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
width: 450px;
|
||||
height: 400px;
|
||||
flex-direction: column;
|
||||
padding: 70px;
|
||||
padding-bottom: 90px;
|
||||
box-shadow: 0px 0px 20px rgba(0, 0, 0, 0.6);
|
||||
row-gap: 8px;
|
||||
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 {
|
||||
width: 300px;
|
||||
height: 30px;
|
||||
background-color: transparent;
|
||||
color: rgb(255, 255, 255, 0.8);
|
||||
box-shadow: 2px 2px 3px rgb(0, 0, 0, 0.5);
|
||||
border: none;
|
||||
border-top: rgba(255, 255, 255, 0.2) 2px solid;
|
||||
border-left: rgb(255, 255, 255, 0.2) 2px solid;
|
||||
border-radius: 10px;
|
||||
padding-left: 5px;
|
||||
}
|
||||
|
||||
.idiv p {
|
||||
color: white;
|
||||
font-family: 'Pixelify Sans', cursive;
|
||||
margin-left: 5px;
|
||||
}
|
||||
|
||||
#username::placeholder {
|
||||
color: rgb(255, 255, 255, 0.5);
|
||||
padding-left: 5px;
|
||||
}
|
||||
|
||||
#password::placeholder {
|
||||
color: rgb(255, 255, 255, 0.5);
|
||||
padding-left: 5px;
|
||||
}
|
||||
|
||||
#conpassword::placeholder {
|
||||
color: rgb(255, 255, 255, 0.5);
|
||||
padding-left: 5px;
|
||||
}
|
||||
|
||||
.idiv input {
|
||||
translate: 0px -20px;
|
||||
}
|
||||
|
||||
.idiv {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
row-gap: 10px;
|
||||
justify-content: center;
|
||||
padding: 7px;
|
||||
}
|
||||
|
||||
.idiv p{
|
||||
padding: none;
|
||||
margin: none;
|
||||
display: absolute;
|
||||
translate: 0px 12px;
|
||||
}
|
||||
|
||||
#loginb {
|
||||
background-color: transparent;
|
||||
color: rgb(255, 255, 255, 0.8);
|
||||
padding: 7px;
|
||||
margin-top: 20px;
|
||||
margin-bottom: 20px;
|
||||
width: 150px;
|
||||
box-shadow: 2px 2px 5px rgb(0, 0, 0, 0.5);
|
||||
translate: 0px -5px;
|
||||
font-family: 'Pixelify Sans', cursive;
|
||||
font-size: 20px;
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
#loginb:active {
|
||||
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;
|
||||
}
|
||||
>>>>>>> d7982e1 (Add error message to login, Fix Internal Error 500)
|
||||
=======
|
||||
}
|
||||
>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user