Code

Sara, Amy, Nkiru - Pipes - VideoStore#19

Code

Open

nkiruka wants to merge 34 commits intoAda-C8:masterAda-C8/VideoStoreConsumer:masterfrom nkiruka:masternkiruka/VideoStoreConsumer:masterCopy head branch name to clipboard

+4,592-63

Commits

Commits on Dec 18, 2017

• Set up movie and movie_list models and views, as well as app.js

  cashmonger

  committed
  ecc8794

  Copy full SHA for ecc8794

• More set-up

  cashmonger

  committed
  2ae7959

  Copy full SHA for 2ae7959

• created base html

  

  Sara Frandsen

  committed
  d711348

  Copy full SHA for d711348

• Merge branch 'master' of https://github.com/nkiruka/VideoStoreConsumer

  

  Sara Frandsen

  committed
  a4eaa5c

  Copy full SHA for a4eaa5c

• renders a list of all movies when a button is clicked

  

  Sara Frandsen

  committed
  079c6f7

  Copy full SHA for 079c6f7

Commits on Dec 19, 2017

• movies visible

  nkiruka

  committed
  4bf7af3

  Copy full SHA for 4bf7af3

• css file

  

  Sara Frandsen

  committed
  63beb13

  Copy full SHA for 63beb13

• Added HTML Template

  cashmonger

  committed
  bdc9d91

  Copy full SHA for bdc9d91

• add some basic html styling to index

  

  Sara Frandsen

  committed
  67dadce

  Copy full SHA for 67dadce

• Set up movie list view

  cashmonger

  committed
  ebfe5de

  Copy full SHA for ebfe5de

• show movies button works, raises header

  

  Sara Frandsen

  committed
  1236ce2

  Copy full SHA for 1236ce2

• show/add search form

  

  Sara Frandsen

  committed
  843e66a

  Copy full SHA for 843e66a

• Successfully display all movies

  cashmonger

  committed
  61abeea

  Copy full SHA for 61abeea

• animate header font size

  

  Sara Frandsen

  committed
  18ae9c4

  Copy full SHA for 18ae9c4

• Successfully retrieve movies from API

  cashmonger

  committed
  019ccda

  Copy full SHA for 019ccda

Commits on Dec 20, 2017

• Add event listener for add movie button

  cashmonger

  committed
  c10ad04

  Copy full SHA for c10ad04

• display inline

  

  Sara Frandsen

  committed
  e8ca2e8

  Copy full SHA for e8ca2e8

• resolve merge conflicts

  

  Sara Frandsen

  committed
  2450026

  Copy full SHA for 2450026

• Final

  cashmonger

  committed
  dc93264

  Copy full SHA for dc93264

• Fix merge conflict

  cashmonger

  committed
  87bc184

  Copy full SHA for 87bc184

• resolve more merge conflicts

  

  Sara Frandsen

  committed
  1ed88be

  Copy full SHA for 1ed88be

• Merge branch 'master' of https://github.com/nkiruka/VideoStoreConsumer

  

  Sara Frandsen

  committed
  aefb5f5

  Copy full SHA for aefb5f5

• Merge conflicts

  cashmonger

  committed
  c2a924e

  Copy full SHA for c2a924e

• Fix merge conflict

  cashmonger

  committed
  9b6a63a

  Copy full SHA for 9b6a63a

• slideToggle for search form

  

  Sara Frandsen

  committed
  8ff6088

  Copy full SHA for 8ff6088

• animate bar to shrink and show a search bar

  

  Sara Frandsen

  committed
  8488eb0

  Copy full SHA for 8488eb0

• Merge branch 'master' of https://github.com/nkiruka/VideoStoreConsumer

  

  Sara Frandsen

  committed
  91a8896

  Copy full SHA for 91a8896

• inline search bar

  

  Sara Frandsen

  committed
  a0a5711

  Copy full SHA for a0a5711

• slide up movie list

  

  Sara Frandsen

  committed
  a786b26

  Copy full SHA for a786b26

• add title to nav bar

  

  Sara Frandsen

  committed
  2f81fd2

  Copy full SHA for 2f81fd2

Commits on Dec 21, 2017

• change div to li for movie list view

  

  Sara Frandsen

  committed
  71d1cd7

  Copy full SHA for 71d1cd7

• styling changes

  

  Sara Frandsen

  committed
  004a987

  Copy full SHA for 004a987

• final css

  

  Sara Frandsen

  committed
  03d313e

  Copy full SHA for 03d313e

• resolve merge conflicts

  

  Sara Frandsen

  committed
  577813f

  Copy full SHA for 577813f