From b3177b906bd95080f71bd39591e1df4a9fe21fa8 Mon Sep 17 00:00:00 2001 From: Daniel Dupriest Date: Sun, 20 Jan 2019 15:16:56 -0800 Subject: [PATCH 1/5] Updated django version to fix vulnerability. --- back/Pipfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back/Pipfile b/back/Pipfile index 876b3dc..6a6941e 100644 --- a/back/Pipfile +++ b/back/Pipfile @@ -6,7 +6,7 @@ verify_ssl = true [dev-packages] [packages] -django = "==2.1.4" +django = "==2.1.5" gunicorn = "==19.6.0" [requires] From b93e889923f5829931b7fcb89a607e55ef2b0f81 Mon Sep 17 00:00:00 2001 From: Preston Doman Date: Sun, 20 Jan 2019 21:45:42 -0800 Subject: [PATCH 2/5] Add Bootstrap styling to login form --- front/static/login.html | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/front/static/login.html b/front/static/login.html index 5f44283..dfe9ce5 100644 --- a/front/static/login.html +++ b/front/static/login.html @@ -14,12 +14,33 @@ -

Log in

-
- username:
- password:
- -
+
+
+
+
+
+

Please log in

+
+
+
+
+ + +
+
+ + +
+ +
+
+
+ Not registered? Sign up +
+
+
+
+

From 457fae09aa840a769c6aa12d17457f46be7f88c8 Mon Sep 17 00:00:00 2001 From: Preston Doman Date: Sun, 20 Jan 2019 21:50:19 -0800 Subject: [PATCH 3/5] Update Bootstrap styling to login form --- front/static/login.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/static/login.html b/front/static/login.html index dfe9ce5..a476dc9 100644 --- a/front/static/login.html +++ b/front/static/login.html @@ -15,7 +15,7 @@ Reimbursinator

-
+
From a6807a4d57d25b51cb071ad506b2c58c381e9dbf Mon Sep 17 00:00:00 2001 From: Jack Date: Tue, 22 Jan 2019 09:37:48 -0800 Subject: [PATCH 4/5] Making the tabs in dashboard responsive --- front/static/dashboard.html | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/front/static/dashboard.html b/front/static/dashboard.html index c25f1dc..576c68a 100644 --- a/front/static/dashboard.html +++ b/front/static/dashboard.html @@ -33,25 +33,23 @@
+
+
+

New report

+
+
+

List of Unfinished report

+
+
+

Report history

+
+
From ad0afab699844ca38cf482216309cdcb3feb4100 Mon Sep 17 00:00:00 2001 From: Preston Doman Date: Tue, 22 Jan 2019 10:46:11 -0800 Subject: [PATCH 5/5] Fix the logging in/out and favicon bugs --- front/static/dashboard.html | 2 +- front/static/index.html | 2 +- front/static/js/logout.js | 5 ++--- front/static/login.html | 4 ++-- front/static/signup.html | 4 ++-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/front/static/dashboard.html b/front/static/dashboard.html index c25f1dc..94b6e71 100644 --- a/front/static/dashboard.html +++ b/front/static/dashboard.html @@ -7,7 +7,7 @@ - + Reimbursinator diff --git a/front/static/index.html b/front/static/index.html index ff26455..dac766d 100644 --- a/front/static/index.html +++ b/front/static/index.html @@ -7,7 +7,7 @@ - + Reimbursinator diff --git a/front/static/js/logout.js b/front/static/js/logout.js index e7a3a21..4cdc571 100644 --- a/front/static/js/logout.js +++ b/front/static/js/logout.js @@ -29,6 +29,5 @@ function postToLogoutEndpoint(event) { xhr.send(); } -const logoutLinks = document.querySelectorAll(".log-out-link"); -logoutLinks[0].addEventListener("click", postToLogoutEndpoint); -logoutLinks[1].addEventListener("click", postToLogoutEndpoint); +const logoutLink = document.querySelector(".log-out-link"); +logoutLink.addEventListener("click", postToLogoutEndpoint); diff --git a/front/static/login.html b/front/static/login.html index a476dc9..5e691ae 100644 --- a/front/static/login.html +++ b/front/static/login.html @@ -7,7 +7,7 @@ - + Log in @@ -42,6 +42,6 @@

- + diff --git a/front/static/signup.html b/front/static/signup.html index 8bec9e3..f0c288e 100644 --- a/front/static/signup.html +++ b/front/static/signup.html @@ -7,7 +7,7 @@ - + Sign up @@ -36,4 +36,4 @@ - \ No newline at end of file +