Add color field to unit info sample data and reducer

markerikson · Nov 11, 2017 · 80349bc · 80349bc
1 parent 9e9c02f
commit 80349bc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/data/sampleData.js b/src/data/sampleData.js
@@ -2,6 +2,7 @@ const sampleData = {
     unit : {
         name : "Black Widow Company",
         affiliation : "wd",
+        color : "black",
     },
     pilots : [
         {

diff --git a/src/features/unitInfo/UnitInfo.jsx b/src/features/unitInfo/UnitInfo.jsx
@@ -3,6 +3,7 @@ import {connect} from "react-redux";
 import {Form, Dropdown, Segment} from "semantic-ui-react";
 
 import FormEditWrapper from "common/components/FormEditWrapper";
+import ColorPickerButton from "common/components/ColorPickerButton";
 
 import {getValueFromEvent} from "common/utils/clientUtils";
 
@@ -43,7 +44,7 @@ class UnitInfo extends Component {
 
     render() {
         const {unitInfo = {}, updateUnitInfo} = this.props;
-        const {name, affiliation} = unitInfo;
+        const {name, affiliation, color} = unitInfo;
 
         return (
             <Segment attached="bottom">
@@ -72,6 +73,10 @@ class UnitInfo extends Component {
                             onChange={this.onAffiliationChanged}
                         />
                     </Form.Field>
+                    <Form.Field name="color">
+                        <label>Color</label>
+                        <ColorPickerButton value={color} />
+                    </Form.Field>
                 </Form>
             </Segment>
         );

diff --git a/src/features/unitInfo/unitInfoReducer.js b/src/features/unitInfo/unitInfoReducer.js
@@ -7,6 +7,7 @@ import {UNIT_INFO_UPDATE} from "./unitInfoConstants";
 const initialState = {
     name : "N/A",
     affiliation : "",
+    color : "blue",
 };
 
 function dataLoaded(state, payload) {