Code

Mary and Abinnet#20

Code

Open

mmlamkin wants to merge 63 commits intoAda-C9:masterAda-C9/video-store-consumer:masterfrom mmlamkin:mastermmlamkin/video-store-consumer:masterCopy head branch name to clipboard

+923-26

Commits

Commits on Jun 18, 2018

• cloned, ran tests etc

  mmlamkin

  committed
  e7c9502

  Copy full SHA for e7c9502

• adds internal api library to react app

  mmlamkin

  committed
  f3026f7

  Copy full SHA for f3026f7

• adds movie component

  mmlamkin

  committed
  13e5ed8

  Copy full SHA for 13e5ed8

• adds state to app and renders library with button click

  mmlamkin

  committed
  7569a61

  Copy full SHA for 7569a61

• adds custoemr button to react app

  mmlamkin

  committed
  8d453f5

  Copy full SHA for 8d453f5

• added search movie component

  Abiaina

  committed
  6516c62

  Copy full SHA for 6516c62

• added search movie component

  Abiaina

  committed
  27498e9

  Copy full SHA for 27498e9

• resolved merge conflict

  Abiaina

  committed
  9f778be

  Copy full SHA for 9f778be

• api call search results show up on app and replace current customer and movie list

  Abiaina

  committed
  5882afa

  Copy full SHA for 5882afa

• adds a non functional button for adding customer to rental

  mmlamkin

  committed
  842d84c

  Copy full SHA for 842d84c

• Merge branch 'master' of https://github.com/mmlamkin/video-store-consumer

  mmlamkin

  committed
  dd2c3e4

  Copy full SHA for dd2c3e4

Commits on Jun 19, 2018

• adds library and movie styling and customer component

  mmlamkin

  committed
  89d55df

  Copy full SHA for 89d55df

• can add customer to rental

  mmlamkin

  committed
  5ef5adf

  Copy full SHA for 5ef5adf

• can add movie to rental

  mmlamkin

  committed
  918d89d

  Copy full SHA for 918d89d

• created searchcontainer working on integrating changes for search and search results to app and other components added some validations and removed unused variables

  Abiaina

  committed
  cf54f00

  Copy full SHA for cf54f00

• Merge branch 'master' of https://github.com/mmlamkin/video-store-consumer

  Abiaina

  committed
  47bbe03

  Copy full SHA for 47bbe03

• can post rental

  mmlamkin

  committed
  d6520d1

  Copy full SHA for d6520d1

• search component sort of works, passes search terms and does query on local api unsuccessfully but without crashing the react page

  Abiaina

  committed
  9c31e3c

  Copy full SHA for 9c31e3c

• adds some stuff

  mmlamkin

  committed
  2d9f7bd

  Copy full SHA for 2d9f7bd

• conflicts

  mmlamkin

  committed
  7d2e453

  Copy full SHA for 7d2e453

• more merge conflicts

  mmlamkin

  committed
  7c56fe0

  Copy full SHA for 7c56fe0

• trying to merge

  Abiaina

  committed
  c2d54b7

  Copy full SHA for c2d54b7

• removed unused variables, searchResults component still unable to change its own state...unsure why

  Abiaina

  committed
  380d6ac

  Copy full SHA for 380d6ac

• fixed search bug...ternary was wrong

  Abiaina

  committed
  dae14cc

  Copy full SHA for dae14cc

• adds set interval to app

  mmlamkin

  committed
  4e5ce23

  Copy full SHA for 4e5ce23

• added the library to the app component for router

  Abiaina

  committed
  edcd786

  Copy full SHA for edcd786

• some stuff

  mmlamkin

  committed
  0aa38a3

  Copy full SHA for 0aa38a3

• Merge branch 'master' of https://github.com/mmlamkin/video-store-consumer

  mmlamkin

  committed
  0394b1f

  Copy full SHA for 0394b1f

• updated router bug fixed

  Abiaina

  committed
  55f38b2

  Copy full SHA for 55f38b2

• url updates to reflect customers and library displays

  Abiaina

  committed
  47c257e

  Copy full SHA for 47c257e

• updated routes and organization of customer and libary

  Abiaina

  committed
  4c0c38e

  Copy full SHA for 4c0c38e

