From 1b2dab063219c13523bb8a067e8c900dec16bd10 Mon Sep 17 00:00:00 2001 From: Preston Doman Date: Wed, 30 Jan 2019 09:03:11 -0800 Subject: [PATCH 1/2] Condense pages, rename html files, and update navbar --- front/static/edit_report.html | 22 ++++++--- front/static/{dashboard.html => home.html} | 8 +-- front/static/js/login.js | 8 +-- front/static/new_report.html | 6 +-- front/static/view_history.html | 57 ---------------------- 5 files changed, 21 insertions(+), 80 deletions(-) rename front/static/{dashboard.html => home.html} (86%) delete mode 100644 front/static/view_history.html diff --git a/front/static/edit_report.html b/front/static/edit_report.html index 56ea832..1fa48c0 100644 --- a/front/static/edit_report.html +++ b/front/static/edit_report.html @@ -12,14 +12,13 @@ -
-

Edit an existing report

+
+
+
+
+
+

Your Report History

+
+
+
+
+
+
+ - diff --git a/front/static/dashboard.html b/front/static/home.html similarity index 86% rename from front/static/dashboard.html rename to front/static/home.html index 05732ef..83f054a 100644 --- a/front/static/dashboard.html +++ b/front/static/home.html @@ -12,14 +12,13 @@
-

Welcome, you are logged in

+

Welcome to Reimbursinator

diff --git a/front/static/js/login.js b/front/static/js/login.js index 20217d3..66fd76f 100644 --- a/front/static/js/login.js +++ b/front/static/js/login.js @@ -24,11 +24,11 @@ function postToLoginEndpoint(event) { console.log(`Server response:\n${this.response}`); token = JSON.parse(this.response).token; localStorage.setItem("token", token); - window.location.replace("dashboard.html"); + window.location.replace("home.html"); } else { - console.log("LOGIN FAILURE!"); - console.log(`Server status: ${this.status}`); - console.log(`Server response:\n${this.response}`); + console.error("LOGIN FAILURE!"); + console.error(`Server status: ${this.status}`); + console.error(`Server response:\n${this.response}`); displayErrorMessage(this.response); } } diff --git a/front/static/new_report.html b/front/static/new_report.html index c6e1a6c..6a0509b 100644 --- a/front/static/new_report.html +++ b/front/static/new_report.html @@ -12,14 +12,13 @@