Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lily & Phoebe - Ampers #6

Open
wants to merge 74 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
97b880d
package.json
lillers1122 Jun 18, 2018
277f9aa
package.json updated
pmanni02 Jun 18, 2018
6b2474c
Merge branch 'master' of https://github.com/pmanni02/video-store-cons…
pmanni02 Jun 18, 2018
f50636b
local api request works; cannot render yet
lillers1122 Jun 18, 2018
894e764
Merge branch 'master' of https://github.com/pmanni02/video-store-cons…
lillers1122 Jun 18, 2018
004c287
components folder made; generic App.js
lillers1122 Jun 18, 2018
109781a
test commit
lillers1122 Jun 18, 2018
9df24a7
creates Tmbd component
pmanni02 Jun 18, 2018
e9d973f
creates SearchTmbdForm component
pmanni02 Jun 18, 2018
162855a
basic movie information shows for all movies
lillers1122 Jun 18, 2018
60abbcd
adds additional logic to search form and passes back term to Tmbd com…
pmanni02 Jun 18, 2018
71cd79e
adds axios get request to Tmbd
pmanni02 Jun 19, 2018
6ace143
adds logic for hidding/showing components within Tmbd Component
pmanni02 Jun 19, 2018
38d38ef
adds TmbdMovie component and renders within Tmbd
pmanni02 Jun 19, 2018
c8a2a97
customer list renders
lillers1122 Jun 19, 2018
fa2f8b1
adds Add Movie button to all movies from search results
pmanni02 Jun 19, 2018
302247e
prepped for merge
lillers1122 Jun 19, 2018
0071f7e
merge resolution
lillers1122 Jun 19, 2018
51ae8f6
post rental works with writing in data
lillers1122 Jun 19, 2018
76915d3
refactors so that front end is not calling tmbd directly
pmanni02 Jun 19, 2018
5d11c65
gets rid of existing code with old api code to tmbd
pmanni02 Jun 19, 2018
e99add3
updated App and components to not need form; can return title and c_i…
lillers1122 Jun 19, 2018
c4f5a49
can update state on App.js for customer name+id and movie title
lillers1122 Jun 19, 2018
cfe4ff5
merge conflict
pmanni02 Jun 19, 2018
bdf6e02
merge resolution
lillers1122 Jun 19, 2018
33f106a
gets rid of npm cors install
pmanni02 Jun 19, 2018
4b9b503
merge conflict fixed
pmanni02 Jun 19, 2018
ffb208b
rental works; hide and how movies and customers works
lillers1122 Jun 19, 2018
2c9a9da
Merge branch 'master' of https://github.com/pmanni02/video-store-cons…
lillers1122 Jun 19, 2018
729907e
adds button for search form
pmanni02 Jun 19, 2018
c83dc8f
gets rid of comments
pmanni02 Jun 19, 2018
c68edf1
adds function to display status message based on state variable
pmanni02 Jun 19, 2018
12b1a6f
adds callbacks from tmbdMovie component to AppJs for posting to backend
pmanni02 Jun 19, 2018
b6266f0
adds timeout for status messages
pmanni02 Jun 19, 2018
562d51c
basic page header styling
lillers1122 Jun 19, 2018
2803466
adds function for default image
pmanni02 Jun 19, 2018
f4cf588
merge conflix fixed
pmanni02 Jun 19, 2018
965b2bf
addtional merge conflict fixed
pmanni02 Jun 19, 2018
12891be
refactor app.js layout / search form
pmanni02 Jun 19, 2018
6330bf9
format tweak
lillers1122 Jun 19, 2018
e5b271d
merge resolution
lillers1122 Jun 19, 2018
b48102a
base css styling
lillers1122 Jun 19, 2018
1bb74de
adds initial setup for react-router
pmanni02 Jun 19, 2018
dcbdc39
merge conflict resolved
pmanni02 Jun 20, 2018
b61db85
fixes popup messages timeout
pmanni02 Jun 20, 2018
39ceda8
css styling for most pages
lillers1122 Jun 20, 2018
86bc3d7
fixes status updates
pmanni02 Jun 20, 2018
68295b9
merge resolution
lillers1122 Jun 20, 2018
70d6747
another merge resolution
lillers1122 Jun 20, 2018
21e5719
code cleanup
pmanni02 Jun 20, 2018
b839ea9
merge conflix resolved
pmanni02 Jun 20, 2018
d00212a
router works
lillers1122 Jun 20, 2018
09c964e
adds parameter for inventory
pmanni02 Jun 20, 2018
8edaf69
cleaned up files; buttons nested in link tos; cursors back
lillers1122 Jun 20, 2018
b356117
adds logic to prevent duplicates from being added to the library
pmanni02 Jun 20, 2018
b55cf81
Merge branch 'duplicate-movies'
pmanni02 Jun 20, 2018
ed388f5
setup for testing
pmanni02 Jun 20, 2018
a13ae6a
adds snapshot tests for Customerlist
pmanni02 Jun 20, 2018
e278a37
footer; code clean up
lillers1122 Jun 20, 2018
a1a9522
Merge branch 'master' of https://github.com/pmanni02/video-store-cons…
lillers1122 Jun 20, 2018
682db64
snapshot test for movie comp.
pmanni02 Jun 20, 2018
63def76
snapshot test for rentalList comp.
pmanni02 Jun 20, 2018
f686309
snapshot test for searchtmbdform comp.
pmanni02 Jun 20, 2018
7fb3dfc
snapshot test for showmovieresults comp.
pmanni02 Jun 20, 2018
431a5e7
snapshot test for tmbd comp.
pmanni02 Jun 20, 2018
b9ed87f
snapshot test for tmbdmovie
pmanni02 Jun 20, 2018
7416aaf
Merge branch 'master' of https://github.com/pmanni02/video-store-cons…
lillers1122 Jun 20, 2018
b1b5765
alt txt added to logo; alerts for adding movie to library
lillers1122 Jun 21, 2018
5220592
changes back to localhost from aws instance
pmanni02 Jun 21, 2018
8a2d34a
refactored/cleaned up tmbd component
pmanni02 Jun 22, 2018
72dca37
cleaned up tmbdmovie component
pmanni02 Jun 22, 2018
f8adf6e
cleaned up app component
pmanni02 Jun 22, 2018
37af922
less space below nav buttons
lillers1122 Jun 22, 2018
734a5c0
code cleanup
pmanni02 Jun 22, 2018
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
1 change: 1 addition & 0 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ class App extends Component {

<CustomerList pickCustomerDetailCallback={this.pickCustomerDetail}/>
<RentalList pickMovieDetailCallback={this.pickMovieDetail}/>

</div>
</div>
);
Expand Down
7 changes: 4 additions & 3 deletions src/components/TmbdMovie.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,28 @@ class TmbdMovie extends Component {

onFormSubmit = (event) => {
event.preventDefault();
console.log(this.props);
// console.log(this.props);
const movieObj = {
title: this.props.title,
release_date: this.props.releaseDate,
overview: this.props.overview,
image_url: this.props.poster,
external_id: this.props.id
}

axios.post('http://localhost:3000/movies/', movieObj)
.then((response) => {
console.log(response);
})
.catch((error) => {
console.log(error);
console.log(error.message);
});
}

render(){
return(
<form onSubmit = {this.onFormSubmit}>
<p> Title: {this.props.title} </p>
<p>Title: {this.props.title} </p>
<p>Release Date: {this.props.releaseDate}</p>
<img
src = {this.props.poster}
Expand Down