Code

#36 Creates search/drinks page#111

Code

Merged

nelsonic merged 30 commits intomasterclub-soda/club-soda-guide:masterfrom search-drinks-pageclub-soda/club-soda-guide:search-drinks-pageCopy head branch name to clipboardOct 23, 2018

+7,123-101

Commits

Commits on Oct 10, 2018

• #8 Sets up carousel elm app

  Cleop

  committed
  7fb981b

  Copy full SHA for 7fb981b

Commits on Oct 11, 2018

• Merge branch 'drinks-card' into elm-carousel

  Cleop

  committed
  e4c2bae

  Copy full SHA for e4c2bae

• #8 Displays drinks cards in elm

  Cleop

  committed
  8ba2d88

  Copy full SHA for 8ba2d88

• Adds elm-stuff to ignore

  Cleop

  committed
  d9cde74

  Copy full SHA for d9cde74

Commits on Oct 12, 2018

• #8 Completes carousel functionality

  Cleop

  committed
  20f3c63

  Copy full SHA for 20f3c63

• #8 Starts adding swipe functionality

  Cleop

  committed
  3dbed65

  Copy full SHA for 3dbed65

• #104 Starts landing page styling

  Cleop

  committed
  cc9e9d9

  Copy full SHA for cc9e9d9

Commits on Oct 15, 2018

• #104 Basic styling of the landing page

  Cleop

  committed
  59801f6

  Copy full SHA for 59801f6

• #8 Fixes swiping bugs for carousel

  Cleop

  committed
  e49b9b3

  Copy full SHA for e49b9b3

• #106 Makes drink name box translucent

  Cleop

  committed
  feea13c

  Copy full SHA for feea13c

Commits on Oct 16, 2018

• #104 Adds cropped images and fixes bugs

  Cleop

  committed
  de464ca

  Copy full SHA for de464ca

• #104 Updates copy wording

  Cleop

  committed
  963956d

  Copy full SHA for 963956d

• #35 Updates logo asset

  Cleop

  committed
  ba755a4

  Copy full SHA for ba755a4

• #36 Creates drinks page

  Cleop

  committed
  34f7ab9

  Copy full SHA for 34f7ab9

• #35 Adds Venues to nav and creates page route

  Cleop

  committed
  b501400

  Copy full SHA for b501400

Commits on Oct 17, 2018

• #104 Adds drink type buttons and styles them

  Cleop

  committed
  8fa3abf

  Copy full SHA for 8fa3abf

• #37 Creates schema for drink type

  Cleop

  committed
  0fc5cd6

  Copy full SHA for 0fc5cd6

• adds brands table

  Danwhy

  committed
  2dc1769

  Copy full SHA for 2dc1769

• #37 Filters by drink type from landing page buttons

  Cleop

  committed
  f6d887b

  Copy full SHA for f6d887b

• Resolves merge conflicts

  Cleop

  committed
  14b1ac8

  Copy full SHA for 14b1ac8

• Resolves bugs occurring from merging

  Cleop

  committed
  4b6bd11

  Copy full SHA for 4b6bd11

• #37 Sets up elm app for search

  Cleop

  committed
  df189f0

  Copy full SHA for df189f0

Commits on Oct 18, 2018

• allows updating of drinks in venue, #63

  Danwhy

  committed
  dd423de

  Copy full SHA for dd423de

• #37 Filters drinks by type from landing page

  Cleop

  committed
  31d81db

  Copy full SHA for 31d81db

• adds styling and js for add drinks page, #63

  Danwhy

  committed
  7c8b051

  Copy full SHA for 7c8b051

Commits on Oct 19, 2018

• adds drink styles, #105

  Danwhy

  committed
  2b47fdf

  Copy full SHA for 2b47fdf

• styles index page tables

  Danwhy

  committed
  ad0fba0

  Copy full SHA for ad0fba0

• #37 Completes filter by drink type functionality

  Cleop

  committed
  c570d22

  Copy full SHA for c570d22

• Merge branch 'master' into search-drinks-page

  Cleop

  committed
  41d9787

  Copy full SHA for 41d9787

• Merge branch 'update-drinks' into search-drinks-page

  Cleop

  committed
  7f963e6

  Copy full SHA for 7f963e6