Merge pull request #206 from JulianNorton/timezone-agnostic

hacking together removing specific times
JulianNorton · Dec 3, 2018 · df24e95 · df24e95
2 parents 17e7437 + 7a45fe7
commit df24e95
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/modules/WeatherRequest.js b/src/modules/WeatherRequest.js
@@ -84,7 +84,7 @@ function WeatherRequest(req) {
 
   this.setTimeZone = () => {
     return timezone({
-      key: process.env.GOOGLE_API_KEY,
+      // key: process.env.GOOGLE_API_KEY,
       location: req.params.latitude + ',' + req.params.longitude,
     })
       .then(res => {

diff --git a/views/pages/index.ejs b/views/pages/index.ejs
@@ -19,7 +19,7 @@
         <header class="card card-block" id="weather-current">
           <div>
             <h3 class="small muted">
-              Now (updated: <%= moment.unix(currently.time).format(params.hoursFormat + ':mm')%><% if (params.hoursFormat === 'h') { %><span class="small-caps"><%= moment.unix(currently.time).format('a') %></span><% } %>)</h3>
+              Now (updated: <%= moment.unix(currently.time).fromNow()%>)</h3>
             <div class="flex wrap status-primary">
               <span class="center"><%= Math.round(currently.temperature) %>º<%= params.scale %></span>
               <%# This only shows the image if it's IE9 and above %>

diff --git a/views/partials/hourly.ejs b/views/partials/hourly.ejs
@@ -28,7 +28,7 @@
         %>
         <li>
             <span class="small muted data-secondary">
-            <%= data.hourly[i].startTime ? moment.unix(data.hourly[i].startTime).format(params.hoursFormat + (params.hoursFormat === 'H' ? ':mm' : '')) + '-' : '' %><%= hourlyTime.format(params.hoursFormat + (params.hoursFormat === 'H' ? ':mm' : ''))%><% if (params.hoursFormat === 'h') { %><span class="small-caps"><%= hourlyTime.format('a') %></span>
+            <%= data.hourly[i].startTime ? moment.unix(data.hourly[i].startTime).fromNow() + ' and ' : '' %><%= hourlyTime.fromNow()%><% if (params.hoursFormat === 'h') { %>
             <% } %>
                 </span>
                 <span class="m-x-1"><%= Math.round(data.hourly[i].temperature) %>º</span>

diff --git a/views/partials/today.ejs b/views/partials/today.ejs
@@ -16,9 +16,9 @@
       </p>
       <p>
         <span class="small">High</span> <%= Math.round(data.daily.apparentTemperatureMax) %>°
-        <span class="small forecast-inline-secondary"> at <%= moment.unix(data.daily.apparentTemperatureMaxTime).format(params.hoursFormat + ':mm')%><% if (params.hoursFormat === 'h') { %><span class="small-caps"><%= moment.unix(data.daily.apparentTemperatureMaxTime).format('a') %></span><% } %></span>
+        <span class="small forecast-inline-secondary"> at <%= moment.unix(data.daily.apparentTemperatureMaxTime).fromNow()%></span>
         <span class="small">Low</span> <%= Math.round(data.daily.apparentTemperatureMin) %>°
-        <span class="small forecast-inline-secondary"> at <%= moment.unix(data.daily.apparentTemperatureMinTime).format(params.hoursFormat + ':mm')%><% if (params.hoursFormat === 'h') { %><span class="small-caps"><%= moment.unix(data.daily.apparentTemperatureMinTime).format('a') %></span><% } %></span>
+        <span class="small forecast-inline-secondary"> at <%= moment.unix(data.daily.apparentTemperatureMinTime).fromNow()%></span>
       </p>
     </div>
     <!--[if gte IE 9]><!-->