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

Unicorns-'R-US (Brandi, Melissa, Emily, Jessica) #36

Open
wants to merge 306 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
306 commits
Select commit Hold shift + click to select a range
e65bd35
added master
eabrash Oct 20, 2016
9eced0e
Cart working, but only for adding from product show page
eabrash Oct 20, 2016
6c67ed9
Added quantity fields to item pages; added OrderitemsController
eabrash Oct 20, 2016
b9b53ca
Cart basically working
eabrash Oct 20, 2016
a034f6b
adding this in after merge
olenellina Oct 20, 2016
439b2f4
Merge pull request #8 from jchung722/develop_sessions
jchung722 Oct 20, 2016
7376a6d
Merge pull request #9 from jchung722/cartbasics
jchung722 Oct 20, 2016
45cd80d
commiting before a pull, not much of a change
BrandiPhillips Oct 20, 2016
3f3fdb2
Merge branch 'master' of https://github.com/jchung722/betsy
BrandiPhillips Oct 20, 2016
e87f08b
merge
jchung722 Oct 20, 2016
cf39adc
Added limit of 1 item to form for order quantity
eabrash Oct 20, 2016
767654e
add
jchung722 Oct 20, 2016
3322481
created the merchants product view, and product edit form
BrandiPhillips Oct 21, 2016
ebf73fd
fixed issue where github username was coming back as nil (auth hash p…
olenellina Oct 21, 2016
ff233d3
validations for order, orderitem, product, review
jchung722 Oct 21, 2016
d61d238
Merge pull request #10 from jchung722/develop_sessions
jchung722 Oct 21, 2016
82dbca4
Form partially completed; changed field types
eabrash Oct 21, 2016
98bb2e7
check for failed login was not correct (would never run, due to auth_…
olenellina Oct 21, 2016
eb9d518
Basic order purchasing working; receipt still needs work
eabrash Oct 21, 2016
4501877
Basic receipt working; still need to improve refreshes/redirects
eabrash Oct 21, 2016
4efc483
Purchasing order and receipt working with basic functionality
eabrash Oct 21, 2016
fa6be58
changes to view
jchung722 Oct 21, 2016
4f7597e
uncommented username validation; commented displayname
jchung722 Oct 21, 2016
83febdf
Merge pull request #11 from jchung722/validation
jchung722 Oct 21, 2016
e9b919a
Merge pull request #12 from jchung722/develop_sessions
jchung722 Oct 21, 2016
7a09e07
Merge branch 'master' into purchaseorder
jchung722 Oct 21, 2016
87b3f1b
Merge branch 'purchaseorder'
jchung722 Oct 21, 2016
5370208
added status and changed zip to string
jchung722 Oct 21, 2016
7cd0824
migration
jchung722 Oct 21, 2016
6ae50c7
updated schema
jchung722 Oct 21, 2016
9e11abb
test helper setup with OmniAuth/mock_auth
olenellina Oct 21, 2016
22340c6
correct schema
jchung722 Oct 21, 2016
f5411c3
Can see products again
eabrash Oct 21, 2016
1f036a6
Merge pull request #14 from jchung722/fixingbugs
jchung722 Oct 21, 2016
7e04a7b
Merge branch 'master' of https://github.com/jchung722/betsy into deve…
olenellina Oct 21, 2016
2367305
manage profile page almost working
BrandiPhillips Oct 21, 2016
964a57f
Fixed order incrementation
eabrash Oct 21, 2016
c487c85
Mid-fix
eabrash Oct 21, 2016
8d94bbb
Browse by store is working again
eabrash Oct 21, 2016
345e076
baseline OAuth tests completed for sessions_controller
olenellina Oct 21, 2016
1ef75fd
changed order route
jchung722 Oct 21, 2016
d5ea16d
Merge branch 'master' of https://github.com/jchung722/betsy into orde…
jchung722 Oct 21, 2016
1cc571c
Seems to be working with all validations up
eabrash Oct 21, 2016
c279ae5
Merge pull request #16 from jchung722/develop_sessions
jchung722 Oct 21, 2016
f841d28
Merge pull request #17 from jchung722/fixingbugs
jchung722 Oct 21, 2016
d2739f5
Merge branch 'master' into merchatn_prod_mngmt
jchung722 Oct 21, 2016
8917a08
Merge branch 'merchatn_prod_mngmt'
jchung722 Oct 21, 2016
94462fa
fixed merge conflict
jchung722 Oct 21, 2016
ed8d087
one of the merge requests over-wrote the redirect in sessions_control…
olenellina Oct 21, 2016
6a5cd5b
fixed products controller typo
jchung722 Oct 21, 2016
e3975b8
Merge pull request #18 from jchung722/develop_sessions
jchung722 Oct 21, 2016
b976a1c
Merge branch 'master' of https://github.com/jchung722/betsy
jchung722 Oct 21, 2016
f0fd7fc
deleted add migrations
jchung722 Oct 21, 2016
5d2dc9a
typo fixed
jchung722 Oct 22, 2016
f96e5b6
Fixed Bobness error
eabrash Oct 22, 2016
8f710a4
Bobness correction II
eabrash Oct 22, 2016
f9aa620
Merge pull request #19 from jchung722/bugfix
jchung722 Oct 22, 2016
0122a98
Merge branch 'master' of https://github.com/jchung722/betsy into orde…
jchung722 Oct 24, 2016
4c681a6
basic order index and show
jchung722 Oct 24, 2016
312d48f
install foundation
jchung722 Oct 24, 2016
3ad6d82
change foundation path
jchung722 Oct 24, 2016
7843e39
changed syntax of find
jchung722 Oct 24, 2016
07b2247
changed syntax
jchung722 Oct 24, 2016
c87bbd3
foundation working
jchung722 Oct 24, 2016
1960d4d
merge foundation
jchung722 Oct 24, 2016
28fa33f
resolve merge conflict
jchung722 Oct 24, 2016
80a3004
link
jchung722 Oct 24, 2016
596a0b5
adding flash notice to home page to tell a user if their login failed…
olenellina Oct 24, 2016
7f57d78
fixed broken oauth test (fix needed because redirect was updated)
olenellina Oct 24, 2016
009ab1f
reviews border
jchung722 Oct 24, 2016
d8178e5
additions to header
olenellina Oct 24, 2016
1b54081
Controller tests for homepages, stores, and categories
eabrash Oct 24, 2016
bba5534
adding alt text to shopping cart image
olenellina Oct 24, 2016
f100aee
Made flexible to multiple products in a category or store
eabrash Oct 24, 2016
ec7945c
review model tests
jchung722 Oct 24, 2016
faf5448
fixed price to display correctly as currency with two decimal places
olenellina Oct 24, 2016
84956f2
Added orders controller tests (for destroy action)
eabrash Oct 24, 2016
2c4ac4c
manage products almost there, working on categories
BrandiPhillips Oct 24, 2016
038b2ca
products validation tests
jchung722 Oct 24, 2016
993d385
fixed links in header to point to the correct paths
olenellina Oct 24, 2016
9933327
authorizations working
BrandiPhillips Oct 24, 2016
cd14748
Merge pull request #20 from jchung722/orderlist
jchung722 Oct 24, 2016
3e90daf
more tests
jchung722 Oct 24, 2016
3f55311
resolved merge conflicts
jchung722 Oct 25, 2016
ed1dbc1
Merge branch 'develop_sessions'
jchung722 Oct 25, 2016
1da86cd
edited fixtures
eabrash Oct 25, 2016
197cd62
fixed merge conflict
eabrash Oct 25, 2016
c598dae
fixed a couple errors
BrandiPhillips Oct 25, 2016
26cb4a1
Orderitems controller tests
eabrash Oct 25, 2016
4a61897
fix some conflicts
BrandiPhillips Oct 25, 2016
59c70c7
Merge pull request #24 from jchung722/merchant_products
jchung722 Oct 25, 2016
e566286
Almost done with cart controller
eabrash Oct 25, 2016
7e70fe6
fixed issue with the way price was represented (no more crazy expensi…
olenellina Oct 25, 2016
2eb54b5
orderitem model tests
jchung722 Oct 25, 2016
c9c19a4
Working except hash bug for testing update
eabrash Oct 25, 2016
5ca5796
Merge pull request #25 from jchung722/develop_sessions
jchung722 Oct 25, 2016
304140f
Merge branch 'master' of https://github.com/jchung722/betsy into mode…
jchung722 Oct 25, 2016
f96548b
added in average rating for products
olenellina Oct 25, 2016
bb1410e
added unicorn image after average score
olenellina Oct 25, 2016
0dc3d47
Merged with master
eabrash Oct 25, 2016
88e8eb9
Merge pull request #27 from jchung722/develop_sessions
jchung722 Oct 25, 2016
72cbcd6
Merge pull request #28 from jchung722/controllertests1
jchung722 Oct 25, 2016
e7fcfc7
Fixed end
eabrash Oct 25, 2016
6f57d27
fixing issue with products which have no reviews
olenellina Oct 25, 2016
bb9defe
merge conflicts in fixtures resolved
jchung722 Oct 25, 2016
838633d
Fixed bug introduced into order model and controller
eabrash Oct 25, 2016
7bb0e46
dry up review fixtures...
jchung722 Oct 25, 2016
eb7e54d
drop-down menu for header nav and some basic styling (which we can ch…
olenellina Oct 25, 2016
c7f9b41
minor change to html to make more readable
olenellina Oct 25, 2016
e177449
Made small edits to merchant-facing orders page
eabrash Oct 25, 2016
c7de190
minor change to display text
olenellina Oct 25, 2016
e5424b3
Small tweaks to order index
eabrash Oct 25, 2016
8f35bed
Merge pull request #29 from jchung722/develop_sessions
jchung722 Oct 25, 2016
c64981e
Merge pull request #30 from jchung722/bugfix2
jchung722 Oct 25, 2016
211a674
Merge pull request #31 from jchung722/merchantfacingorders
jchung722 Oct 25, 2016
6d361b2
refactoring review test
jchung722 Oct 25, 2016
056d3f8
needed to rake db:migrate after git pull
olenellina Oct 25, 2016
6320e2e
categories are working hurray
BrandiPhillips Oct 25, 2016
75d61ef
finished refactoring review model test
jchung722 Oct 25, 2016
af10823
split tests
jchung722 Oct 25, 2016
2080c36
fixed testing problem with date_select hash emulation
eabrash Oct 25, 2016
897fe94
Merge pull request #32 from jchung722/merchant_products
eabrash Oct 25, 2016
b10e655
Merge branch 'master' of https://github.com/jchung722/betsy into deve…
olenellina Oct 25, 2016
17d58cf
fixed categories
BrandiPhillips Oct 25, 2016
d85e611
Merge pull request #33 from jchung722/categories
eabrash Oct 25, 2016
bd7c57f
Merge branch 'master' of https://github.com/jchung722/betsy into deve…
olenellina Oct 25, 2016
25c8c9e
miscellaneous little edits
eabrash Oct 25, 2016
a4d0768
orditem validation tests
jchung722 Oct 26, 2016
0eae662
cleaned up a bit, added a logo, worked on authorization
BrandiPhillips Oct 26, 2016
82d9286
set up some more access restriction
BrandiPhillips Oct 26, 2016
b68d418
Modifications so backordered items cannot be added to cart or purchased
eabrash Oct 26, 2016
6fa5e93
orderitem model custom mthod test
jchung722 Oct 26, 2016
b6eac2d
Merged in stock edits
eabrash Oct 26, 2016
7711c50
Added simplecov and some tests
eabrash Oct 26, 2016
4a242c3
fixed authorizations
BrandiPhillips Oct 26, 2016
5485aa2
Merge pull request #34 from jchung722/productstock
jchung722 Oct 26, 2016
6c35a3d
header formated
BrandiPhillips Oct 26, 2016
973259a
Merge pull request #35 from jchung722/modeltest
eabrash Oct 26, 2016
7983d5b
basic structure for landing page orbital
olenellina Oct 26, 2016
e96003d
Merge branch 'master' of https://github.com/jchung722/betsy into deve…
olenellina Oct 26, 2016
47b566b
Fixed test conflicts
eabrash Oct 26, 2016
254fd11
orderitem list working properly yay
jchung722 Oct 26, 2016
d9de05f
Merge branch 'revisions'
jchung722 Oct 26, 2016
9ab9db5
resolved merge conflicts
jchung722 Oct 26, 2016
aafe954
Merge pull request #37 from jchung722/controllertests2
jchung722 Oct 26, 2016
cf931a5
added orbital & header/footer styles
olenellina Oct 26, 2016
46c6017
resolve merge conflict?
jchung722 Oct 26, 2016
59eb9d9
Edit to display categories
eabrash Oct 26, 2016
031bd2a
see order and purchase items
jchung722 Oct 26, 2016
da2f6e9
Merge branch 'master' of https://github.com/jchung722/betsy into orde…
jchung722 Oct 26, 2016
400282d
merged in changes
olenellina Oct 26, 2016
5571840
updated gemfile for heroku
BrandiPhillips Oct 26, 2016
fb97d4e
merged in master
eabrash Oct 26, 2016
84f7ef1
Product and review testing (user-facing) complete
eabrash Oct 27, 2016
845865b
Moved price to be stored on orderitem and added checks for changes in…
eabrash Oct 27, 2016
4b590c0
fonts added, image bug fixed
BrandiPhillips Oct 27, 2016
d237717
merged changes in with Brandi's on the header
olenellina Oct 27, 2016
c135782
Basic functionality: order form must contain apppropriate user inform…
eabrash Oct 27, 2016
faba8b7
Merge pull request #39 from jchung722/controllertesting2
jchung722 Oct 27, 2016
146662c
Merge pull request #40 from jchung722/orderitemprice
jchung722 Oct 27, 2016
b5ee269
Merge pull request #41 from jchung722/develop_sessions
jchung722 Oct 27, 2016
004e4ba
added sales to order index
jchung722 Oct 27, 2016
a8654c6
Edited fixtures to have necessary fields
eabrash Oct 27, 2016
68dd50f
Fixed tests broken by new validations on order
eabrash Oct 27, 2016
a43ef11
Merge pull request #42 from jchung722/orderformrestrictions
jchung722 Oct 27, 2016
b78fa05
added back in footer, fixed orbit buttons
olenellina Oct 27, 2016
9f93a18
Changed 'Keep shopping' to go to categories index
eabrash Oct 27, 2016
14e6df6
added links to orbit images
olenellina Oct 27, 2016
c28301e
Build out model tests for Order, including new validations
eabrash Oct 27, 2016
07020b0
Merge branch 'master' into orderformrestrictions
eabrash Oct 27, 2016
f36db42
Small edits to delete orderitems when order is deleted
eabrash Oct 27, 2016
21224b7
can complete and fulfill orders
jchung722 Oct 27, 2016
ce3cb3c
some workign tests ofr merchants_controller and merchants_model
olenellina Oct 27, 2016
95822c2
added more links
jchung722 Oct 28, 2016
dac7b66
Merge pull request #43 from jchung722/develop_sessions
jchung722 Oct 28, 2016
c3674e9
Merge branch 'orderformrestrictions'
eabrash Oct 28, 2016
dd0a7c6
Merged in orderrestrictions branch
eabrash Oct 28, 2016
ef80323
Merge branch 'master' of https://github.com/jchung722/betsy
eabrash Oct 28, 2016
dd0fa7d
merge conflicts resolved
jchung722 Oct 28, 2016
06a314c
Merge pull request #45 from jchung722/orderindex
jchung722 Oct 28, 2016
577f58d
Fixed default image not showing; added an image for merchant Jane in …
eabrash Oct 28, 2016
dcb42ae
Small testing changes
eabrash Oct 28, 2016
ca3a5d8
Added tests to orders controller testing to get application controlle…
eabrash Oct 28, 2016
5ccd4d2
Edits to quantity added to cart
eabrash Oct 28, 2016
42afde0
Merged in image fix
eabrash Oct 28, 2016
2647c4d
VERY QUESTIONABLE
eabrash Oct 28, 2016
27b1d5e
last commit before fixing orbit
eabrash Oct 28, 2016
e1e885d
Added fix to ensure carousel consistently updates on reset
eabrash Oct 28, 2016
e2b2844
Hid 'empty cart' button on cart page when cart is empty
eabrash Oct 28, 2016
b68811d
Added some tests for orderitem controller following changes
eabrash Oct 28, 2016
bf5c8d7
deleted method
jchung722 Oct 28, 2016
9b918b7
readded buttons to order show page
jchung722 Oct 28, 2016
b36754f
shipped button
jchung722 Oct 28, 2016
96c0d92
move order items to index
jchung722 Oct 28, 2016
c7b5bbe
completed status filter
jchung722 Oct 28, 2016
d99081a
deleted unused views
jchung722 Oct 28, 2016
0f08803
information display complete
jchung722 Oct 28, 2016
ae1c840
coverage
jchung722 Oct 28, 2016
62d0e2a
Added orderitem controller tests
eabrash Oct 28, 2016
19dcd56
Minor edits to review controller
eabrash Oct 28, 2016
b24e6fc
tests for merchants controller
olenellina Oct 28, 2016
a8e17f3
Merge pull request #46 from jchung722/merchantimagefix
jchung722 Oct 28, 2016
6b701ff
Merge pull request #47 from jchung722/moreorder
jchung722 Oct 28, 2016
c5c6a77
Merge pull request #48 from jchung722/testingcleanup
jchung722 Oct 28, 2016
a83ab10
merchant update test
BrandiPhillips Oct 28, 2016
8f7c8a4
Merge branch 'master' of https://github.com/jchung722/betsy
jchung722 Oct 28, 2016
21ccf37
moved review method to product model
olenellina Oct 28, 2016
f53916b
fixed conflict
BrandiPhillips Oct 28, 2016
ded2ea7
updated test for average reviews/moved to model
olenellina Oct 28, 2016
1e08a41
added some category model tests, deleted asserts true tests
jchung722 Oct 28, 2016
da307a1
merging in my tests with Brandi's
olenellina Oct 28, 2016
6d9d401
Merge pull request #49 from jchung722/develop_sessions
jchung722 Oct 28, 2016
3926504
ignore coverage..
jchung722 Oct 28, 2016
0ed37dd
Tiles in equalizer
eabrash Oct 28, 2016
96fb8a2
Merge branch 'master' into stylingtiles
eabrash Oct 28, 2016
b59697d
config/env/prod.rb added stuff for imgs
BrandiPhillips Oct 28, 2016
c49a5eb
Small changes
eabrash Oct 28, 2016
c72de96
WORK please
BrandiPhillips Oct 28, 2016
474c86e
Merge branch 'master' of https://github.com/jchung722/betsy
BrandiPhillips Oct 28, 2016
6d1e558
added custom method tests to merchant model test
jchung722 Oct 28, 2016
d957852
more merchant model tests
jchung722 Oct 28, 2016
920158e
slight format
jchung722 Oct 28, 2016
465d456
fixed heroku images
BrandiPhillips Oct 28, 2016
b889539
styling for tiles
eabrash Oct 28, 2016
7ae1c12
edit seems to be working for merchant product
eabrash Oct 28, 2016
522b60a
centered tiles and made gray backgrounds to better match foundation
eabrash Oct 28, 2016
241424c
updated order model method
jchung722 Oct 28, 2016
1feb51c
updated tests
jchung722 Oct 28, 2016
32a7b55
Merge pull request #50 from jchung722/fixingedit
jchung722 Oct 28, 2016
56cf8bf
Merge pull request #51 from jchung722/stylingtiles
jchung722 Oct 28, 2016
6827a81
Merge pull request #52 from jchung722/jesschanges
jchung722 Oct 28, 2016
8240f57
added styling to manage products
BrandiPhillips Oct 28, 2016
4e1deac
Edited display styling for product show
eabrash Oct 28, 2016
ff0e546
Threw a few forms in rows and columns to give them a margin
eabrash Oct 28, 2016
4fdd8e0
updated total revenue
jchung722 Oct 28, 2016
2a4a3c4
Merge pull request #54 from jchung722/stylingtiles
jchung722 Oct 28, 2016
bbf002a
Merge pull request #55 from jchung722/jesschanges
jchung722 Oct 28, 2016
1bfb9bc
Merge branch 'master' into styling
jchung722 Oct 28, 2016
a454893
Merge branch 'styling'
jchung722 Oct 28, 2016
d120e39
added image and title to browser tabs
olenellina Oct 28, 2016
e52f789
Merge pull request #56 from jchung722/develop_sessions
jchung722 Oct 28, 2016
6c84cde
added default merchant name
olenellina Oct 28, 2016
fe8bc6e
resolve merge conflicts
BrandiPhillips Oct 28, 2016
4f063a7
Merge branch 'styling'
BrandiPhillips Oct 28, 2016
c737232
merging conflicts
BrandiPhillips Oct 28, 2016
9c027f9
fixed css issue
BrandiPhillips Oct 28, 2016
f551930
minor change
BrandiPhillips Oct 28, 2016
bfea532
Merge pull request #57 from jchung722/develop_sessions
jchung722 Oct 28, 2016
4fc38ba
wrapped up loose ends
BrandiPhillips Oct 29, 2016
8c27db3
Merge branch 'master' of https://github.com/jchung722/betsy
BrandiPhillips Oct 29, 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
Binary file added .DS_Store
Binary file not shown.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,13 @@
# Ignore bundler config.
/.bundle

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

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

.DS_Store
.env
26 changes: 23 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
source 'https://rubygems.org'
ruby '2.3.1'

gem 'has_scope'
# Foundation Rails Gem
gem 'foundation-rails'
# Required due to an incompatibility between TurboLinks and Foundation.
gem 'jquery-turbolinks'
gem 'awesome_print'
# 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'

# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
Expand All @@ -14,6 +18,8 @@ gem 'coffee-rails', '~> 4.1.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

gem 'simplecov', :require => false, :group => :test

# Use jquery as the JavaScript library
gem 'jquery-rails'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
Expand All @@ -32,9 +38,19 @@ gem 'sdoc', '~> 0.4.0', group: :doc
# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

# OAuth gems
gem 'omniauth'
gem 'omniauth-github'

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 'binding_of_caller'
gem 'minitest-reporters'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'
end

group :development do
Expand All @@ -44,3 +60,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 :production do
gem 'pg'
gem 'rails_12factor'
end
138 changes: 110 additions & 28 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -36,45 +36,98 @@ GEM
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)
has_scope (0.7.0)
actionpack (>= 4.1, < 5.1)
activesupport (>= 4.1, < 5.1)
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)
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)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
Expand All @@ -97,40 +150,58 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
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.6)
actionpack (= 4.2.6)
activesupport (= 4.2.6)
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)
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 +213,31 @@ PLATFORMS
ruby

