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
11 changes: 8 additions & 3 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import AddMovieForm from './components/AddMovieForm';
import FavoriteMovieList from './components/FavoriteMovieList';

const App = props => {
const displayFavorites = true;

return (
<div>
Expand All @@ -23,7 +22,7 @@ const App = props => {
<div className="container">
<MovieHeader/>
<div className="row ">
{displayFavorites && <FavoriteMovieList/>}
{props.displayFavorites && <FavoriteMovieList/>}

<Switch>
<Route exact path="/movies/add">
Expand All @@ -48,4 +47,10 @@ const App = props => {
);
};

export default App;
const mapStateToProps = (state) => {
return({
displayFavorites: state.favoriteMovie.displayFavorites
})
}

export default connect(mapStateToProps)(App);
13 changes: 13 additions & 0 deletions src/actions/favoriteActions.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
export const DISPLAY_FAVORITES = 'DISPLAY_FAVORITES'
export const ADD_FAVORITE = 'ADD_FAVORITE'
export const DELETE_FAVORITE = 'DELETE_FAVORITE'

export const displayFavorites = () =>{
return({type:DISPLAY_FAVORITES})
}
export const addFavorite = (obj) =>{
return({type:ADD_FAVORITE, payload:obj})
}
export const deleteFavorite = (id) =>{
return({type:DELETE_FAVORITE, payload:id})
}
4 changes: 4 additions & 0 deletions 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 = (values) => {
return({type: ADD_MOVIE, payload:values})
}
13 changes: 9 additions & 4 deletions src/components/AddMovieForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ import { connect } from 'react-redux';
import { Link, useHistory } from 'react-router-dom';

const AddMovieForm = (props) => {
const { push } = useHistory();
const history = useHistory();

const [movie, setMovie] = useState({
title: "",
director: "",
genre: "",
metascore: 0,
description:""
description:"",
id:Date.now()
});

const handleChange = (e) => {
Expand All @@ -25,6 +26,10 @@ const AddMovieForm = (props) => {
const handleSubmit = (e) => {
}

const handleAddMovie = () => {
props.addMovie(movie)
history.push(`/movies`)
}
const { title, director, genre, metascore, description } = movie;
return(<div className="col">
<div className="modal-dialog">
Expand Down Expand Up @@ -58,7 +63,7 @@ const AddMovieForm = (props) => {

</div>
<div className="modal-footer">
<input type="submit" className="btn btn-success" value="Add"/>
<input type="submit" className="btn btn-success" value="Add" onClick={handleAddMovie}/>
<Link to={`/movies`}><input type="button" className="btn btn-default" value="Cancel"/></Link>
</div>
</form>
Expand All @@ -67,4 +72,4 @@ const AddMovieForm = (props) => {
</div>);
}

export default AddMovieForm;
export default connect(null, {addMovie})(AddMovieForm);
20 changes: 15 additions & 5 deletions src/components/FavoriteMovieList.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,35 @@
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 handleDeleteFavorite = (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><span class="material-icons" onClick={()=>{handleDeleteFavorite(movie.id)}}>remove_circle</span></span>
</Link>
</div>
})
}
</div>);
}


export default FavoriteMovieList;
const mapStateToProps = (state) => {
return ({
favorites: state.favoriteMovie.favorites
})
}
export default connect(mapStateToProps, {deleteFavorite})(FavoriteMovieList);
35 changes: 28 additions & 7 deletions src/components/Movie.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,27 @@
import React from 'react';
import React, { useState } 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 history = useHistory();

const [favButton, setFavButton] = useState(true)

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

const handleDeleteMovie = () => {
props.deleteMovie(movie.id)
history.push(`/movies`)
}

const handleAddFavorite = (obj) => {
props.addFavorite(obj)
}

return(<div className="modal-page col">
<div className="modal-dialog">
<div className="modal-content">
Expand Down Expand Up @@ -37,8 +51,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.favButton && <span className="m-2 btn btn-dark" onClick={()=>{handleAddFavorite(movie)}}>Favorite</span>}
<span className="delete"><input type="button" className="m-2 btn btn-danger" value="Delete" onClick={()=>{handleDeleteMovie(movie)}} /></span>
</section>
</div>
</div>
Expand All @@ -47,4 +61,11 @@ const Movie = (props) => {
</div>);
}

export default Movie;
const mapStateToProps =(state)=> {
return({
movies: state.movie.movies,
favButton: state.favoriteMovie.favButton
})
}

export default connect(mapStateToProps, { deleteMovie, addFavorite })(Movie);
26 changes: 19 additions & 7 deletions src/components/MovieHeader.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,34 @@
import React from 'react';
import React, { useState } from 'react';
import { Link } from 'react-router-dom';
import { connect } from 'react-redux';
import { displayFavorites } from '../actions/favoriteActions';

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


const [button, setButton] = useState(true)

const handleDisplayFavorites = () => {
props.displayFavorites()
setButton(!button)
}
return(<div className="table-title">
<div className="row">
<div className="col-sm-6">
<h2>{appTitle}</h2>
<h2>{props.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"><span onClick={handleDisplayFavorites}>{ button ? "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({
appTitle: state.movie.appTitle,
displayFavorites: state.favoriteMovie.displayFavorites
})
}
export default connect(mapStateToProps, {displayFavorites})(MovieHeader);
15 changes: 10 additions & 5 deletions src/components/MovieList.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ import React from 'react';

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

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

return (
<div className="col">
<table className="table table-striped table-hover">
Expand All @@ -21,14 +20,20 @@ const MovieList = (props)=> {

<tbody>
{
movies.map(movie=><MovieListItem key={movie.id} movie={movie}/>)
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.movie.movies
})
}

export default connect(mapStateToProps)(MovieList);
6 changes: 5 additions & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,13 @@ import App from './App'
import { BrowserRouter as Router } from 'react-router-dom';
import './index.css';

const store = createStore(reducer);

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

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

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

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

import movieReducer from './movieReducer';
import favoriteMovieReducer from './favoriteMovieReducer';

export default movieReducer;

export default combineReducers({
movie: movieReducer,
favoriteMovie: favoriteMovieReducer
});
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