Code

Anna & Mona - Fire#7

Code

Open

MonaRahmani wants to merge 75 commits intoAda-C14:masterAda-C14/video-store-consumer:masterfrom MonaRahmani:masterMonaRahmani/video-store-consumer:masterCopy head branch name to clipboard

Commits

Commits on Jan 19, 2021

• initial setup

  MonaRahmani

  committed
  be15f0d

  Copy full SHA for be15f0d

• created component folderinitial setup for components

  MonaRahmani

  committed
  6f1a53e

  Copy full SHA for 6f1a53e

• added react Router

  MonaRahmani

  committed
  e5314a1

  Copy full SHA for e5314a1

Commits on Jan 20, 2021

• fixed the switch error and added routes in App

  MonaRahmani

  committed
  2998883

  Copy full SHA for 2998883

• listed all videos in the video library

  MonaRahmani

  committed
  fdc0d3e

  Copy full SHA for fdc0d3e

• Merge pull request #1 from MonaRahmani/MovieLibrary

  Show description for f1fe466
  MonaRahmani

  authored
  f1fe466

  Copy full SHA for f1fe466

• basic setup for MovieSearch component

  annakim93

  committed
  7f82934

  Copy full SHA for 7f82934

• moviesearch comp: add state - searchQuery and searchResults

  annakim93

  committed
  203c02c

  Copy full SHA for 203c02c

• moviesearch comp: add onInputChange handler

  annakim93

  committed
  4575505

  Copy full SHA for 4575505

• add base api url localhost3000 as constant in app comp

  annakim93

  committed
  4148bbd

  Copy full SHA for 4148bbd

• moviesearch comp: submit event handler; set state for alerts to pass to search results page

  annakim93

  committed
  2514fef

  Copy full SHA for 2514fef

• rename components

  annakim93

  committed
  ac46800

  Copy full SHA for ac46800

• rename components

  annakim93

  committed
  27d1544

  Copy full SHA for 27d1544

• moviesearchbar comp: set up return and redirect on submit

  annakim93

  committed
  d0b57cc

  Copy full SHA for d0b57cc

• set up route to take in props for moviesearchresults in app comp

  annakim93

  committed
  65689ae

  Copy full SHA for 65689ae

• moviesearchresults: update proptypes to check for nested props

  annakim93

  committed
  41d7449

  Copy full SHA for 41d7449

• add movie component

  annakim93

  committed
  cda54cd

  Copy full SHA for cda54cd

• complete return for movie comp and proptypes

  annakim93

  committed
  6843981

  Copy full SHA for 6843981

• moviesearchresults comp: generateMovieComponents fn

  annakim93

  committed
  83c82a5

  Copy full SHA for 83c82a5

• update moviesearchresults comp to return movie components

  annakim93

  committed
  1a98edd

  Copy full SHA for 1a98edd

• worked on CustomerLis- we can see a list of all customers

  MonaRahmani

  committed
  de17d21

  Copy full SHA for de17d21

• styling for movie component

  annakim93

  committed
  1d6f880

  Copy full SHA for 1d6f880

• Merge pull request #2 from MonaRahmani/ML

  Show description for 35ba338
  MonaRahmani

  authored
  35ba338

  Copy full SHA for 35ba338

• add styling to movie search results

  annakim93

  committed
  c0dd472

  Copy full SHA for c0dd472

• add similar styling to movie library list

  annakim93

  committed
  86f2eb8

  Copy full SHA for 86f2eb8

• Merge branch 'master' into video-search

  annakim93

  authored
  f7aef20

  Copy full SHA for f7aef20

• Merge pull request #3 from MonaRahmani/video-search

  Show description for b09ff54
  annakim93

  authored
  b09ff54

  Copy full SHA for b09ff54

• set up alert messages for num search results found in moviesearchresults comp and moviesearchbar

  annakim93

  committed
  93db068

  Copy full SHA for 93db068

• add props to movie library component

  annakim93

  committed
  7f3bec7

  Copy full SHA for 7f3bec7

• adjust movie to allow for info on click

  annakim93

  committed
  16c4083

  Copy full SHA for 16c4083

• add popup component to show more info on movies on click

  annakim93

  committed
  aac3b48

  Copy full SHA for aac3b48

• add popup component to show more info on movies on click

  annakim93

  committed
  d6ab5e0

  Copy full SHA for d6ab5e0

• working on customer selection - created selectCustomerCallback

  MonaRahmani

  committed
  3163075

  Copy full SHA for 3163075

• started working on rental

  MonaRahmani

  committed
  5c95d3b

  Copy full SHA for 5c95d3b

• Merge pull request #4 from MonaRahmani/customer

  Show description for 8adf93b
  MonaRahmani

  authored
  8adf93b

  Copy full SHA for 8adf93b

