Added pizza printout. Changed size to 300px

vivek-pai · Jan 18, 2015 · 29144ef · 29144ef
1 parent 7ac8465
commit 29144ef
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 1 deletion.
diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
@@ -7,7 +7,7 @@ ul,li,h2,p,h4,h3,h5 {
 .content {
 
 	-webkit-font-smoothing: none;
-	width: 384px;
+	width: 300px;
 	overflow: hidden;
 	margin: 0 auto;
 	background-color: white; 

diff --git a/routes/pizza.js b/routes/pizza.js
@@ -73,6 +73,13 @@ router.get('/', function(req, res, next) {
 				if (!error2){
 					console.log("statusCode: ", response2.statusCode);
 					console.log(body2);
+
+					var data = {						
+						duration : "60",
+						fee : "5"
+					};
+
+					res.render("pizza.html", data);
 				}
 			});
 		}

diff --git a/views/pizza.html b/views/pizza.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="UTF-8">
+		<title>PIZZA DELIVERY</title>
+		<link rel="stylesheet" type="text/css" href="/stylesheets/style.css">
+	</head>
+	<body>
+		<div class="content">
+			<h1>PIZZA DELIVERY</h1>
+				<div class="wrapper">
+				<img id="w-image" src="/images/thunder.png" alt="">
+					<div id="w-text">
+						<span id="weather">??</span>
+						<h2><%= duration %> minutes</h2>
+						<p>$<%= fee %></p>	
+					</div>	
+				</div>		
+		</div>			
+	</body>
+</html>
diff --git a/views/weather.html b/views/weather.html
@@ -9,6 +9,7 @@
 		<div class="content">
 			<h1>WEATHER</h1>
 				<div class="wrapper">
+				<%if (conditions=="Rain") {%><img id="w-image" src="/images/rain.png" alt=""><% }%>
 				<%if (conditions=="Chance of Rain") {%><img id="w-image" src="/images/rain.png" alt=""><% }%>
 				<%if (conditions=="Partly Cloudy") {%><img id="w-image" src="/images/partly.png" alt=""><% }%>
 				<%if (conditions=="Mostly Cloudy") {%><img id="w-image" src="/images/cloudy.png" alt=""><% }%>