diff --git a/.gitignore b/.gitignore index 79f8239..ac68707 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,8 @@ *__pycache__* /node_modules +<<<<<<< HEAD +======= +/devfolder +.vscode +>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a diff --git a/backend/static/favicon.ico b/backend/static/favicon.ico new file mode 100644 index 0000000..40dd7f5 Binary files /dev/null and b/backend/static/favicon.ico differ diff --git a/frontend/html/dashboard.html b/frontend/html/dashboard.html index 3c5c41d..0eddd7a 100644 --- a/frontend/html/dashboard.html +++ b/frontend/html/dashboard.html @@ -1,8 +1,12 @@ <<<<<<< HEAD +<<<<<<< HEAD p ======= >>>>>>> a260428 (Dashboard Entry Update) +======= + +>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a @@ -14,6 +18,9 @@ p
<<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
@@ -40,6 +47,9 @@ p <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
@@ -151,6 +161,9 @@ p
<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
@@ -166,6 +179,7 @@ p
+<<<<<<< HEAD ======= ======= @@ -340,6 +354,8 @@ p
>>>>>>> 19834dd (Add Change Password Function + Dashboard Complete) +======= +>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
diff --git a/frontend/html/index.html b/frontend/html/index.html index 603a5e9..11a94cb 100644 --- a/frontend/html/index.html +++ b/frontend/html/index.html @@ -4,6 +4,7 @@ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ======= @@ -12,6 +13,9 @@ ======= >>>>>>> a260428 (Dashboard Entry Update) +======= + +>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a Login @@ -35,6 +39,7 @@
<<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= Forgot Password
@@ -42,6 +47,8 @@ >>>>>>> 22cbef5 (Add all other pages) ======= >>>>>>> 7afbaba (Finish Frontend) +======= +>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a Register @@ -57,6 +64,7 @@ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ======= @@ -65,6 +73,9 @@ ======= >>>>>>> 464820a (Add Entry List with Functionality) +======= + +>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a diff --git a/frontend/html/register.html b/frontend/html/register.html index 37f7da6..5387207 100644 --- a/frontend/html/register.html +++ b/frontend/html/register.html @@ -3,6 +3,7 @@ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -20,6 +21,12 @@ >>>>>>> d7982e1 (Add error message to login, Fix Internal Error 500) +======= + + + + +>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a Register
@@ -27,10 +34,14 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a

Register

+<<<<<<< HEAD =======

Register

@@ -41,6 +52,8 @@

Register

>>>>>>> d7982e1 (Add error message to login, Fix Internal Error 500) +======= +>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
@@ -48,6 +61,9 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
@@ -56,6 +72,7 @@
+<<<<<<< HEAD <<<<<<< HEAD ======= @@ -74,6 +91,9 @@ ======= >>>>>>> 7afbaba (Finish Frontend) +======= + +>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a
diff --git a/frontend/scripts/index.js b/frontend/scripts/index.js index c79db5d..5bf79c3 100644 --- a/frontend/scripts/index.js +++ b/frontend/scripts/index.js @@ -49,6 +49,7 @@ formData.append('password', _password); try { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD const response = await fetch('http://127.0.0.1:5000/', { method: 'POST', @@ -71,6 +72,10 @@ formData.append('password', _password); const response = await fetch('/login', { method: "post", >>>>>>> a260428 (Dashboard Entry Update) +======= + const response = await fetch('/login', { + method: "post", +>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a body: formData }); @@ -92,6 +97,7 @@ formData.append('password', _password); // handleAuthRes(data); +<<<<<<< HEAD <<<<<<< HEAD console.log(`Got token: ${token}`) } catch (error) { @@ -107,6 +113,10 @@ formData.append('password', _password); ======= console.error('Error:', error.message); >>>>>>> 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 function handleAuthRes(data) { if(data.token){ localStorage.setItem('token', token.data); @@ -127,6 +138,9 @@ function handleAuthRes(data) { ======= >>>>>>> 106888c (Add input boxes for Add entry page) +======= + +>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a const register = document.getElementById("register"); register.addEventListener("click", function(event) { @@ -158,6 +172,7 @@ window.onload = async function() { <<<<<<< HEAD +<<<<<<< HEAD @@ -175,6 +190,8 @@ window.onload = async function() { >>>>>>> 22cbef5 (Add all other pages) ======= >>>>>>> 7afbaba (Finish Frontend) +======= +>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a // function handleAuthRes(data) { // if(data.token){ // localStorage.setItem('token', data.token); @@ -184,6 +201,9 @@ window.onload = async function() { // } // } <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b1b896f (Add api request changes) ======= >>>>>>> a260428 (Dashboard Entry Update) +======= +>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a diff --git a/frontend/styles/register.css b/frontend/styles/register.css index d532490..ff95cdb 100644 --- a/frontend/styles/register.css +++ b/frontend/styles/register.css @@ -1,6 +1,9 @@ * { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a box-sizing: border-box; } @@ -202,6 +205,7 @@ 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; @@ -469,3 +473,6 @@ footer p{ box-shadow: rgb(0, 0, 0) 0px 0px 10px; } >>>>>>> d7982e1 (Add error message to login, Fix Internal Error 500) +======= +} +>>>>>>> 0d9e690db10b6dfbef3d9aa4316e52d1e8cb8f6a