Skip to content

Kelly Nguyen #90

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
kelly-tnguyen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Kelly Nguyen #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
82 changes: 60 additions & 22 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.

14 changes: 13 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,17 @@
"not dead",
"not ie <= 11",
"not op_mini all"
]
],
"description": "Fork, clone, npm i, npm start",
"main": "index.js",
"repository": {
"type": "git",
"url": "git+https://github.com/kelly-tnguyen/react-redux-actions-practice.git"
},
"author": "",
"license": "ISC",
"bugs": {
"url": "https://github.com/kelly-tnguyen/react-redux-actions-practice/issues"
},
"homepage": "https://github.com/kelly-tnguyen/react-redux-actions-practice#readme"
}
34 changes: 17 additions & 17 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
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 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 SortUsers from "./components/SortUsers";
import ScaleVideo from "./components/ScaleVideo";
import Modal from "./components/Modal";
import ShowModal from "./components/ShowModal";
import CounterButton from "./containers/counterButtonContainer";
import SpecialTextBox from "./containers/SpecialTextBoxContainer";
import Counter from "./containers/counterContainer";
import SpecialText from "./containers/SpecialTextContainer";
import UserButtons from "./containers/userButtonContainer";
import Thermostat from "./containers/thermostatContainer";
import Users from "./containers/usersContainer";
import ChangeTemperature from "./containers/changeTempContainer";
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 "./containers/sortUserContainer";
import ScaleVideo from './containers/scaleVideoContainer';
import Modal from "./containers/modalContainer";
import ShowModal from "./containers/showModalContainer";

function App() {
return (
Expand Down
Loading