Code

Ports - Sav & Angela #9

Code

Open

AngelaOh wants to merge 112 commits intoAda-C11:masterAda-C11/video-store-consumer:masterfrom AngelaOh:masterAngelaOh/video-store-consumer:masterCopy head branch name to clipboard

+1,184-8

Commits

Commits on Jun 24, 2019

• added components folder and MovieLibrary component

  AngelaOh

  committed
  6a9d1c1

  Copy full SHA for 6a9d1c1

• router dom installed

  qqdipps

  committed
  6a3504e

  Copy full SHA for 6a3504e

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

  qqdipps

  committed
  e7943c0

  Copy full SHA for e7943c0

• created MovieLibrary component

  AngelaOh

  committed
  2a2b380

  Copy full SHA for 2a2b380

• basic routes set up for homepage

  qqdipps

  committed
  46e25c8

  Copy full SHA for 46e25c8

• Merge pull request #1 from AngelaOh/homepage

  Show description for 9d899c4
  AngelaOh

  authored
  9d899c4

  Copy full SHA for 9d899c4

• able to view list of movies with MovieLibrary and Movie components

  AngelaOh

  committed
  1237652

  Copy full SHA for 1237652

• fixed merge conflicts

  AngelaOh

  committed
  39d95d1

  Copy full SHA for 39d95d1

• Merge pull request #2 from AngelaOh/ao/movie_library_react

  Show description for ff18067
  qqdipps

  authored
  ff18067

  Copy full SHA for ff18067

• passing callback func exploration

  qqdipps

  committed
  1968180

  Copy full SHA for 1968180

• Merge branch 'master' into customerList

  qqdipps

  committed
  acf296c

  Copy full SHA for acf296c

• addeds select button in Movie component

  AngelaOh

  committed
  49fbbd1

  Copy full SHA for 49fbbd1

• set up api request for customers didmount

  qqdipps

  committed
  66588de

  Copy full SHA for 66588de

• fixed bunches of bugs

  qqdipps

  committed
  2fe1ae9

  Copy full SHA for 2fe1ae9

• added customer information to component

  qqdipps

  committed
  073a42d

  Copy full SHA for 073a42d

• trying to add callback function for selectMovie

  AngelaOh

  committed
  63c3327

  Copy full SHA for 63c3327

• add movie callback function connected

  AngelaOh

  committed
  6dc9a8d

  Copy full SHA for 6dc9a8d

• added selecting customer functionality

  qqdipps

  committed
  07d57f4

  Copy full SHA for 07d57f4

• passing movie as prop when selecting one movie

  AngelaOh

  committed
  55cf9e2

  Copy full SHA for 55cf9e2

• Merge pull request #4 from AngelaOh/ao/movie_library_select

  Show description for 62d878a
  qqdipps

  authored
  62d878a

  Copy full SHA for 62d878a

• merge conf

  qqdipps

  committed
  c4986f2

  Copy full SHA for c4986f2

Commits on Jun 25, 2019

• moved axios api request into separate method

  AngelaOh

  committed
  812a319

  Copy full SHA for 812a319

• fixed indentation and erased comments

  AngelaOh

  committed
  100702f

  Copy full SHA for 100702f

• used spread operator to pass movie object into Movie

  AngelaOh

  committed
  94ca94c

  Copy full SHA for 94ca94c

• more syntax cleanup

  AngelaOh

  committed
  fe19caf

  Copy full SHA for fe19caf

• added message in Router if movie is selected

  AngelaOh

  committed
  2e682ca

  Copy full SHA for 2e682ca

• Merge pull request #5 from AngelaOh/ao/movie_library_refactorings

  Show description for 6e50bfa
  qqdipps

  authored
  6e50bfa

  Copy full SHA for 6e50bfa

• refactored homepage to reflect code style changes and temp display of customers

  qqdipps

  committed
  1cbb959

  Copy full SHA for 1cbb959

• fixed display bug for customer

  qqdipps

  committed
  69b84c3

  Copy full SHA for 69b84c3

• added a get request to Rails API in MovieSearch

  AngelaOh

  committed
  3bc44e3

  Copy full SHA for 3bc44e3

• Merge branch 'master' of https://github.com/AngelaOh/video-store-consumer into ao/movie_search

  AngelaOh

  committed
  ce0fb47

  Copy full SHA for ce0fb47

• set up scaffolding for checkOut component

  qqdipps

  committed
  333ca4b

  Copy full SHA for 333ca4b

• added lifecyle func to derive states from props after intialization of object

  qqdipps

  committed
  06d9c70

  Copy full SHA for 06d9c70

• sets state so SearchedMovies returns all movies from external database based on search query

  AngelaOh

  committed
  acaad7a

  Copy full SHA for acaad7a

• DOM renders list of searched movies

  AngelaOh

  committed
  8dda284

  Copy full SHA for 8dda284

• refactored to functional componenet with callback, state not req

  qqdipps

  committed
  acf30f3

  Copy full SHA for acf30f3

