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.

Sign up for GitHub

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

Jump to bottom

Ports - Shamira, Ngoc, Elle #28

Open
wants to merge 51 commits into
base: master
Choose a base branch
from
Open

Ports - Shamira, Ngoc, Elle #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
d0b2eb8
Initial commit.
dev-elle-up Jun 24, 2019
0dcbf5b
initial setup
lebaongoc Jun 24, 2019
f1e822c
initial setup
MiraMarshall Jun 24, 2019
f4d6fb1
Merge branch 'master' of https://github.com/Mello-Cello/video-store-c…
lebaongoc Jun 24, 2019
dfba3b3
Merge branch 'master' of https://github.com/Mello-Cello/video-store-c…
MiraMarshall Jun 24, 2019
e906481
added React Routes
lebaongoc Jun 24, 2019
c315f99
Merge pull request #1 from Mello-Cello/nl_react_router
dev-elle-up Jun 24, 2019
c2361fa
Merge branch 'master' of https://github.com/Mello-Cello/video-store-c…
MiraMarshall Jun 24, 2019
59cbb7a
Changed MovieList component name to Library
MiraMarshall Jun 24, 2019
e99b0a5
Show all movies, GET request working.
MiraMarshall Jun 25, 2019
feb3348
Working Library component. Renders Title for all movies.
MiraMarshall Jun 25, 2019
aca962a
Added button to select movie.
MiraMarshall Jun 25, 2019
7276e93
Initial commit, customer branch. Setting up classical component for c…
dev-elle-up Jun 26, 2019
0c7d9d9
Merge branch 'sm-library' of https://github.com/Mello-Cello/video-sto…
dev-elle-up Jun 26, 2019
7e5112e
Wrote CustomerList component to show each customer's name and a selec…
dev-elle-up Jun 26, 2019
15532f9
added external API request for list of movies from MovieDB to onSearc…
lebaongoc Jun 26, 2019
9153bb2
display search results and added the add to rental library button for…
lebaongoc Jun 26, 2019
cc0806b
Select Movie working
MiraMarshall Jun 26, 2019
993958d
Showing selected movie throughout app.
MiraMarshall Jun 26, 2019
4e5a6f4
Added route path so Library is only renddered when at the Library route.
MiraMarshall Jun 26, 2019
95c839b
Library component and render working
MiraMarshall Jun 26, 2019
7973672
Merge pull request #2 from Mello-Cello/ek_customers
dev-elle-up Jun 26, 2019
7ee9858
Working Selection Component
MiraMarshall Jun 27, 2019
8ffcb97
updated post request to add movie to internal database
lebaongoc Jun 27, 2019
c895d60
Merge pull request #4 from Mello-Cello/nl_search
lebaongoc Jun 27, 2019
e1ffc79
Merge branch 'master' into sm-library
MiraMarshall Jun 27, 2019
4957140
Merge pull request #3 from Mello-Cello/sm-library
MiraMarshall Jun 27, 2019
85fc2d1
added search component to app
lebaongoc Jun 27, 2019
899ece2
Cleaned up small errors. Uncomment later if components are needed.
dev-elle-up Jun 27, 2019
5df428e
Merge pull request #5 from Mello-Cello/smallWarningFixes
dev-elle-up Jun 27, 2019
6834fc8
Updated messages displayed to user on adding a duplicate movie.
dev-elle-up Jun 27, 2019
9b29118
Merge pull request #6 from Mello-Cello/smallWarningFixes
dev-elle-up Jun 27, 2019
a9fd124
updated error message for post request to internal API
lebaongoc Jun 27, 2019
76311f9
movie styling and nav bar
MiraMarshall Jun 28, 2019
2551b54
Movie search page styling
MiraMarshall Jun 28, 2019
7804bc4
Selected objects functionality
MiraMarshall Jun 28, 2019
a03432f
Figured out post request body syntax to make a new rental. Began impl…
dev-elle-up Jun 28, 2019
dfa1902
One more comment.
dev-elle-up Jun 28, 2019
2ab1ec2
Added logic for Selection view
MiraMarshall Jun 28, 2019
55afbde
Display vids for search component
MiraMarshall Jun 28, 2019
59a5b0a
Added BlockBusted logo
MiraMarshall Jun 28, 2019
0fcbc89
changes
MiraMarshall Jun 28, 2019
b49b1d6
Fixed post request for saving a movie rental.
dev-elle-up Jun 28, 2019
981ee21
Merge branch 'sm-library' of https://github.com/Mello-Cello/video-sto…
dev-elle-up Jun 28, 2019
79567e2
Added class name for button styling.
dev-elle-up Jun 28, 2019
4be01af
Finished merge. Fixed bug with customer id not getting passed to POST…
dev-elle-up Jun 28, 2019
68452ae
debugged
lebaongoc Jun 28, 2019
42c60cd
resolve conflict
lebaongoc Jun 28, 2019
a254bdb
added logic to slice image url for movie post request to internal API…
lebaongoc Jun 28, 2019
f87a997
Fixed link to home button. Cleaned up lots of comments and console logs.
dev-elle-up Jun 29, 2019
8e4ce03
Removed hard-coded due date and implemented a one-week rental period.
dev-elle-up Jun 29, 2019
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: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*

.env
Loading