- {this.props.idToNameResolver.resolve('distributionCenter', shipment.fromId)}
+
+
+
+ {this.props.idToNameResolver.resolve('distributionCenter', shipment.fromId)}
+
{shipment.status}
))}
diff --git a/src/routes/Dashboard/components/Map/PopUpCard/ShipmentCard/ShipmentCard.jsx b/src/routes/Dashboard/components/Map/PopUpCard/ShipmentCard/ShipmentCard.jsx
index c391101..2cd32b1 100644
--- a/src/routes/Dashboard/components/Map/PopUpCard/ShipmentCard/ShipmentCard.jsx
+++ b/src/routes/Dashboard/components/Map/PopUpCard/ShipmentCard/ShipmentCard.jsx
@@ -34,9 +34,11 @@ export class ShipmentCard extends React.PureComponent {
status,
currentLocation,
estimatedTimeOfArrival,
- updatedAt,
fromId,
toId,
+ averageSpeed,
+ shipmentHumidity,
+ shipmentTemp,
} = this.props.shipment;
return (
@@ -67,9 +69,20 @@ export class ShipmentCard extends React.PureComponent {
}
- Last Updated
+ Shipment Data
+
+
+
+ {`Average Speed: ${averageSpeed || '-'} mph`}
+
+
+
+ {`Humidity: ${shipmentHumidity || '-'} %`}
+
+
+
+ {`Temperature: ${shipmentTemp || '-'}°F`}
- {updatedAt ? formatTime(updatedAt) : 'N/A'}
Origin
@@ -87,8 +100,17 @@ export class ShipmentCard extends React.PureComponent {
Current Weather
- {currentLocation.weather ?
- `${currentLocation.weather.observation.temp}° | ${currentLocation.weather.observation.wx_phrase}` :
+
+ {currentLocation.weather ?
+
![{currentLocation.weather.observation.wx_phrase}]({`/images/weather/${currentLocation.weather.observation.wx_icon}.png`})
+ {`${currentLocation.weather.observation.temp}
+ ° | ${currentLocation.weather.observation.wx_phrase}`}
+
+ :
(
)}
diff --git a/src/services/index.js b/src/services/index.js
index 59f9f4f..82125af 100644
--- a/src/services/index.js
+++ b/src/services/index.js
@@ -1,7 +1,8 @@
// Polyfill for fetch() not yet implemented by all browsers http://caniuse.com/#feat=fetch
import 'whatwg-fetch';
-export const controllerApi = `${__CONTROLLER_API__}/api/v1`;
+// remove trailing / from url and add /api/v1
+export const controllerApi = `${__CONTROLLER_API__.replace(/\/$/, '')}/api/v1`;
export const callApi = (endpoint, {
apiUrl = controllerApi,
diff --git a/src/static/images/weather/0.png b/src/static/images/weather/0.png
new file mode 100644
index 0000000..cebc73a
Binary files /dev/null and b/src/static/images/weather/0.png differ
diff --git a/src/static/images/weather/1.png b/src/static/images/weather/1.png
new file mode 100644
index 0000000..98b2d31
Binary files /dev/null and b/src/static/images/weather/1.png differ
diff --git a/src/static/images/weather/10.png b/src/static/images/weather/10.png
new file mode 100644
index 0000000..adf9f35
Binary files /dev/null and b/src/static/images/weather/10.png differ
diff --git a/src/static/images/weather/11.png b/src/static/images/weather/11.png
new file mode 100644
index 0000000..5743498
Binary files /dev/null and b/src/static/images/weather/11.png differ
diff --git a/src/static/images/weather/12.png b/src/static/images/weather/12.png
new file mode 100644
index 0000000..68b651c
Binary files /dev/null and b/src/static/images/weather/12.png differ
diff --git a/src/static/images/weather/13.png b/src/static/images/weather/13.png
new file mode 100644
index 0000000..74f4fc1
Binary files /dev/null and b/src/static/images/weather/13.png differ
diff --git a/src/static/images/weather/14.png b/src/static/images/weather/14.png
new file mode 100644
index 0000000..108fc60
Binary files /dev/null and b/src/static/images/weather/14.png differ
diff --git a/src/static/images/weather/15.png b/src/static/images/weather/15.png
new file mode 100644
index 0000000..2d858a8
Binary files /dev/null and b/src/static/images/weather/15.png differ
diff --git a/src/static/images/weather/16.png b/src/static/images/weather/16.png
new file mode 100644
index 0000000..5eec1eb
Binary files /dev/null and b/src/static/images/weather/16.png differ
diff --git a/src/static/images/weather/17.png b/src/static/images/weather/17.png
new file mode 100644
index 0000000..8425190
Binary files /dev/null and b/src/static/images/weather/17.png differ
diff --git a/src/static/images/weather/18.png b/src/static/images/weather/18.png
new file mode 100644
index 0000000..f685e11
Binary files /dev/null and b/src/static/images/weather/18.png differ
diff --git a/src/static/images/weather/19.png b/src/static/images/weather/19.png
new file mode 100644
index 0000000..1cb2cc6
Binary files /dev/null and b/src/static/images/weather/19.png differ
diff --git a/src/static/images/weather/2.png b/src/static/images/weather/2.png
new file mode 100644
index 0000000..6c1811d
Binary files /dev/null and b/src/static/images/weather/2.png differ
diff --git a/src/static/images/weather/20.png b/src/static/images/weather/20.png
new file mode 100644
index 0000000..b59be44
Binary files /dev/null and b/src/static/images/weather/20.png differ
diff --git a/src/static/images/weather/21.png b/src/static/images/weather/21.png
new file mode 100644
index 0000000..c486ad3
Binary files /dev/null and b/src/static/images/weather/21.png differ
diff --git a/src/static/images/weather/22.png b/src/static/images/weather/22.png
new file mode 100644
index 0000000..d62546e
Binary files /dev/null and b/src/static/images/weather/22.png differ
diff --git a/src/static/images/weather/23.png b/src/static/images/weather/23.png
new file mode 100644
index 0000000..0856a9a
Binary files /dev/null and b/src/static/images/weather/23.png differ
diff --git a/src/static/images/weather/24.png b/src/static/images/weather/24.png
new file mode 100644
index 0000000..a282415
Binary files /dev/null and b/src/static/images/weather/24.png differ
diff --git a/src/static/images/weather/25.png b/src/static/images/weather/25.png
new file mode 100644
index 0000000..e5786f9
Binary files /dev/null and b/src/static/images/weather/25.png differ
diff --git a/src/static/images/weather/26.png b/src/static/images/weather/26.png
new file mode 100644
index 0000000..5c47bb8
Binary files /dev/null and b/src/static/images/weather/26.png differ
diff --git a/src/static/images/weather/27.png b/src/static/images/weather/27.png
new file mode 100644
index 0000000..17f39d2
Binary files /dev/null and b/src/static/images/weather/27.png differ
diff --git a/src/static/images/weather/28.png b/src/static/images/weather/28.png
new file mode 100644
index 0000000..6cd97b0
Binary files /dev/null and b/src/static/images/weather/28.png differ
diff --git a/src/static/images/weather/29.png b/src/static/images/weather/29.png
new file mode 100644
index 0000000..6c84087
Binary files /dev/null and b/src/static/images/weather/29.png differ
diff --git a/src/static/images/weather/3.png b/src/static/images/weather/3.png
new file mode 100644
index 0000000..5328a2f
Binary files /dev/null and b/src/static/images/weather/3.png differ
diff --git a/src/static/images/weather/30.png b/src/static/images/weather/30.png
new file mode 100644
index 0000000..4cfb5fc
Binary files /dev/null and b/src/static/images/weather/30.png differ
diff --git a/src/static/images/weather/31.png b/src/static/images/weather/31.png
new file mode 100644
index 0000000..c72690b
Binary files /dev/null and b/src/static/images/weather/31.png differ
diff --git a/src/static/images/weather/32.png b/src/static/images/weather/32.png
new file mode 100644
index 0000000..da3909d
Binary files /dev/null and b/src/static/images/weather/32.png differ
diff --git a/src/static/images/weather/33.png b/src/static/images/weather/33.png
new file mode 100644
index 0000000..1b020a0
Binary files /dev/null and b/src/static/images/weather/33.png differ
diff --git a/src/static/images/weather/34.png b/src/static/images/weather/34.png
new file mode 100644
index 0000000..3739bce
Binary files /dev/null and b/src/static/images/weather/34.png differ
diff --git a/src/static/images/weather/35.png b/src/static/images/weather/35.png
new file mode 100644
index 0000000..0c051ee
Binary files /dev/null and b/src/static/images/weather/35.png differ
diff --git a/src/static/images/weather/36.png b/src/static/images/weather/36.png
new file mode 100644
index 0000000..672157a
Binary files /dev/null and b/src/static/images/weather/36.png differ
diff --git a/src/static/images/weather/37.png b/src/static/images/weather/37.png
new file mode 100644
index 0000000..d0b154c
Binary files /dev/null and b/src/static/images/weather/37.png differ
diff --git a/src/static/images/weather/38.png b/src/static/images/weather/38.png
new file mode 100644
index 0000000..2d399fc
Binary files /dev/null and b/src/static/images/weather/38.png differ
diff --git a/src/static/images/weather/39.png b/src/static/images/weather/39.png
new file mode 100644
index 0000000..4699f8f
Binary files /dev/null and b/src/static/images/weather/39.png differ
diff --git a/src/static/images/weather/4.png b/src/static/images/weather/4.png
new file mode 100644
index 0000000..bb6211b
Binary files /dev/null and b/src/static/images/weather/4.png differ
diff --git a/src/static/images/weather/40.png b/src/static/images/weather/40.png
new file mode 100644
index 0000000..25b4a40
Binary files /dev/null and b/src/static/images/weather/40.png differ
diff --git a/src/static/images/weather/41.png b/src/static/images/weather/41.png
new file mode 100644
index 0000000..32974fb
Binary files /dev/null and b/src/static/images/weather/41.png differ
diff --git a/src/static/images/weather/42.png b/src/static/images/weather/42.png
new file mode 100644
index 0000000..91e533b
Binary files /dev/null and b/src/static/images/weather/42.png differ
diff --git a/src/static/images/weather/43.png b/src/static/images/weather/43.png
new file mode 100644
index 0000000..565cf7b
Binary files /dev/null and b/src/static/images/weather/43.png differ
diff --git a/src/static/images/weather/44.png b/src/static/images/weather/44.png
new file mode 100644
index 0000000..da9bb9a
Binary files /dev/null and b/src/static/images/weather/44.png differ
diff --git a/src/static/images/weather/45.png b/src/static/images/weather/45.png
new file mode 100644
index 0000000..fb04152
Binary files /dev/null and b/src/static/images/weather/45.png differ
diff --git a/src/static/images/weather/46.png b/src/static/images/weather/46.png
new file mode 100644
index 0000000..016959b
Binary files /dev/null and b/src/static/images/weather/46.png differ
diff --git a/src/static/images/weather/47.png b/src/static/images/weather/47.png
new file mode 100644
index 0000000..513567d
Binary files /dev/null and b/src/static/images/weather/47.png differ
diff --git a/src/static/images/weather/5.png b/src/static/images/weather/5.png
new file mode 100644
index 0000000..b070d09
Binary files /dev/null and b/src/static/images/weather/5.png differ
diff --git a/src/static/images/weather/6.png b/src/static/images/weather/6.png
new file mode 100644
index 0000000..6fd1bfd
Binary files /dev/null and b/src/static/images/weather/6.png differ
diff --git a/src/static/images/weather/7.png b/src/static/images/weather/7.png
new file mode 100644
index 0000000..26cc8b9
Binary files /dev/null and b/src/static/images/weather/7.png differ
diff --git a/src/static/images/weather/8.png b/src/static/images/weather/8.png
new file mode 100644
index 0000000..c9aa207
Binary files /dev/null and b/src/static/images/weather/8.png differ
diff --git a/src/static/images/weather/9.png b/src/static/images/weather/9.png
new file mode 100644
index 0000000..9b7f4a1
Binary files /dev/null and b/src/static/images/weather/9.png differ
diff --git a/src/static/images/weather/na.png b/src/static/images/weather/na.png
new file mode 100644
index 0000000..900272b
Binary files /dev/null and b/src/static/images/weather/na.png differ
diff --git a/src/styles/base/_colors.scss b/src/styles/base/_colors.scss
index 77f2265..cc5a820 100644
--- a/src/styles/base/_colors.scss
+++ b/src/styles/base/_colors.scss
@@ -9,10 +9,10 @@ $textColor: $primary2Color;
$backgroundColor: rgba(239, 242, 245, 1);
$map1Primary: #DB7C00;
$map1Accent: #FAF1E8;
-$map2Primary: #9320A2;
-$map2Accent: #F6ECF5;
-$map3Primary: #749C68;
-$map3Accent: #F4F9F2;
+$map2Primary: #749C68;
+$map2Accent: #F4F9F2;
+$map3Primary: #9320A2;
+$map3Accent: #F6ECF5;
:export { navColor: $navColor; }
:export { primary1Color: $primary1Color; }