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

video-store-katherine-kay #13

Open
wants to merge 45 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
2889572
created customers component draft
kayxn23 Dec 18, 2018
1deed10
connected customers to app
kayxn23 Dec 18, 2018
f0f7741
CustomerCollection and Axios get
KatherineJF Dec 18, 2018
b9f19ab
Merge pull request #1 from kayxn23/Katherine
kayxn23 Dec 18, 2018
bb538c1
set up axios request successful in customerscollection and displayCus…
kayxn23 Dec 18, 2018
cd0f29b
added rentalLibrary and movie components
KatherineJF Dec 18, 2018
d5bee2e
saved PropTypes add
KatherineJF Dec 18, 2018
8057712
added SearchBar.js to App for search bar funcationality still with bug
kayxn23 Dec 18, 2018
eaefebc
add search query
KatherineJF Dec 18, 2018
fc4f9b8
slightly edited app
kayxn23 Dec 18, 2018
196f01d
Merge branch 'Katherine'
KatherineJF Dec 18, 2018
98145c8
search query added
KatherineJF Dec 18, 2018
0c7f696
search query return from api
KatherineJF Dec 18, 2018
bd4f4e9
added displayMovies callback in searchbar component
kayxn23 Dec 18, 2018
4f20755
fixed bug in url
kayxn23 Dec 18, 2018
54da151
added unique key for Movie compoenents when theyre created in display…
kayxn23 Dec 18, 2018
0d9a3d9
updated movie props
kayxn23 Dec 19, 2018
105ef4f
exited keys for Movie components and display imgs
kayxn23 Dec 19, 2018
5369014
selected movie persisted in app
KatherineJF Dec 19, 2018
7843444
app fixes
KatherineJF Dec 19, 2018
a1b92b5
updated click handler for select movie
KatherineJF Dec 19, 2018
6d52f03
adding movies to library works
KatherineJF Dec 19, 2018
7fa6805
added callbackfuncationality in Customer to select a customer in app
kayxn23 Dec 19, 2018
47ceb34
added h1 tag to display selected customer
kayxn23 Dec 19, 2018
4193f80
made small changes to edit styling and html organization
kayxn23 Dec 20, 2018
c3a1f99
added react-boostrap and styled buttons and imge
kayxn23 Dec 20, 2018
d65b200
changed display from media to col row in rental library
kayxn23 Dec 20, 2018
521d448
added regular bootstrap and aligned text buttons center
kayxn23 Dec 20, 2018
3dbea6b
added padding to movies
kayxn23 Dec 20, 2018
e20f386
display movie img and customer in card when selected
kayxn23 Dec 20, 2018
45e6d04
updated bkground color in selected mv customer
kayxn23 Dec 20, 2018
3f2fee3
card background image added
kayxn23 Dec 20, 2018
74fe9bb
slight change to background
kayxn23 Dec 20, 2018
d13802e
work on app.js checkout method
KatherineJF Dec 20, 2018
a1c68ef
merge conflict button accept in app.js
KatherineJF Dec 20, 2018
508f09a
added app title
kayxn23 Dec 20, 2018
388f3ec
fixed mrg conflict
kayxn23 Dec 20, 2018
7dd47a9
addex axios to app.js
kayxn23 Dec 20, 2018
4f4cb50
checkout method error reversal
KatherineJF Dec 20, 2018
f3b6323
new function in app for checkout
KatherineJF Dec 20, 2018
a135348
added button for checkout + function
kayxn23 Dec 20, 2018
9ae200e
checkout function working
kayxn23 Dec 21, 2018
471b23e
added AlertMessage component to display checkout alert messages
kayxn23 Dec 21, 2018
ffb5cb6
added alertmessage.js again
kayxn23 Dec 21, 2018
a5a9ff8
font color
KatherineJF 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
19 changes: 19 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"parser": "babel-eslint",
"plugins": ["jest", "react"],
"rules": {
"max-len": [1, 120, 2, {ignoreComments: true}],
"no-console": 0,
"no-var": 1,
"jsx-a11y/href-no-hash": [0]
},
"extends": ["eslint:recommended", "plugin:react/recommended"],
"env": {
"node": true,
"browser": true,
"commonjs": true,
"es6": true,
"jquery": true,
"jest/globals": true
}
}
Loading