Code

karin/alma/maddie/sky (basketcase)#40

Code

Open

wordkarin wants to merge 142 commits intoAda-C6:masterAda-C6/betsy:masterfrom wordkarin:masterwordkarin/betsy:masterCopy head branch name to clipboard

+7,577-183

Commits

Commits on Oct 19, 2016

• removed the broken rails app

  wordkarin

  committed
  e6ff2ef

• new rails app

  wordkarin

  committed
  b5c8fde

• updated gemfile

  wordkarin

  committed
  8a64011

• added all the models/migrations

  wordkarin

  committed
  088205e

• added all the seed csvs, updated seed file, maddie's images

  wordkarin

  committed
  cf8e66c

• added order_items csv

  mjohnson3038

  committed
  cd1271e

• Added product_categories.csv. Modified gitignore and ds-store.

  mimyal

  committed
  0c37c09

• Routes

  mjohnson3038

  committed
  1072cb4

• OrderItem and ProductCategory Seed Files

  mjohnson3038

  committed
  5e83b3d

• removed product destroy route

  LaurenSky

  committed
  c6b1a07

• Merge branch 'master' of https://github.com/wordkarin/betsy

  LaurenSky

  committed
  b5faf8e

• Controllers generated for basketcase site

  mimyal

  committed
  43da540

Commits on Oct 20, 2016

• removed some undneeded routes

  LaurenSky

  committed
  b401f03

• added coverage by adding minitest and simplecov gems to gemfile

  LaurenSky

  committed
  b1505fe

• updated the routes

  wordkarin

  committed
  57fc00e

Commits on Oct 21, 2016

• added validations and stubs for actions

  wordkarin

  committed
  19a4e81

• Merchant validations implemented through TDD

  mimyal

  committed
  0f680b7

• wrote all the fixtures

  wordkarin

  committed
  30b292c

• Merge pull request #1 from wordkarin/karin-product-validation

  Show description for 5764aee
  LaurenSky

  authored
  5764aee

• some Review model validation tests completed

  LaurenSky

  committed
  3747b95

• Merge branch 'master' into sky

  LaurenSky

  committed
  a2fd1d1

• model validations updated, with tests

  wordkarin

  committed
  7df75f1

• one more validation

  wordkarin

  committed
  a3e91cc

• added order and review validations and tests & added some new items to existing order fixture

  LaurenSky

  committed
  5111ccc

• OrderItem Tests and Validations

  mjohnson3038

  committed
  d7965a8

• Are the product_id and order_id valid?

  mjohnson3038

  committed
  ed82f46

• Undoing Yaml

  mjohnson3038

  committed
  2bd901b

• modified order test for must have at least 1 order_item

  LaurenSky

  committed
  a7bb523

• Merge pull request #2 from wordkarin/karin-product-validation

  Show description for c62254c
  mjohnson3038

  authored
  c62254c

• Merge pull request #4 from wordkarin/merchant-setup

  Show description for e009820
  mjohnson3038

  authored
  e009820

• Merge branch 'master' into maddie/orderitem-validation

  mjohnson3038

  committed
  88f23a0

• fixed validation test for needing >= 1 order_item

  LaurenSky

  committed
  e89ffe5

• hadn't saved order_test file before committing prior to last commit

  LaurenSky

  committed
  ada93af

• merge master into sky/orderreviewvals

  LaurenSky

  committed
  adc2f93

• Merge pull request #3 from wordkarin/sky/order-review-validations

  Show description for e10f7a2
  wordkarin

  authored
  e10f7a2

