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

Mary and Abinnet #20

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

Mary and Abinnet #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
e7c9502
cloned, ran tests etc
mmlamkin Jun 18, 2018
f3026f7
adds internal api library to react app
mmlamkin Jun 18, 2018
13e5ed8
adds movie component
mmlamkin Jun 18, 2018
7569a61
adds state to app and renders library with button click
mmlamkin Jun 18, 2018
8d453f5
adds custoemr button to react app
mmlamkin Jun 18, 2018
6516c62
added search movie component
Abiaina Jun 18, 2018
27498e9
added search movie component
Abiaina Jun 18, 2018
9f778be
resolved merge conflict
Abiaina Jun 18, 2018
5882afa
api call search results show up on app and replace current customer a…
Abiaina Jun 18, 2018
842d84c
adds a non functional button for adding customer to rental
mmlamkin Jun 18, 2018
dd2c3e4
Merge branch 'master' of https://github.com/mmlamkin/video-store-cons…
mmlamkin Jun 18, 2018
89d55df
adds library and movie styling and customer component
mmlamkin Jun 19, 2018
5ef5adf
can add customer to rental
mmlamkin Jun 19, 2018
918d89d
can add movie to rental
mmlamkin Jun 19, 2018
cf54f00
created searchcontainer working on integrating changes for search and…
Abiaina Jun 19, 2018
47bbe03
Merge branch 'master' of https://github.com/mmlamkin/video-store-cons…
Abiaina Jun 19, 2018
d6520d1
can post rental
mmlamkin Jun 19, 2018
9c31e3c
search component sort of works, passes search terms and does query on…
Abiaina Jun 19, 2018
2d9f7bd
adds some stuff
mmlamkin Jun 19, 2018
7d2e453
conflicts
mmlamkin Jun 19, 2018
7c56fe0
more merge conflicts
mmlamkin Jun 19, 2018
c2d54b7
trying to merge
Abiaina Jun 19, 2018
380d6ac
removed unused variables, searchResults component still unable to cha…
Abiaina Jun 19, 2018
dae14cc
fixed search bug...ternary was wrong
Abiaina Jun 19, 2018
4e5ce23
adds set interval to app
mmlamkin Jun 19, 2018
edcd786
added the library to the app component for router
Abiaina Jun 19, 2018
0aa38a3
some stuff
mmlamkin Jun 19, 2018
0394b1f
Merge branch 'master' of https://github.com/mmlamkin/video-store-cons…
mmlamkin Jun 19, 2018
55f38b2
updated router bug fixed
Abiaina Jun 19, 2018
47c257e
url updates to reflect customers and library displays
Abiaina Jun 19, 2018
4c0c38e
updated routes and organization of customer and libary
Abiaina Jun 19, 2018
0ccc337
adds some router stuff
mmlamkin Jun 19, 2018
4b54b86
updated routes for customer, home and library, search route is not wo…
Abiaina Jun 19, 2018
1d1b522
re integrated the search components into a container and set up route…
Abiaina Jun 19, 2018
40b5a74
adds styling
mmlamkin Jun 19, 2018
3daa935
merge conflicts
mmlamkin Jun 19, 2018
84cc683
small changes in search passing props/callbacks
Abiaina Jun 19, 2018
d5b7010
Merge branch 'master' of https://github.com/mmlamkin/video-store-cons…
Abiaina Jun 19, 2018
23bbe9b
refactored search box to be in app, search bar now shows up on search…
Abiaina Jun 20, 2018
40fbe56
Search page works returns matching result...still needs to be broken …
Abiaina Jun 20, 2018
35f0781
found a bug in the search results page: results show previous search …
Abiaina Jun 20, 2018
3efb4a7
updated search to querry external api
Abiaina Jun 20, 2018
a56f314
adds some styling
mmlamkin Jun 20, 2018
568c97a
adds some styling
mmlamkin Jun 20, 2018
7a1aab4
trying to keep the changes only in search results..library and movie …
Abiaina Jun 20, 2018
c9fed7a
tracks current movie library in app
Abiaina Jun 20, 2018
a74e807
search results give title specific message when movie is added to lib…
Abiaina Jun 20, 2018
201b3a9
clears search results with new search
mmlamkin Jun 20, 2018
b05ce68
pushing up any uncommitted changes
Abiaina Jun 21, 2018
4ed418d
fix merge conflicts
mmlamkin Jun 21, 2018
8032178
updated the add lib search post request in searchResults
Abiaina Jun 21, 2018
166c951
updated post for addLib in searchResults
Abiaina Jun 21, 2018
023b023
cannot access post request server...only works in postman
Abiaina Jun 21, 2018
87836ce
updated library to hold the rent movie button, functionality not affe…
Abiaina Jun 21, 2018
22efa10
some crappy styling
mmlamkin Jun 21, 2018
3c0148c
Merge branch 'master' of https://github.com/mmlamkin/video-store-cons…
Abiaina Jun 21, 2018
d62e6b1
added addLib button to search results
Abiaina Jun 21, 2018
f8508c8
adds some error messaging stuff and movies post to api
mmlamkin Jun 21, 2018
9d1c711
adds all proptypes
mmlamkin Jun 21, 2018
60368d9
fixes customer proptypes
mmlamkin Jun 21, 2018
6813e52
images of movies added to library are displayed--still a bug where th…
mmlamkin Jun 21, 2018
b133a15
adds some styling
mmlamkin Jun 22, 2018
64a846d
fixed terrible indentation
mmlamkin Dec 3, 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
5 changes: 5 additions & 0 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
MOVIEDB_KEY = "55c7599870e0d7e85e6d6126ae7f44b1"

REQUEST_LINK = "https://api.themoviedb.org/3/movie/550?api_key=32d7cfaf6ce21cc76643993aa46a7590"

READ_ACCESS_TOKEN = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJhdWQiOiIzMmQ3Y2ZhZjZjZTIxY2M3NjY0Mzk5M2FhNDZhNzU5MCIsInN1YiI6IjViMjgxODQ1MGUwYTI2NzdhMjAwMWU4MiIsInNjb3BlcyI6WyJhcGlfcmVhZCJdLCJ2ZXJzaW9uIjoxfQ.lFlCml9N36HVWMGJTZI1yuZVuUlcloTz_LOT1gfDl0Q"
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
.env.test.local
.env.production.local

.env

npm-debug.log*
yarn-debug.log*
yarn-error.log*
91 changes: 91 additions & 0 deletions package-lock.json
View file
Open in desktop

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

6 changes: 5 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"axios": "^0.18.0",
"react": "^16.4.1",
"react-alert": "^4.0.4",
"react-alert-template-basic": "^1.0.0",
"react-dom": "^16.4.1",
"react-router-dom": "^4.3.1",
"react-scripts": "1.1.4"
},
"scripts": {
Expand All @@ -13,4 +17,4 @@
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject"
}
}
}
1 change: 1 addition & 0 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
<link href="https://fonts.googleapis.com/css?family=Seaweed+Script" rel="stylesheet">
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Expand Down
Loading