Fix Logout Error

nus-mtp · Apr 1, 2017 · c3f5b32 · c3f5b32
1 parent e2cf0c3
commit c3f5b32
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 36 deletions.
diff --git a/public/js/lobby.js b/public/js/lobby.js
@@ -0,0 +1,11 @@
+var logoutConfirmation = "Would You Like to Log Out?";
+
+$("#logout").on
+(
+	"click",
+	function(event)
+	{
+		Cookies.remove('token');
+		location.reload();
+	}
+);
diff --git a/source/view/Lobby/lobby.ejs b/source/view/Lobby/lobby.ejs
@@ -25,10 +25,7 @@
 			<li class="header"><a class="active" href="/"><%= username %></a></li>
 
 			<li class="header" style="float:right"><a class="active" href="/dashboard">Dashboard</a></li>
-
-			<% if(user){ %>
-				<li style="float:right"><a class="active" id="logout" href="/">Log Out</a></li>
-			<% } %>		
+			<!--<li class="header" style="float:right"><a class="active" id="logout" href="/">Log Out</a></li>-->
 		</ul>
 
 		<div ng-controller="socketCtrl" class="container" id="header-bar"> <!-- Title Box -->
@@ -264,21 +261,7 @@
 				</div>
 
 			</div>
-		</div>
-
-		<script type="text/javascript" src="/libs/jquery/jquery-3.2.0.min.js"></script>
-		<script type="text/javascript" src="/libs/bootstrap-3.3.7-dist/js/bootstrap.min.js"></script>
-        <script type="text/javascript" src="/libs/socket.io-1.7.3/js/socket.io.min.js"></script>
-		<script type="text/javascript" src="/libs/angular-1.6.3/angular.min.js"></script>
-		<script type="text/javascript" src="/libs/angular-1.6.3/angular-sanitize.min.js"></script>
-
-        <script type="text/javascript" src="/javascripts/Lobby/lobby-angular-module.js"></script>
-        <script type="text/javascript" src="/javascripts/Lobby/lobby-angular-socket-controller.js"></script>
-        <script type="text/javascript" src="/javascripts/Lobby/lobby-angular-student-controller.js"></script>
-        <script type="text/javascript" src="/javascripts/Lobby/lobby-angular-tutor-controller.js"></script>
-        <script type="text/javascript" src="/javascripts/Lobby/lobby-angular-chat-controller.js"></script>
-        <script type="text/javascript" src="/javascripts/Lobby/lobby-angular-activeusers-controller.js"></script>
-
+		</div>			
         <!--<script>
 		
 			/*$(document).ready(function() {
@@ -299,19 +282,20 @@
 	</body>
 </html>
 
-<script>
-	var logoutConfirmation = "Would You Like to Log Out?";
+<script type="text/javascript" src="/libs/jquery/jquery-3.2.0.min.js"></script>
+<script type="text/javascript" src="/libs/bootstrap-3.3.7-dist/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="/libs/socket.io-1.7.3/js/socket.io.min.js"></script>
+<script type="text/javascript" src="/libs/angular-1.6.3/angular.min.js"></script>
+<script type="text/javascript" src="/libs/angular-1.6.3/angular-sanitize.min.js"></script>
+
+<script type="text/javascript" src="/javascripts/Lobby/lobby-angular-module.js"></script>
+<script type="text/javascript" src="/javascripts/Lobby/lobby-angular-socket-controller.js"></script>
+<script type="text/javascript" src="/javascripts/Lobby/lobby-angular-student-controller.js"></script>
+<script type="text/javascript" src="/javascripts/Lobby/lobby-angular-tutor-controller.js"></script>
+<script type="text/javascript" src="/javascripts/Lobby/lobby-angular-chat-controller.js"></script>
+<script type="text/javascript" src="/javascripts/Lobby/lobby-angular-activeusers-controller.js"></script>
 
-	$("#logout").on
-	(
-		"click",
-		function(event)
-		{
-			Cookies.remove('token');
-			location.reload();
-		}
-	);
-</script>
+<script src="js/lobby.js" type="application/javascript"></script>
 
 <style>
 </style>
diff --git a/source/view/dashboard.ejs b/source/view/dashboard.ejs
@@ -16,15 +16,11 @@
 </head>
 
 <body>
-
-
 	<ul id="header">
 			<li class="header"><a class="active" href="/"><%= user.name %></a></li>
-
-			<li class="header" style="float:right"><a class="active" href="https://github.com/nus-mtp/e-tutorial">GitHub Repository</a></li>
 
 			<% if(user){ %>
-				<li style="float:right"><a class="active" id="logout" href="/">Log Out</a></li>
+				<li class="header" style="float:right"><a class="active" id="logout" href="/">Log Out</a></li>
 			<% } %>
 	</ul>