• updated order of seed data, so that relationships work (#5)

  

  wordkarin

  authored and

  LaurenSky

  committed
  be2a946

• Fixtures added in and fixed

  mjohnson3038

  committed
  35e4c9a

• fixed the seed

  wordkarin

  committed
  e3ca2ea

• Created main page, routes and controller. Tested.

  mimyal

  committed
  eaec2b2

• Merge branch 'maddie/orderitem-validation'

  wordkarin

  committed
  3a8b2b2

• merging maddies fixtures for order_items

  wordkarin

  committed
  a69c791

• Merge branch 'maddie/orderitem-validation'

  wordkarin

  committed
  fd5a184

• Merge pull request #7 from wordkarin/root-setup

  Show description for 8954475
  mjohnson3038

  authored
  8954475

• fixed fixture error on orders.yml

  wordkarin

  committed
  d2ee4f2

Commits on Oct 22, 2016

• added Sessions Controller and OAuth config for Google API. Also enabled a merchant to be created using OAuth. Added provider and uid to Merchant table

  LaurenSky

  committed
  fce0d6b

• added link to root_path & login/logout link to nav bar. Also, added index method and saved user.id to the session in the create method in the Sessions Controller

  LaurenSky

  committed
  000ecb1

• added favicon to tab

  LaurenSky

  committed
  4f4f86f

• added reviews#index method and view

  LaurenSky

  committed
  2dffd0f

Commits on Oct 23, 2016

• OrderItem#create

  mjohnson3038

  committed
  f7a7a38

• WIP Testing for OrderItem and Order

  mjohnson3038

  committed
  aa09615

• Removed products#index route. Built tests/controllers/views for merchant index/show

  mimyal

  committed
  d472755

• added uid and provider to merchant table & uid is string because it is so long

  LaurenSky

  committed
  4d8e4b9

Commits on Oct 24, 2016

• working on sessions controller tests

  LaurenSky

  committed
  2002ff9

• adding updates so I can merge sky/css into branch

  LaurenSky

  committed
  edd733c

• Merge branch 'sky/css' into sky/sessions-Oauth

  LaurenSky

  committed
  5d79988

• completed sessions tests

  LaurenSky

  committed
  2f209cb

• Merge pull request #8 from wordkarin/sky/sessions-Oauth

  Show description for d6a8475
  wordkarin

  authored
  d6a8475

• Merge pull request #9 from wordkarin/sky/css

  Show description for 0943ea1
  wordkarin

  authored
  0943ea1

• Added foundation files to app/assets/stylesheets

  LaurenSky

  committed
  7df65a6

• added controller actions and views for index/show, started on form partial and new

  wordkarin

  committed
  6a2b9c1

• Merge pull request #10 from wordkarin/merchants-controller

  Show description for 24cec7c
  mjohnson3038

  authored
  24cec7c

• Merge branch 'master' into mbj/Order_Controller

  mjohnson3038

  committed
  6014a9e

• show now has product categories displayed, and all images

  wordkarin

  committed
  a8a3e13

• got error messages for validations to show up

  wordkarin

  committed
  4cab9bf

• Merchant fixtures corrected to work with uid/provider validation. Merchant model tests now use these and extra validations tested also.

  mimyal

  committed
  70ca437

• added errors view folder and updated reviews create method

  LaurenSky

  committed
  2434ada

• order#create

  mjohnson3038

  committed
  2355eb2

• session controller testing updated

  LaurenSky

  committed
  46a46a1

• finished all review controller tests

  LaurenSky

  committed
  ac65584

• changed form headers

  LaurenSky

  committed
  6bba40d

• Completed Sessions Controller testing

  LaurenSky

  committed
  b184b89

• WIP OrderItems#Create

  mjohnson3038

  committed
  0463c8f

• tests for index and show

  wordkarin

  committed
  0d2d080

• Merge branch 'master' into karin/product-controller

  wordkarin

  committed
  e94eab0

• fixed product reroute path #index

  mjohnson3038

  committed
  9f19417

• Merge branch 'master' into sky/reviews-controller

  mjohnson3038

  committed
  76e0037

• Merge pull request #11 from wordkarin/fixtures

  Show description for f1803f4
  LaurenSky

  authored
  f1803f4

• Merge branch 'master' into sky/reviews-controller

  mjohnson3038

  committed
  026a686

• Merge pull request #12 from wordkarin/sky/reviews-controller

  Show description for 9a805e8
  mjohnson3038

  authored
  9a805e8

• Merge remote-tracking branch 'origin/master' into karin/product-controller

  wordkarin

  committed
  7b422f2

• merged app/assets/stylesheets/appication.css file

  LaurenSky

  committed
  16affc5

• removed extra space

  LaurenSky

  committed
  ab3ce8b

• Merge branch 'master' into sky/sessions-Oauth

  LaurenSky

  committed
  02e8463

• Fixed Picture Links

  mjohnson3038

  committed
  f9bed1a

• Merge branch 'master' into karin/product-controller

  mjohnson3038

  committed
  9ece07b

• Merge pull request #14 from wordkarin/karin/product-controller

  Show description for d2d9de1
  mjohnson3038

  authored
  d2d9de1

• Merge pull request #13 from wordkarin/sky/sessions-Oauth

  Show description for 89c354b
  mimyal

  authored
  89c354b

• Merge branch 'master' into mbj/Order_Controller

  mjohnson3038

  committed
  4c73959

• WIP General Orders and OrderItems

  mjohnson3038

  committed
  e4049f4

Commits on Oct 25, 2016

• completed category actions in controller

  LaurenSky

  committed
  023ddd8

• orders#create basic functionality implemented. Working on carrying through to order_items and also to complete orders#create failsafes

  mimyal

  committed
  5575163

• Working with current_user = merchant.last

  mjohnson3038

  committed
  72948be

• fixed typo on product_not_found, added note on add to cart

  wordkarin

  committed
  db2f875

• Fixed reviews#create

  mjohnson3038

  committed
  efbbdf7

• Merge conflicts fixed

  mjohnson3038

  committed
  c784a13

• Merge pull request #16 from wordkarin/application-connections

  Show description for dffb695
  wordkarin

  authored
  dffb695

• added a partial form for category and updated new.html.erb

  LaurenSky

  committed
  b82fc17

• Merge pull request #15 from wordkarin/mbj/Order_Controller

  Show description for 8e67ffc
  mjohnson3038

  authored
  8e67ffc

• created new nested route for prodcut/product-categories & added partial form for new category

  LaurenSky

  committed
  0c82f77

• fixed route merge conflict-- kept both new routes

  LaurenSky

  committed
  a207994

• fixed the reference to the category form, and added link to show

  wordkarin

  committed
  ad4934a

• Merge pull request #17 from wordkarin/sky/categories-controller

  Show description for 6ad808e
  wordkarin

  authored
  6ad808e

• Karin/product controller (#19)

  Show description for 572369d
  

  wordkarin

  authored and

  LaurenSky

  committed
  572369d

• Sky/foundation nav (#18)

  Show description for e0d0bcb
  

  LaurenSky

  authored and

  wordkarin

  committed
  e0d0bcb

Commits on Oct 26, 2016

• Mbj/order controller (#21)

  Show description for 70307f1
  

  mjohnson3038

  authored and

  wordkarin

  committed
  70307f1

• added authorization on product#edit

  wordkarin

  committed
  df287a1

• logged out guests and wrong merchants cannot edit products from merchant page

  wordkarin

  committed
  9052443

• Merge pull request #22 from wordkarin/karin/authorization

  Show description for 56e8701
  mimyal

  authored
  56e8701

Commits on Oct 27, 2016

• finished tests for products

  wordkarin

  committed
  4ed01fe

• updated review#new to not authorize merchant if they're the owner

  wordkarin

  committed
  3bdd3bf

• Merge pull request #23 from wordkarin/karin/authorization

  Show description for d338eb9
  mjohnson3038

  authored
  d338eb9

• Sky/categories controller (#25)

  Show description for 4f7ab85
  

  LaurenSky

  authored and

  mimyal

  committed
  4f7ab85

• Mbj/order controller (#24)

  Show description for 55f97e9
  

  mjohnson3038

  authored and

  wordkarin

  committed
  55f97e9

• fixed the list of products on a merchant.index

  wordkarin

  committed
  a15f318

• changed routes to checkout/pay, added session[:order_id]

  wordkarin

  committed
  d3af070

• Km/cart order (#26)

  Show description for 18211f4
  

  wordkarin

  authored and

  LaurenSky

  committed
  18211f4

• added styles

  LaurenSky

  committed
  e2c428c

Commits on Oct 28, 2016

• Product#Index Css

  mjohnson3038

  committed
  36a1468

• Merge pull request #27 from wordkarin/mbj/css

  Show description for f5f3f14
  LaurenSky

  authored
  f5f3f14

• Category#Index Css

  mjohnson3038

  committed
  4faf128

• Merge pull request #28 from wordkarin/mbj/css

  Show description for 7fbd7e5
  LaurenSky

  authored
  7fbd7e5

• css for forms

  LaurenSky

  committed
  7efc329

• fixed merge conflicts

  LaurenSky

  committed
  fc55f9c

• added basket cart

  LaurenSky

  committed
  a10b7bb

• Alma/join tables (#30)

  Show description for 3fd356e
  

  wordkarin

  authored and

  LaurenSky

  committed
  3fd356e

• fixed the order_date for pending orders on merchant show page

  wordkarin

  committed
  85d5eb3

• fixed omniauth login problem

  wordkarin

  committed
  6b4419a

• am actually saving order with purchase_time now

  wordkarin

  committed
  2d84030

• Merge pull request #32 from wordkarin/karin/strftime

  Show description for fe3b6df
  wordkarin

  authored
  fe3b6df

• hoping to fix css on production

  wordkarin

  committed
  d992149

• another fix for css

  wordkarin

  committed
  cb702b1

• Order controller, OrderItem model and tests realigned after git 'reorg'. Removed skipped test.

  mimyal

  committed
  618b98e

• Order controller, OrderItem model and tests realigned after git 'reorg'. Model tests pass. Rm skipped test.

  mimyal

  committed
  852728d

• merge conflict with myself resolved

  mimyal

  committed
  169bf4e

• Merge pull request #33 from wordkarin/alma/test

  Show description for 1f67d2d
  mjohnson3038

  authored
  1f67d2d

• Final css adds (#34)

  Show description for 63bf5e7
  

  LaurenSky

  authored and

  wordkarin

  committed
  63bf5e7

• Final css adds (#35)

  Show description for 44c2dc6
  

  LaurenSky

  authored and

  wordkarin

  committed
  44c2dc6

• adding reference for favicon

  wordkarin

  committed
  a5cd45e

• trying to fix favicon

  wordkarin

  committed
  f3d3cbb

• another attempt to fix favicon

  wordkarin

  committed
  37ec01a

• Final css adds (#37)

  Show description for 0cdcc54
  

  LaurenSky

  authored and

  mimyal

  committed
  0cdcc54

• Merge branch 'master' of https://github.com/wordkarin/betsy

  wordkarin

  committed
  4d72310