Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
387 commits
Select commit Hold shift + click to select a range
7b99696
adds product fixtures
npeters5 Apr 23, 2018
a64bb54
Merge branch 'master' of https://github.com/kcforsman/betsy
kcforsman Apr 23, 2018
fd07019
fixtures for merchant and order_products
madaleines Apr 23, 2018
27f8893
Merge branch 'master' of https://github.com/kcforsman/betsy
madaleines Apr 23, 2018
e523615
minor edit to product fixtures
npeters5 Apr 23, 2018
c64f6f9
adds merchant fixture references to products yml file
npeters5 Apr 23, 2018
0a4d8ca
adds review fixtures
npeters5 Apr 23, 2018
8e83a01
order_product fixtures with order & product
madaleines Apr 23, 2018
fd528ba
Merge branch 'master' of https://github.com/kcforsman/betsy
madaleines Apr 23, 2018
5985864
order_products fixtures with order & product
madaleines Apr 23, 2018
b115aaa
adds validation and relation tests for Review model. all tests passing
npeters5 Apr 23, 2018
0512354
Write validations tests for order_test
madaleines Apr 23, 2018
f9a5b92
adds path to cart, adds path to all of merchants products from a prod…
AngelaPoland Apr 23, 2018
f1b8d29
adds show page for Order/current_cart
npeters5 Apr 23, 2018
8b012ef
refactoring products#add_to_cart
npeters5 Apr 23, 2018
1841e4f
edits current_cart method to create new cart for each new session
npeters5 Apr 23, 2018
7ef825f
adds simplecov to Gemfile and coverage directory to gitignore
npeters5 Apr 23, 2018
1030efe
creates new empty cart after payment is submitted
npeters5 Apr 23, 2018
ba291d9
edits cart display to show num of items in session cart
npeters5 Apr 23, 2018
5f425d5
adds checkout link to order show page
npeters5 Apr 23, 2018
9514ef7
adds simplecov to test_helper
npeters5 Apr 23, 2018
b953d3b
adjusted routes for custom merchant paths to not have a merchant id i…
kcforsman Apr 23, 2018
5de1968
Merge branch 'master' of https://github.com/kcforsman/betsy
kcforsman Apr 23, 2018
032f994
adds order_products model tests
AngelaPoland Apr 23, 2018
a175fdd
write validations for order model
madaleines Apr 23, 2018
67b2939
Merge branch 'master' of https://github.com/kcforsman/betsy
madaleines Apr 23, 2018
5e87f73
categories model tests for validations only
AngelaPoland Apr 23, 2018
6656569
remove regex from validations for order model
madaleines Apr 23, 2018
e01c26e
edit tests for order
madaleines Apr 24, 2018
753af12
deletes homepages controller test file. adds migration to categories_…
npeters5 Apr 24, 2018
11b8f27
updated schema file
npeters5 Apr 24, 2018
b21e20a
schema all good
kcforsman Apr 24, 2018
36cf80c
Merge branch 'master' of https://github.com/kcforsman/betsy
kcforsman Apr 24, 2018
f6fcfb5
these f-ing dropdown menus, man
AngelaPoland Apr 24, 2018
e132356
merged an angela branch Merge branch 'master' of https://github.com/k…
AngelaPoland Apr 24, 2018
eb98733
Merge branch 'master' of https://github.com/kcforsman/betsy
kcforsman Apr 24, 2018
762a936
adds/finished category model tests
AngelaPoland Apr 24, 2018
efcbde9
adds calculate_total method to order model
npeters5 Apr 24, 2018
ccf7f57
edits product fixture
npeters5 Apr 24, 2018
bee6a25
Merge branch 'master' of https://github.com/kcforsman/betsy
npeters5 Apr 24, 2018
4b7195a
THE F-ING DROPDOWN MENUS WORK NOW THANKS TO KATIE
AngelaPoland Apr 24, 2018
4fde6e9
Merge branch 'master' of https://github.com/kcforsman/betsy
AngelaPoland Apr 24, 2018
bf95bf1
Merge branch 'master' of https://github.com/kcforsman/betsy
kcforsman Apr 24, 2018
2eb9702
added update quantity functionality to cart, accounts for adding inve…
kcforsman Apr 24, 2018
db146db
added remove from cart funcationality by creating a restful route for…
kcforsman Apr 24, 2018
b6ce6bd
added logic to order_product destroy action method that adds quantity…
kcforsman Apr 24, 2018
6cac996
added logic in the order show view to see cart table info and checkou…
kcforsman Apr 24, 2018
041e740
added empty cart functionality to the orders#destroy action method, u…
kcforsman Apr 24, 2018
c119a47
adds merchant model unit tests. all tests passing
npeters5 Apr 24, 2018
3150ca9
adds additional review fixture
npeters5 Apr 24, 2018
998a67a
adds has_many unit tests for product model
npeters5 Apr 24, 2018
ad5376d
adds staff picks to root page
AngelaPoland Apr 24, 2018
d0778f3
adds merchant custom method model test
AngelaPoland Apr 24, 2018
c494370
adds tests for reviews controller
npeters5 Apr 24, 2018
f1e5a73
adds dependent: :destroy to order_products and reviews for products c…
npeters5 Apr 24, 2018
a98fa52
adds root tests for products controller
npeters5 Apr 24, 2018
361b41e
Added log message
madaleines Apr 24, 2018
d82294f
Added auth failure route
madaleines Apr 24, 2018
625f037
edit merchant fixtures and commented out code in sessions controller
madaleines Apr 24, 2018
5416ebc
added top rated functionality to root view
AngelaPoland Apr 24, 2018
627d974
Merge branch 'master' of https://github.com/kcforsman/betsy
AngelaPoland Apr 24, 2018
ab40997
another root view fix
AngelaPoland Apr 24, 2018
e40bcb8
Move cart show logic to index view
madaleines Apr 24, 2018
a411579
edits render404 method in app controller
npeters5 Apr 24, 2018
ca77bbc
minor refactoring on product controller
npeters5 Apr 24, 2018
7ce1fa3
adds product controller tests for index & show
npeters5 Apr 24, 2018
fae5249
adds category for hoodie fixture
npeters5 Apr 24, 2018
d5cfebe
Merge branch 'master' of https://github.com/kcforsman/betsy
npeters5 Apr 24, 2018
7428ce7
adds placeholder image functionality to products controller
npeters5 Apr 24, 2018
e7906bb
adds image_tag to product index view
npeters5 Apr 24, 2018
f373b2e
adds image_tag to product show page and root
npeters5 Apr 24, 2018
40f5c90
view order page as authorized merchant or non-authorized user confirm…
madaleines Apr 25, 2018
f6b1142
Reformat the orders show view
madaleines Apr 25, 2018
3b0f6a1
fixes image tag in product show page
npeters5 Apr 25, 2018
8ad09eb
adds image assets and references in seed file
npeters5 Apr 25, 2018
839b115
Merge branch 'master' of https://github.com/kcforsman/betsy
npeters5 Apr 25, 2018
afe9e14
Add feature to find order by confirmation number
madaleines Apr 25, 2018
94f2939
Add error if there is no existing id to finding confirmation order
madaleines Apr 25, 2018
dea50b2
Change redirect to render in confirmation view
madaleines Apr 25, 2018
8e77e24
started categories controller tests
AngelaPoland Apr 25, 2018
487806f
fixed merge conflict
AngelaPoland Apr 25, 2018
e7356e6
adds image assets
npeters5 Apr 25, 2018
4b383c7
adds base styles
npeters5 Apr 25, 2018
ff5aee9
adds buttons, edits views to work with styles
npeters5 Apr 25, 2018
b5830e7
edits product seed file
npeters5 Apr 25, 2018
5543ab1
stubs tests for products controller
npeters5 Apr 25, 2018
ea3654e
Merge branch 'master' of https://github.com/kcforsman/betsy
npeters5 Apr 25, 2018
c570d44
merge conflict resolved
npeters5 Apr 25, 2018
a605f15
add placeholder img in asset folder
madaleines Apr 25, 2018
0ece9a5
deleted unused routes, controller actions, and views from project
kcforsman Apr 25, 2018
a2e44b5
add redirect to order show page if order DNE
madaleines Apr 25, 2018
0df1655
Add message to order_fulfillment view if there are no orders
madaleines Apr 25, 2018
c0a13c5
refactors products#root, products#create, and adds categories_attribu…
npeters5 Apr 25, 2018
a8dcd52
adds fields_for helper to enable user to add new category to a new pr…
npeters5 Apr 25, 2018
211d64a
adds relationship to product model to accept nested attributes for ca…
npeters5 Apr 25, 2018
729c3ca
resizes placeholder image file
npeters5 Apr 25, 2018
b7884b6
corrects category_params
npeters5 Apr 25, 2018
4344bed
conditional logic in root view accounts for if staff picks are nil
npeters5 Apr 25, 2018
1c26104
refactors current_merchant method in app controller
npeters5 Apr 25, 2018
5263009
created permissions to require login and confirming merchant and appl…
madaleines Apr 25, 2018
a5b18dd
resolve merge conflicts in products controller
madaleines Apr 25, 2018
c29653d
added more conditionals to add_to_order to account for no inventory o…
kcforsman Apr 25, 2018
9d4b1d8
adds resizing attribute to image_tag on product index page, and moves…
npeters5 Apr 25, 2018
fdc33b3
minor change to test helper
npeters5 Apr 25, 2018
26fd664
testing diff images in product seed file
npeters5 Apr 25, 2018
2915e18
add permissions to require login to add a categor
madaleines Apr 25, 2018
1524b7b
Merge branch 'master' into kf-refactor
kcforsman Apr 25, 2018
4e99f3b
Merge branch 'master' of https://github.com/kcforsman/betsy
madaleines Apr 25, 2018
28d00df
Merge branch 'master' of https://github.com/kcforsman/betsy
kcforsman Apr 25, 2018
1c01230
fixed typo in categories
madaleines Apr 25, 2018
b13087e
started logic for when 2nd nav is viewable
AngelaPoland Apr 25, 2018
116d3e4
finished categories controller tests
AngelaPoland Apr 25, 2018
b12856f
finished sessions controller tests
AngelaPoland Apr 25, 2018
b2448d1
added through association between a merchant and orderproduct through…
kcforsman Apr 26, 2018
9e14d7b
adds hover css to img tags
npeters5 Apr 26, 2018
90bc154
refactors product controller actions based on test feedback
npeters5 Apr 26, 2018
1495bf5
adds products controller tests for root, index, show, new, create, ed…
npeters5 Apr 26, 2018
7021e21
actually finished sessions controller tests this time - i think
AngelaPoland Apr 26, 2018
ab1365a
Merge branch 'master' of https://github.com/kcforsman/betsy
AngelaPoland Apr 26, 2018
4d5b95a
adds function to return to all orders on order fulfillment page, and …
npeters5 Apr 26, 2018
66f68ea
Merge branch 'master' of https://github.com/kcforsman/betsy
npeters5 Apr 26, 2018
624235c
added images
AngelaPoland Apr 26, 2018
b2e2674
Merge branch 'master' of https://github.com/kcforsman/betsy into angela4
AngelaPoland Apr 26, 2018
6a121a1
apply require_login to merchants controller and delete comments from …
madaleines Apr 26, 2018
938eeb3
merge conflict?
AngelaPoland Apr 26, 2018
d9dd3a7
comments out new category form in new product form temporarily until …
kcforsman Apr 26, 2018
af81ff8
hide nav bar on specified pages
madaleines Apr 26, 2018
6105d19
hide nav bar on specified pages
madaleines Apr 26, 2018
397026d
Merge branch 'master' of https://github.com/kcforsman/betsy
madaleines Apr 26, 2018
083b82a
tiny style change to merchant account page
AngelaPoland Apr 26, 2018
f727bb0
Merge branch 'angela4'
AngelaPoland Apr 26, 2018
d24e92f
refactors create method flash errors on products controller
npeters5 Apr 26, 2018
2e809ca
adds updated Hipsty logo
npeters5 Apr 26, 2018
e0fda96
adds categories attributes method and reject_if proc to product model
npeters5 Apr 26, 2018
9794296
refactors errors loop on app layout
npeters5 Apr 26, 2018
e1cdbb0
refactors product form
npeters5 Apr 26, 2018
03cd835
Merge branch 'master' of https://github.com/kcforsman/betsy
npeters5 Apr 26, 2018
01603ab
refactored merchants controller action order_fulfillment to be more c…
kcforsman Apr 26, 2018
7e84a16
refactored categories controller tests, added more tests for edge cas…
kcforsman Apr 26, 2018
0ef5e46
slightly altered the way flash messages are displayed
kcforsman Apr 26, 2018
3931c0b
added tests for all actions in merchant controller, a few stubs that …
kcforsman Apr 26, 2018
84e266c
updated cart paths and confirmation paths in orders controller to mat…
kcforsman Apr 26, 2018
efd1dc7
stubbed out order products and tried to refactor some, tests need help
kcforsman Apr 26, 2018
c4cf665
tiny confirmation page edit
AngelaPoland Apr 26, 2018
c060586
Merge branch 'master' of https://github.com/kcforsman/betsy into angela4
AngelaPoland Apr 26, 2018
37912dd
method for showing total
madaleines Apr 26, 2018
8917c72
merge conflict resolved
madaleines Apr 26, 2018
fd62be5
edit merchants_controller
madaleines Apr 26, 2018
c8199cc
show cart total
madaleines Apr 26, 2018
285ec70
edit account_page
madaleines Apr 26, 2018
f27e4b2
refactored products fixtures to exclude manually assigned ids, update…
kcforsman Apr 26, 2018
971675f
Merge branch 'master' of https://github.com/kcforsman/betsy
kcforsman Apr 26, 2018
6c92b4c
edits product show view
npeters5 Apr 26, 2018
502b29f
Merge branch 'master' of https://github.com/kcforsman/betsy
npeters5 Apr 26, 2018
648494e
show revenue and order count by status
madaleines Apr 26, 2018
be7a856
Merge branch 'master' of https://github.com/kcforsman/betsy
madaleines Apr 26, 2018
e28b34e
small account page styling
AngelaPoland Apr 26, 2018
1ea92df
adds link to product index images and css to product show view
npeters5 Apr 26, 2018
28657fb
Merge branch 'master' of https://github.com/kcforsman/betsy
npeters5 Apr 26, 2018
d1f3680
fixed paid action problem for correcting unused variable
kcforsman Apr 26, 2018
93b9032
Merge branch 'master' of https://github.com/kcforsman/betsy
kcforsman Apr 26, 2018
7485e94
Merge branch 'master' of https://github.com/kcforsman/betsy
npeters5 Apr 26, 2018
044187a
minor change to order show view(confirmation page)
npeters5 Apr 26, 2018
1303662
updated categories test to handle change to product yml file and chan…
kcforsman Apr 26, 2018
d0b3167
Merge branch 'master' of https://github.com/kcforsman/betsy
kcforsman Apr 26, 2018
a2c718d
changed product name to a link to product show pages in products mana…
kcforsman Apr 26, 2018
dbe3214
small styling stuff
AngelaPoland Apr 26, 2018
0d12ff2
updates root method and view
npeters5 Apr 26, 2018
3e0e0b7
Merge branch 'master' of https://github.com/kcforsman/betsy
npeters5 Apr 26, 2018
eddb642
Merge branch 'master' of https://github.com/kcforsman/betsy
kcforsman Apr 26, 2018
6017ee5
small style change
AngelaPoland Apr 26, 2018
7c78166
Merge branch 'master' of https://github.com/kcforsman/betsy
AngelaPoland Apr 26, 2018
ce0687c
Add $ to price
madaleines Apr 26, 2018
4cdacba
Merge branch 'master' of https://github.com/kcforsman/betsy
madaleines Apr 26, 2018
8df9fbf
updated all flash messages in controllers to match through app, and f…
kcforsman Apr 26, 2018
da6b2e9
Merge branch 'master' of https://github.com/kcforsman/betsy
kcforsman Apr 26, 2018
344dc75
small cart message change
AngelaPoland Apr 26, 2018
1c8b720
merge fixed Merge branch 'master' of https://github.com/kcforsman/betsy
AngelaPoland Apr 26, 2018
a0a50ab
css
npeters5 Apr 26, 2018
5868a74
adds price formatting to product mgr page
npeters5 Apr 26, 2018
8eb19e4
adds image links to root view
npeters5 Apr 26, 2018
d5f89f7
adds class to review section
npeters5 Apr 26, 2018
b67c5c1
merge conflict resolved
npeters5 Apr 26, 2018
3d54a5f
updated csv files - fixed a couple of photos
AngelaPoland Apr 26, 2018
7569514
updated csv photo files Merge branch 'angela6'
AngelaPoland Apr 26, 2018
2fb96a0
temp comment out before_action for cart
madaleines Apr 26, 2018
6ef0082
took out a random mistype
AngelaPoland Apr 26, 2018
7979b0b
Merge branch 'master' of https://github.com/kcforsman/betsy
madaleines Apr 26, 2018
92e3d19
require cart now
madaleines Apr 26, 2018
1edd8be
removes extraneous method from products controller
npeters5 Apr 27, 2018
5980135
fixes typo in pendingorder method
npeters5 Apr 27, 2018
110b1fd
adds rounding to product show page ave rating
npeters5 Apr 27, 2018
b4af717
adds tests for products#add_to_order. all but two tests passing
npeters5 Apr 27, 2018
9d20b26
Merge branch 'master' of https://github.com/kcforsman/betsy
npeters5 Apr 27, 2018
c3c1000
finished refactor for orders controller and corresponding tests for a…
kcforsman Apr 27, 2018
a118e08
Merge branch 'master' of https://github.com/kcforsman/betsy
kcforsman Apr 27, 2018
0b601bb
all products controller tests passing
npeters5 Apr 27, 2018
c753f7c
removed require 'pry' calls from controller tests to prevent potentia…
kcforsman Apr 27, 2018
e1e2baa
update merchants test so they are getting >90% with SimpleCov
kcforsman Apr 27, 2018
bd97098
added tests for enter_order and find_order in the products controller…
kcforsman Apr 27, 2018
f65a84e
updated account page css - took out dotted border and now it reacts b…
AngelaPoland Apr 27, 2018
e049281
account page styling
madaleines Apr 27, 2018
db71ccc
Merge branch 'master' of https://github.com/kcforsman/betsy into ms_m…
madaleines Apr 27, 2018
2f0d14a
top nav styling and media queries
AngelaPoland Apr 27, 2018
463f47a
adjusted models tests for category and product relationships to pass …
kcforsman Apr 27, 2018
463a29b
added require login back into the controller, gosh darnit git merge
kcforsman Apr 27, 2018
4dede25
deleted mystery unused total method
kcforsman Apr 27, 2018
95b0787
adjusted session finder to use find_by to return nil rather than error
kcforsman Apr 27, 2018
31bc688
got order_products_tests to work for destroy action and adjusted meth…
kcforsman Apr 27, 2018
2584701
Merge branch 'master' of https://github.com/kcforsman/betsy
kcforsman Apr 27, 2018
d251500
adds index tests for orders controller
npeters5 Apr 27, 2018
fa45fec
minor typo
npeters5 Apr 27, 2018
b40de80
Merge branch 'master' of https://github.com/kcforsman/betsy
npeters5 Apr 27, 2018
9dc771c
styling changes to cart
AngelaPoland Apr 27, 2018
ad95f33
merge conflict solved
AngelaPoland Apr 27, 2018
f822583
changed message when removing a product from cart and fixed a merge c…
AngelaPoland Apr 27, 2018
f11f018
tiniest of changes
AngelaPoland Apr 27, 2018
73b6042
changed top nav from saying become a merchant to sign up for spacing/…
AngelaPoland Apr 27, 2018
ce111dc
Adjust layout for merchant related pages
madaleines Apr 27, 2018
99b5a2d
Merge branch 'master' of https://github.com/kcforsman/betsy into ms_m…
madaleines Apr 27, 2018
05ebc80
adds validation to orders#destroy to check for nil order
npeters5 Apr 27, 2018
18fbeff
removes currentcart else condition in products#add_to_order
npeters5 Apr 27, 2018
72b3027
adds tests for orders#destroy
npeters5 Apr 27, 2018
f3812f0
edits test for products#add_to_order
npeters5 Apr 27, 2018
2af4a91
changes inventory for salt lamp fixture to 0
npeters5 Apr 27, 2018
ee13ffd
Merge branch 'master' of https://github.com/kcforsman/betsy
npeters5 Apr 27, 2018
5685701
added about us page
AngelaPoland Apr 27, 2018
528c7dd
merge conflict fixed?'
AngelaPoland Apr 27, 2018
fb1108f
adjust views and logic for merchant page
madaleines Apr 27, 2018
eb20db6
Merge branch 'master' of https://github.com/kcforsman/betsy
madaleines Apr 27, 2018
39d9614
about us change
AngelaPoland Apr 27, 2018
09cd82b
Merge branch 'master' of https://github.com/kcforsman/betsy
AngelaPoland Apr 27, 2018
a7dfc8a
more styling to about us page
AngelaPoland Apr 27, 2018
97ee244
added message about security onto checkout page
AngelaPoland Apr 27, 2018
c943305
fixed visibility of about us page
AngelaPoland Apr 27, 2018
b5b7f71
css clean up
AngelaPoland Apr 27, 2018
98c5064
fixes indentation on dropdown menu ul
npeters5 Apr 27, 2018
a3b817f
Merge branch 'master' of https://github.com/kcforsman/betsy
npeters5 Apr 27, 2018
e38be60
deleted unused method from merchant model
kcforsman Apr 27, 2018
ee51dc2
added test for empty photo url submission in the product controller t…
kcforsman Apr 27, 2018
65f1bfb
changed path for editing an order will now redirect back to manage pr…
AngelaPoland Apr 27, 2018
ce6b5e0
Merge branch 'master' of https://github.com/kcforsman/betsy
AngelaPoland Apr 27, 2018
0f4ae1a
updated dropdown padding so they are all even
AngelaPoland Apr 27, 2018
4d96903
Merge branch 'master' of https://github.com/kcforsman/betsy
npeters5 Apr 27, 2018
6177bae
adds tests for order model method calculate total
npeters5 Apr 27, 2018
88290aa
styles grid for about us page
npeters5 Apr 27, 2018
acd03b4
adjusted flash messages to have some kind of view
kcforsman Apr 27, 2018
0f137dd
Merge branch 'master' of https://github.com/kcforsman/betsy
kcforsman Apr 27, 2018
2ceba61
Update README.md
AngelaPoland Oct 16, 2018
a46c8bb
Update README.md
AngelaPoland Oct 16, 2018
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
21 changes: 21 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore bundler config.
/.bundle

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

