Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
56 changes: 42 additions & 14 deletions package-lock.json

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

34 changes: 17 additions & 17 deletions src/App.js
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
90 changes: 85 additions & 5 deletions src/actions/index.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,104 @@
export const INCREASE_COUNTER = "INCREASE_COUNTER";

export function increaseCounter(){
return {
type:"INCREASE_COUNTER"
type:INCREASE_COUNTER
}
}

export const DECREASE_COUNTER = "DECREASE_COUNTER";

export function decreaseCounter(){
return {
type: DECREASE_COUNTER,
}
}

export const SET_SPECIAL_TEXT = "SET_SPECIAL_TEXT";

export function setSpecialText(txt){
return {
type:"SET_SPECIAL_TEXT",
type: SET_SPECIAL_TEXT,
value:txt
}
}

export const ADD_USER = "ADD_USER";

export function addUser(user){
return {
type:"ADD_USER",
type: ADD_USER,
value:user
}
}

export const REMOVE_USER = "REMOVE_USER"

export function removeUser(){
return {
type:"REMOVE_USER"
type: REMOVE_USER,
}
}

export const SET_SEARCH_TEXT = "SET_SEARCH_TEXT";

export function setSearchText(text) {
return {
type:SET_SEARCH_TEXT,
value:text
}
}

export const SET_IS_LOADING = "SET_IS_LOADING";

export function setIsLoading(isLoading) {
return {
type:SET_IS_LOADING,
value:isLoading
}
}

export const SET_TEMP = "SET_TEMP";

export function setTemp(temp) {
return {
type:SET_TEMP,
value:temp
}
}

export const SET_CURRENT_CITY = "SET_CURRENT_CITY";

export function setCurrentCity(city) {
return {
type:SET_CURRENT_CITY,
value:city
}
}

export const SET_VIDEO_URL = "SET_VIDEO_URL";

export function setVideoURL(URL) {
return {
type:SET_VIDEO_URL,
value:URL
}
}

export const SET_CURRENT_USER_SORT = "SET_CURRENT_USER_SORT";

export function setCurrentUserSort(sort) {
return {
type:SET_CURRENT_USER_SORT,
value:sort
}
}

export const SET_VIDEO_SCALE = "SET_VIDEO_SCALE";

export function setVideoScale(scale) {
return {
type:SET_VIDEO_SCALE,
value: scale
}
}
}
Loading