Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Team Puffy Shirts bring you (parens) #37

Open
wants to merge 321 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
321 commits
Select commit Hold shift + click to select a range
ae185e2
added add to cart button
ninamutty Oct 20, 2016
788c44f
Merge pull request #9 from miriam-cortes/merchant_show_and_edit
wilsab30 Oct 20, 2016
9d25f60
editing cart button
ninamutty Oct 20, 2016
58a5eb9
added inventory to product seeds
ninamutty Oct 20, 2016
876d0a3
merge conflicts
OLegge Oct 20, 2016
5b4f322
Merge pull request #10 from miriam-cortes/guests_controller
ninamutty Oct 20, 2016
54763aa
merged master into products
ninamutty Oct 20, 2016
e53b8f9
Merge pull request #11 from miriam-cortes/products
miriam-cortes Oct 20, 2016
54dfa56
added pry gem
ninamutty Oct 20, 2016
34d7357
products and reviews model test complete
ninamutty Oct 20, 2016
941fb5c
few things happening
miriam-cortes Oct 20, 2016
60f4c06
added delete buttons for reviews
ninamutty Oct 20, 2016
9b97ab9
review and product controller tests done
ninamutty Oct 20, 2016
b2d6570
merchant can now login using github and properly links to their show …
miriam-cortes Oct 21, 2016
8d8a14b
categories tests complete, changed line-item fixture to add order_id etc
OLegge Oct 21, 2016
38a78ea
category model validation test
OLegge Oct 21, 2016
e193a86
Moved methods into model
wilsab30 Oct 21, 2016
e9c450e
nighttime miriam just doesn't get it
miriam-cortes Oct 21, 2016
8889643
Merge branch 'master' into SessionsController
wilsab30 Oct 21, 2016
420c5a3
Merge branch 'master' into merchant_show_and_edit
miriam-cortes Oct 21, 2016
6d1a63f
merged controller test
ninamutty Oct 21, 2016
ff87495
Merge pull request #12 from miriam-cortes/merchant_show_and_edit
ninamutty Oct 21, 2016
d948698
Merge branch 'master' into SessionsController
wilsab30 Oct 21, 2016
4046fdc
Merge branch 'master' into products
ninamutty Oct 21, 2016
9b6e6ab
Merge pull request #13 from miriam-cortes/products
miriam-cortes Oct 21, 2016
8f00b8e
Merge branch 'master' into SessionsController
wilsab30 Oct 21, 2016
a28532d
Updated Gemfile for Heroku
wilsab30 Oct 21, 2016
1d3b158
Updated Gemfile for Heroku
wilsab30 Oct 21, 2016
1ccbf24
Added gems
wilsab30 Oct 21, 2016
13ad3dc
logout button not routing correctly but showing when it's supposed to
miriam-cortes Oct 21, 2016
b976468
gemfile for heroku
miriam-cortes Oct 21, 2016
52042a2
gemfile lock
miriam-cortes Oct 21, 2016
db2ade4
gemfile, wtf
miriam-cortes Oct 21, 2016
f7635db
I hate the gemfile
miriam-cortes Oct 21, 2016
c64e15d
I hate my life
miriam-cortes Oct 21, 2016
4382ffa
wtf git, SERIOUSLY
miriam-cortes Oct 21, 2016
19c90eb
thank god for TAs
miriam-cortes Oct 21, 2016
bdae86d
please, PLEASEEEEE
miriam-cortes Oct 21, 2016
5df596f
updated routes so products are nested in merchants
ninamutty Oct 21, 2016
cce55f8
Merge branch 'master' into merchant_show_and_edit
miriam-cortes Oct 21, 2016
f52e406
please go to my branch
miriam-cortes Oct 21, 2016
074ecdb
logout working
miriam-cortes Oct 21, 2016
cb52286
added so user can only add new category if logged in
OLegge Oct 21, 2016
4b3ffe7
merchant models added
miriam-cortes Oct 21, 2016
b75b788
edited seed file headers and nested routes
ninamutty Oct 21, 2016
2eefa1c
Merge pull request #14 from miriam-cortes/categories
miriam-cortes Oct 21, 2016
6539d78
Merge branch 'master' of https://github.com/miriam-cortes/betsy
miriam-cortes Oct 21, 2016
24df4a9
Merge branch 'master' into products
ninamutty Oct 21, 2016
087882a
fixed merge conflict
wilsab30 Oct 21, 2016
2878149
merge conflicts fixed
miriam-cortes Oct 21, 2016
76ce19b
Merge pull request #16 from miriam-cortes/merchant_show_and_edit
ninamutty Oct 21, 2016
6f9e3a0
Merge branch 'master' of https://github.com/miriam-cortes/betsy
wilsab30 Oct 21, 2016
87990f4
Fixed merge conflict
wilsab30 Oct 21, 2016
9cf075f
merged miriam's
ninamutty Oct 21, 2016
499b839
Update products_controller.rb
ninamutty Oct 21, 2016
6948955
Update show.html.erb
ninamutty Oct 21, 2016
122e748
Update show.html.erb
miriam-cortes Oct 21, 2016
d21ba01
Update application_controller.rb
ninamutty Oct 21, 2016
83e504b
Update index.html.erb
miriam-cortes Oct 21, 2016
ebcfbdd
Update show.html.erb
ninamutty Oct 21, 2016
d989f51
Merge pull request #17 from miriam-cortes/products
miriam-cortes Oct 21, 2016
bfc74aa
Merge branch 'master' of https://github.com/miriam-cortes/betsy
wilsab30 Oct 21, 2016
6b5bb6a
Fixed merge conflict
wilsab30 Oct 21, 2016
d28494e
fixed customer orders associations
miriam-cortes Oct 22, 2016
64009b5
Merge pull request #18 from miriam-cortes/charles_is_magical
miriam-cortes Oct 22, 2016
5facd13
Merge branch 'master' of https://github.com/miriam-cortes/betsy
wilsab30 Oct 22, 2016
d8db389
Merge branch 'master' into SessionsController
wilsab30 Oct 22, 2016
e812f04
commented out pg gem
ninamutty Oct 24, 2016
bd7f6bc
new review stars to dropdown and merchant can't review their own prod…
ninamutty Oct 24, 2016
2beac8d
login and out not working on heroku
miriam-cortes Oct 24, 2016
99800f0
rescue thing
miriam-cortes Oct 24, 2016
07a0583
going to have to de-seed when we get ready for heroku
miriam-cortes Oct 24, 2016
962019b
updated price to type in a float
ninamutty Oct 24, 2016
93f6681
basic nav bar
OLegge Oct 24, 2016
39407c3
added foundation gem
OLegge Oct 24, 2016
a2fcce4
merchant's categories button redirecting correctly
miriam-cortes Oct 24, 2016
7c596f8
merchant's categories button redirecting correctly
miriam-cortes Oct 24, 2016
42eacbf
changed category routes
OLegge Oct 24, 2016
ec42c33
Merge pull request #19 from miriam-cortes/products
miriam-cortes Oct 24, 2016
4877023
Merge branch 'master' into navigation
OLegge Oct 24, 2016
7758920
Merge pull request #20 from miriam-cortes/login
ninamutty Oct 24, 2016
2e6c01e
fixed merge conflicts
OLegge Oct 24, 2016
cbc2200
Merge pull request #22 from miriam-cortes/navigation
ninamutty Oct 24, 2016
8c35da2
trying to fix heroku id stuff, and session tests
miriam-cortes Oct 25, 2016
7ca50a2
can add categories to a product
OLegge Oct 25, 2016
6fcb506
added back to all categories button
OLegge Oct 25, 2016
920eb55
added foundation gem
ninamutty Oct 25, 2016
5fc863d
add to cart method and helper methods
wilsab30 Oct 25, 2016
49df859
working on fixing delete review button
ninamutty Oct 25, 2016
a9f8a4e
fixing paths in tests after nesting products in merchants
ninamutty Oct 25, 2016
096a9b1
Merge pull request #23 from miriam-cortes/SessionsController
miriam-cortes Oct 25, 2016
59c557f
adding to checkout master:
ninamutty Oct 25, 2016
d457a77
Merge branch 'master' of https://github.com/miriam-cortes/betsy
ninamutty Oct 25, 2016
37b63e2
merchant oAuth tests and simplecov addition
miriam-cortes Oct 25, 2016
eb7f217
merchant test incomplete
miriam-cortes Oct 25, 2016
1954169
fixed merge conflicts with Sabrinas version
miriam-cortes Oct 25, 2016
5bb093a
error message if category already exists
OLegge Oct 25, 2016
b2874a9
tests working again - yay
ninamutty Oct 25, 2016
40d8efc
Able to add new order.
wilsab30 Oct 25, 2016
34d6fe4
Added view cart.
wilsab30 Oct 26, 2016
d5903f7
Added table to view cart page
wilsab30 Oct 26, 2016
45db45e
added product assets
ninamutty Oct 26, 2016
51902dc
made changes to view cart.
wilsab30 Oct 26, 2016
3437410
coverage and tests for merchant model
miriam-cortes Oct 26, 2016
3a8ff98
gemfile changed from weird merge
miriam-cortes Oct 26, 2016
8cb4814
Merge branch 'master' of https://github.com/miriam-cortes/betsy
ninamutty Oct 26, 2016
b200196
Merge branch 'master' into SessionsController
wilsab30 Oct 26, 2016
eed9597
Merge branch 'master' into products
ninamutty Oct 26, 2016
e162412
resolve merge conflicts
OLegge Oct 26, 2016
5bd1d5c
seeds file uncommented and gemfile cleaned up
miriam-cortes Oct 26, 2016
aab338e
commented out pg on gemfile
OLegge Oct 26, 2016
bc5ce56
Merge pull request #26 from miriam-cortes/SessionsController
ninamutty Oct 26, 2016
67a10a7
Merge branch 'master' into merchant_tests
miriam-cortes Oct 26, 2016
86b33f1
commented out pg gem
ninamutty Oct 26, 2016
b3bb212
deleted skooter picture asset
ninamutty Oct 26, 2016
2ce6f22
Merge branch 'master' of https://github.com/miriam-cortes/betsy
ninamutty Oct 26, 2016
7725936
Merge branch 'master' into products
ninamutty Oct 26, 2016
ed4ae74
Merge pull request #28 from miriam-cortes/navigation
ninamutty Oct 26, 2016
8f87de0
Merge branch 'master' of https://github.com/miriam-cortes/betsy
ninamutty Oct 26, 2016
1248e1a
merge conflict in gemfile
miriam-cortes Oct 26, 2016
607f812
merged master
ninamutty Oct 26, 2016
442b48c
path to merchant product in merchant show page
miriam-cortes Oct 26, 2016
a2ea080
updated path
ninamutty Oct 26, 2016
f299900
Merge pull request #29 from miriam-cortes/products
livmaria7891 Oct 26, 2016
b54f885
Fixed merge conflict.
wilsab30 Oct 26, 2016
00325e5
merge conflicts resolved
miriam-cortes Oct 26, 2016
d79d2da
ignore coverage stuffs
miriam-cortes Oct 26, 2016
1e00084
Merge pull request #31 from miriam-cortes/merchant_tests
miriam-cortes Oct 26, 2016
1171878
fixed merge conflict
wilsab30 Oct 26, 2016
2be1f37
creading landing index page
ninamutty Oct 26, 2016
6300c56
Delete index.html
miriam-cortes Oct 26, 2016
ee44557
Delete .last_run.json
miriam-cortes Oct 26, 2016
42d3d0d
Delete .resultset.json
miriam-cortes Oct 26, 2016
f390fd8
Delete .resultset.json.lock
miriam-cortes Oct 26, 2016
dc80062
Delete magnify.png
miriam-cortes Oct 26, 2016
85053ff
Delete loading.gif
miriam-cortes Oct 26, 2016
7cda419
Delete favicon_yellow.png
miriam-cortes Oct 26, 2016
e32d58c
Delete favicon_red.png
miriam-cortes Oct 26, 2016
2a7b7ed
Delete favicon_green.png
miriam-cortes Oct 26, 2016
04a788b
Delete application.js
miriam-cortes Oct 26, 2016
68ed32c
Delete application.css
miriam-cortes Oct 26, 2016
9a3b3fc
Delete ui-bg_flat_0_aaaaaa_40x100.png
miriam-cortes Oct 26, 2016
3915aeb
removed coverage file
miriam-cortes Oct 26, 2016
d1936c8
Delete ui-bg_flat_75_ffffff_40x100.png
miriam-cortes Oct 26, 2016
c5e83e8
Delete ui-bg_glass_55_fbf9ee_1x400.png
miriam-cortes Oct 26, 2016
868c03d
Delete ui-bg_glass_65_ffffff_1x400.png
miriam-cortes Oct 26, 2016
42be2cf
Delete ui-bg_glass_75_dadada_1x400.png
miriam-cortes Oct 26, 2016
babf61d
Delete ui-bg_glass_75_e6e6e6_1x400.png
miriam-cortes Oct 26, 2016
2f79f80
Delete ui-bg_glass_95_fef1ec_1x400.png
miriam-cortes Oct 26, 2016
293b85b
Delete ui-bg_highlight-soft_75_cccccc_1x100.png
miriam-cortes Oct 26, 2016
149e076
Delete ui-icons_222222_256x240.png
miriam-cortes Oct 26, 2016
c23536c
Delete ui-icons_2e83ff_256x240.png
miriam-cortes Oct 26, 2016
00a9792
Delete ui-icons_454545_256x240.png
miriam-cortes Oct 26, 2016
1d18ef6
Delete ui-icons_888888_256x240.png
miriam-cortes Oct 26, 2016
3c1f54e
Delete ui-icons_cd0a0a_256x240.png
miriam-cortes Oct 26, 2016
94630ff
Delete border.png
miriam-cortes Oct 26, 2016
21b9b3a
Delete controls.png
miriam-cortes Oct 26, 2016
ab34aa6
Delete loading.gif
miriam-cortes Oct 26, 2016
188ac2a
Delete loading_background.png
miriam-cortes Oct 26, 2016
b2764d8
Merge branch 'master' of https://github.com/miriam-cortes/betsy
miriam-cortes Oct 26, 2016
92372d0
Add remove item from cart.
wilsab30 Oct 26, 2016
ca6a132
Added subtotal and order total to cart.
wilsab30 Oct 27, 2016
4061e78
Fix link issue and add update qty.
wilsab30 Oct 27, 2016
139d962
Merge pull request #33 from miriam-cortes/SessionsController
miriam-cortes Oct 27, 2016
26af941
logo added
miriam-cortes Oct 27, 2016
e83760d
Merge branch 'master' of https://github.com/miriam-cortes/betsy
miriam-cortes Oct 27, 2016
234f746
added foundation layout grid styling
ninamutty Oct 27, 2016
96d54f1
Merge branch 'master' into merchant_tests
miriam-cortes Oct 27, 2016
20fdd5b
Merge branch 'master' into styling
ninamutty Oct 27, 2016
5e42f06
Merge pull request #34 from miriam-cortes/merchant_tests
ninamutty Oct 27, 2016
e1d0a24
Merge branch 'master' into styling
ninamutty Oct 27, 2016
9af525e
Merge pull request #35 from miriam-cortes/styling
miriam-cortes Oct 27, 2016
bea5db6
merchant show page correctly listing orders placed TO them
miriam-cortes Oct 27, 2016
01f8439
used number_to_currency for merchant revenues and fix cart amounts to…
miriam-cortes Oct 27, 2016
ac499ee
order status showing
miriam-cortes Oct 27, 2016
20021e9
removed link on order number bc it was routing to a cart
miriam-cortes Oct 27, 2016
bbbdff7
Added checkout page.
wilsab30 Oct 27, 2016
4d066ff
Lots of seeds
OLegge Oct 27, 2016
14659b5
Updated update page to say order complete.
wilsab30 Oct 27, 2016
45a085a
Merge pull request #37 from miriam-cortes/seeding
miriam-cortes Oct 27, 2016
e1215c6
more styles
miriam-cortes Oct 27, 2016
0d1eb0f
Merge branch 'master' into merchant_styles
miriam-cortes Oct 27, 2016
e372e88
Merge branch 'master' into checkout
wilsab30 Oct 27, 2016
c89365c
header styling...not done yet
ninamutty Oct 27, 2016
4353faa
deleted headers
ninamutty Oct 27, 2016
0029242
removed header
OLegge Oct 27, 2016
ed23002
deleted first line of Olivia's csv
miriam-cortes Oct 27, 2016
9ad2f35
Merge branch 'master' into styling
ninamutty Oct 27, 2016
29b51b7
Update orders_controller.rb
miriam-cortes Oct 27, 2016
7ef2d0d
Merge pull request #38 from miriam-cortes/checkout
miriam-cortes Oct 27, 2016
5416857
Merge branch 'master' into merchant_styles
miriam-cortes Oct 27, 2016
6c7cc19
Merge branch 'master' into checkout
wilsab30 Oct 27, 2016
5905a99
edited dropdown - will edit more
ninamutty Oct 27, 2016
5001546
Merge branch 'master' of https://github.com/miriam-cortes/betsy
ninamutty Oct 27, 2016
cf2fd9b
Merge branch 'master' into styling
ninamutty Oct 27, 2016
5dd033a
Merge pull request #39 from miriam-cortes/merchant_styles
ninamutty Oct 27, 2016
2b82c02
Merge branch 'master' of https://github.com/miriam-cortes/betsy
ninamutty Oct 27, 2016
b1b0fa8
Merge branch 'master' into checkout
wilsab30 Oct 27, 2016
5b7cad6
fixed merged conflict
ninamutty Oct 27, 2016
bacb0e8
Merge pull request #40 from miriam-cortes/styling
miriam-cortes Oct 27, 2016
a806d89
Merge branch 'master' into checkout
wilsab30 Oct 27, 2016
321b78d
pg uncommented for heroku
miriam-cortes Oct 27, 2016
7b74810
heroku crap
miriam-cortes Oct 28, 2016
7562340
uncommented things in Gemfile for Olivia and Nina
miriam-cortes Oct 28, 2016
33be154
landing styling
ninamutty Oct 28, 2016
dfd2363
styled merchants page
miriam-cortes Oct 28, 2016
b009ed7
took out basic display route thing
miriam-cortes Oct 28, 2016
d37982e
deleted unnecessary css
miriam-cortes Oct 28, 2016
e6c0a6a
added footer
ninamutty Oct 28, 2016
82fa45d
capital first letters on order statuses
miriam-cortes Oct 28, 2016
8d06a58
more button styled
miriam-cortes Oct 28, 2016
d3ffb7f
products and reviews styling
ninamutty Oct 28, 2016
3de23a1
Merge pull request #41 from miriam-cortes/merchant_styles
ninamutty Oct 28, 2016
fd30ca3
seeds and tests
OLegge Oct 28, 2016
34d954d
Merge branch 'master' into styling
ninamutty Oct 28, 2016
b124441
Merge branch 'master' into checkout
wilsab30 Oct 28, 2016
42be609
Merge pull request #42 from miriam-cortes/styling
miriam-cortes Oct 28, 2016
cebf3cf
Merge branch 'master' into checkout
wilsab30 Oct 28, 2016
97d0354
Merge pull request #43 from miriam-cortes/seeding
miriam-cortes Oct 28, 2016
c0a9448
Merge branch 'master' into checkout
wilsab30 Oct 28, 2016
219b808
heroku gemfile updates
miriam-cortes Oct 28, 2016
735ffe9
more styled buttons and link in the logo
miriam-cortes Oct 28, 2016
418e68d
gemfile modified for ya
miriam-cortes Oct 28, 2016
7af4df6
Added langauge to confirmation page.
wilsab30 Oct 28, 2016
afd5b20
STYLING
ninamutty Oct 28, 2016
767aa99
Merge pull request #44 from miriam-cortes/more_styles
miriam-cortes Oct 28, 2016
a300713
Merge branch 'master' into styling
ninamutty Oct 28, 2016
8f63e4d
added pictures and more seeds
OLegge Oct 28, 2016
163ea63
fixed merege.
wilsab30 Oct 28, 2016
1afdb42
Merge branch 'master' into seeding
OLegge Oct 28, 2016
9a0fe2d
Merge pull request #45 from miriam-cortes/styling
miriam-cortes Oct 28, 2016
29b8095
handled csv merge conflict
OLegge Oct 28, 2016
7a8a9f8
fixed merge.
wilsab30 Oct 28, 2016
8da5937
Merge pull request #46 from miriam-cortes/seeding
miriam-cortes Oct 28, 2016
684a7d7
Merge branch 'master' into checkout
wilsab30 Oct 28, 2016
995c1b1
Merge pull request #47 from miriam-cortes/checkout
miriam-cortes Oct 28, 2016
b9275ca
edited wedding ring csv
ninamutty Oct 28, 2016
ada82e4
Merge branch 'master' into styling
ninamutty Oct 28, 2016
ee47cf9
Gemfile for heroku
miriam-cortes Oct 28, 2016
3b62a90
for heroku
miriam-cortes Oct 28, 2016
5de78ed
reviews 6-9
ninamutty Oct 28, 2016
2a87ebb
reviews added
miriam-cortes Oct 28, 2016
edab648
purchased orders vs customer orders
miriam-cortes Oct 28, 2016
10f3b85
Olivia's changes
miriam-cortes Oct 28, 2016
a9dd3ba
Merge pull request #49 from miriam-cortes/reviews
miriam-cortes Oct 28, 2016
9baf840
seeds fixed
ninamutty Oct 28, 2016
68ea06d
Merge pull request #50 from miriam-cortes/styling
miriam-cortes Oct 28, 2016
ade6ce5
gemfile for heroku
miriam-cortes Oct 28, 2016
cb85654
seeds
miriam-cortes Oct 28, 2016
ac5b16d
checkout button
miriam-cortes Oct 28, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,20 @@
# Ignore bundler config.
/.bundle


