refactor(dependencies): Remove unused dependencies

conveyal · Feb 26, 2019 · 4e8524c · 4e8524c
1 parent 6f7d560
commit 4e8524c
Show file tree

Hide file tree

Showing 4 changed files with 809 additions and 1,100 deletions.
diff --git a/package.json b/package.json
@@ -30,21 +30,17 @@
     "@conveyal/woonerf": "^4.1.0",
     "@mapbox/polyline": "^1.0.0",
     "@zeit/next-css": "^1.0.1",
-    "d3-scale": "^2.1.0",
-    "date-fns": "^1.29.0",
-    "debug": "^4.1.0",
     "dotenv": "^6.2.0",
     "js-cookie": "^2.2.0",
-    "jsolines": "^2.1.0",
+    "jsolines": "^2.1.1",
     "lodash": "^4.17.10",
-    "mapbox-gl": "^0.52.0",
+    "mapbox-gl": "^0.53.0",
     "next": "latest",
-    "next-cookies": "^1.0.4",
+    "next-cookies": "^1.1.2",
     "node-fetch": "^2.3.0",
-    "react": "v16.8.0-alpha.0",
-    "react-dom": "v16.8.0-alpha.0",
-    "react-mapbox-gl": "^4.1.0",
-    "react-redux": "^6.0.0",
+    "react": "v16.8.3",
+    "react-dom": "v16.8.3",
+    "react-redux": "^6.0.1",
     "react-select": "^1.2.1",
     "react-select-fast-filter-options": "^0.2.3",
     "react-virtualized-select": "^3.1.3",
@@ -53,10 +49,10 @@
     "whatwg-fetch": "^3.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.2.2",
+    "@babel/core": "^7.3.4",
     "babel-core": "^7.0.0-bridge.0",
-    "babel-jest": "^23.6.0",
-    "jest": "^23.6.0",
+    "babel-jest": "^24.1.0",
+    "jest": "^24.1.0",
     "regenerator-runtime": "^0.13.1"
   }
 }
diff --git a/src/components/log/item.js b/src/components/log/item.js
@@ -1,18 +1,10 @@
-// @flow
-import formatDate from 'date-fns/format'
 import React from 'react'
 
-const FORMAT = 'HH:mm:ss'
-
 export default function Item (props) {
   return (
     <div className={`LogItem ${props.level}`}>
-      <span className='LogItem-createdAt'>
-        {formatDate(props.createdAt, FORMAT)}
-      </span>
-      <span className='LogItem-text'>
-        {props.text}
-      </span>
+      <span className='LogItem-createdAt'>{props.createdAt}</span>
+      <span className='LogItem-text'>{props.text}</span>
     </div>
   )
 }
diff --git a/src/components/route-segments.js b/src/components/route-segments.js
@@ -17,13 +17,9 @@ export default function RouteSegments ({routeSegments, oldTravelTime, travelTime
       <tr className='BestTrip'>
         <td><span className='fa fa-street-view' /></td>
         <td>
-          <span>Take </span>
-          {bestJourney.filter(s => s.mode !== 'WALK').map((segment, index) => (
-            <Segment key={index} segment={segment} />
-          ))}
           {travelTime > 120
-            ? <span className='decrease'>inaccessible within 120 minutes</span>
-            : <span>in
+            ? <span className='decrease'>Inaccessible within 120 minutes</span>
+            : <span>Trip duration
               <strong> {travelTime}</strong> {message('Units.Mins')}&nbsp;
               <TripDiff
                 baseTravelTime={oldTravelTime}
@@ -32,19 +28,21 @@ export default function RouteSegments ({routeSegments, oldTravelTime, travelTime
             </span>}
         </td>
       </tr>
+      <tr>
+        <td></td>
+        <td>Take <Segments segments={bestJourney} /></td>
+      </tr>
       {routeSegments.length > 1 &&
-        <tr className='AlternateTrips'>
-          <td><span className='fa fa-map-signs' /></td>
+        <tr>
+          <td></td>
           <td>
             <span>{message('Systems.AlternateTripsTitle')} </span>
-            {alternateJourneys.map((segments, jindex) => (
-              <span key={jindex}>
-                {segments.filter(s => s.mode !== 'WALK').map((segment, index) => (
-                  <Segment key={index} segment={segment} />
-                ))}
-                {jindex < alternateJourneys.length - 1 && <span>or </span>}
+            {alternateJourneys.map((segments, i) =>
+              <span key={i}>
+                <Segments segments={segments} />
+                {i < alternateJourneys.length - 1 && 'or '}
               </span>
-            ))}
+            )}
           </td>
         </tr>}
     </tbody>
@@ -58,6 +56,16 @@ const getFontColor = backgroundColor => {
   return {color, textShadow}
 }
 
+function Segments (p) {
+  return p.segments.filter(s => s.mode !== 'WALK')
+    .map((segment, i, segments) =>
+      <span key={i}>
+        <Segment segment={segment} />
+        {i !== (segments.length - 1) && 'to '}
+      </span>
+    )
+}
+
 const Segment = ({segment}) => (
   <span
     className='CardSegment'