moving app.html into / view file

9 years ago · c04ab09fc8
parent e14904d9d9
commit c04ab09fc8
2 changed files with 13 additions and 20 deletions
--- a/public/app.html
+++ b/public/app.html
@ -1,12 +0,0 @@
 <!DOCTYPE html>
 <html>
 	<head>
 		<link href="/css/app.css" rel="stylesheet" />
 	</head>
 	<body>
 		<h1>Run Tracker</h1>
 		<svg></svg>
 		<script src="https://d3js.org/d3.v4.min.js"></script>
 		<script src="/js/app.js"></script>
 	</body>
 </html>
--- a/views/index.ejs
+++ b/views/index.ejs
@ -1,5 +1,8 @@
 <!DOCTYPE html>
 <html>
 	<head>
 		<link href="/css/app.css" rel="stylesheet" />
 	</head>
 	<body>
 		<h1>
 			Welcome to Run Tracker
@ -7,15 +10,17 @@
 				<%=currentUser.username%>
 			<% } %>
 		</h1>
-		<nav>
+		<% if(currentUser) { %>
-			<ul>
+			<svg></svg>
-				<% if(currentUser) { %>
+			<script src="https://d3js.org/d3.v4.min.js"></script>
-					<li><a href="/app.html">View The App</a></li>
+			<script src="/js/app.js"></script>
-				<% } else { %>
+		<% } else { %>
 			<nav>
 				<ul>
 					<li><a href="/users/new">Sign Up</a></li>
 					<li><a href="/logins/new">Log In</a></li>
-				<% } %>
+				</ul>
-			</ul>
+			</nav>
-		</nav>
+		<% } %>
 	</body>
 </html>