diff --git a/src/components/CounterButton.js b/src/components/CounterButton.js
index 96eaa08..1e4eea7 100644
--- a/src/components/CounterButton.js
+++ b/src/components/CounterButton.js
@@ -1,16 +1,17 @@
import React from 'react';
+import store from '../store';
function CounterButton(props) {
return (
diff --git a/src/components/CurrentCity.js b/src/components/CurrentCity.js
index a073d8e..d14e31b 100644
--- a/src/components/CurrentCity.js
+++ b/src/components/CurrentCity.js
@@ -1,18 +1,28 @@
import React from 'react';
+import store from '../store';
class CurrentCity extends React.Component {
state={
text:""
}
+ componentDidMount(){
+ let currentCity = store.getState().currentCity;
+ this.setState({text:currentCity});
+ store.subscribe(()=>{
+ let currentCity = store.getState().currentCity;
+ this.setState({text:currentCity});
+ })
+ }
+
render() {
- const {
- props,
- } = this;
+ // const {
+ // props,
+ // } = this;
return (
- CurrentCity: {this.state.text}
+ CurrentCity: {this.state.text || "Austin"}
);
}
diff --git a/src/components/Modal.js b/src/components/Modal.js
index 1789040..c33dbbb 100644
--- a/src/components/Modal.js
+++ b/src/components/Modal.js
@@ -1,24 +1,33 @@
import React from 'react';
import Modal from 'react-modal';
+import store from '../store';
class LoadingModal extends React.Component {
state={
isLoading:false
}
+
+ componentDidMount(){
+ store.subscribe(()=>{
+ let isLoading = store.getState().isLoading;
+ this.setState({isLoading:isLoading});
+ })
+ }
+
render() {
- const {
- props,
- } = this;
+ // const {
+ // props,
+ // } = this;
return (
Loading .......
diff --git a/src/components/ScaleVideo.js b/src/components/ScaleVideo.js
index 803b257..c16e87c 100644
--- a/src/components/ScaleVideo.js
+++ b/src/components/ScaleVideo.js
@@ -1,4 +1,5 @@
import React from 'react';
+import store from '../store';
function ScaleVideo(props) {
return (
@@ -6,7 +7,7 @@ function ScaleVideo(props) {
Scale Video: {
-
+ store.dispatch({type: "SET_VIDEO_SCALE", value: e.target.value})
}
}
type="range" min="1" max="10" step="1" />
diff --git a/src/components/SearchTextBox.js b/src/components/SearchTextBox.js
index 43f3416..83c6c00 100644
--- a/src/components/SearchTextBox.js
+++ b/src/components/SearchTextBox.js
@@ -1,11 +1,12 @@
import React from 'react';
+import store from '../store';
function SearchTextBox(props) {
return (
Search Users on First Name:
{
-
+ store.dispatch({type: "SET_SEARCH_TEXT", value: e.target.value})
}} />
);
diff --git a/src/components/ShowModal.js b/src/components/ShowModal.js
index 1e73950..5587646 100644
--- a/src/components/ShowModal.js
+++ b/src/components/ShowModal.js
@@ -1,11 +1,12 @@
import React from 'react';
+import store from '../store';
function ShowModal(props) {
return (
diff --git a/src/components/SortUsers.js b/src/components/SortUsers.js
index fd6cb04..4cb2d1d 100644
--- a/src/components/SortUsers.js
+++ b/src/components/SortUsers.js
@@ -1,4 +1,5 @@
import React from 'react';
+import store from '../store';
function SortUsers(props) {
return (
@@ -6,7 +7,7 @@ function SortUsers(props) {
Sort Users On:
diff --git a/src/components/Users.js b/src/components/Users.js
index 79bfbef..2a94419 100644
--- a/src/components/Users.js
+++ b/src/components/Users.js
@@ -1,4 +1,5 @@
import React from 'react';
+import store from '../store';
class Users extends React.Component {
@@ -8,6 +9,20 @@ class Users extends React.Component {
firstNameFilter:""
}
+ componentDidMount() {
+ let users = store.getState().users
+ this.setState({users:users})
+ // fetch("https://jsonplaceholder.typicode.com/users")
+ // .then(res=>res.json())
+ // .then(users=>this.setState({users}));
+ store.subscribe(()=>{
+ let users = store.getState().users
+ let searchText = store.getState().searchText
+ let currentUserSort = store.getState().currentUserSort
+ this.setState({users:users, sortOn:currentUserSort, firstNameFilter:searchText})
+ })
+ }
+
render() {
let {users,sortOn,firstNameFilter} = this.state;
var usersDivs = null;
diff --git a/src/components/VideoPlayer.js b/src/components/VideoPlayer.js
index f4fc08b..a37e97c 100644
--- a/src/components/VideoPlayer.js
+++ b/src/components/VideoPlayer.js
@@ -1,18 +1,27 @@
import React from 'react';
+import store from '../store';
class VideoPlayer extends React.Component {
state={scale:0,URL:""}
+ componentDidMount(){
+ store.subscribe(()=>{
+ let videoURL = store.getState().videoURL;
+ let videoScale = store.getState().videoScale;
+ this.setState({URL:videoURL, scale:videoScale});
+ })
+ }
+
render() {
- const {
- props,
- } = this;
+ // const {
+ // props,
+ // } = this;
let width = 200;
let height = 200;
if(this.state.scale){
- width = 200 * props.scale;
- height = 200 * props.scale;
+ width = 200 * this.state.scale;
+ height = 200 * this.state.scale;
}
return (