+
+
diff --git a/app/views/index.ejs b/app/views/index.ejs index b80bb34..534afaf 100644 --- a/app/views/index.ejs +++ b/app/views/index.ejs @@ -1,233 +1,217 @@ -<% -if (locals.forecast != "" && locals.forecast != undefined) { - forecast = locals.forecast - currentforecast = forecast.forecastcurrent - hourlyforecast = forecast.forecasthourly - dailyforecast = forecast.forecastdaily +<% +if (locals.locationError) {locationError = true} else {locationError = false} +if (locals.forecastError) {forecastError = true} else {forecastError = false} + +if (locals.currentForecast != "" && locals.currentForecast != undefined) { + currentForecast = locals.currentForecast + hourlyForecast=locals.hourlyForecast + dailyForecast=locals.dailyForecast + alertsForecast=locals.alertsForecast + timerTotal=locals.avgTimer } else { - forecast = "" - currentforecast = "" - hourlyforecast = "" - dailyforecast = "" + location = "" + currentForecast = "" + hourlyForecast = "" + dailyForecast = "" + alertsForecast = "" + timerTotal = "" } %> - - - - - - - - - - - - - - - - - - - - - - - - - - - +<%- include('inc/header.ejs') %> + +
+
+
+ <% if (currentForecast == "") { %> + + <% } else { %> + + <% } %> + +
+
+

- It's Weather Outside - + <% if (currentForecast == "") { %> +
+ + 60601 (Least accurate)
+ Chicago IL (More accurate)
+ 233 S Wacker Dr Chicago IL (Most accurate) +
+
+ <% } %> - -
- - - - - -
-

-

It's Weather Outside

-
-
- -
-
-
- <% - if (forecast == "") { - %> -
- - 60601 (Least accurate)
- Chicago IL (More accurate)
- 233 S Wacker Dr Chicago IL (Most accurate) -
-
- <% - } - %> - <%=//JSON.stringify(hourlyforecast)%> - + + <% if (locationError) { %> +
+
+

There was an issue finding your location, please double check your entry.

+ <% } %> + + + <% if (forecastError) { %>
-