Emilio Campa

src/App.js

@@ -1,17 +1,17 @@
 import React from 'react';
-import CounterButton from "./components/CounterButton";
-import SpecialTextBox from "./components/SpecialTextBox";
-import Counter from "./components/Counter";
-import SpecialText from "./components/SpecialText";
+import CounterButton from "./containers/CounterBottonContainer";
+import SpecialTextBox from "./containers/SpecialTextBoxContainer";
+import Counter from "./containers/CounterContainer";
+import SpecialText from "./containers/SearchTextBoxContainer";
 import UserButtons from "./components/UserButtons";
-import Thermostat from "./components/Thermostat";
-import Users from "./components/Users";
-import ChangeTemperature from "./components/ChangeTemperature";
-import VideoPlayer from "./components/VideoPlayer";
-import VideoTextBox from "./components/VideoTextBox";
-import CurrentCity from "./components/CurrentCity";
-import CityDropDown from "./components/CityDropDown";
-import SearchTextBox from "./components/SearchTextBox";
+import Thermostat from "./containers/ThermostatContainer";
+import Users from "./containers/UsersContainer";
+import ChangeTemperature from "./containers/ChangeTemperatureContainer";
+import VideoPlayer from "./containers/VideoPlayerContainer";
+import VideoTextBox from "./containers/VideoTextBoxContainer";
+import CurrentCity from "./containers/CurrentCityContainer";
+import CityDropDown from "./containers/CityDropDownContainer";
+import SearchTextBox from "./containers/SearchTextBoxContainer";
 import SortUsers from "./components/SortUsers";
 import ScaleVideo from "./components/ScaleVideo";
 import Modal from "./components/Modal";

src/actions/index.js

@@ -4,6 +4,12 @@ export function increaseCounter(){
   }
 }
 
+export function decreaseCounter(){
+  return {
+    type:"DECREASE_COUNTER"
+  }
+}
+
 export function setSpecialText(txt){
   return {
     type:"SET_SPECIAL_TEXT",
@@ -21,4 +27,33 @@ export function removeUser(){
   return {
     type:"REMOVE_USER"
   }
+}
+
+export function setCurrentCity(city) {
+  return {
+    type: "SET_CURRENT_CITY",
+    value: city
+  }
+}
+
+export function setCurrentTemperature(temperature) {
+  return {
+    type: "SET_CURRENT_TEMPERATURE",
+    value: temperature
+  }
+}
+
+export function setVideoUrl(url) {
+  return {
+    type: "SET_VIDEO_URL",
+    value: url
+  }
+}
+
+
+export function setFirstNameFilter(firstName) {
+  return {
+    type: "SET_FIRST_NAME",
+    value: firstName
+  }
 }

src/components/CityDropDown.js

@@ -11,6 +11,7 @@ function CityDropDown(props) {
             }
           }
         }>
+          <option value="none">---</option>
           <option value="Austin">Austin</option>
           <option value="New York">New York</option>
           <option value="New Olreans">New Olreans</option>

src/components/SpecialTextBox.js

@@ -1,8 +1,6 @@
 import React from 'react';
-import {connect} from "react-redux";
-import {setSpecialText} from "../actions";
 
-function SpecialTextBox(props) {
+export default function SpecialTextBox(props) {
   return (
       <div>
         Enter Special Text:
@@ -13,14 +11,4 @@ function SpecialTextBox(props) {
         }} />
       </div>
   );
-}
-
-function mapDispatchToProps(dispatch){
-  return {
-    set:function(txt){
-      let action = setSpecialText(txt)
-      dispatch(action);
-    }
-  }
-}
-export default (SpecialTextBox);
+}

src/components/UserButtons.js

@@ -8,8 +8,7 @@ function UserButtons(props) {
             if(props.add){
               props.add({
                 "id": 1,
-                "first_name": "george",
-                "last_name": "bluth",
+                "name": "George Bluth",
                 "address": "4116 Magnolia Drive, Portland, ME 04103",
                 "phone": 15551234567,
                 "occupation": "father",

src/components/Users.js

@@ -11,8 +11,8 @@ function Users(props) {
       (props.firstNameFilter && 
       u.name.indexOf(props.firstNameFilter) > -1);
     })
-    usersDivs = usersDivs.map(function(u){
-      return <div>{u.name}</div>
+    usersDivs = usersDivs.map(function(u, i){
+      return <div key={i}>{u.name}</div>
     })
   }
   return (

src/containers/ChangeTemperatureContainer.js

@@ -0,0 +1,11 @@
+import { connect } from 'react-redux';
+import {setCurrentTemperature} from "../actions";
+import ChangeTemperature from "../components/ChangeTemperature";
+
+
+const mapDispatchToProps = {
+   set:setCurrentTemperature
+  }
+
+
+export default connect(null,mapDispatchToProps)(ChangeTemperature);

src/containers/CityDropDownContainer.js

@@ -0,0 +1,11 @@
+import { connect } from 'react-redux';
+import {setCurrentCity} from "../actions";
+import CityDropDown from "../components/CityDropDown";
+
+
+const mapDispatchToProps = {
+   set:setCurrentCity
+  }
+
+
+export default connect(null,mapDispatchToProps)(CityDropDown);