/node_modules
/yarn-error.log

.byebug_history
.env
coverage
78 changes: 78 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
source 'https://rubygems.org'

git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
"https://github.com/#{repo_name}.git"
end


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.1.6'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 3.7'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

# Use CoffeeScript for .coffee assets and views
# gem 'coffee-rails', '~> 4.2'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem 'turbolinks', '~> 5'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.5'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 4.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

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', platforms: [:mri, :mingw, :x64_mingw]
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '~> 2.13'
gem 'selenium-webdriver'
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
gem 'web-console', '>= 3.3.0'
gem 'listen', '>= 3.0.5', '< 3.2'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
gem 'dotenv-rails'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

gem 'jquery-turbolinks'
gem 'jquery-rails'
gem 'foundation-rails'
gem 'normalize-rails'
group :development, :test do
gem 'pry-rails'
end

group :development do
gem 'better_errors'
gem 'binding_of_caller'
gem 'rails_layout'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
gem 'simplecov', require: false
end
274 changes: 274 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,274 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.1.6)
actionpack (= 5.1.6)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.6)
actionpack (= 5.1.6)
actionview (= 5.1.6)
activejob (= 5.1.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.1.6)
actionview (= 5.1.6)
activesupport (= 5.1.6)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.6)
activesupport (= 5.1.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.1.6)
activesupport (= 5.1.6)
globalid (>= 0.3.6)
activemodel (5.1.6)
activesupport (= 5.1.6)
activerecord (5.1.6)
activemodel (= 5.1.6)
activesupport (= 5.1.6)
arel (~> 8.0)
activesupport (5.1.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
ansi (1.5.0)
arel (8.0.0)
babel-source (5.8.35)
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
better_errors (2.4.0)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
bindex (0.5.0)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
builder (3.2.3)
byebug (10.0.2)
capybara (2.18.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (>= 2.0, < 4.0)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
coderay (1.1.2)
concurrent-ruby (1.0.5)
crass (1.0.4)
debug_inspector (0.0.3)
docile (1.1.5)
dotenv (2.2.2)
dotenv-rails (2.2.2)
dotenv (= 2.2.2)
railties (>= 3.2, < 6.0)
erubi (1.7.1)
execjs (2.7.0)
faraday (0.12.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.23)
foundation-rails (6.4.3.0)
railties (>= 3.1.0)
sass (>= 3.3.0, < 3.5)
sprockets-es6 (>= 0.9.0)
globalid (0.4.1)
activesupport (>= 4.2.0)
hashie (3.5.7)
i18n (1.0.1)
concurrent-ruby (~> 1.0)
jbuilder (2.7.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jquery-rails (4.3.3)
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 (2.1.0)
jwt (1.5.6)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
mini_mime (>= 0.1.1)
method_source (0.9.0)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
minitest-rails (3.0.0)
minitest (~> 5.8)
railties (~> 5.0)
minitest-reporters (1.2.0)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
nio4r (2.3.0)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
normalize-rails (4.1.1)
oauth2 (1.4.0)
faraday (>= 0.8, < 0.13)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
omniauth (1.8.1)
hashie (>= 3.4.6, < 3.6.0)
rack (>= 1.6.2, < 3)
omniauth-github (1.3.0)
omniauth (~> 1.5)
omniauth-oauth2 (>= 1.4.0, < 2.0)
omniauth-oauth2 (1.5.0)
oauth2 (~> 1.1)
omniauth (~> 1.2)
pg (1.0.0)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.6)
pry (>= 0.10.4)
public_suffix (3.0.2)
puma (3.11.4)
rack (2.0.4)
rack-test (1.0.0)
rack (>= 1.0, < 3)
rails (5.1.6)
actioncable (= 5.1.6)
actionmailer (= 5.1.6)
actionpack (= 5.1.6)
actionview (= 5.1.6)
activejob (= 5.1.6)
activemodel (= 5.1.6)
activerecord (= 5.1.6)
activesupport (= 5.1.6)
bundler (>= 1.3.0)
railties (= 5.1.6)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails_layout (1.0.42)
railties (5.1.6)
actionpack (= 5.1.6)
activesupport (= 5.1.6)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.1)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
ruby-progressbar (1.9.0)
ruby_dep (1.5.0)
rubyzip (1.2.1)
sass (3.4.25)
sass-rails (5.0.7)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
selenium-webdriver (3.11.0)
childprocess (~> 0.5)
rubyzip (~> 1.2)
simplecov (0.15.1)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
spring (2.0.2)
activesupport (>= 4.2)
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-es6 (0.9.2)
babel-source (>= 5.8.11)
babel-transpiler
sprockets (>= 3.0.0)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
thor (0.20.0)
thread_safe (0.3.6)
tilt (2.0.8)
turbolinks (5.1.1)
turbolinks-source (~> 5.1)
turbolinks-source (5.1.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.9)
execjs (>= 0.3.0, < 3)
web-console (3.6.0)
actionview (>= 5.0)
activemodel (>= 5.0)
bindex (>= 0.4.0)
railties (>= 5.0)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
xpath (3.0.0)
nokogiri (~> 1.8)

PLATFORMS
ruby

DEPENDENCIES
better_errors
binding_of_caller
byebug
capybara (~> 2.13)
dotenv-rails
foundation-rails
jbuilder (~> 2.5)
jquery-rails
jquery-turbolinks
listen (>= 3.0.5, < 3.2)
minitest-rails
minitest-reporters
normalize-rails
omniauth
omniauth-github
pg (>= 0.18, < 2.0)
pry-rails
puma (~> 3.7)
rails (~> 5.1.6)
rails_layout
sass-rails (~> 5.0)
selenium-webdriver
simplecov
spring
spring-watcher-listen (~> 2.0.0)
turbolinks (~> 5)
tzinfo-data
uglifier (>= 1.3.0)
web-console (>= 3.3.0)

BUNDLED WITH
1.16.1
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

# bEtsy
[Much like other e-commerce platforms](https://www.etsy.com/), your team will make an online store where a wide variety of products can be listed and sold by any user. This project focuses on reinforcing the major components of Rails, model validations, testing, and more complex logic such as user authentication.

Expand Down
6 changes: 6 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.

require_relative 'config/application'

Rails.application.load_tasks
3 changes: 3 additions & 0 deletions app/assets/config/manifest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
//= link_tree ../images
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css
Empty file added app/assets/images/.keep
Empty file.
Binary file added app/assets/images/Hipsty-logo.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/kale.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/mustache.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/placeholder.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading