Merge pull request #428 from mz8i/feature/414-reorganise-categories

Feature 414: reorganise categories

app/src/frontend/building/building-view.tsx

@@ -10,7 +10,7 @@ import SizeContainer from './data-containers/size';
 import ConstructionContainer from './data-containers/construction';
 import TeamContainer from './data-containers/team';
 import SustainabilityContainer from './data-containers/sustainability';
-import GreeneryContainer from './data-containers/greenery';
+import StreetscapeContainer from './data-containers/streetscape';
 import CommunityContainer from './data-containers/community';
 import PlanningContainer from './data-containers/planning';
 import LikeContainer from './data-containers/like';
@@ -91,13 +91,13 @@ const BuildingView = (props) => {
                 help="https://pages.colouring.london/sustainability"
                 inactive={true}
             />
-        case 'greenery':
-            return <GreeneryContainer
+        case 'streetscape':
+            return <StreetscapeContainer
                 {...props}
                 key={props.building && props.building.building_id}
-                title="Greenery"
-                intro="Is there greenery nearby? Coming soon…"
-                help="https://pages.colouring.london/greenery"
+                title="Streetscape"
+                intro="What's the building's context? Coming soon…"
+                help="https://pages.colouring.london/streetscape"
                 inactive={true}
             />
         case 'community':

app/src/frontend/building/categories.tsx

@@ -70,19 +70,19 @@ const Categories = (props) => (
             building_id={props.building_id}
         />
         <Category
-            title="Sustainability"
-            desc="Performance"
-            slug="sustainability"
-            help="https://pages.colouring.london/sustainability"
+            title="Streetscape"
+            desc="Environment"
+            slug="streetscape"
+            help="https://pages.colouring.london/streetscape"
             inactive={true}
             mode={props.mode}
             building_id={props.building_id}
         />
         <Category
-            title="Greenery"
-            desc="Green context"
-            slug="greenery"
-            help="https://pages.colouring.london/greenery"
+            title="Sustainability"
+            desc="Performance"
+            slug="sustainability"
+            help="https://pages.colouring.london/sustainability"
             inactive={true}
             mode={props.mode}
             building_id={props.building_id}

app/src/frontend/building/data-containers/streetscape.tsx

@@ -3,9 +3,9 @@ import React, { Fragment } from 'react';
 import withCopyEdit from '../data-container';
 
 /**
-* Greenery view/edit section
+* Streetscape view/edit section
 */
-const GreeneryView = (props) => (
+const StreetscapeView = (props) => (
     <Fragment>
         <p className="data-intro">{props.intro}</p>
         <ul className="data-list">
@@ -18,6 +18,6 @@ const GreeneryView = (props) => (
         </ul>
     </Fragment>
 )
-const GreeneryContainer = withCopyEdit(GreeneryView);
+const StreetscapeContainer = withCopyEdit(StreetscapeView);
 
-export default GreeneryContainer;
+export default StreetscapeContainer;

app/src/frontend/map/legend.tsx

@@ -71,8 +71,8 @@ const LEGEND_CONFIG = {
         title: 'Sustainability',
         elements: []
     },
-    greenery: {
-        title: 'Greenery',
+    streetscape: {
+        title: 'Streetscape',
         elements: []
     },
     planning: {

app/src/frontend/styles/colours.css

@@ -80,7 +80,7 @@
 .background-sustainability {
     background-color: #5ec232;
 }
-.background-greenery {
+.background-streetscape {
     background-color: #6dbb8b;
 }
 .background-community {