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
2 changes: 1 addition & 1 deletion src/App.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";

import { Route, Switch, Redirect } from "react-router-dom";
import { connect } from 'react-redux';
// import { connect } from 'react-redux';

import MovieList from './components/MovieList';
import Movie from './components/Movie';
Expand Down
15 changes: 15 additions & 0 deletions src/actions/favoriteActions.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
export const ADD_FAVORITE = "ADD_FAVORITE";
export const DELETE_FAVORITE = "DELETE_FAVORITE";
export const TOGGLE_FAVORITE = "TOGGLE_FAVORITE";

export const addFavorite = (movie) => {
return {type: ADD_FAVORITE, payload: movie}
}

export const deleteFavorite = (id) => {
return {type: DELETE_FAVORITE, payload: id}
}

export const toggleFavorites = (movie) => {
return {type: TOGGLE_FAVORITE}
}
6 changes: 5 additions & 1 deletion src/actions/movieActions.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
export const DELETE_MOVIE = "DELETE_MOVIE";
export const ADD_MOVIE = "ADD_MOVIE";

export const deleteMovie = (id)=>{
return({type: DELETE_MOVIE, payload:id});
}
}

export const addMovie = ({id, title, director, genre, metascore, description})=> {
return({type:ADD_MOVIE, payload:{id, title, director, genre, metascore, description}})}
6 changes: 5 additions & 1 deletion src/components/AddMovieForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const AddMovieForm = (props) => {
const { push } = useHistory();

const [movie, setMovie] = useState({
id: "",
title: "",
director: "",
genre: "",
Expand All @@ -23,6 +24,9 @@ const AddMovieForm = (props) => {
}

const handleSubmit = (e) => {
e.preventDefault();
props.addMovie({...movie, id:Date.now()});
push("/movies");
}

const { title, director, genre, metascore, description } = movie;
Expand Down Expand Up @@ -67,4 +71,4 @@ const AddMovieForm = (props) => {
</div>);
}

export default AddMovieForm;
export default connect(null, {addMovie})(AddMovieForm);
20 changes: 14 additions & 6 deletions src/components/FavoriteMovieList.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
import React from 'react';

import { Link } from 'react-router-dom';
import { connect } from 'react-redux';
import { deleteFavorite } from '../actions/favoriteActions';


const FavoriteMovieList = (props) => {
const favorites = [];
const handleRemove = (id) => {
props.deleteFavorite(id);
}

return (<div className="col-xs savedContainer">
<h5>Favorite Movies</h5>
{
favorites.map(movie=>{
{props.favorites.map(movie=>{
return <div key={movie.id}>
<Link className="btn btn-light savedButton" to={`/movies/${movie.id}`}>
{movie.title}
<span><span class="material-icons">remove_circle</span></span>
<span onClick={()=>{handleRemove(movie.id)}}><span class="material-icons">remove_circle</span></span>
</Link>
</div>
})
Expand All @@ -22,4 +24,10 @@ const FavoriteMovieList = (props) => {
}


export default FavoriteMovieList;
const mapStateToProps = (state)=> {
return {
favorites: state.favoritesState.favorites,
}
}

export default connect(mapStateToProps, {deleteFavorite})(FavoriteMovieList);
34 changes: 29 additions & 5 deletions src/components/Movie.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
import React from 'react';
import { useParams, useHistory } from 'react-router-dom';
import { connect } from 'react-redux';

import { deleteMovie } from '../actions/movieActions';
import { addFavorite } from '../actions/favoriteActions';

const Movie = (props) => {
const { id } = useParams();
const { push } = useHistory();

const movies = [];
const movies = props.movies;
const movie = movies.find(movie=>movie.id===Number(id));

const handleDelete = (e) => {
props.deleteMovie(movie.id);
push("/movies");
}

const handleFavorite = (e) => {
props.addFavorite(movie)
}

return(<div className="modal-page col">
<div className="modal-dialog">
Expand Down Expand Up @@ -37,8 +49,8 @@ const Movie = (props) => {
</section>

<section>
<span className="m-2 btn btn-dark">Favorite</span>
<span className="delete"><input type="button" className="m-2 btn btn-danger" value="Delete"/></span>
{props.displayFavorites && <span onClick={handleFavorite}className="m-2 btn btn-dark">Favorite</span>}
<span className="delete"><input type="button" className="m-2 btn btn-danger" value="Delete" onClick={handleDelete}/></span>
</section>
</div>
</div>
Expand All @@ -47,4 +59,16 @@ const Movie = (props) => {
</div>);
}

export default Movie;
const mapStateToProps = (state) => {
return ({
movies: state.moviesState.movies,
displayFavorites: state.favoritesState.displayFavorites
})
}

const mapActionToProps = {
deleteMovie: deleteMovie,
addFavorite: addFavorite
}

export default connect(mapStateToProps, mapActionToProps)(Movie);
21 changes: 17 additions & 4 deletions src/components/MovieHeader.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,35 @@
import React from 'react';
import { Link } from 'react-router-dom';
import {connect} from 'react-redux';
import { toggleFavorites } from '../actions/favoriteActions';

const MovieHeader = (props) => {
const appTitle = "";
const displayFavorites = true;
const appTitle = props.header;
const displayFavorites = props.displayFavorites;

const handleClick = () => {
props.toggleFavorites()
}

return(<div className="table-title">
<div className="row">
<div className="col-sm-6">
<h2>{appTitle}</h2>
</div>
<div className="col-sm-6 headerBar">
<div className="btn btn-sm btn-primary"><span>{ displayFavorites ? "Hide" : "Show"} Favorites</span></div>
<div className="btn btn-sm btn-primary" onClick = {handleClick}><span>{ displayFavorites ? "Hide" : "Show"} Favorites</span></div>
<Link to="/movies" className="btn btn-sm btn-primary">View All Movies</Link>
<Link to="/movies/add" className="btn btn-sm btn-success"><i className="material-icons">&#xE147;</i> <span>Add New Movie</span></Link>
</div>
</div>
</div>);
}

export default MovieHeader;
const mapStateToProps = (state) => {
return {
header: state.moviesState.appTitle,
displayFavorites: state.favoritesState.displayFavorites
}
}

export default connect(mapStateToProps, {toggleFavorites})(MovieHeader);
21 changes: 11 additions & 10 deletions src/components/MovieList.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import React from 'react';

import { connect } from 'react-redux';
import MovieListItem from './MovieListItem';
import MovieFooter from './MovieFooter';

const MovieList = (props)=> {
const movies = [];

return (
<div className="col">
<table className="table table-striped table-hover">
Expand All @@ -19,16 +17,19 @@ const MovieList = (props)=> {
</tr>
</thead>

<tbody>
{
movies.map(movie=><MovieListItem key={movie.id} movie={movie}/>)
}
<tbody>
{props.movies.map(movie=><MovieListItem key={movie.id} movie={movie}/>)}
</tbody>
</table>

<MovieFooter totalMovies={movies.length}/>
<MovieFooter totalMovies={props.movies.length}/>
</div>
);
}

export default MovieList;
const mapStateToProps = (state) => {
return {
movies: state.moviesState.movies,
}
}

export default connect(mapStateToProps,{})(MovieList);
11 changes: 7 additions & 4 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,18 @@ import ReactDOM from 'react-dom';
import { createStore } from 'redux';
import { Provider} from 'react-redux';

import reducer from './reducers';
// import reducer from './reducers';

import App from './App'
import { BrowserRouter as Router } from 'react-router-dom';
import './index.css';
import combineReducer from './reducers/index';

ReactDOM.render(
<Router>
<App />
</Router>,
<Provider store={createStore(combineReducer)}>
<Router>
<App />
</Router>
</Provider>,
document.getElementById('root')
);
32 changes: 32 additions & 0 deletions src/reducers/favoritesReducer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import { ADD_FAVORITE } from "../actions/favoriteActions";
import { DELETE_FAVORITE } from "../actions/favoriteActions";
import { TOGGLE_FAVORITE } from "../actions/favoriteActions";

const initialState = {
favorites : [],
displayFavorites : true
}

const favoriteReducer = (state = initialState, action) => {
switch(action.type) {
case ADD_FAVORITE:
return {
...state,
favorites: [...state.favorites, action.payload]
}
case DELETE_FAVORITE:
return {
...state,
favorites: state.favorites.filter(favorite => action.payload !== favorite.id)
}
case TOGGLE_FAVORITE:
return {
...state,
displayFavorites: !state.displayFavorites
}
default:
return state;
}
};

export default favoriteReducer;
8 changes: 7 additions & 1 deletion src/reducers/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
import { combineReducers } from 'redux';

import movieReducer from './movieReducer';
import favoriteReducer from './favoritesReducer';

export default movieReducer;
const combineReducer = combineReducers({
favoritesState: favoriteReducer,
moviesState: movieReducer
})

export default combineReducer;
7 changes: 6 additions & 1 deletion src/reducers/movieReducer.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,17 @@ const initialState = {
appTitle: "IMDB Movie Database"
}

const reducer = (state, action) => {
const reducer = (state = initialState, action) => {
switch(action.type) {
case DELETE_MOVIE:
return {
movies: state.movies.filter(item=>(action.payload !== item.id))
}
case ADD_MOVIE:
return {
...state,
movies: [...state.movies, action.payload]
}
default:
return state;
}
Expand Down