changed default to cd

Author: Carolina Gonzalez

competitiveness/src/App.jsx

@@ -14,7 +14,7 @@ class AppContainer extends Component {
   //do some checks so we're not calling backend 5 times a load
   static getDerivedStateFromProps(nextProps, prevState) {
 
-    let parentDistrictType = (typeof(nextProps.match.params.parentDistrictType) === 'undefined') ? 'AD' : nextProps.match.params.parentDistrictType 
+    let parentDistrictType = (typeof(nextProps.match.params.parentDistrictType) === 'undefined') ? 'CD' : nextProps.match.params.parentDistrictType 
     let selectedDistrict = (typeof(nextProps.match.params.selectedDistrict) === 'undefined') ? 0 : nextProps.match.params.selectedDistrict
     let params = queryString.parse(nextProps.location.search)
     let election = params.election

competitiveness/src/components/ParentHeader.jsx

@@ -5,9 +5,9 @@ const React = require('react');
 
 const ParentHeaderContainer = withRouter(({districtType, changeDistrict, history}) => (
     <h1>New York City Competitiveness - <Dropdown options={
-        [{text: 'State Assembly District', value: 'AD'},
+        [{text: 'Congressional District', value: 'CD'},
          {text: 'State Senate District', value: 'SD'},
-         {text: 'Congressional District', value: 'CD'},
+         {text: 'State Assembly District', value: 'AD'},
          ]}
          defaultValue={districtType}
          onChange={(e, d) => changeDistrict(e, d, history)}

competitiveness/src/components/edDetails/TopDetails.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { connect } from 'react-redux'
-import { Grid } from 'semantic-ui-react'
+import { Grid, Loader } from 'semantic-ui-react'
 
 const toPercent = (val) => {
   if (!val) {
@@ -24,8 +24,13 @@ const humanReadable = (el) => {
 // election should be dropdown with curr elec selected
 const TopDetailsContainer = ({election, margin, winningParty, 
                               mrTurnout, winningCandidate, totalPop,
-                              dbdo, pctRegistered}) => (
-    <Grid>
+                              dbdo, pctRegistered, isLoading}) => {
+  let content;
+  if (isLoading) {
+    content = <Loader active /> 
+  }
+  else {
+    content = (
       <Grid.Row centered divided className='top-details'>
         <Grid.Column width={3} className='top-label'>
           <strong>{humanReadable(election)} winner:</strong> {winningCandidate} ({winningParty.split('').slice(0,3).join('')}) -- {margin}%
@@ -42,9 +47,14 @@ const TopDetailsContainer = ({election, margin, winningParty,
         <Grid.Column width={3} className='top-label'>
           <strong>Registered:</strong> {pctRegistered}
         </Grid.Column>
-      </Grid.Row>
+      </Grid.Row>)
+  }
+  return (
+    <Grid>
+        { content }
     </Grid>
-  ) 
+    )
+}
 
 const mapStateToProps = (state) => (
   {election: state.selectedElection,
@@ -54,7 +64,8 @@ const mapStateToProps = (state) => (
    mrTurnout: toPercent(state.highlightedEdData.turnout.turnout_17) || '',
    totalPop: state.highlightedEdData.edMetrics.total,
    dbdo: toPercent(1 - state.highlightedEdData.edMetrics[`dbdo_${state.selectedElection.toLowerCase()}`]) || '',
-   pctRegistered: toPercent(state.highlightedEdData.edMetrics.registered_pct) || ''
+   pctRegistered: toPercent(state.highlightedEdData.edMetrics.registered_pct) || '',
+   isLoading: state.isLoading
   })
 
 const TopDetails = connect(mapStateToProps)(TopDetailsContainer)

competitiveness/src/reducers/reducers.js

@@ -34,7 +34,7 @@ export function sidebarDimensionsReducer(state=[200,200], action) {
   }
 }
 
-export function districtTypeReducer(state='AD', action) {
+export function districtTypeReducer(state='CD', action) {
   switch (action.type) {
     case 'CHANGE_DISTRICT_TYPE':
       return action.payload.main