Fix Clock Setting & Update Version Number + Fixes

dymajo · May 30, 2017 · 61eba9b · 61eba9b
1 parent 63521a8
commit 61eba9b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 9 deletions.
diff --git a/js/stores/settingsStore.js b/js/stores/settingsStore.js
@@ -12,7 +12,7 @@ export class settingsStore {
         this.state[attrname] = preState[attrname]
       }
     }
-    localStorage.setItem('AppVersion', '1.1.0')
+    localStorage.setItem('AppVersion', '1.2.0')
   }
   getState() {
     return this.state

diff --git a/js/views/timetable.jsx b/js/views/timetable.jsx
@@ -2,6 +2,7 @@ import React from 'react'
 
 import { iOS } from '../models/ios.js'
 import { StationStore } from '../stores/stationStore.js'
+import { SettingsStore } from '../stores/settingsStore.js'
 import { UiStore } from '../stores/uiStore.js'
 
 export default class Timetable extends React.Component {
@@ -215,14 +216,25 @@ export default class Timetable extends React.Component {
             <ul>
               {this.state.trips.map(function(item, key) {
                 if ('seperator' in item) {
-                  let timeString = (item.seperator % 12 === 0 ? 12 : item.seperator % 12) + ':00'
-                  timeString += item.seperator >= 12 ? ' PM' : ' AM'
+                  let timeString
+                  if (SettingsStore.state.clock) {
+                    timeString = item.seperator + ':00'
+                  } else {
+                    timeString = (item.seperator % 12 === 0 ? 12 : item.seperator % 12) + ':00'
+                    timeString += item.seperator >= 12 ? ' PM' : ' AM'
+                  }
                   return <li key={key} ref={'time'+item.seperator} className="seperator">{timeString}</li>
                 }
                 const absotime = parseInt(item.date.getUTCHours() + ('0' + item.date.getUTCMinutes()).slice(-2))
                 const name = item.route_long_name.split('Via')
-                let timestring = (item.date.getUTCHours() % 12 === 0 ? 12 : item.date.getUTCHours() % 12) + ':' + ('0' + item.date.getUTCMinutes()).slice(-2)
-                timestring += item.date.getUTCHours() >= 12 ? ' PM' : ' AM'
+
+                let timestring
+                if (SettingsStore.state.clock) {
+                  timestring = item.date.getUTCHours() + ':' + ('0' + item.date.getUTCMinutes()).slice(-2)
+                } else {
+                  timestring = (item.date.getUTCHours() % 12 === 0 ? 12 : item.date.getUTCHours() % 12) + ':' + ('0' + item.date.getUTCMinutes()).slice(-2)
+                  timestring += item.date.getUTCHours() >= 12 ? ' PM' : ' AM'
+                }
 
                 let className = ''
                 if (absotime > currentTime && opacity === false) {

diff --git a/scss/_content.scss b/scss/_content.scss
@@ -174,7 +174,6 @@ $bgheight: 125px;
 		}
 	}
 	.error {
-		position: absolute;
 		z-index: 0;
 		line-height: 60px;
 		text-align: center;

diff --git a/server/staticrender.js b/server/staticrender.js
@@ -48,9 +48,17 @@ const staticrender = {
           success()
         }).catch(notFound)
       } else if (path.length === 5) {
-        title = 'Realtime Trip Info' + defaultName
-        description = 'View live vehicle location in DYMAJO Transit.'
-        success()
+        if (path[3] === 'timetable') {
+          title = path[4].split('-')[0] + ' Timetable' + defaultName
+          description = 'View timetable in DYMAJO Transit.'
+          success()
+        } else if (path[3] === 'realtime') {
+          title = 'Realtime Trip Info' + defaultName
+          description = 'View live vehicle location in DYMAJO Transit.'
+          success()
+        } else {
+          return notFound()  
+        }
       } else {
         return notFound()
       }