Fix Server Static Routing

Author: consindo

js/stores/stationStore.js

@@ -269,7 +269,7 @@ export class stationStore extends Events {
 
     // we need to pass an extra param for train trips
     var requestData
-    if (tripData[0].route_type === '2') {
+    if (tripData[0].route_type === 2) {
       requestData = JSON.stringify({
         trips: queryString,
         train: true

server/index.js

@@ -6,7 +6,6 @@ var line = require('./line')
 var email = require('./email')
 var vehicle = require('./vehicle')
 var search = require('./search')
-var sitemap = require('./sitemap')
 
 console.log('using AT API Key: ' + process.env.atApiKey)
 console.log('using SendGrid API Key: '+ process.env.SENDGRID_API_KEY)
@@ -15,6 +14,7 @@ console.log('using SendGrid API Key: '+ process.env.SENDGRID_API_KEY)
 cache.check()
 setInterval(cache.check, 1800000)
 
+// TODO: 301 redirects
 router.get('/station', station.stopInfo)
 router.get('/station/search', search.getStopsLatLng)
 router.get('/station/:station', station.stopInfo)

server/realtime.js

@@ -102,7 +102,7 @@ var realtime = {
       res.send(rt)
     }
   },
-	getTripsAuckland: function(trips, train = false) {
+  getTripsAuckland: function(trips, train = false) {
     var realtimeInfo = {}
     trips.forEach(function(trip) {
       realtimeInfo[trip] = {}

server/staticrender.js

@@ -31,10 +31,12 @@ const staticrender = {
       canonical = 'https://transit.dymajo.com'
       success()
     } else if (path[1] === 's') {
-      if (path.length === 2) {
-        return notFound()
-      } else if (path.length === 3) {
-        station._stopInfo(path[2], 'nz-akl').then(function(data) {
+      if (path.length === 3) {
+        path.splice(2, 0, 'nz-akl')
+        return res.redirect(301, path.join('/'))
+        // return res.redirect(301, ca)
+      } else if (path.length === 4) {
+        station._stopInfo(path[3], 'nz-akl').then(function(data) {
           title = data.stop_name + defaultName
           description = 'Realtime departures and timetable for '
           if (data.stop_name.toLowerCase().match('train station')|| 
@@ -47,12 +49,12 @@ const staticrender = {
 
           success()
         }).catch(notFound)
-      } else if (path.length === 5) {
-        if (path[3] === 'timetable') {
-          title = path[4].split('-')[0] + ' Timetable' + defaultName
+      } else if (path.length === 6) {
+        if (path[4] === 'timetable') {
+          title = path[5].split('-')[0] + ' Timetable' + defaultName
           description = 'View timetable in DYMAJO Transit.'
           success()
-        } else if (path[3] === 'realtime') {
+        } else if (path[4] === 'realtime') {
           title = 'Realtime Trip Info' + defaultName
           description = 'View live vehicle location in DYMAJO Transit.'
           success()
@@ -64,12 +66,15 @@ const staticrender = {
       }
     } else if (path[1] === 'l') {
       if (path.length === 2) {
+        path.splice(2, 0, 'nz-akl')
+        return res.redirect(301, path.join('/'))
+      } else if (path.length === 3) {
         title = 'Lines' + defaultName
         description = 'View all Auckland Bus, Train, and Ferry Services.'
         success()
-      } else if (path.length === 3) {
-        path[2] = path[2].trim()
-        line._getLine(path[2], function(err, data) {
+      } else if (path.length === 4) {
+        path[3] = path[3].trim()
+        line._getLine(path[3], function(err, data) {
           if (data.length === 0) {
             return notFound()
           } else {

server/station.js

@@ -81,6 +81,11 @@ var station = {
     today.setUTCMonth(time.month())
     today.setUTCDate(time.date())
 
+    // midnight fix
+    if (time.hour() < 5) {
+      today.subtract(1, 'day')
+    }
+
     const realtimeTrips = []
     connection.get().request()
       .input('prefix', sql.VarChar(50), prefix)