Add Christchurch Branding

dymajo · Sep 17, 2019 · b0925a4 · b0925a4
1 parent 2f45679
commit b0925a4
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/dist/icons/normal/metro-canterbury.png b/dist/icons/normal/metro-canterbury.png
diff --git a/dist/photos/nz-chc.jpg b/dist/photos/nz-chc.jpg
diff --git a/dist/photos/nz-wlg.jpg b/dist/photos/nz-wlg.jpg
diff --git a/js/views/pages/Settings.jsx b/js/views/pages/Settings.jsx
@@ -17,7 +17,7 @@ let styles
 
 const renderLinks = items =>
   items.map((item, key) => (
-    <View key={key} style={styles.creditRow}>
+    <View key={item[0]} style={styles.creditRow}>
       <Text accessibilityRole="link" href={item[0]} style={styles.link}>
         {item[1]}
       </Text>
@@ -101,11 +101,14 @@ const Settings = () => {
               ['https://jono.nz', 'Jono Cooper', 'Engineering'],
               ['http://mattdavidson.kiwi', 'Matt Davidson', 'Engineering'],
               ['http://www.generationzero.org/', 'Generation Zero', 'Artwork'],
-            ])}
-            {renderLinks([
               ['https://at.govt.nz', 'Auckland Transport', 'API Usage'],
               ['https://www.openstreetmap.org/', 'OpenStreetMap', 'Map Data'],
               ['https://www.openmaptiles.com/', 'OpenMapTiles', 'Map Data'],
+              [
+                'https://www.flickr.com/photos/vdmakwana/35888025371/',
+                'Vishal Makwana',
+                'Christchurch Imagery - Cropped',
+              ],
             ])}
             <Text style={[paragraphStyles.p, styles.love]}>
               Made with 💚 in Aotearoa, NZ

diff --git a/js/views/root/Content.jsx b/js/views/root/Content.jsx
@@ -65,9 +65,9 @@ class RootContent extends React.Component {
   }
 
   render() {
-    const { desktopLayout, stations } = this.state
+    const { desktopLayout, stations, currentCity } = this.state
     let twitterAcc
-    if (this.state.currentCity.prefix === 'nz-akl') {
+    if (currentCity.prefix === 'nz-akl') {
       twitterAcc = (
         <Sidebar
           type="url"
@@ -77,7 +77,19 @@ class RootContent extends React.Component {
           description={t('serviceAlerts.twitter', { account: 'AklTransport' })}
         />
       )
-    } else if (this.state.currentCity.prefix === 'nz-wlg') {
+    } else if (currentCity.prefix === 'nz-chc') {
+      twitterAcc = (
+        <Sidebar
+          type="url"
+          url="https://twitter.com/MetroCanterbury"
+          icon="metro-canterbury.png"
+          name="Metro"
+          description={t('serviceAlerts.twitter', {
+            account: 'MetroCanterbury',
+          })}
+        />
+      )
+    } else if (currentCity.prefix === 'nz-wlg') {
       twitterAcc = (
         <Sidebar
           type="url"
@@ -88,6 +100,7 @@ class RootContent extends React.Component {
         />
       )
     }
+
     const secondTwo = [
       <Sidebar
         key="city"