Code

Ports - Ari and Amy W#25

Code

Open

amythetester wants to merge 59 commits intoAda-C11:masterAda-C11/video-store-consumer:masterfrom aribray:masteraribray/video-store-consumer:masterCopy head branch name to clipboard

+926-28

Commits

Commits on Jun 24, 2019

• imported react-router-dom into App.js

  aribray

  committed
  db92ce8

Commits on Jun 25, 2019

• skeleton of app layout created

  amythetester

  committed
  4cef164

• added customer and customerlist components

  aribray

  committed
  f0b6507

Commits on Jun 26, 2019

• added showrentals functionality, added rentalLibrary and Movie components

  aribray

  committed
  af089fe

• added show customer functionality (mostly just fixed the customer component

  aribray

  committed
  ea1c7e0

• formatting changes

  aribray

  committed
  26beca0

• Merge branch 'customerlibrary' into rentallibrary

  aribray

  committed
  0b90ff5

• merged customerlibrary branch into this branch, cleaned up formatting

  aribray

  committed
  ff5ff00

• refactored app to use react-router

  aribray

  committed
  3191328

• Merge pull request #1 from aribray/rentallibrary

  Show description for 0e7b852
  amythetester

  authored
  0e7b852

• Merge pull request #3 from aribray/app_refactor

  Show description for 7b242f4
  amythetester

  authored
  7b242f4

• added search functionality/component

  aribray

  committed
  120c3fe

• added rendering of search results with photo within search component

  aribray

  committed
  7d71cc5

• select customer in state

  amythetester

  committed
  752fd6b

• Merge pull request #4 from aribray/search

  Show description for d4ea684
  amythetester

  authored
  d4ea684

• merged

  amythetester

  committed
  9c35743

• fixed search link

  amythetester

  committed
  57fed6d

• Merge pull request #5 from aribray/customer-movie-react

  Show description for 3840545
  aribray

  authored
  3840545

• select movie in state

  amythetester

  committed
  d31ee08

• Merge remote-tracking branch 'origin' into customer-movie-react

  amythetester

  committed
  c56e142

• Merge pull request #6 from aribray/customer-movie-react

  Show description for f6faab9
  aribray

  authored
  f6faab9

• working on addMovie functionality

  aribray

  committed
  7a31648

• using internal api to query external api

  aribray

  committed
  91dc2e0

• working on creating post endpoint in rails API. pushing react portion so we can work on rails portion

  aribray

  committed
  73d043f

• changed addMovieCallback function back to what it was before

  aribray

  committed
  b677c5f

• Merge pull request #7 from aribray/addMovie

  Show description for 06de04a
  amythetester

  authored
  06de04a

• addMovie Post request

  amythetester

  committed
  550937d

• fixed addmovie function. successfully adding movies

  aribray

  committed
  cf73354

• added ability to see currently selected movie and customer

  aribray

  committed
  e219073

• movie rental

  amythetester

  committed
  335dfa3

Commits on Jun 27, 2019

• homepage rendering

  amythetester

  committed
  b81946d

• organize nav, checkout, and added search image

  amythetester

  committed
  3204236

• added styling for CustomerList and Customer components

  aribray

  committed
  1be56db

• added styling to RentalLibrary and Movie components

  aribray

  committed
  2a85d7d

• style fixed nav

  amythetester

  committed
  cf3c689

• Merge pull request #8 from aribray/customer_styling

  Show description for 0995bd5
  amythetester

  authored
  0995bd5

• Merge remote-tracking branch 'origin' into nav-styling

  amythetester

  committed
  45f7593

• selected box

  amythetester

  committed
  38d3fc4

• Merge pull request #9 from aribray/nav-styling

  Show description for 42ee552
  aribray

  authored
  42ee552

• checkout section styled

  amythetester

  committed
  562d9b8

• fixed movie image problem

  aribray

  committed
  1bfc828

• Merge branch 'master' into style-checkout

  amythetester

  authored
  ceef89a

• Merge pull request #10 from aribray/style-checkout

  Show description for 9639be7
  amythetester

  authored
  9639be7

Commits on Jun 28, 2019

• added image to homepage and centered

  amythetester

  committed
  b74a984

• Merge pull request #11 from aribray/homepage-style

  Show description for 044ee1b
  aribray

  authored
  044ee1b

• search form centered

  amythetester

  committed
  3a4b9ea

• Merge branch 'master' into search-style

  amythetester

  committed
  d92b6c7

• fixed Search header style

  amythetester

  committed
  c771235

• fixed font

  amythetester

  committed
  8f4f4aa

• styling results

  amythetester

  committed
  970433a

• Merge pull request #13 from aribray/result-style

  Show description for 8a477f3
  aribray

  authored
  8a477f3

• Added flexbox to movies

  amythetester

  committed
  3b4623d

• fixed bold on homepage

  amythetester

  committed
  c24ba57

• bolding

  amythetester

  committed
  b03d717

• Merge remote-tracking branch 'origin' into list-style

  amythetester

  committed
  b0fbd40

• fixed new movie link color

  amythetester

  committed
  5edb3fa

• Merge pull request #14 from aribray/list-style

  Show description for 7f581a6
  aribray

  authored
  7f581a6

• added some front end success

  amythetester

  committed
  4cbbcb9

• Merge remote-tracking branch 'origin' into list-style

  amythetester

  committed
  7fbc77f