DEPENDENCIES
awesome_print
better_errors
binding_of_caller
byebug
coffee-rails (~> 4.1.0)
dotenv-rails
foundation-rails
has_scope
jbuilder (~> 2.0)
jquery-rails
jquery-turbolinks
minitest-reporters
omniauth
omniauth-github
pg
rails (= 4.2.6)
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.6
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/cart.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/cute_uni.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/default_uni.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/horn_magic_cookie.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/lucky_uni_shoe.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/my_unicorn_necklace.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/rating.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/uni_ate_hm_tee.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/uni_bed_spread.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/uni_cake_tee.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/uni_chair.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/uni_flats.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/uni_horn_necklace.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/uni_light_up_slippers.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/uni_old_book_art.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/uni_pillow.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/uni_platforms.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/uni_pllw.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/uni_poo.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/uni_puke_mug.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/uni_ring.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/uni_steampunk_necklace.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/uni_wall_art.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/uni_wall_mount.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/unicorn_cake_topper.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/unicorn_farts.png
Binary file added app/assets/images/unicorn_liqueur.png
Binary file added app/assets/images/unicorn_merchant.jpg
Binary file added app/assets/images/unilogo.png
10 changes: 10 additions & 0 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,15 @@
//
//= require jquery
//= require jquery_ujs
//= require foundation
//= require turbolinks
//= require_tree .

$(function(){ $(document).foundation(); });

//= require foundation
$(document).foundation();

$(document).on('turbolinks:load', function() {
$(function(){ $(document).foundation(); });
});
3 changes: 3 additions & 0 deletions app/assets/javascripts/carts.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/categories.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/homepages.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/merchants.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/orderitems.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/orders.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/products.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/reviews.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/sessions.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/stores.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
Loading