From fe62f7bc51f0654a592d431b3f397238588d5ab3 Mon Sep 17 00:00:00 2001 From: AFutureWebDev Date: Wed, 21 Aug 2019 20:34:05 -0500 Subject: [PATCH 1/2] initial commit --- package-lock.json | 56 ++++++++++++++++++++++++--------- public/index.html | 2 +- src/components/CounterButton.js | 1 + src/reducers/index.js | 8 ++--- 4 files changed, 48 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index 20071db..2224181 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3086,12 +3086,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" @@ -3106,17 +3108,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", @@ -3233,7 +3238,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -3245,6 +3251,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -3259,6 +3266,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -3266,12 +3274,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" @@ -3290,6 +3300,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -3370,7 +3381,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -3382,6 +3394,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -3503,6 +3516,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", @@ -7487,12 +7501,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" @@ -7507,17 +7523,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", @@ -7634,7 +7653,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -7646,6 +7666,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -7660,6 +7681,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -7667,12 +7689,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" @@ -7691,6 +7715,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -7771,7 +7796,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -7783,6 +7809,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -7904,6 +7931,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/public/index.html b/public/index.html index e989043..f5fcfa0 100644 --- a/public/index.html +++ b/public/index.html @@ -90,5 +90,5 @@ To begin the development, run `npm start`. To create a production bundle, use `npm run build`. --> - + diff --git a/src/components/CounterButton.js b/src/components/CounterButton.js index 96eaa08..f3e8509 100644 --- a/src/components/CounterButton.js +++ b/src/components/CounterButton.js @@ -1,4 +1,5 @@ import React from 'react'; +import store from '../store'; function CounterButton(props) { return ( diff --git a/src/reducers/index.js b/src/reducers/index.js index e4e85c8..cb474d1 100644 --- a/src/reducers/index.js +++ b/src/reducers/index.js @@ -2,19 +2,19 @@ import { combineReducers } from 'redux' function currentCount(state=0, action){ 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 === "ADD_USER"){ - + } - if(action.type === "REMOVE_USER"){ + if(action.type === "REMOVE_USER"){ } return state; From 76ff47ca989a5015bbb84dc46f56382feb574f52 Mon Sep 17 00:00:00 2001 From: AFutureWebDev Date: Sun, 25 Aug 2019 21:51:30 -0500 Subject: [PATCH 2/2] finished --- src/components/ChangeTemperature.js | 3 +- src/components/CityDropDown.js | 3 +- src/components/Counter.js | 11 +++++ src/components/CounterButton.js | 4 +- src/components/CurrentCity.js | 10 +++++ src/components/Modal.js | 13 +++++- src/components/ScaleVideo.js | 3 +- src/components/SearchTextBox.js | 3 +- src/components/ShowModal.js | 3 +- src/components/SortUsers.js | 3 +- src/components/SpecialText.js | 9 +++++ src/components/SpecialTextBox.js | 3 +- src/components/Thermostat.js | 8 ++++ src/components/UserButtons.js | 5 ++- src/components/Users.js | 12 ++++++ src/components/VideoPlayer.js | 13 +++++- src/components/VideoTextBox.js | 3 +- src/reducers/index.js | 62 +++++++++++++++++++++++++++-- 18 files changed, 151 insertions(+), 20 deletions(-) diff --git a/src/components/ChangeTemperature.js b/src/components/ChangeTemperature.js index fa894bc..72100cb 100644 --- a/src/components/ChangeTemperature.js +++ b/src/components/ChangeTemperature.js @@ -1,4 +1,5 @@ import React from "react"; +import store from "../store"; function ChangeTemperature(props){ return( @@ -6,7 +7,7 @@ function ChangeTemperature(props){
diff --git a/src/components/CityDropDown.js b/src/components/CityDropDown.js index d43df20..4e3ed6f 100644 --- a/src/components/CityDropDown.js +++ b/src/components/CityDropDown.js @@ -1,4 +1,5 @@ import React from 'react'; +import store from "../store"; function CityDropDown(props) { return ( @@ -6,7 +7,7 @@ function CityDropDown(props) { CurrentCity: { - + 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..d621ea3 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..2e2f562 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..3d26ff6 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: { - + store.dispatch({type:"SET_SPECIAL_TEXT",value: e.target.value}) }} />
); diff --git a/src/components/Thermostat.js b/src/components/Thermostat.js index 2e43fbe..9677a8d 100644 --- a/src/components/Thermostat.js +++ b/src/components/Thermostat.js @@ -1,9 +1,17 @@ import React from "react"; import DonutChart from "./ignore/DonutChart"; +import store from "../store"; class Thermostat extends React.Component { state={temp:""} + componentDidMount(){ + store.subscribe(()=>{ + let currentTemp = store.getState().currentTemp; + this.setState({temp:currentTemp}); + }) + } + render() { const { props, diff --git a/src/components/UserButtons.js b/src/components/UserButtons.js index f857369..7905c47 100644 --- a/src/components/UserButtons.js +++ b/src/components/UserButtons.js @@ -1,4 +1,5 @@ import React from 'react'; +import store from "../store"; function UserButtons(props) { return ( @@ -13,12 +14,12 @@ function UserButtons(props) { "occupation": "father", "avatar": "https://s3.amazonaws.com/uifaces/faces/twitter/calebogden/128.jpg" }; - + store.dispatch({type:"ADD_USER",value: user}) } }>Add User diff --git a/src/components/Users.js b/src/components/Users.js index 79bfbef..8876796 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,17 @@ class Users extends React.Component { firstNameFilter:"" } + componentDidMount() { + let users = store.getState().users + this.setState({users: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..f1693a6 100644 --- a/src/components/VideoPlayer.js +++ b/src/components/VideoPlayer.js @@ -1,8 +1,17 @@ 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, @@ -11,8 +20,8 @@ class VideoPlayer extends React.Component { 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 (