Change Error Page Look + Cover All Error Cases

nus-mtp · Apr 4, 2017 · 07c2816 · 07c2816
1 parent f93b9e5
commit 07c2816
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/public/images/errorButton.png b/public/images/errorButton.png
diff --git a/source/router.js b/source/router.js
@@ -21,7 +21,16 @@ router.get ('/login', auth.ensureAuth, login.get);
 router.get ('/login/callback', login.callback);
 
 router.get ('/dashboard', auth.ensureAuth, dashboard.get);
-router.get ('/error', error.get);
+router.get ('/error',
+	function (req, res, next)
+	{
+		var errorMessage = "You Cannot Just Access the Error Page Manually!";
+
+		res.render('error.ejs', {
+			errorMessage: errorMessage
+		});
+	}
+);
 
 router.post('/api/dashboard/forceSyncIVLE', auth.ensureAuth, dashboard.forceSyncIVLE);
 router.post('/api/dashboard/getTutorials', auth.ensureAuth, dashboard.getTutorials);

diff --git a/source/view/error.ejs b/source/view/error.ejs
@@ -19,17 +19,20 @@
 		<li></li>
 	</ul>	
 
-	<h1><a class="active" href="/">Error! Click here to return!</a></h1>
-
 	<% if(errorMessage){ %>
-		<h1>Error Message</h1>
+		<h1>Error!</h1>
 		<h2><%=errorMessage%></h2>
 	<% } %>
 
+	<a href="/">
+		<div class="errorButton"><img src="images/errorButton.png"></div> 
+	</a>
+
 </body>
 </html>
 
 <script>
+	 var errorMessage = "";
 </script>
 
 <style>
@@ -42,7 +45,7 @@
 		font-size: 5vw;
 		color: #FFFFFF;
 		margin: 0;
-		padding: 0;
+		padding: 2%;
 		text-align: center;
 		margin-top: 20vh;
 	}
@@ -80,5 +83,10 @@
         background-color: #B7B7B6;
     }
 	
-	
+	.errorButton {
+		text-align: center;
+		margin-top: 12%;
+		background-color: transparent;
+		outline: none;
+	}	
 </style>