• added click popup to movie library component

  annakim93

  committed
  2725308

  Copy full SHA for 2725308

• changes to movie component hover styling

  annakim93

  committed
  97cf7d2

  Copy full SHA for 97cf7d2

• add 'location' to props passed to movie component

  annakim93

  committed
  7ec00e4

  Copy full SHA for 7ec00e4

• addToLibrary callback fn for movie search results

  annakim93

  committed
  bd53d4c

  Copy full SHA for bd53d4c

• Merge pull request #5 from MonaRahmani/add-video-to-library

  Show description for abcaf29
  annakim93

  authored
  abcaf29

  Copy full SHA for abcaf29

Commits on Jan 21, 2021

• styling

  annakim93

  committed
  4956191

  Copy full SHA for 4956191

• worked on rental- not done

  MonaRahmani

  committed
  7eb3e86

  Copy full SHA for 7eb3e86

• homepage styling

  annakim93

  committed
  6ed05fb

  Copy full SHA for 6ed05fb

• Merge pull request #6 from MonaRahmani/select-customer

  Show description for 050ed76
  annakim93

  authored
  050ed76

  Copy full SHA for 050ed76

• added selectMovie func

  MonaRahmani

  committed
  a06d743

  Copy full SHA for a06d743

• Merge branch 'master' into stillcustomer

  MonaRahmani

  authored
  11676ab

  Copy full SHA for 11676ab

• Merge pull request #7 from MonaRahmani/stillcustomer

  Show description for 1a017b1
  MonaRahmani

  authored
  1a017b1

  Copy full SHA for 1a017b1

• added dueDate func

  MonaRahmani

  committed
  e8a52db

  Copy full SHA for e8a52db

• adjust to select customer

  annakim93

  committed
  0e37305

  Copy full SHA for 0e37305

• Merge branch 'rental-setup'

  annakim93

  committed
  c76ea7b

  Copy full SHA for c76ea7b

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

  annakim93

  committed
  2b637f5

  Copy full SHA for 2b637f5

• add rentMovie func-POST to checkout

  MonaRahmani

  committed
  af907ce

  Copy full SHA for af907ce

• add select movie for rental functionality to movie library and movie comps

  annakim93

  committed
  69124fc

  Copy full SHA for 69124fc

• adjust rentmovie fn in app comp

  annakim93

  committed
  0cf82eb

  Copy full SHA for 0cf82eb

• add view to homepage to show if rental in progress

  annakim93

  committed
  dd98430

  Copy full SHA for dd98430

• complete conditional rendering on homepage for rental in-progress

  annakim93

  committed
  98252d0

  Copy full SHA for 98252d0

• fix some styling and add alert messages for picking rental parties

  annakim93

  committed
  60c1860

  Copy full SHA for 60c1860

• add homepage component

  annakim93

  committed
  c053d58

  Copy full SHA for c053d58

• added rental section

  MonaRahmani

  committed
  db38a5d

  Copy full SHA for db38a5d

• added rental section

  MonaRahmani

  committed
  a5612e7

  Copy full SHA for a5612e7

• add buttons to popups to select movies that way too

  annakim93

  committed
  823058a

  Copy full SHA for 823058a

• fix issue with popup positioning off-screen; add scroll to top functionality

  annakim93

  committed
  e8e1ce6

  Copy full SHA for e8e1ce6

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

  annakim93

  committed
  bf72bf5

  Copy full SHA for bf72bf5

• add undo buttons to video and customer selections

  annakim93

  committed
  f27b19f

  Copy full SHA for f27b19f

• conditional checkout button dependent on rental materials present

  annakim93

  committed
  451397e

  Copy full SHA for 451397e

• add navbar component and add logic to show rental status on all pages

  annakim93

  committed
  8da4598

  Copy full SHA for 8da4598

• post request for movie rental

  annakim93

  committed
  9bfe887

  Copy full SHA for 9bfe887

• we added alert message for successful rental

  annakim93

  committed
  88a0082

  Copy full SHA for 88a0082

• added same alert for error message with post request

  annakim93

  committed
  984ca12

  Copy full SHA for 984ca12

• remove not used fns

  annakim93

  committed
  2d69fc1

  Copy full SHA for 2d69fc1

• removed some comments

  MonaRahmani

  committed
  faebb29

  Copy full SHA for faebb29

Commits on Jan 22, 2021

• clean up some unused imports

  annakim93

  committed
  f8ae3f3

  Copy full SHA for f8ae3f3

• make popup exit button less funky looking

  annakim93

  committed
  e5fc954

  Copy full SHA for e5fc954

• adjust homepage to get image on full rhs

  annakim93

  committed
  21229bd

  Copy full SHA for 21229bd

• homepage movie transitions

  annakim93

  committed
  5646334

  Copy full SHA for 5646334