From ad0afab699844ca38cf482216309cdcb3feb4100 Mon Sep 17 00:00:00 2001
From: Preston Doman <pdoman@pdx.edu>
Date: Tue, 22 Jan 2019 10:46:11 -0800
Subject: [PATCH] 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 @@
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous"></script>
- <link rel="shortcut icon" href="/favicon.ico">
+ <link rel="shortcut icon" href="img/favicon.ico">
<title>Reimbursinator</title>
</head>
<body>
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 @@
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous"></script>
- <link rel="shortcut icon" href="/favicon.ico">
+ <link rel="shortcut icon" href="img/favicon.ico">
<title>Reimbursinator</title>
</head>
<body>
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 @@
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous"></script>
- <link rel="shortcut icon" href="/favicon.ico">
+ <link rel="shortcut icon" href="img/favicon.ico">
<title>Log in</title>
</head>
<body>
@@ -42,6 +42,6 @@
</div>
</div>
<p id="errorReport"><p>
- <script src="login.js"></script>
+ <script src="js/login.js"></script>
</body>
</html>
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 @@
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous"></script>
- <link rel="shortcut icon" href="/favicon.ico">
+ <link rel="shortcut icon" href="img/favicon.ico">
<title>Sign up</title>
</head>
<body style="background-color: lightgreen">
@@ -36,4 +36,4 @@
</body>
<script src="js/signupPage.js"></script>
<!--Still need to check if user exist and if email exist test-->
-</html>
\ No newline at end of file
+</html>