Code

Ports- Amy M. & Steph#22

Code

Open

smarchante1 wants to merge 71 commits intoAda-C11:masterAda-C11/video-store-consumer:masterfrom smarchante1:mastersmarchante1/video-store-consumer:masterCopy head branch name to clipboard

+846-86

Commits

Commits on Jun 24, 2019

• added state to app and skeleton for functions

  smarchante1

  committed
  818d0ec

• added skeleton for all components in mock design

  smarchante1

  committed
  a7ef58f

• added movie card functional component

  smarchante1

  committed
  8acd766

• added react routes to render all components

  smarchante1

  committed
  e6bb48e

Commits on Jun 25, 2019

• created API request to fetch all movie json data

  amyesh

  committed
  4f21b84

• added API call to fetch all customers

  amyesh

  committed
  4a08ad1

• added API requests to find movie by title and search movies by word

  amyesh

  committed
  6733455

• added onFormSubmit function

  smarchante1

  committed
  f37d076

• fixed typo

  amyesh

  committed
  89af3cf

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

  Show description for 200418c
  amyesh

  committed
  200418c

• functional search bar

  smarchante1

  committed
  4cf02b0

• passed props into customerList

  amyesh

  committed
  a85701e

• Merge branch 'master' into customers

  amyesh

  committed
  cd4be74

• merged updates from master

  amyesh

  committed
  58c18cf

• finalized search functionality and MovieCard component

  smarchante1

  committed
  73eae79

• added movieCard display

  amyesh

  committed
  486ad0a

• merged conflicts

  amyesh

  committed
  cb5c2a1

• Click handler for select movie and appropriate state changes

  smarchante1

  committed
  1251852

• click handler for select customer and appropriate state changes which propogates

  smarchante1

  committed
  0c15ec8

• working through adding to library

  amyesh

  committed
  0259d61

• working through adding movie to rails server

  amyesh

  committed
  4152f47

Commits on Jun 26, 2019

• made changes to add movie function bug with displaying MovieCard

  smarchante1

  committed
  29d8a12

• added method to checkout movie

  amyesh

  committed
  d2147c5

• fixed post request to successfully add data to rails server

  amyesh

  committed
  f11a48d

• changed Library to classical component to render state

  amyesh

  committed
  a4cb56d

• rendering selected movie object

  smarchante1

  committed
  84ed048

• changed function to select customer object

  smarchante1

  committed
  0c0fcc9

• added user messages to app state

  smarchante1

  committed
  e3ff093

• added proptypes and messages section

  smarchante1

  committed
  ab1dc29

• removed i from search results map

  smarchante1

  committed
  f8132ee

• added checkout method to app

  amyesh

  committed
  7ba60ab

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

  amyesh

  committed
  94cfa00

• Merge branch 'userMessages'

  smarchante1

  committed
  3145ed8

• cleaned up app file

  amyesh

  committed
  667bd36

• added disabled button for movie checkout

  smarchante1

  committed
  f9c28ce

• working through conditional button rendering

  amyesh

  committed
  f07b4ee

• tried to render buttons to no avail

  amyesh

  committed
  8b77368

• reset files

  amyesh

  committed
  8172394

Commits on Jun 27, 2019

• completed conditional button rendering based on movie library

  amyesh

  committed
  288bf3e

• fixed typo

  smarchante1

  committed
  6d50a07

• added conditional rendering to selected movies and setState to addMovie function

  amyesh

  committed
  e570b15

• added form clearing functionality to search

  amyesh

  committed
  24c0926

• debugging search function

  amyesh

  committed
  e5372e2

• internal server error present

  amyesh

  committed
  27f3c40

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

  amyesh

  committed
  f1fea20

• added bootstrap

  amyesh

  committed
  ab3719a

• added bootstrap

  smarchante1

  committed
  22b75f4

• basic movie card styling

  smarchante1

  committed
  a72cfc2

• added navbar styling

  amyesh

  committed
  8f6d287

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

  amyesh

  committed
  d42ab9c

• movie library grid under constructtion

  smarchante1

  committed
  87415f0

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

  amyesh

  committed
  9326f95

• changed button styling

  amyesh

  committed
  a32e4ae

• movie card title changes and rearranging description

  smarchante1

  committed
  b6bca35

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

  amyesh

  committed
  9a4bd0f

• basic styling for cards in card columns

  smarchante1

  committed
  c6fde59

Commits on Jun 28, 2019

• added styling to nav bar and homepage

  amyesh

  committed
  a08c0d6

• movie cards flip style working

  smarchante1

  committed
  99196b9

• added table styling to customer list

  amyesh

  committed
  6a18710

• added cursor and blue shadow to movie cards

  smarchante1

  committed
  3d68f93

• added styling to selected items

  amyesh

  committed
  a9fa35e

• changed the height of movie cards so text won't overflow

  smarchante1

  committed
  a72148c

• overrode bootstrap styles with styling in app css

  smarchante1

  committed
  0b3cee5

• fixing merge conflicts

  smarchante1

  committed
  5343ff6

• minor changes to styling

  amyesh

  committed
  edde30a

• changed color of movie overview text

  smarchante1

  committed
  81dacf1

• fixed search bar style

  smarchante1

  committed
  5ccbedc

• updated card container and selected margin styling

  amyesh

  committed
  a2fac6b

• merged conflicts

  amyesh

  committed
  74a9fa3

• fixed search styling

  amyesh

  committed
  3c60e9d

• cleaned up comments

  amyesh

  committed
  703527c