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
16 changes: 16 additions & 0 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"react-redux": "^7.2.6",
"react-router-dom": "5.2.0",
"redux": "^4.2.0",
"redux-devtools-extension": "^2.13.9",
"sass": "^1.32.8",
"style-loader": "^3.3.1",
"styled-components": "5.3.3"
Expand Down
8 changes: 7 additions & 1 deletion src/actions/movieActions.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
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 = (movie) => {
return ({
type: ADD_MOVIE, payload:movie
})
}
8 changes: 6 additions & 2 deletions 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: Date.now(),
title: "",
director: "",
genre: "",
Expand All @@ -22,7 +23,9 @@ const AddMovieForm = (props) => {
});
}

const handleSubmit = (e) => {
const handleSubmit = () => {
props.addMovie(movie)
push('/movies')
}

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

export default AddMovieForm;

export default connect(null,{addMovie})(AddMovieForm);
11 changes: 9 additions & 2 deletions src/components/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import AddMovieForm from './AddMovieForm';
import FavoriteMovieList from './FavoriteMovieList';

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

return (
<div>
Expand Down Expand Up @@ -48,4 +48,11 @@ const App = props => {
);
};

export default App;
const mapStateToProps = state => {
return{
displayFavorites: state.favorite.displayFavorites
}
}


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

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


const FavoriteMovieList = (props) => {
const favorites = [];
const favorites = props.favorites;

return (<div className="col-xs savedContainer">
<h5>Favorite Movies</h5>
Expand All @@ -13,13 +14,19 @@ const FavoriteMovieList = (props) => {
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 className="material-icons" onClick={() => props.removeFavorite(movie.id)}>remove_circle</span></span>
</Link>
</div>
})
}
</div>);
}

const mapStateToProps = state => {
return {
favorites: state.favorite.favorites
}

}

export default FavoriteMovieList;
export default connect(mapStateToProps,{removeFavorite})(FavoriteMovieList);
29 changes: 25 additions & 4 deletions src/components/Movie.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,26 @@
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/favoritesActions';

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 handleFavorite = (e) => {
e.preventDefault;
props.addFavorite(movie)
}

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

return(<div className="modal-page col">
<div className="modal-dialog">
Expand Down Expand Up @@ -37,14 +51,21 @@ 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>
<span className="m-2 btn btn-dark" onClick={(e) => handleFavorite(e)}>Favorite</span>
<span className="delete"><input type="button" className="m-2 btn btn-danger" value="Delete" onClick={(e) => handleDelete(e)}/></span>
</section>
</div>
</div>
</div>
</div>
</div>);
}
const mapStateToProps = state => {
return {
displayFavorites: state.favorite.displayFavorites,
movies: state.movie.movies
}
}


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

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


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={() => props.toggleFavorites()}><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>);
}
const mapStateToProps = state => {
return{
displayFavorites: state.favorite.displayFavorites,
title: state.movie.appTitle
}
}

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

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

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

return (
<div className="col">
Expand All @@ -30,5 +30,11 @@ const MovieList = (props)=> {
</div>
);
}
const mapStateToProps = state => {
return {
movies: state.movie.movies
}
}


export default MovieList;
export default connect(mapStateToProps, {})(MovieList);
16 changes: 10 additions & 6 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { createStore } from 'redux';
import { legacy_createStore as createStore } from 'redux';
import { Provider } from 'react-redux';

import {composeWithDevTools} from 'redux-devtools-extension'
import reducer from './reducers';

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

const store = createStore(reducer,composeWithDevTools())

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

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

const reducer = (state = initialState, action) => {
switch(action.type) {
case TOGGLE_FAVORITES:
return {
...state,
displayFavorites: !state.displayFavorites
}
case ADD_FAVORITE:
for(let i = 0; i<state.favorites.length;i++){
if(state.favorites[i].id === action.payload.id){
return {
...state
}
}
}
return{
...state,
favorites: [...state.favorites,action.payload]
}
case REMOVE_FAVORITE:
return {
...state,
favorites: state.favorites.filter(item=>(action.payload !== item.id))
}
default:
return state;
}

}


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

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

const rootReducers = combineReducers({movie: movieReducer, favorite: favoritesRducer})

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

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