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,365 changes: 16,315 additions & 50 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
"axios": "^0.19.0",
"react": "^16.9.0",
"react-dom": "^16.9.0",
"react-redux": "^7.2.3",
"react-redux": "^7.2.6",
"react-router-dom": "^5.0.1",
"react-scripts": "^3.1.1",
"redux": "^4.0.5"
"redux": "^4.1.2"
},
"scripts": {
"start": "react-scripts start",
Expand Down
10 changes: 7 additions & 3 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import AddMovieForm from './components/AddMovieForm';
import FavoriteMovieList from './components/FavoriteMovieList';

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

return (
<div>
Expand Down Expand Up @@ -47,5 +47,9 @@ const App = props => {
</div>
);
};

export default App;
const mapStateToProps = (state) => {
return ({
displayFavorites: state.favoriteReducer.displayFavorites
})
}
export default connect(mapStateToProps,{})(App);
16 changes: 13 additions & 3 deletions src/components/AddMovieForm.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
import React, { useState } from 'react';
import { addMovie } from './../actions/movieActions';
//import { addMovie } from '../actions/movieActions';
import { connect } from 'react-redux';

import { Link, useHistory } from 'react-router-dom';

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

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

const handleChange = (e) => {
Expand All @@ -23,6 +25,11 @@ const AddMovieForm = (props) => {
}

const handleSubmit = (e) => {
e.preventDefault()
addMovie(movie)
console.log(movie)

push('/movies/')
}

const { title, director, genre, metascore, description } = movie;
Expand Down Expand Up @@ -66,5 +73,8 @@ const AddMovieForm = (props) => {
</div>
</div>);
}
const mapStateToProps = (state) => {
return ({})
}

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

import { Link } from 'react-router-dom';


import {connect} from 'react-redux'
import {deleteFavorites} from '../actions/favoritesActions'
const FavoriteMovieList = (props) => {
const favorites = [];
const {favorites, displayFavorites, deleteFavorites} = props;
console.log(favorites)

return (<div className="col-xs savedContainer">
<h5>Favorite Movies</h5>
Expand All @@ -13,13 +14,20 @@ 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={() => {
deleteFavorites(movie.id)
}}>remove_circle</span></span>
</Link>
</div>
})
}
</div>);
}
const mapStateToProps = (state) => {
return ({
favorites: state.favoriteReducer.favorites,
displayFavorites: state.favoriteReducer.displayFavorites
})
}


export default FavoriteMovieList;
export default connect(mapStateToProps,{deleteFavorites}) (FavoriteMovieList);
23 changes: 19 additions & 4 deletions src/components/Movie.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import React from 'react';
import { useParams, useHistory } from 'react-router-dom';
import { connect } from 'react-redux'
import {deleteMovie} from '../actions/movieActions'
import { addFavorites } from '../actions/favoritesActions'

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

const movies = [];
const {movies, deleteMovie, addFavorites} = props;
const movie = movies.find(movie=>movie.id===Number(id));

return(<div className="modal-page col">
Expand Down Expand Up @@ -37,14 +40,26 @@ 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={() => {
addFavorites(movie)

}}>Favorite</span>
<span className="delete" onClick={() => {
deleteMovie(movie.id)
push('/movies')
}
}><input type="button" className="m-2 btn btn-danger" value="Delete"/></span>
</section>
</div>
</div>
</div>
</div>
</div>);
}
const mapStateToProps = (state) => {
return({
movies: state.movieReducer.movies, displayFavorites: state.favoriteReducer.displayFavorites
})
}

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

import MovieListItem from './MovieListItem';
import MovieFooter from './MovieFooter';
import movies from '../data';

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

return (
<div className="col">
Expand All @@ -31,4 +33,10 @@ const MovieList = (props)=> {
);
}

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

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

import reducer from './reducers';

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

const store = createStore(reducer)



ReactDOM.render(
<Router>
<Provider store={store}>
<App />
</Provider>
</Router>,
document.getElementById('root')
);
);