• Merge pull request #6 from AngelaOh/ao/movie_search

  Show description for 3c6ffc8
  qqdipps

  authored
  3c6ffc8

  Copy full SHA for 3c6ffc8

• removed console.log

  qqdipps

  committed
  f4cbd3e

  Copy full SHA for f4cbd3e

• Merge pull request #7 from AngelaOh/checkOut

  Show description for 1be7acd
  AngelaOh

  authored
  1be7acd

  Copy full SHA for 1be7acd

• added addToLibrary button

  AngelaOh

  committed
  980a77e

  Copy full SHA for 980a77e

• added post request for rental to callback, and update state to clear selected items

  qqdipps

  committed
  6e87710

  Copy full SHA for 6e87710

• Merge pull request #8 from AngelaOh/checkOut

  Show description for fcd85b6
  AngelaOh

  authored
  fcd85b6

  Copy full SHA for fcd85b6

• Merge branch 'master' into ao/add_to_library

  AngelaOh

  committed
  581cc73

  Copy full SHA for 581cc73

• merge resolved

  qqdipps

  committed
  d6080da

  Copy full SHA for d6080da

• added proptypes to all child components

  AngelaOh

  committed
  ae532a3

  Copy full SHA for ae532a3

• added customer.js proptypes

  AngelaOh

  committed
  d552a73

  Copy full SHA for d552a73

• finished PropTypes and erased unnecessary console.logs

  AngelaOh

  committed
  43a3d47

  Copy full SHA for 43a3d47

• Merge pull request #10 from AngelaOh/ao/add_proptypes

  Show description for 42228cd
  AngelaOh

  authored
  42228cd

  Copy full SHA for 42228cd

• added dynamic button display to movie

  qqdipps

  committed
  f285f2b

  Copy full SHA for f285f2b

• conflict resolved

  qqdipps

  committed
  d08a45b

  Copy full SHA for d08a45b

• debug conflict

  qqdipps

  committed
  937d7dc

  Copy full SHA for 937d7dc

• Merge pull request #11 from AngelaOh/DynamicButtonDisplay

  Show description for 330d6c5
  AngelaOh

  authored
  330d6c5

  Copy full SHA for 330d6c5

Commits on Jun 26, 2019

• added callback error massage method to movieSearch

  qqdipps

  committed
  365cbd1

  Copy full SHA for 365cbd1

• added callback error massage method to movieLibrary

  qqdipps

  committed
  9c084df

  Copy full SHA for 9c084df

• added callback error massage method to customerList

  qqdipps

  committed
  f4fa53e

  Copy full SHA for f4fa53e

• added post request to add movie from exernal into library

  AngelaOh

  committed
  f50a6f9

  Copy full SHA for f50a6f9

• erased unnecessary console.logs

  AngelaOh

  committed
  1a379f8

  Copy full SHA for 1a379f8

• Merge pull request #12 from AngelaOh/ao/add_to_library_axios

  Show description for 24b4948
  qqdipps

  authored
  24b4948

  Copy full SHA for 24b4948

• added Error Message component and implemeted callback func

  qqdipps

  committed
  c5c4058

  Copy full SHA for c5c4058

• added bootstrap

  AngelaOh

  committed
  562322f

  Copy full SHA for 562322f

• implemented clear error callback func and sent to components

  qqdipps

  committed
  1456f4b

  Copy full SHA for 1456f4b

• Merge branch 'master' into errorHandling

  AngelaOh

  authored
  a468238

  Copy full SHA for a468238

• Merge pull request #13 from AngelaOh/errorHandling

  Show description for 4ccca71
  AngelaOh

  authored
  4ccca71

  Copy full SHA for 4ccca71

• added bootstrap button

  AngelaOh

  committed
  b870dd9

  Copy full SHA for b870dd9

• added bootstrap cards for movie list display

  AngelaOh

  committed
  b00d146

  Copy full SHA for b00d146

• added bootstrap nav bar

  AngelaOh

  committed
  e7a72c9

  Copy full SHA for e7a72c9

• added customer cards

  AngelaOh

  committed
  dd11799

  Copy full SHA for dd11799

Commits on Jun 27, 2019

• Merge pull request #14 from AngelaOh/ao/styling_movies

  Show description for ff99ff5
  qqdipps

  authored
  ff99ff5

  Copy full SHA for ff99ff5

• format auto

  qqdipps

  committed
  839da2f

  Copy full SHA for 839da2f

• added welcomComponent and display logic

  qqdipps

  committed
  e066474

  Copy full SHA for e066474

• Merge branch 'master' into welcomeComponent

  qqdipps

  authored
  759a65a

  Copy full SHA for 759a65a

• fixed reload bug

  qqdipps

  committed
  3f60144

  Copy full SHA for 3f60144

• rearrange error placement and added boot strap alert to error

  qqdipps

  committed
  f97ae6e

  Copy full SHA for f97ae6e

• fixed bug in chechout for undfined func

  qqdipps

  committed
  af4933c

  Copy full SHA for af4933c

• Merge branch 'welcomeComponent' into errorStyle

  qqdipps

  committed
  9a9cd3d

  Copy full SHA for 9a9cd3d

