Skip to content

Aaron Altounian #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aaronaltounian wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Aaron Altounian #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7fa0e87
started
aaronaltounian Jun 5, 2019
688b7a9
got up to current city done"
aaronaltounian Jun 5, 2019
80beb54
added thermostat and modal"
aaronaltounian Jun 10, 2019
fd5aa5a
began working on video player
aaronaltounian Jun 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
56 changes: 42 additions & 14 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

116 changes: 65 additions & 51 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,65 +1,79 @@
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 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 "./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";
import Modal from "./components/Modal";
import ShowModal from "./components/ShowModal";
import Modal from "./containers/ModalContainer";
import ShowModal from "./containers/ShowModalContainer";
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;
Loading