Code

Ports - Faiza & Heather#27

Code

Open

Faiza1987 wants to merge 56 commits intoAda-C11:masterAda-C11/video-store-consumer:masterfrom Faiza1987:masterFaiza1987/video-store-consumer:masterCopy head branch name to clipboard

+1,226-13

Commits

Commits on Jun 24, 2019

• added files for components and css

  piffer59

  committed
  8c86a36

  Copy full SHA for 8c86a36

• component did mount for rails api, populated allMovies

  piffer59

  committed
  2650aa1

  Copy full SHA for 2650aa1

Commits on Jun 25, 2019

• List of movies displays in App

  Faiza1987

  committed
  be77d6c

  Copy full SHA for be77d6c

• can get a list of customers from the api

  piffer59

  committed
  bae67e4

  Copy full SHA for bae67e4

• Can display Movies with button

  Faiza1987

  committed
  aedf61b

  Copy full SHA for aedf61b

• Merge pull request #1 from Faiza1987/movies

  Show description for 413aaa7
  Faiza1987

  authored
  413aaa7

  Copy full SHA for 413aaa7

• Added React Router to App component for Movies

  Faiza1987

  committed
  3836c51

  Copy full SHA for 3836c51

• Can access array of all customers in Customers component

  piffer59

  committed
  04207be

  Copy full SHA for 04207be

• Can save movie.id to movieId in state

  Faiza1987

  committed
  25c1b90

  Copy full SHA for 25c1b90

• Can display list of customers when button is clicked

  piffer59

  committed
  e64acee

  Copy full SHA for e64acee

• Merge pull request #3 from Faiza1987/movies

  Show description for b214acf
  Faiza1987

  authored
  b214acf

  Copy full SHA for b214acf

• merge conflicts

  piffer59

  committed
  1c6a195

  Copy full SHA for 1c6a195

• Merge pull request #2 from Faiza1987/hki-customers

  Show description for da3d38e
  piffer59

  authored
  da3d38e

  Copy full SHA for da3d38e

Commits on Jun 26, 2019

• Moved componentDidMount from App to Movies

  Faiza1987

  committed
  5a7d713

  Copy full SHA for 5a7d713

• Merge pull request #4 from Faiza1987/library-axios

  Show description for e7b92f3
  Faiza1987

  authored
  e7b92f3

  Copy full SHA for e7b92f3

• Fixed some indentation

  Faiza1987

  committed
  2570a63

  Copy full SHA for 2570a63

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

  Faiza1987

  committed
  b37d7d3

  Copy full SHA for b37d7d3

• Created a link to the search component in the Nav Bar

  Faiza1987

  committed
  417cff8

  Copy full SHA for 417cff8

• Added some styling

  Faiza1987

  committed
  7c041dc

  Copy full SHA for 7c041dc

• working on selecting a customer

  piffer59

  committed
  6e43388

  Copy full SHA for 6e43388

• can select a customer

  piffer59

  committed
  ed5caa0

  Copy full SHA for ed5caa0

• changed movie buttons to divs in Library

  piffer59

  committed
  54aadbd

  Copy full SHA for 54aadbd

• Changed button select movie to a div

  Faiza1987

  committed
  d551392

  Copy full SHA for d551392

• merge errors

  piffer59

  committed
  718b231

  Copy full SHA for 718b231

• merge conflicts

  piffer59

  committed
  70d4478

  Copy full SHA for 70d4478

• merge conflicts

  piffer59

  committed
  5ba36cc

  Copy full SHA for 5ba36cc

• changed Library and Customers to pass back objects to App state rather than IDs

  piffer59

  committed
  05dc2f8

  Copy full SHA for 05dc2f8

• selected customer and movie persist and are viewable throughout the app

  piffer59

  committed
  29414ec

  Copy full SHA for 29414ec

• post request in progress to rentals

  piffer59

  committed
  3e006bf

  Copy full SHA for 3e006bf

• Search movies GET request + select movie

  Faiza1987

  committed
  137b56d

  Copy full SHA for 137b56d

• merge conflicts resolved

  Faiza1987

  committed
  85ffd78

  Copy full SHA for 85ffd78

• can checkout out a selected movie to a selected customer

  piffer59

  committed
  a5fbb9c

  Copy full SHA for a5fbb9c

• Can post movies

  Faiza1987

  committed
  bb9c666

  Copy full SHA for bb9c666

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

  Faiza1987

  committed
  eab634e

  Copy full SHA for eab634e

• Merge pull request #5 from Faiza1987/search

  Show description for 88351dc
  Faiza1987

  authored
  88351dc

  Copy full SHA for 88351dc

• Added conditional to prevent adding of duplicate movies

  Faiza1987

  committed
  25bbd15

  Copy full SHA for 25bbd15

• Merge pull request #6 from Faiza1987/search

  Show description for 9d119c2
  Faiza1987

  authored
  9d119c2

  Copy full SHA for 9d119c2

• Added a break

  Faiza1987

  committed
  dcd0544

  Copy full SHA for dcd0544

• Merge pull request #7 from Faiza1987/search

  Show description for fdf78db
  Faiza1987

  authored
  fdf78db

  Copy full SHA for fdf78db

Commits on Jun 27, 2019

• Selected Customer and Movie dissapear when creating rental, successful rental message

  piffer59

  committed
  bb202e6

  Copy full SHA for bb202e6

• Can now show images for added movies

  Faiza1987

  committed
  dd68f72

  Copy full SHA for dd68f72

• Merge pull request #8 from Faiza1987/search

  Show description for 12b359e
  Faiza1987

  authored
  12b359e

  Copy full SHA for 12b359e

• Updated Rental

  piffer59

  committed
  f3e7941

  Copy full SHA for f3e7941

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

  piffer59

  committed
  1814f47

  Copy full SHA for 1814f47

• Displaying movie library as cards, added css

  piffer59

  committed
  0f371f4

  Copy full SHA for 0f371f4

• Added lots of styling

  Faiza1987

  committed
  1d3cdea

  Copy full SHA for 1d3cdea

• Merge pull request #9 from Faiza1987/homepage-css

  Show description for 2e9f07a
  Faiza1987

  authored
  2e9f07a

  Copy full SHA for 2e9f07a

Commits on Jun 28, 2019

• Added more styling to Search component

  Faiza1987

  committed
  16d0675

  Copy full SHA for 16d0675

• Merge pull request #10 from Faiza1987/homepage-css

  Show description for d1b0a26
  Faiza1987

  authored
  d1b0a26

  Copy full SHA for d1b0a26

• Made movie card float next to movie list in the Search component

  Faiza1987

  committed
  032f645

  Copy full SHA for 032f645

• Added PropTypes

  Faiza1987

  committed
  1a380fc

  Copy full SHA for 1a380fc

• Merge pull request #11 from Faiza1987/homepage-css

  Show description for b8bc45a
  Faiza1987

  authored
  b8bc45a

  Copy full SHA for b8bc45a

• css for rental info

  piffer59

  committed
  9e04ef2

  Copy full SHA for 9e04ef2

• css on rental info

  piffer59

  committed
  54b1fa5

  Copy full SHA for 54b1fa5

• Merge pull request #12 from Faiza1987/hki-main

  Show description for b7704c9
  piffer59

  authored
  b7704c9

  Copy full SHA for b7704c9

• More styling

  Faiza1987

  committed
  dd0e5c9

  Copy full SHA for dd0e5c9