• styling and rearranging selected comp for CheckOut, looks ok, not great

  qqdipps

  committed
  8ef25f7

  Copy full SHA for 8ef25f7

• Merge pull request #15 from AngelaOh/welcomeComponent

  Show description for ef08482
  AngelaOh

  authored
  ef08482

  Copy full SHA for ef08482

• Merge pull request #16 from AngelaOh/errorStyle

  Show description for 622c94f
  AngelaOh

  authored
  622c94f

  Copy full SHA for 622c94f

• Merge pull request #17 from AngelaOh/checkOutStyle

  Show description for 7cfcbc8
  AngelaOh

  authored
  7cfcbc8

  Copy full SHA for 7cfcbc8

• added message when movie is added to library

  AngelaOh

  committed
  a8b44b8

  Copy full SHA for a8b44b8

• Merge pull request #18 from AngelaOh/ao/add_to_library_message

  Show description for 1b26d3e
  AngelaOh

  authored
  1b26d3e

  Copy full SHA for 1b26d3e

• refactoring errormessage to generic alert component

  qqdipps

  committed
  831655f

  Copy full SHA for 831655f

• merge conflict resolve in imports

  qqdipps

  committed
  73d20eb

  Copy full SHA for 73d20eb

• added modal to show movie information on side

  AngelaOh

  committed
  05ead74

  Copy full SHA for 05ead74

• added margins for movie list

  AngelaOh

  committed
  d82e2d4

  Copy full SHA for d82e2d4

Commits on Jun 28, 2019

• fixed card sizes to be uniform

  AngelaOh

  committed
  dd975d7

  Copy full SHA for dd975d7

• fixed button on movie

  AngelaOh

  committed
  91f43cd

  Copy full SHA for 91f43cd

• refactoring message components to Alert

  qqdipps

  committed
  584cc39

  Copy full SHA for 584cc39

• refactored MovieSearch errormessage handling to alerts

  qqdipps

  committed
  8b7a108

  Copy full SHA for 8b7a108

• refactored error messages to handling alerts

  qqdipps

  committed
  7840cba

  Copy full SHA for 7840cba

• finished cleaning up and refactoring alerts and related callback func

  qqdipps

  committed
  7b67c43

  Copy full SHA for 7b67c43

• removed unused var

  qqdipps

  committed
  7dc7daf

  Copy full SHA for 7dc7daf

• Merge pull request #19 from AngelaOh/testing-modal

  Show description for 0b51c53
  qqdipps

  authored
  0b51c53

  Copy full SHA for 0b51c53

• Merge branch 'sd/refactor-error-to-alert'

  qqdipps

  committed
  bfd4725

  Copy full SHA for bfd4725

• updated add to library logic so button changes on click

  qqdipps

  committed
  787d5dd

  Copy full SHA for 787d5dd

• updating proptypes, func naming readability

  qqdipps

  committed
  d9e0e7e

  Copy full SHA for d9e0e7e

• adding more prop types

  qqdipps

  committed
  ac3d888

  Copy full SHA for ac3d888

• added prop types for custom movie attr props

  qqdipps

  committed
  f856c96

  Copy full SHA for f856c96

• changed select to selected on click

  qqdipps

  committed
  67aaf16

  Copy full SHA for 67aaf16

• added button changes

  qqdipps

  committed
  b94497a

  Copy full SHA for b94497a

• Merge pull request #22 from AngelaOh/propTypes-double-check

  Show description for 73687d4
  AngelaOh

  authored
  73687d4

  Copy full SHA for 73687d4

• Merge pull request #23 from AngelaOh/select-btn-change

  Show description for 337267c
  AngelaOh

  authored
  337267c

  Copy full SHA for 337267c

• alpha display of movies

  qqdipps

  committed
  aac4513

  Copy full SHA for aac4513

• Merge pull request #24 from AngelaOh/alpha-display

  Show description for e9676db
  qqdipps

  authored
  e9676db

  Copy full SHA for e9676db

• disabled button if movies have already been added

  AngelaOh

  committed
  fec100a

  Copy full SHA for fec100a

• Merge pull request #25 from AngelaOh/movie_button

  Show description for 4157c08
  AngelaOh

  authored
  4157c08

  Copy full SHA for 4157c08

• added disabled button for movie selected, comented out sorting line in movieLibrary

  AngelaOh

  committed
  9dc5049

  Copy full SHA for 9dc5049

• fixing alpha bug

  qqdipps

  committed
  98f1ca5

  Copy full SHA for 98f1ca5

• Merge pull request #26 from AngelaOh/disable_movie_library_button

  Show description for 1551251
  qqdipps

  authored
  1551251

  Copy full SHA for 1551251

• Merge branch 'master' into test_master

  qqdipps

  authored
  385d496

  Copy full SHA for 385d496

• Merge pull request #27 from AngelaOh/test_master

  Show description for 5e46d85
  qqdipps

  authored
  5e46d85

  Copy full SHA for 5e46d85

• got rid of spaces

  AngelaOh

  committed
  053bbf2

  Copy full SHA for 053bbf2