From 7fa0e879a50ddde72484103bc34ab9a176621dac Mon Sep 17 00:00:00 2001
From: Aaron Altounian <aaron.altounian@gmail.com>
Date: Tue, 4 Jun 2019 20:37:24 -0500
Subject: [PATCH 1/4] started

---
 package-lock.json               |  56 +++++++++++++-----
 src/App.js                      | 100 ++++++++++++++++++--------------
 src/actions/index.js            |  10 +++-
 src/components/Counter.js       |  10 +++-
 src/components/CounterButton.js |  12 +++-
 src/index.js                    |   6 +-
 src/reducers/index.js           |  16 ++++-
 7 files changed, 145 insertions(+), 65 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ee9a1d2..d7bb883 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3187,12 +3187,14 @@
             "balanced-match": {
               "version": "1.0.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "brace-expansion": {
               "version": "1.1.11",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -3207,17 +3209,20 @@
             "code-point-at": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "concat-map": {
               "version": "0.0.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -3334,7 +3339,8 @@
             "inherits": {
               "version": "2.0.3",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "ini": {
               "version": "1.3.5",
@@ -3346,6 +3352,7 @@
               "version": "1.0.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -3360,6 +3367,7 @@
               "version": "3.0.4",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
@@ -3367,12 +3375,14 @@
             "minimist": {
               "version": "0.0.8",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -3391,6 +3401,7 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -3471,7 +3482,8 @@
             "number-is-nan": {
               "version": "1.0.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "object-assign": {
               "version": "4.1.1",
@@ -3483,6 +3495,7 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -3604,6 +3617,7 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -7113,12 +7127,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -7133,17 +7149,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -7260,7 +7279,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -7272,6 +7292,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -7286,6 +7307,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -7293,12 +7315,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -7317,6 +7341,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -7397,7 +7422,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -7409,6 +7435,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -7530,6 +7557,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
diff --git a/src/App.js b/src/App.js
index 392ed1f..8693277 100644
--- a/src/App.js
+++ b/src/App.js
@@ -16,50 +16,64 @@ import SortUsers from "./components/SortUsers";
 import ScaleVideo from "./components/ScaleVideo";
 import Modal from "./components/Modal";
 import ShowModal from "./components/ShowModal";
+import store from './store';
 
-function App() {
-  return (
-      <div className="App">
-        <div className="container">
-          <CounterButton />
-          <br />
-          <SpecialTextBox />
-          <br />
-          <UserButtons />
-          <br />
-          <CityDropDown />
-           <br />
-          <ChangeTemperature />
-          <br />
-          <SearchTextBox />
-          <br />
-          <VideoTextBox />
-          <br />
-          <SortUsers />
-          <br />
-          <ScaleVideo />
-          <br />
-          <ShowModal />
-        </div>
-        <div className="container">
-          <Counter />
-          <br />
-          <SpecialText />
-          <br />
-          <CurrentCity />
-          <br />
-          <Thermostat />
-          <br />
-          <VideoPlayer />
-          <br />
-          
-          
-        </div>
-        <div className="container">
-          <Users />
+class App extends React.Component {
+
+  componentDidMount() {
+    fetch('https://jsonplaceholder.typicode.com/users')
+      .then(res => res.json())
+      .then(users => {
+        let message = {value: users, type:'USERS_LOADED'};
+        store.dispatch(message)
+      })
+  }
+
+  render() {
+  
+    return (
+        <div className="App">
+          <div className="container">
+            <CounterButton />
+            <br />
+            <SpecialTextBox />
+            <br />
+            <UserButtons />
+            <br />
+            <CityDropDown />
+            <br />
+            <ChangeTemperature />
+            <br />
+            <SearchTextBox />
+            <br />
+            <VideoTextBox />
+            <br />
+            <SortUsers />
+            <br />
+            <ScaleVideo />
+            <br />
+            <ShowModal />
+          </div>
+          <div className="container">
+            <Counter />
+            <br />
+            <SpecialText />
+            <br />
+            <CurrentCity />
+            <br />
+            <Thermostat />
+            <br />
+            <VideoPlayer />
+            <br />
+            
+            
+          </div>
+          <div className="container">
+            <Users />
+          </div>
+          <Modal />
         </div>
-        <Modal />
-      </div>
-  );
+    )
+  };
 }
 export default App;
\ No newline at end of file
diff --git a/src/actions/index.js b/src/actions/index.js
index 78955f4..b84d9c1 100644
--- a/src/actions/index.js
+++ b/src/actions/index.js
@@ -1,6 +1,14 @@
+export const INCREASE_COUNTER = 'INCREASE_COUNTER';
+
 export function increaseCounter(){
   return {
-    type:"INCREASE_COUNTER"
+    type:INCREASE_COUNTER
+  }
+}
+
+export function decreaseCounter() {
+  return {
+    type:"DECREASE_COUNTER"
   }
 }
 
diff --git a/src/components/Counter.js b/src/components/Counter.js
index e858afd..f9422fc 100644
--- a/src/components/Counter.js
+++ b/src/components/Counter.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import {connect} from 'react-redux';
 
 function Counter(props) {
   return (
@@ -7,4 +8,11 @@ function Counter(props) {
       </div>
   );
 }
-export default Counter;
\ No newline at end of file
+
+const mapStateToProps = (state) => {
+  return {
+    count: state.currentCount
+  }
+}
+
+export default connect(mapStateToProps, null)(Counter);
\ No newline at end of file
diff --git a/src/components/CounterButton.js b/src/components/CounterButton.js
index df3a778..53a014d 100644
--- a/src/components/CounterButton.js
+++ b/src/components/CounterButton.js
@@ -1,4 +1,6 @@
 import React from 'react';
+import {connect} from 'react-redux';
+import {increaseCounter, decreaseCounter} from '../actions/index';
 
 function CounterButton(props) {
   return (
@@ -12,7 +14,7 @@ function CounterButton(props) {
         }>Increase Counter By One</button>
         <button onClick={
           ()=>{
-            if(props.increase){
+            if(props.decrease){
               props.decrease();
             }
           }
@@ -20,4 +22,10 @@ function CounterButton(props) {
       </div>
   );
 }
-export default CounterButton;
\ No newline at end of file
+
+const mapDispatchToProps = {
+  increase: increaseCounter,
+  decrease: decreaseCounter
+}
+
+export default connect(null, mapDispatchToProps)(CounterButton);
\ No newline at end of file
diff --git a/src/index.js b/src/index.js
index 25f54ba..438b482 100644
--- a/src/index.js
+++ b/src/index.js
@@ -2,9 +2,13 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import App from './App';
 import './index.css';
+import {Provider} from 'react-redux';
+import store from './store';
 
 
 ReactDOM.render(
-  <App />,
+  <Provider store={store}>
+    <App />
+  </Provider>,
   document.getElementById('root')
 );
diff --git a/src/reducers/index.js b/src/reducers/index.js
index dce7c2c..5074c72 100644
--- a/src/reducers/index.js
+++ b/src/reducers/index.js
@@ -1,15 +1,20 @@
+import {combineReducers} from 'redux';
+import {INCREASE_COUNTER} from '../actions/index';
 
 function currentCount(state=0, action){
-  if(action.type === "INCREASE_COUNTER"){
-    
+  if(action.type === INCREASE_COUNTER){
+    return state + 1;
   }
   if(action.type === "DECREASE_COUNTER"){
-    
+    return state - 1;
   }
   return state;
 }   
 
 function users(state =[], action){
+  if(action.type === 'USERS_LOADED'){
+    return [...state, ...action.value];
+  }
   if(action.type === "ADD_USER"){
 
   }
@@ -27,3 +32,8 @@ function specialText(state = "", action){
   return state;
 }
 
+export default combineReducers({
+  currentCount,
+  users,
+  specialText
+})
\ No newline at end of file

From 688b7a988bc1d02fcfa1ac777dc6bcd40bf04c43 Mon Sep 17 00:00:00 2001
From: Aaron Altounian <aaron.altounian@gmail.com>
Date: Tue, 4 Jun 2019 21:01:40 -0500
Subject: [PATCH 2/4] got up to current city done"

---
 src/App.js                              |  8 ++++----
 src/actions/index.js                    |  7 +++++++
 src/containers/CityDropDownContainer.js |  9 +++++++++
 src/containers/CurrentCityContainer.js  | 10 ++++++++++
 src/reducers/index.js                   | 10 +++++++++-
 5 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100644 src/containers/CityDropDownContainer.js
 create mode 100644 src/containers/CurrentCityContainer.js

diff --git a/src/App.js b/src/App.js
index 8693277..96c0383 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,16 +1,16 @@
 import React from 'react';
 import CounterButton from "./components/CounterButton";
-import SpecialTextBox from "./components/SpecialTextBox";
+import SpecialTextBox from "./containers/SpecialTextBoxContainer";
 import Counter from "./components/Counter";
-import SpecialText from "./components/SpecialText";
+import SpecialText from "./containers/SpecialTextContainer";
 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 CurrentCity from "./containers/CurrentCityContainer";
+import CityDropDown from "./containers/CityDropDownContainer";
 import SearchTextBox from "./components/SearchTextBox";
 import SortUsers from "./components/SortUsers";
 import ScaleVideo from "./components/ScaleVideo";
diff --git a/src/actions/index.js b/src/actions/index.js
index b84d9c1..88a200e 100644
--- a/src/actions/index.js
+++ b/src/actions/index.js
@@ -29,4 +29,11 @@ export function removeUser(){
   return {
     type:"REMOVE_USER"
   }
+}
+
+export function setCurrentCity(city) {
+  return {
+    type: "SET_CURRENT_CITY",
+    value: city
+  }
 }
\ No newline at end of file
diff --git a/src/containers/CityDropDownContainer.js b/src/containers/CityDropDownContainer.js
new file mode 100644
index 0000000..e1123a1
--- /dev/null
+++ b/src/containers/CityDropDownContainer.js
@@ -0,0 +1,9 @@
+import {connect} from 'react-redux';
+import CityDropDown from '../components/CityDropDown';
+import {setCurrentCity} from '../actions/index';
+
+const mapDispatchToProps = {
+    set: setCurrentCity
+}
+
+export default connect(null, mapDispatchToProps)(CityDropDown);
\ No newline at end of file
diff --git a/src/containers/CurrentCityContainer.js b/src/containers/CurrentCityContainer.js
new file mode 100644
index 0000000..7e770b7
--- /dev/null
+++ b/src/containers/CurrentCityContainer.js
@@ -0,0 +1,10 @@
+import {connect} from 'react-redux';
+import CurrentCity from '../components/CurrentCity';
+
+const mapStateToProps = (state) => {
+    return {
+        text: state.currentCity
+    }
+}
+
+export default connect(mapStateToProps, null)(CurrentCity);
\ No newline at end of file
diff --git a/src/reducers/index.js b/src/reducers/index.js
index 5074c72..8083409 100644
--- a/src/reducers/index.js
+++ b/src/reducers/index.js
@@ -32,8 +32,16 @@ function specialText(state = "", action){
   return state;
 }
 
+function currentCity(state='', action) {
+  if(action.type === 'SET_CURRENT_CITY') {
+    return action.value;
+  }
+  return state;
+}
+
 export default combineReducers({
   currentCount,
   users,
-  specialText
+  specialText,
+  currentCity
 })
\ No newline at end of file

From 80beb54c778eb384c6f6a884a8c2981c671ef984 Mon Sep 17 00:00:00 2001
From: Aaron Altounian <aaron.altounian@gmail.com>
Date: Sun, 9 Jun 2019 20:33:32 -0500
Subject: [PATCH 3/4] added thermostat and modal"

---
 README.md                             |  2 +-
 src/App.js                            |  8 ++++----
 src/actions/index.js                  | 14 ++++++++++++++
 src/components/SpecialTextBox.js      |  2 --
 src/containers/ChangeTempContainer.js |  9 +++++++++
 src/containers/ModalContainer.js      | 15 +++++++++++++++
 src/containers/ShowModalContainer.js  |  9 +++++++++
 src/containers/ThermostatContainer.js | 10 ++++++++++
 src/reducers/index.js                 | 21 ++++++++++++++++++---
 9 files changed, 80 insertions(+), 10 deletions(-)
 create mode 100644 src/containers/ChangeTempContainer.js
 create mode 100644 src/containers/ModalContainer.js
 create mode 100644 src/containers/ShowModalContainer.js
 create mode 100644 src/containers/ThermostatContainer.js

diff --git a/README.md b/README.md
index 338b5b3..b769a88 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Make sure to do one thing at a time, save and refresh to check for errors
+  # Make sure to do one thing at a time, save and refresh to check for errors
 ### Setup
 Fork, clone, npm i, npm start
 
diff --git a/src/App.js b/src/App.js
index 96c0383..086a1f5 100644
--- a/src/App.js
+++ b/src/App.js
@@ -4,9 +4,9 @@ import SpecialTextBox from "./containers/SpecialTextBoxContainer";
 import Counter from "./components/Counter";
 import SpecialText from "./containers/SpecialTextContainer";
 import UserButtons from "./components/UserButtons";
-import Thermostat from "./components/Thermostat";
+import Thermostat from "./containers/ThermostatContainer";
 import Users from "./components/Users";
-import ChangeTemperature from "./components/ChangeTemperature";
+import ChangeTemperature from "./containers/ChangeTempContainer";
 import VideoPlayer from "./components/VideoPlayer";
 import VideoTextBox from "./components/VideoTextBox";
 import CurrentCity from "./containers/CurrentCityContainer";
@@ -14,8 +14,8 @@ import CityDropDown from "./containers/CityDropDownContainer";
 import SearchTextBox from "./components/SearchTextBox";
 import SortUsers from "./components/SortUsers";
 import ScaleVideo from "./components/ScaleVideo";
-import Modal from "./components/Modal";
-import ShowModal from "./components/ShowModal";
+import Modal from "./containers/ModalContainer";
+import ShowModal from "./containers/ShowModalContainer";
 import store from './store';
 
 class App extends React.Component {
diff --git a/src/actions/index.js b/src/actions/index.js
index 88a200e..dbb60a2 100644
--- a/src/actions/index.js
+++ b/src/actions/index.js
@@ -36,4 +36,18 @@ export function setCurrentCity(city) {
     type: "SET_CURRENT_CITY",
     value: city
   }
+}
+
+export function setTemp(temp) {
+  return {
+    type: 'SET_TEMP',
+    value: temp
+  }
+}
+
+export function setIsLoading(isLoading) {
+  return {
+    type: 'SET_IS_LOADING',
+    value: isLoading
+  }
 }
\ No newline at end of file
diff --git a/src/components/SpecialTextBox.js b/src/components/SpecialTextBox.js
index aca3278..7c400c1 100644
--- a/src/components/SpecialTextBox.js
+++ b/src/components/SpecialTextBox.js
@@ -1,6 +1,4 @@
 import React from 'react';
-import {connect} from "react-redux";
-import {setSpecialText} from "../actions";
 
 function SpecialTextBox(props) {
   return (
diff --git a/src/containers/ChangeTempContainer.js b/src/containers/ChangeTempContainer.js
new file mode 100644
index 0000000..1770fb8
--- /dev/null
+++ b/src/containers/ChangeTempContainer.js
@@ -0,0 +1,9 @@
+import {connect} from 'react-redux';
+import ChangeTemperature from '../components/ChangeTemperature';
+import {setTemp} from '../actions/index';
+
+const mapDispatchToProps = {
+    set: setTemp
+}
+
+export default connect(null, mapDispatchToProps)(ChangeTemperature);
\ No newline at end of file
diff --git a/src/containers/ModalContainer.js b/src/containers/ModalContainer.js
new file mode 100644
index 0000000..84104ad
--- /dev/null
+++ b/src/containers/ModalContainer.js
@@ -0,0 +1,15 @@
+import {connect} from 'react-redux';
+import Modal from '../components/Modal';
+import {setIsLoading} from '../actions/index'
+
+const mapDispatchToProps = {
+    setIsLoading: setIsLoading
+}
+
+const mapStateToProps = (state) => {
+    return {
+        isLoading: state.isLoading
+    }
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(Modal);
\ No newline at end of file
diff --git a/src/containers/ShowModalContainer.js b/src/containers/ShowModalContainer.js
new file mode 100644
index 0000000..1e8a053
--- /dev/null
+++ b/src/containers/ShowModalContainer.js
@@ -0,0 +1,9 @@
+import {connect} from 'react-redux';
+import ShowModal from '../components/ShowModal';
+import {setIsLoading} from '../actions/index';
+
+const mapDispatchToProps = {
+    setIsLoading: setIsLoading
+}
+
+export default connect(null, mapDispatchToProps)(ShowModal);
\ No newline at end of file
diff --git a/src/containers/ThermostatContainer.js b/src/containers/ThermostatContainer.js
new file mode 100644
index 0000000..ecd0b68
--- /dev/null
+++ b/src/containers/ThermostatContainer.js
@@ -0,0 +1,10 @@
+import {connect} from 'react-redux';
+import Thermostat from '../components/Thermostat';
+
+const mapStateToProps = (state) => {
+    return {
+        temp: state.currentTemp
+    }
+}
+
+export default connect(mapStateToProps, null)(Thermostat);
\ No newline at end of file
diff --git a/src/reducers/index.js b/src/reducers/index.js
index 8083409..34a327c 100644
--- a/src/reducers/index.js
+++ b/src/reducers/index.js
@@ -9,7 +9,7 @@ function currentCount(state=0, action){
     return state - 1;
   }
   return state;
-}   
+}
 
 function users(state =[], action){
   if(action.type === 'USERS_LOADED'){
@@ -24,7 +24,6 @@ function users(state =[], action){
   return state;
 }
 
-
 function specialText(state = "", action){
   if(action.type === "SET_SPECIAL_TEXT"){
     return action.value;
@@ -39,9 +38,25 @@ function currentCity(state='', action) {
   return state;
 }
 
+function currentTemp(state='', action) {
+  if(action.type === 'SET_TEMP') {
+    return action.value;
+  }
+  return state;
+}
+
+function isLoading(state=false, action) {
+  if(action.type === 'SET_IS_LOADING') {
+    return action.value;
+  }
+  return state;
+}
+
 export default combineReducers({
   currentCount,
   users,
   specialText,
-  currentCity
+  currentCity,
+  currentTemp,
+  isLoading
 })
\ No newline at end of file

From fd5aa5a1c7f24c1a99027da43fea286aa93aa1ae Mon Sep 17 00:00:00 2001
From: Aaron Altounian <aaron.altounian@gmail.com>
Date: Tue, 11 Jun 2019 18:25:41 -0500
Subject: [PATCH 4/4] began working on video player

---
 src/actions/index.js                   |  7 +++++++
 src/components/VideoPlayer.js          |  2 +-
 src/containers/VideoPlayerContainer.js | 11 +++++++++++
 src/reducers/index.js                  | 10 +++++++++-
 4 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 src/containers/VideoPlayerContainer.js

diff --git a/src/actions/index.js b/src/actions/index.js
index dbb60a2..d222978 100644
--- a/src/actions/index.js
+++ b/src/actions/index.js
@@ -50,4 +50,11 @@ export function setIsLoading(isLoading) {
     type: 'SET_IS_LOADING',
     value: isLoading
   }
+}
+
+export function setVideoURL(url) {
+  return {
+    type: 'SET_VIDEO_URL',
+    value: url
+  }
 }
\ No newline at end of file
diff --git a/src/components/VideoPlayer.js b/src/components/VideoPlayer.js
index 11b518b..47d52d5 100644
--- a/src/components/VideoPlayer.js
+++ b/src/components/VideoPlayer.js
@@ -9,7 +9,7 @@ function VideoPlayer(props) {
   }
   return (
       <div><iframe title="YouTube video player"  type="text/html" 
-      width={width} height={height} src={props.URL}
+      width={width} height={height} src={props.url}
       frameBorder="0" allowFullScreen></iframe></div>
   );
 }
diff --git a/src/containers/VideoPlayerContainer.js b/src/containers/VideoPlayerContainer.js
new file mode 100644
index 0000000..0ce02ba
--- /dev/null
+++ b/src/containers/VideoPlayerContainer.js
@@ -0,0 +1,11 @@
+import {connect} from 'react-redux'
+import VideoPlayer from '../components/VideoPlayer';
+
+const mapStateToProps = (state) => {
+    return {
+        url: state.videoURL,
+        scale: state.videoScale
+    }
+}
+
+export default connect(mapStateToProps, null)(VideoPlayer);
\ No newline at end of file
diff --git a/src/reducers/index.js b/src/reducers/index.js
index 34a327c..ad2aade 100644
--- a/src/reducers/index.js
+++ b/src/reducers/index.js
@@ -52,11 +52,19 @@ function isLoading(state=false, action) {
   return state;
 }
 
+function videoURL(state='', action) {
+  if(action.type === 'SET_VIDEO_URL') {
+    return action.value;
+  }
+  return state;
+}
+
 export default combineReducers({
   currentCount,
   users,
   specialText,
   currentCity,
   currentTemp,
-  isLoading
+  isLoading,
+  videoURL
 })
\ No newline at end of file