• adds some router stuff

  mmlamkin

  committed
  0ccc337

  Copy full SHA for 0ccc337

• updated routes for customer, home and library, search route is not working..

  Abiaina

  committed
  4b54b86

  Copy full SHA for 4b54b86

• re integrated the search components into a container and set up route and button for search page

  Abiaina

  committed
  1d1b522

  Copy full SHA for 1d1b522

• adds styling

  mmlamkin

  committed
  40b5a74

  Copy full SHA for 40b5a74

• merge conflicts

  mmlamkin

  committed
  3daa935

  Copy full SHA for 3daa935

• small changes in search passing props/callbacks

  Abiaina

  committed
  84cc683

  Copy full SHA for 84cc683

• Merge branch 'master' of https://github.com/mmlamkin/video-store-consumer

  Abiaina

  committed
  d5b7010

  Copy full SHA for d5b7010

Commits on Jun 20, 2018

• refactored search box to be in app, search bar now shows up on search page

  Abiaina

  committed
  23bbe9b

  Copy full SHA for 23bbe9b

• Search page works returns matching result...still needs to be broken up and placed in a container

  Abiaina

  committed
  40fbe56

  Copy full SHA for 40fbe56

• found a bug in the search results page: results show previous search values until page is rendered again. Copied app search components into search container..future place to refactor

  Abiaina

  committed
  35f0781

  Copy full SHA for 35f0781

• updated search to querry external api

  Abiaina

  committed
  3efb4a7

  Copy full SHA for 3efb4a7

• adds some styling

  mmlamkin

  committed
  a56f314

  Copy full SHA for a56f314

• adds some styling

  mmlamkin

  committed
  568c97a

  Copy full SHA for 568c97a

• trying to keep the changes only in search results..library and movie button now has no functionality

  Abiaina

  committed
  7a1aab4

  Copy full SHA for 7a1aab4

• tracks current movie library in app

  Abiaina

  committed
  c9fed7a

  Copy full SHA for c9fed7a

• search results give title specific message when movie is added to library...still missing full functionality

  Abiaina

  committed
  a74e807

  Copy full SHA for a74e807

• clears search results with new search

  mmlamkin

  committed
  201b3a9

  Copy full SHA for 201b3a9

Commits on Jun 21, 2018

• pushing up any uncommitted changes

  Abiaina

  committed
  b05ce68

  Copy full SHA for b05ce68

• fix merge conflicts

  mmlamkin

  committed
  4ed418d

  Copy full SHA for 4ed418d

• updated the add lib search post request in searchResults

  Abiaina

  committed
  8032178

  Copy full SHA for 8032178

• updated post for addLib in searchResults

  Abiaina

  committed
  166c951

  Copy full SHA for 166c951

• cannot access post request server...only works in postman

  Abiaina

  committed
  023b023

  Copy full SHA for 023b023

• updated library to hold the rent movie button, functionality not affected. still unable to have post request to addmovie to lib

  Abiaina

  committed
  87836ce

  Copy full SHA for 87836ce

• some crappy styling

  mmlamkin

  committed
  22efa10

  Copy full SHA for 22efa10

• Merge branch 'master' of https://github.com/mmlamkin/video-store-consumer

  Abiaina

  committed
  3c0148c

  Copy full SHA for 3c0148c

• added addLib button to search results

  Abiaina

  committed
  d62e6b1

  Copy full SHA for d62e6b1

• adds some error messaging stuff and movies post to api

  mmlamkin

  committed
  f8508c8

  Copy full SHA for f8508c8

• adds all proptypes

  mmlamkin

  committed
  9d1c711

  Copy full SHA for 9d1c711

• fixes customer proptypes

  mmlamkin

  committed
  60368d9

  Copy full SHA for 60368d9

• images of movies added to library are displayed--still a bug where the disappear from external api search page after hitting add to library

  mmlamkin

  committed
  6813e52

  Copy full SHA for 6813e52

Commits on Jun 22, 2018

• adds some styling

  mmlamkin

  committed
  b133a15

  Copy full SHA for b133a15

Commits on Dec 3, 2018

• fixed terrible indentation

  mmlamkin

  committed
  64a846d

  Copy full SHA for 64a846d