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

Div & Liz #19

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

Div & Liz #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
7305ad5
added CustomerList and Customer components
elle-johnnie Dec 17, 2018
cfb7f2f
browser router
elle-johnnie Dec 18, 2018
6f265ad
merge conflicts resolved
elle-johnnie Dec 18, 2018
5ccd3b4
customers rendering
elle-johnnie Dec 18, 2018
56264b5
customer selection
elle-johnnie Dec 18, 2018
87f625d
populate customer selection
elle-johnnie Dec 18, 2018
c1e3b9a
customer selection passed back to parent app
elle-johnnie Dec 18, 2018
539afae
customer component fixes
elle-johnnie Dec 18, 2018
8768d23
created structur for cofirm rental event
elle-johnnie Dec 18, 2018
98c7ffc
navbar css
elle-johnnie Dec 19, 2018
745f71b
gitignore
elle-johnnie Dec 19, 2018
2cbb05e
fixed merge conflict
elle-johnnie Dec 19, 2018
7e5297b
fixed .idea settings
elle-johnnie Dec 19, 2018
1cf2a87
ignore this commit
elle-johnnie Dec 19, 2018
bbd4fd3
ignore this commit2
elle-johnnie Dec 19, 2018
f7358db
Working copy for Movies
Naltrexone Dec 19, 2018
dac6e8e
Merge branch 'master' of https://github.com/elle-johnnie/video-store-…
Naltrexone Dec 19, 2018
322c9ef
Search.js - transition stage
Naltrexone Dec 19, 2018
0c92b9e
Revert "ignore this commit2"
Naltrexone Dec 19, 2018
dff3842
Revert "Revert "ignore this commit2""
Naltrexone Dec 19, 2018
ecbc081
Revert "Search.js - transition stage"
Naltrexone Dec 19, 2018
76eafe8
Merge completed except App.js
Naltrexone Dec 19, 2018
f3b1ecc
Basic page setup.. Movies not showing up
Naltrexone Dec 19, 2018
41595c5
fixed library render
elle-johnnie Dec 19, 2018
6a50973
rental created with updated movies out count
elle-johnnie Dec 19, 2018
7eb9795
checked out rentals component added
elle-johnnie Dec 20, 2018
b8c70a5
Add a movie function works
Naltrexone Dec 20, 2018
568ccb7
Merge branch 'master' of https://github.com/elle-johnnie/video-store-…
Naltrexone Dec 20, 2018
1c54dd3
parsed out componentdidmount data retrievals to fetch data functions
elle-johnnie Dec 20, 2018
7032a64
Merge branch 'master' of https://github.com/elle-johnnie/video-store-…
elle-johnnie Dec 20, 2018
077a94b
functionality to show overdue rentals and return rentals
elle-johnnie Dec 20, 2018
6d4a23c
overdue render function
elle-johnnie Dec 20, 2018
79105ce
fixes to navbar and styling
elle-johnnie Dec 20, 2018
d311b1d
movie info on hover popover
elle-johnnie Dec 20, 2018
5bd650d
settings file
elle-johnnie Dec 20, 2018
b6df489
start with react app on heroku
elle-johnnie Dec 20, 2018
ca25e85
removed yarn lock to deploy conflicted with npm package json file
elle-johnnie Dec 20, 2018
51ad7c6
added semicolons to import lines in app.js
elle-johnnie Dec 20, 2018
c1ee6be
dealing with Can't resolve './Components/SearchCollection' changed Co…
elle-johnnie Dec 20, 2018
6e44bd7
fixed typo in URL
elle-johnnie Dec 20, 2018
9eea361
working on bug in search feature
elle-johnnie Dec 21, 2018
4ec5a99
working on json status error when duplicated movies are added to library
elle-johnnie Dec 21, 2018
90d9f04
favicon added
elle-johnnie Dec 21, 2018
7b8f8bf
search alert message
elle-johnnie Dec 21, 2018
35a4b7c
search alert message showing but still not showing detailed error mes…
elle-johnnie Dec 21, 2018
69208e1
changed styling of alert box
elle-johnnie Dec 21, 2018
7325891
alert box css
elle-johnnie Dec 21, 2018
720aed2
header bottom padding
elle-johnnie Dec 21, 2018
c5788d8
catch errors on movie add
elle-johnnie Dec 21, 2018
676364d
catch errors on movie add
elle-johnnie Dec 21, 2018
f08fb40
trying error.errors
elle-johnnie Dec 21, 2018
1a68bef
nested errors.message works used for setState in add to library
elle-johnnie Dec 21, 2018
3ca4900
nevermind nested error message does not work outside of console log
elle-johnnie Dec 21, 2018
aed20c8
bugs in status for adding to library
elle-johnnie Dec 21, 2018
4374bc1
spinner logo
elle-johnnie Dec 21, 2018
dbb07e6
spinner logo bug
elle-johnnie Dec 21, 2018
fdf94f9
remove spinner
elle-johnnie Dec 21, 2018
d983060
info panels css
elle-johnnie Dec 21, 2018
c71111a
cleaned up messages
elle-johnnie Dec 21, 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
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.env
.idea

.idea
4 changes: 4 additions & 0 deletions .idea/encodings.xml
View file
Open in desktop

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

6 changes: 6 additions & 0 deletions .idea/misc.xml
View file
Open in desktop

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

8 changes: 8 additions & 0 deletions .idea/modules.xml
View file
Open in desktop

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

7 changes: 7 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

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

12 changes: 12 additions & 0 deletions .idea/video-store-consumer.iml
View file
Open in desktop

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

638 changes: 638 additions & 0 deletions .idea/workspace.xml
View file
Open in desktop

Large diffs are not rendered by default.

Loading