/coverage/
#Ignore .DS_Store
/.DS_Store
.DS_Store

#ignore our secrets
/.env

# Ignore the default SQLite database.
/db/*.sqlite3
/db/*.sqlite3-journal

# Ignore all logfiles and tempfiles.
/log/*
!/log/.keep
/tmp

.DS_Store
1 change: 0 additions & 1 deletion .ruby-gemset

This file was deleted.

1 change: 0 additions & 1 deletion .ruby-version

This file was deleted.

26 changes: 22 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
source 'https://rubygems.org'
ruby '2.3.1'

#Foundation Rails gem
gem 'foundation-rails'
gem 'jquery-turbolinks'
gem "awesome_print"
gem "omniauth"
gem "omniauth-github"

gem 'simplecov', group: :test
gem 'pg', group: :production
gem 'rails_12factor', group: :production

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.6'
# Use postgresql as the database for Active Record
# gem 'pg', '~> 0.15'
gem 'rails', '4.2.7'
# Use sqlite3 as the database for Active Record
gem 'sqlite3', group: [:development, :test]
# Use SCSS for stylesheets

gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
Expand Down Expand Up @@ -35,6 +46,9 @@ gem 'sdoc', '~> 0.4.0', group: :doc
group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug'
gem 'dotenv-rails'
gem 'better_errors'
gem 'pry'
end

group :development do
Expand All @@ -44,3 +58,7 @@ group :development do
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
end

group :test do
gem 'minitest-reporters'
end
200 changes: 142 additions & 58 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,93 +1,148 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.6)
actionpack (= 4.2.6)
actionview (= 4.2.6)
activejob (= 4.2.6)
actionmailer (4.2.7)
actionpack (= 4.2.7)
actionview (= 4.2.7)
activejob (= 4.2.7)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.6)
actionview (= 4.2.6)
activesupport (= 4.2.6)
actionpack (4.2.7)
actionview (= 4.2.7)
activesupport (= 4.2.7)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.6)
activesupport (= 4.2.6)
actionview (4.2.7)
activesupport (= 4.2.7)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.6)
activesupport (= 4.2.6)
activejob (4.2.7)
activesupport (= 4.2.7)
globalid (>= 0.3.0)
activemodel (4.2.6)
activesupport (= 4.2.6)
activemodel (4.2.7)
activesupport (= 4.2.7)
builder (~> 3.1)
activerecord (4.2.6)
activemodel (= 4.2.6)
activesupport (= 4.2.6)
activerecord (4.2.7)
activemodel (= 4.2.7)
activesupport (= 4.2.7)
arel (~> 6.0)
activesupport (4.2.6)
activesupport (4.2.7)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
ansi (1.5.0)
arel (6.0.3)
awesome_print (1.7.0)
babel-source (5.8.35)
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
better_errors (2.1.1)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.2)
byebug (8.2.5)
byebug (9.0.6)
coderay (1.1.1)
coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
concurrent-ruby (1.0.1)
concurrent-ruby (1.0.2)
debug_inspector (0.0.2)
docile (1.1.5)
dotenv (2.1.1)
dotenv-rails (2.1.1)
dotenv (= 2.1.1)
railties (>= 4.0, < 5.1)
erubis (2.7.0)
execjs (2.6.0)
globalid (0.3.6)
execjs (2.7.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
foundation-rails (6.2.4.0)
railties (>= 3.1.0)
sass (>= 3.3.0, < 3.5)
sprockets-es6 (>= 0.9.0)
globalid (0.3.7)
activesupport (>= 4.1.0)
hashie (3.4.6)
i18n (0.7.0)
jbuilder (2.4.1)
jbuilder (2.6.0)
activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2)
jquery-rails (4.1.1)
jquery-rails (4.2.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-turbolinks (2.1.0)
railties (>= 3.1.0)
turbolinks
json (1.8.3)
jwt (1.5.6)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.4)
mime-types (>= 1.16, < 4)
mime-types (3.0)
method_source (0.8.2)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0221)
mini_portile2 (2.0.0)
minitest (5.8.4)
multi_json (1.11.3)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.9.1)
minitest-reporters (1.1.11)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
multi_json (1.12.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
oauth2 (1.2.0)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
omniauth (1.3.1)
hashie (>= 1.2, < 4)
rack (>= 1.0, < 3)
omniauth-github (1.1.2)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-oauth2 (1.4.0)
oauth2 (~> 1.0)
omniauth (~> 1.2)
pg (0.19.0)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.6)
actionmailer (= 4.2.6)
actionpack (= 4.2.6)
actionview (= 4.2.6)
activejob (= 4.2.6)
activemodel (= 4.2.6)
activerecord (= 4.2.6)
activesupport (= 4.2.6)
rails (4.2.7)
actionmailer (= 4.2.7)
actionpack (= 4.2.7)
actionview (= 4.2.7)
activejob (= 4.2.7)
activemodel (= 4.2.7)
activerecord (= 4.2.7)
activesupport (= 4.2.7)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.6)
railties (= 4.2.7)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
Expand All @@ -97,40 +152,59 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (4.2.6)
actionpack (= 4.2.6)
activesupport (= 4.2.6)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (4.2.7)
actionpack (= 4.2.7)
activesupport (= 4.2.7)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (11.1.2)
rake (11.3.0)
rdoc (4.2.2)
json (~> 1.4)
ruby-progressbar (1.8.1)
sass (3.4.22)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sdoc (0.4.1)
sdoc (0.4.2)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
spring (1.7.1)
sprockets (3.6.0)
simplecov (0.12.0)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slop (3.6.0)
spring (2.0.0)
activesupport (>= 4.2)
sprockets (3.7.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.0.4)
sprockets-es6 (0.9.2)
babel-source (>= 5.8.11)
babel-transpiler
sprockets (>= 3.0.0)
sprockets-rails (3.2.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.12)
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.2)
turbolinks (2.5.3)
coffee-rails
tilt (2.0.5)
turbolinks (5.0.1)
turbolinks-source (~> 5)
turbolinks-source (5.0.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (3.0.0)
uglifier (3.0.2)
execjs (>= 0.3.0, < 3)
web-console (2.3.0)
activemodel (>= 4.0)
Expand All @@ -142,20 +216,30 @@ PLATFORMS
ruby

DEPENDENCIES
awesome_print
better_errors
byebug
coffee-rails (~> 4.1.0)
dotenv-rails
foundation-rails
jbuilder (~> 2.0)
jquery-rails
rails (= 4.2.6)
jquery-turbolinks
minitest-reporters
omniauth
omniauth-github
pg
pry
rails (= 4.2.7)
rails_12factor
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
simplecov
spring
sqlite3
turbolinks
uglifier (>= 1.3.0)
web-console (~> 2.0)

RUBY VERSION
ruby 2.3.1p112

BUNDLED WITH
1.13.5
1.13.1
28 changes: 28 additions & 0 deletions README.rdoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
== README

This README would normally document whatever steps are necessary to get the
application up and running.

Things you may want to cover:

* Ruby version

* System dependencies

* Configuration

* Database creation

* Database initialization

* How to run the test suite

* Services (job queues, cache servers, search engines, etc.)

* Deployment instructions

* ...


Please feel free to use a different markup language if you do not plan to run
<tt>rake doc:app</tt>.
Binary file added app/assets/images/NoProductImage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/NotYetsyLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/bath_bomb.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/bone_fish.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/card_humanity.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/cat_watch.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/drunk_stoned_or_stupid.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/elephant_wine.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/eyelash_goggles.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/face.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/fake_banana.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/finger_stash.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/flamingo_lights.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/galaxy_lollipops.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/giraffe.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/glass_dino.jpg
Binary file added app/assets/images/gosling_blanket.jpg
Binary file added app/assets/images/gosling_pillow.jpg
Binary file added app/assets/images/hamock.jpg
Binary file added app/assets/images/hand.jpg
Binary file added app/assets/images/hey_girl.jpg
Binary file added app/assets/images/horse_lamp.jpg
Binary file added app/assets/images/hotdog_lego.jpg
Binary file added app/assets/images/knives.jpg
Binary file added app/assets/images/ludicrous_choices.jpg
Binary file added app/assets/images/mask.jpg
Binary file added app/assets/images/mermaid_lego.jpg
Binary file added app/assets/images/monkey_pizza_cutter.jpg
Binary file added app/assets/images/mustache_clips.jpg
Binary file added app/assets/images/mythical_pillow.jpg
Binary file added app/assets/images/nude_cat_pillow.jpg
Binary file added app/assets/images/nude_cat_statue.jpg
Binary file added app/assets/images/nudes_book.jpg
Binary file added app/assets/images/outlet_stash.jpg
Binary file added app/assets/images/pac_man_clock.jpg
Binary file added app/assets/images/party_plungers.jpg
Binary file added app/assets/images/pens.jpg
Binary file added app/assets/images/phone_case.jpg
Binary file added app/assets/images/pig_egg.jpg
Binary file added app/assets/images/pizza_raft.jpg
Binary file added app/assets/images/rainbow_maker.jpg
Binary file added app/assets/images/sheep.jpg
Binary file added app/assets/images/sphinx_bedding.jpg
Binary file added app/assets/images/sphinx_book.jpg
Binary file added app/assets/images/sphinx_clock.jpg
Binary file added app/assets/images/sphinx_mask.jpg
Binary file added app/assets/images/sphinx_shirt.jpg
Binary file added app/assets/images/spinning_zombie_game.jpg
Binary file added app/assets/images/sticky_notes.jpg
Binary file added app/assets/images/stress_balls.jpg
Binary file added app/assets/images/tea_infuser.jpg
Binary file added app/assets/images/tire_swing.jpg
Binary file added app/assets/images/umbrella.jpg
Binary file added app/assets/images/unicorn.jpg
Binary file added app/assets/images/unicorn_animal.jpg
Binary file added app/assets/images/unicorn_head.jpg
Binary file added app/assets/images/view_master.jpg
Binary file added app/assets/images/water.jpg
Binary file added app/assets/images/wedding_ring.jpg
Binary file added app/assets/images/wig.jpg
Loading