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 GLITZY- Tanja, Jan, Severin, and Amy #65

Open
wants to merge 388 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
388 commits
Select commit Hold shift + click to select a range
c43e694
Merge branch 'master' of https://github.com/ayjlee/betsy
s-wigg Oct 20, 2017
747889c
place order page
misstonbon Oct 20, 2017
dba7d32
Merge branch 'master' of https://github.com/ayjlee/betsy into confirm…
misstonbon Oct 20, 2017
2c2bc71
Merge branch 'master' of https://github.com/ayjlee/betsy into review-…
JNEdrozo Oct 20, 2017
dc6d861
Added review fixture let (one) statement for ReviewController#update …
JNEdrozo Oct 20, 2017
fd1cf03
Updated Application.html.erb file for flash messages
JNEdrozo Oct 20, 2017
7aebf8f
colors
misstonbon Oct 20, 2017
b62f7fc
Merge branch 'master' of https://github.com/ayjlee/betsy into confirm…
misstonbon Oct 20, 2017
a3d6229
deleted Cart migration because cart model does not exist
ayjlee Oct 20, 2017
843f2f2
updated product show page to include reviews and total cost
s-wigg Oct 20, 2017
0b38b13
resolved merge conflicts
s-wigg Oct 20, 2017
b317de9
rescuing accidentially deleted confirmation page
s-wigg Oct 20, 2017
45a3f3c
Added test for ReviewController #update and #destroy: tests to confir…
JNEdrozo Oct 20, 2017
c67b58c
fixed place order page merge conflict
s-wigg Oct 20, 2017
e3e5468
Added Login or Session comment notes for ReviewController#update and …
JNEdrozo Oct 20, 2017
050ea41
finally getting the confimation page to work
misstonbon Oct 20, 2017
9fccac8
M:erge branch 'review-controller-testing'
JNEdrozo Oct 20, 2017
0cebbaf
rescuing order.rb
misstonbon Oct 20, 2017
675cd36
Merge branch 'master' of https://github.com/ayjlee/betsy
JNEdrozo Oct 20, 2017
9372c2e
dropped carts table
misstonbon Oct 20, 2017
e0b166a
Merge branch 'master' of https://github.com/ayjlee/betsy
JNEdrozo Oct 20, 2017
5d14f66
revised styling for when no items in cart
s-wigg Oct 20, 2017
145196d
Merge branch 'master' of https://github.com/ayjlee/betsy
JNEdrozo Oct 20, 2017
e1946a8
ReviewControllerUpdate: Added review and product catch for merchant; …
JNEdrozo Oct 21, 2017
75592b3
ReviewControllerUpdate: Edit Denial message changed to inform users o…
JNEdrozo Oct 21, 2017
ac55d4b
Edited OrderItem form to limit the select options up to 20 or availab…
ayjlee Oct 21, 2017
d146368
Merge branch 'master' of https://github.com/ayjlee/betsy
ayjlee Oct 21, 2017
e35fb9c
Added edit form to allow quantity change for order_item
JNEdrozo Oct 21, 2017
984eede
Updated OrderItem#update method to update order_item quantity from ed…
JNEdrozo Oct 21, 2017
7b7f4ec
Update Order and User fixtures (order fixture names and content have …
JNEdrozo Oct 21, 2017
08a4e19
Changed the edit and new order_item form so customers can choose any …
JNEdrozo Oct 21, 2017
879ed78
Confirmed that the OrderItemEdit Form uses the nested routes (@produc…
JNEdrozo Oct 22, 2017
469aa04
Added OrderItem#delete method and nominal test
JNEdrozo Oct 22, 2017
22085f6
Added OrderItem#delete method and nominal test(for paid order)
JNEdrozo Oct 22, 2017
4d9bc3d
receipt styling and quanity picker
misstonbon Oct 22, 2017
e002f10
Merge branch 'quantity-picker'
misstonbon Oct 22, 2017
fa42130
background image fix
misstonbon Oct 22, 2017
f7b88a3
updated styling for quantity picker
misstonbon Oct 22, 2017
2ae9618
added logic to keep track of items in cart via session
misstonbon Oct 22, 2017
6bc9c74
orders show page styling
misstonbon Oct 23, 2017
106cbea
home page
misstonbon Oct 23, 2017
81c9a52
minitest reporters added
misstonbon Oct 23, 2017
05bbdb4
tested that we can update an order item if the order's status is inco…
ayjlee Oct 23, 2017
35a3e3b
Added note to research into model validations to compare order_item q…
ayjlee Oct 23, 2017
418fa5f
updated OrderItem#update method to prevent changes to an order item i…
ayjlee Oct 23, 2017
9ed04fb
updated OrderItem model validation so that order item's quantity must…
ayjlee Oct 23, 2017
54d0c58
added simplecov
ayjlee Oct 23, 2017
b8a96e3
Merge branch 'basic-order-item-update-tests'
ayjlee Oct 23, 2017
164b0b5
more style for product index page
misstonbon Oct 23, 2017
da1ba65
Merge branch 'master' of https://github.com/ayjlee/betsy
ayjlee Oct 23, 2017
dc4d34f
pushing a product test before I switch to a branch
misstonbon Oct 23, 2017
eb00af5
category form
misstonbon Oct 23, 2017
445496b
Updated Review Model Testing to ensure rating is an integer and is on…
JNEdrozo Oct 23, 2017
99a1dd5
added additional OrderItem controller tests
s-wigg Oct 23, 2017
3db0221
product test for bad data
misstonbon Oct 23, 2017
aeb1a19
Added OrderItem Model Testing
JNEdrozo Oct 23, 2017
8503e75
added tests for edit method to orderitem controller and for extraneou…
s-wigg Oct 23, 2017
6807766
Merge branch 'master' of https://github.com/ayjlee/betsy
s-wigg Oct 23, 2017
49e1032
Updated OrderItem Model relations and validation testing
JNEdrozo Oct 23, 2017
a644d3e
added tests to ensure OAuth user's name and email save
s-wigg Oct 23, 2017
bb5f225
Added Order Model relations and validations (currently Order has many…
JNEdrozo Oct 23, 2017
6633842
Merge branch 'review-mc-testing'
JNEdrozo Oct 23, 2017
49b83d6
Created nested user_orders routes and user_order_items routes for the…
ayjlee Oct 23, 2017
c12a703
fixed final? receipt styling
misstonbon Oct 23, 2017
43e3da8
Added Order Model relations and validation testing and 2 basic nomina…
JNEdrozo Oct 23, 2017
76522c2
added order model tests for custom method total_cost
s-wigg Oct 23, 2017
5a0531b
started adding controller tests for order
s-wigg Oct 23, 2017
e8b5904
added order controller tests for edit
s-wigg Oct 23, 2017
b573fea
product view page
misstonbon Oct 23, 2017
fc83d18
Merge branch 'master' of https://github.com/ayjlee/betsy into more-st…
misstonbon Oct 23, 2017
d411fc4
Added Products Model Testing (ensures Product creation must have a pr…
JNEdrozo Oct 23, 2017
b9f8033
Cleaned up let statements for product_test.rb
JNEdrozo Oct 23, 2017
a0c9a6e
added User has_many: order_items through: :products relationship to U…
ayjlee Oct 23, 2017
57efbd4
Added User(Merchant) Model testing for relations and validations
JNEdrozo Oct 23, 2017
5f21f78
User Model Testing Updated: Updated invalid_provider array contents
JNEdrozo Oct 23, 2017
6f7c415
final? styling for order edit
misstonbon Oct 23, 2017
f30955b
Merge branch 'master' of https://github.com/ayjlee/betsy into more-st…
misstonbon Oct 23, 2017
b972c88
Merge branch 'more-styling'
misstonbon Oct 23, 2017
f1a934a
minor change
misstonbon Oct 23, 2017
8f2b0bf
Created empty placeholder view for OrderFulfillment page, placeholder…
ayjlee Oct 23, 2017
279ed96
Updated Users Model Validation Testing to remove name validation and …
JNEdrozo Oct 23, 2017
d276631
Merge branch 'card-2-Mon'
JNEdrozo Oct 23, 2017
3ef4c89
added first place order controller test
s-wigg Oct 23, 2017
4c694ad
category controller
misstonbon Oct 24, 2017
518dcfa
Merge branch 'master' of https://github.com/ayjlee/betsy into category
misstonbon Oct 24, 2017
5339854
view handles empty cart
misstonbon Oct 24, 2017
581d295
refactored place order method
s-wigg Oct 24, 2017
0f0e2e1
added tests to make sure place order adjusts quantity in inventory
s-wigg Oct 24, 2017
483593b
resolved merge conflict around total cost test
s-wigg Oct 24, 2017
f82edb4
updated total cost test to reflect change in the fixtures
s-wigg Oct 24, 2017
38a7958
first pass order fulfillment logic
ayjlee Oct 24, 2017
dd0f1a8
resolved merged conflicts from pulling on origin master
ayjlee Oct 24, 2017
8bcf1e2
added flash error message for when an unauthorized viewer tries to vi…
ayjlee Oct 24, 2017
5019cf3
updated product show view test to account for db changes
s-wigg Oct 24, 2017
9bb6d1e
Merge branch 'master' of https://github.com/ayjlee/betsy
ayjlee Oct 24, 2017
8e46a58
User#account method and route added
JNEdrozo Oct 24, 2017
1b50280
Merge branch 'master' of https://github.com/ayjlee/betsy;
JNEdrozo Oct 24, 2017
3e1284f
Changed Schema: Products have photo_url and stock columns
JNEdrozo Oct 24, 2017
66707c6
Updated Products New form to include stock's select options
JNEdrozo Oct 24, 2017
cf3e726
Form Updated for new products
JNEdrozo Oct 24, 2017
2bcacf7
Added nested route for categories and products
JNEdrozo Oct 24, 2017
1417599
Merge conflict resolved: Product model has stock constant
JNEdrozo Oct 24, 2017
47ef092
user tests added
misstonbon Oct 24, 2017
4a6e4dd
Merge branch 'master' of https://github.com/ayjlee/betsy into total-r…
misstonbon Oct 24, 2017
87b3697
fixed category name display logic
ayjlee Oct 24, 2017
bb38860
Added Category drop down selection for new_product form
JNEdrozo Oct 24, 2017
1afe390
Completed create method to add new product for merchant
JNEdrozo Oct 24, 2017
7d8eece
Merge branch 'master' of https://github.com/ayjlee/betsy
JNEdrozo Oct 24, 2017
d2016f6
added merchant account view page
s-wigg Oct 24, 2017
f5a73f0
added merchant account button
s-wigg Oct 24, 2017
e697957
total-revenue for user and tests
misstonbon Oct 24, 2017
b0763c3
Merge branch 'total-revenue'
misstonbon Oct 24, 2017
dbcffff
added view helper method to print out category names when needed
s-wigg Oct 24, 2017
f4277d4
moved order_fulfillment route, controller method, and tests to Users …
ayjlee Oct 24, 2017
3c85232
incomplete category tests
misstonbon Oct 24, 2017
2f70575
Merge branch 'master' of https://github.com/ayjlee/betsy
ayjlee Oct 24, 2017
5ee9d43
Merge branch 'master' of https://github.com/ayjlee/betsy into order-f…
ayjlee Oct 24, 2017
7972dbb
erd
misstonbon Oct 24, 2017
af7365b
ensure that all three product index views only display in stock produ…
s-wigg Oct 24, 2017
5e93300
Merge branch 'master' of https://github.com/ayjlee/betsy
s-wigg Oct 24, 2017
cfba8c1
added ugly basic view of order fulfillment page with user's revenue,…
ayjlee Oct 24, 2017
e22940c
Merge branch 'master' of https://github.com/ayjlee/betsy
ayjlee Oct 24, 2017
fac17a0
Merge branch 'order-fulfillment-view'
ayjlee Oct 24, 2017
3a00cb3
categories controller tests pass
misstonbon Oct 24, 2017
0d2754d
Merge branch 'master' of https://github.com/ayjlee/betsy
misstonbon Oct 24, 2017
6bdc005
added shipped column to order_items
ayjlee Oct 24, 2017
d3bc062
Merge branch 'add-shipment-to-order-item'
ayjlee Oct 24, 2017
9728946
minor correction to merchant account view
s-wigg Oct 24, 2017
0ac0fac
peperclip
misstonbon Oct 25, 2017
7c4c9b2
resolved merge conflict
s-wigg Oct 25, 2017
ac9e67f
schema merge conflict resolve
misstonbon Oct 25, 2017
7dcac8b
Added stock = 'In Stock' to each product fixture
ayjlee Oct 25, 2017
5742b3a
validate presence of status for all orders, passing tests
ayjlee Oct 25, 2017
f311603
no ignoring the production
misstonbon Oct 25, 2017
83ca000
user model tests completely covered
ayjlee Oct 25, 2017
b47dfe6
added test to make sure .user_orders still returns an empty array if …
ayjlee Oct 25, 2017
d040df5
paperclip set up
misstonbon Oct 25, 2017
b516180
Merge branch 'master' of https://github.com/ayjlee/betsy
misstonbon Oct 25, 2017
c34588f
added key and set up gitignore
misstonbon Oct 25, 2017
2bb4dd5
removed extra columns from users table through a migration
ayjlee Oct 25, 2017
9705ec5
removed data from user fixtures to match the new user schema
ayjlee Oct 25, 2017
c9491a8
added default value of 'not shipped' to Shipped column of Order Items…
ayjlee Oct 25, 2017
66c3e97
added default value of 'incomplete' to an Order's Status
ayjlee Oct 25, 2017
d2b3f0d
removed Photo_URL column from Products because gem already installs n…
ayjlee Oct 25, 2017
fcd0b81
refactored 'Order requires status to be valid' model test to account …
ayjlee Oct 25, 2017
0dbff3a
updated Users#Account test by logging in the user before accessing th…
ayjlee Oct 25, 2017
4a30df9
reseeded database to reflect schema changes, still missing photos for…
ayjlee Oct 25, 2017
cc7337e
destroyed unused carts controller
ayjlee Oct 25, 2017
ecde2f7
fixed logical issue breaking site in non-incognito browser
s-wigg Oct 25, 2017
89a081e
added username to log out button to personalize
s-wigg Oct 25, 2017
8e71534
added default photos through paperclip
ayjlee Oct 25, 2017
e8776cc
moved the config paperclip defaults in the environments production file
ayjlee Oct 25, 2017
8c6afd2
grid for all products
misstonbon Oct 25, 2017
8bbc452
Merge branch 'master' of https://github.com/ayjlee/betsy
misstonbon Oct 25, 2017
ac05214
Test commit
JNEdrozo Oct 25, 2017
3ab4f5e
can select multiple categories
ayjlee Oct 25, 2017
338d236
Updated Review.rb and ReviewController test to pass
JNEdrozo Oct 25, 2017
17eef03
deleted extraneous error output line
ayjlee Oct 25, 2017
512bdfe
Merge branch 'multiple-category-selection'
ayjlee Oct 25, 2017
10a1c2a
Updated Product model test (self.to_merchant_hash method) and changed…
JNEdrozo Oct 25, 2017
0fed69a
Merge pull request from Jan!
ayjlee Oct 25, 2017
b696723
updated ENV variable key names for aws heroku:
ayjlee Oct 25, 2017
469f08b
enchanced views
misstonbon Oct 25, 2017
3f93581
Merge branch 'master' of https://github.com/ayjlee/betsy
misstonbon Oct 25, 2017
952c978
Preserved ProductsController Changes from S&A and added product model…
JNEdrozo Oct 26, 2017
58757c2
Merge Jan's pull request for product model test additions
ayjlee Oct 26, 2017
c80ae44
updated outdated production file from merge
ayjlee Oct 26, 2017
0e1e820
updated production file
ayjlee Oct 26, 2017
fd1430c
dropped carts table
ayjlee Oct 26, 2017
859018f
Merge branch 'delete-drop-carts-migration'
ayjlee Oct 26, 2017
8d40677
updated product update method to use new categories param with checkb…
ayjlee Oct 26, 2017
0a65a34
updated test to reflect that product params now stores a categories h…
ayjlee Oct 26, 2017
b3c4024
added 'require aws' statement to bin/rails file to fix deployment iss…
ayjlee Oct 26, 2017
7859b2c
updated config file
s-wigg Oct 26, 2017
f6cd59e
order fulfillment view in progress
misstonbon Oct 26, 2017
c3c0113
Merge branch 'master' of https://github.com/ayjlee/betsy
misstonbon Oct 26, 2017
202b45a
removed config production file from gitignore
s-wigg Oct 26, 2017
4c65913
Merge branch 'master' of https://github.com/ayjlee/betsy
s-wigg Oct 26, 2017
0eacf0c
Added Order Fulfillment button to nav
JNEdrozo Oct 26, 2017
02ddea5
installed earlier version of aws to try and work with paperclip gem
ayjlee Oct 26, 2017
227840d
Updated OrderItem#mark_shipped method to redirect to merchant order f…
JNEdrozo Oct 26, 2017
33e432f
added test for logout
s-wigg Oct 26, 2017
d7c346b
Added OrderItem#mark_shipped testing for default status and after Shi…
JNEdrozo Oct 26, 2017
fafc5e5
Merge branch 'master' of https://github.com/ayjlee/betsy
ayjlee Oct 26, 2017
2d07f10
Merge pull request Jan/shipped-button
ayjlee Oct 26, 2017
24d95a4
Merge branch 'master' of https://github.com/ayjlee/betsy
ayjlee Oct 26, 2017
08543c3
ensured not logged in user cannot access merchant account directly th…
s-wigg Oct 26, 2017
a67f070
fixed glitch with cart refresh
s-wigg Oct 26, 2017
0dcdf8b
updated tests to account for authentication restrictions
s-wigg Oct 26, 2017
7458659
Merge branch 'master' of https://github.com/ayjlee/betsy
s-wigg Oct 26, 2017
390fe9a
Products basic css
ayjlee Oct 26, 2017
f2058ad
order fulfillment view in progress
misstonbon Oct 26, 2017
8adb2f6
fixing main page view
misstonbon Oct 26, 2017
d9be8d1
slightly updated product show page styling
ayjlee Oct 26, 2017
7e27e9a
Merge branch 'show-order-page-styling'
ayjlee Oct 26, 2017
7c081da
order fullfillment button added
misstonbon Oct 26, 2017
1d1ac4a
Merge branch 'master' of https://github.com/ayjlee/betsy
misstonbon Oct 26, 2017
cc2ab00
updated styling for product index by merchant
s-wigg Oct 26, 2017
485a200
updated styling for product index by category
s-wigg Oct 26, 2017
984ea64
Merge branch 'master' of https://github.com/ayjlee/betsy
s-wigg Oct 26, 2017
19e29bd
moved find_instock method to product controller
s-wigg Oct 26, 2017
80a43f2
refactoring
misstonbon Oct 26, 2017
257c086
Merge branch 'master' of https://github.com/ayjlee/betsy
misstonbon Oct 26, 2017
24f8f7b
refactored to create category clean_up method
s-wigg Oct 26, 2017
497d8d5
Updated OrderItem#mark_shipped test: changes order_item's shipping st…
JNEdrozo Oct 26, 2017
cd0a23d
resolved conflict in products_controller
s-wigg Oct 26, 2017
e2583c3
Updated OrderItem#mark_shipped test to include .reload
JNEdrozo Oct 26, 2017
d9775b0
OrderItem#mark_shipped test: added reload to last test
JNEdrozo Oct 27, 2017
a79467a
Merge pull request #8 from Jan/shipped-test
ayjlee Oct 27, 2017
f81c9f7
minor spacing changes
s-wigg Oct 27, 2017
5f25e6b
updated aws config variables to fix paperclip
ayjlee Oct 27, 2017
f2c0bde
Merge branch 'master' of https://github.com/ayjlee/betsy
s-wigg Oct 27, 2017
6e82cf9
Merge branch 'master' of https://github.com/ayjlee/betsy
ayjlee Oct 27, 2017
20d887e
refactored orders controller inventory adjust methods
ayjlee Oct 27, 2017
73779f0
some final styling changes
misstonbon Oct 27, 2017
3ae2776
Merge branch 'master' of https://github.com/ayjlee/betsy into final
misstonbon Oct 27, 2017
9602057
fixed add new product
misstonbon Oct 27, 2017
48e6851
fixed bug and updated dropdown
misstonbon Oct 27, 2017
51d9067
Adjusted heading from h1 to h2 to match ShopByMerchant and byCategory
JNEdrozo Oct 27, 2017
5fcad09
Merge pull request #10 from ayjlee/uniform-headings
JNEdrozo Oct 27, 2017
d307490
updated price formatting so that it shows correctly on each page
ayjlee Oct 27, 2017
536a097
added more wrappers, adjusted alignments, set some max/min widths
ayjlee Oct 27, 2017
000644b
Merge branch 'more-show-product-style'
ayjlee Oct 27, 2017
d753874
styling to order_fulfillment page
ayjlee Oct 27, 2017
990baec
styled account dashboard table to see thumbnails, click through to pr…
ayjlee Oct 27, 2017
f56e562
added spacing between picture and product info, narrowed the content …
ayjlee Oct 27, 2017
277b5c6
fixed show method to render404 and return when nonexisten order numbe…
ayjlee Oct 27, 2017
30a8ee7
updated application helper method #print_categories to include a spac…
ayjlee Oct 27, 2017
af9d4ff
included comma separation instead fo just space separation
ayjlee Oct 27, 2017
ac63b06
Merge branch 'order-fulfillment-style'
ayjlee Oct 27, 2017
fcf5a02
updated button and link font colors on order fulfillment page
ayjlee Oct 27, 2017
98c1617
removed view all orders button and fixed avg-rating display
ayjlee Oct 27, 2017
48540a1
Home Page Styling
JNEdrozo Oct 27, 2017
4dd545f
Merge pull request #12 from Jan/home-fin
ayjlee Oct 27, 2017
3a01d34
updated account user view and merged account-dashboard styling
ayjlee Oct 27, 2017
95a932c
got rid of underline on links
ayjlee Oct 27, 2017
00d68ce
deleted extraneous code
ayjlee Oct 27, 2017
160f4b6
updated error message whe product is not saved, updated test with new…
ayjlee Oct 27, 2017
d99d12d
aligned header texting to product photos
ayjlee Oct 27, 2017
e861bff
new review styling
misstonbon Oct 27, 2017
5bf0c6f
updated header number on by_merchant page
ayjlee Oct 27, 2017
192757e
Merge branch 'master' of https://github.com/ayjlee/betsy
misstonbon Oct 27, 2017
d3c110b
Merge branch 'fix-spacing'
ayjlee Oct 27, 2017
4e145c0
added orders controller test
s-wigg Oct 27, 2017
5cfc4f0
Merge branch 'master' of https://github.com/ayjlee/betsy
s-wigg Oct 27, 2017
6cb16e7
set max height and overflow scroll for all content pages
ayjlee Oct 27, 2017
a38c224
Merge branch 'master' of https://github.com/ayjlee/betsy
ayjlee Oct 27, 2017
2d07862
updated add new order item form language
ayjlee Oct 27, 2017
f3b94ca
cleanup
misstonbon Oct 27, 2017
fd4f2c2
Update README.md
misstonbon Oct 30, 2017
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
24 changes: 24 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# 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'

.env

#Ignore simplecov coverage results
coverage

# Ignore bundler config.
/.bundle

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

/node_modules
/yarn-error.log

.byebug_history
58 changes: 58 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
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


gem "omniauth"
gem "omniauth-github"

gem 'rails', '~> 5.1.4'
gem 'pg', '~> 0.18'
gem 'puma', '~> 3.7'
gem 'sass-rails', '~> 5.0'
gem 'uglifier', '>= 1.3.0'

gem 'turbolinks', '~> 5'
gem 'jbuilder', '~> 2.5'
gem 'aws-sdk', '< 3.0'
gem 'paperclip'
gem 'figaro'
gem 'will_paginate', '~> 3.1.0'

group :development, :test do
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
gem 'capybara', '~> 2.13'
gem 'selenium-webdriver'
gem 'dotenv-rails'
gem 'aws-sdk', '< 3.0'
gem 'paperclip'
gem 'figaro'
end

group :development do
gem 'web-console', '>= 3.3.0'
gem 'listen', '>= 3.0.5', '< 3.2'
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
end

gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
gem 'jquery-turbolinks'
gem 'foundation-rails', '6.4.1.2'


group :development do
gem 'better_errors'
gem 'pry-rails'
gem 'binding_of_caller'
gem 'rails-erd', require: false
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
gem 'simplecov', :require => false
end
302 changes: 302 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,302 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.1.4)
actionpack (= 5.1.4)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.4)
actionpack (= 5.1.4)
actionview (= 5.1.4)
activejob (= 5.1.4)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.1.4)
actionview (= 5.1.4)
activesupport (= 5.1.4)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.4)
activesupport (= 5.1.4)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.1.4)
activesupport (= 5.1.4)
globalid (>= 0.3.6)
activemodel (5.1.4)
activesupport (= 5.1.4)
activerecord (5.1.4)
activemodel (= 5.1.4)
activesupport (= 5.1.4)
arel (~> 8.0)
activesupport (5.1.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
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)
aws-sdk (2.10.71)
aws-sdk-resources (= 2.10.71)
aws-sdk-core (2.10.71)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.10.71)
aws-sdk-core (= 2.10.71)
aws-sigv4 (1.0.2)
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.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.3)
byebug (9.1.0)
capybara (2.15.4)
addressable
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
childprocess (0.8.0)
ffi (~> 1.0, >= 1.0.11)
choice (0.2.0)
climate_control (0.2.0)
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
coderay (1.1.2)
concurrent-ruby (1.0.5)
crass (1.0.2)
debug_inspector (0.0.3)
docile (1.1.5)
dotenv (2.2.1)
dotenv-rails (2.2.1)
dotenv (= 2.2.1)
railties (>= 3.2, < 5.2)
erubi (1.7.0)
execjs (2.7.0)
faraday (0.12.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.18)
figaro (1.1.1)
thor (~> 0.14)
foundation-rails (6.4.1.2)
railties (>= 3.1.0)
sass (>= 3.3.0, < 3.5)
sprockets-es6 (>= 0.9.0)
globalid (0.4.0)
activesupport (>= 4.2.0)
hashie (3.5.6)
i18n (0.9.0)
concurrent-ruby (~> 1.0)
jbuilder (2.7.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jmespath (1.3.1)
jquery-turbolinks (2.1.0)
railties (>= 3.1.0)
turbolinks
json (2.0.2)
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.1.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.6.6)
mime-types (>= 1.16, < 4)
method_source (0.9.0)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mimemagic (0.3.2)
mini_mime (0.1.4)
mini_portile2 (2.3.0)
minitest (5.10.3)
minitest-rails (3.0.0)
minitest (~> 5.8)
railties (~> 5.0)
minitest-reporters (1.1.18)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
multi_json (1.12.2)
multi_xml (0.6.0)
multipart-post (2.0.0)
nio4r (2.1.0)
nokogiri (1.8.1)
mini_portile2 (~> 2.3.0)
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.7.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.4.0)
oauth2 (~> 1.0)
omniauth (~> 1.2)
paperclip (5.1.0)
activemodel (>= 4.2.0)
activesupport (>= 4.2.0)
cocaine (~> 0.5.5)
mime-types
mimemagic (~> 0.3.0)
pg (0.21.0)
pry (0.11.1)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.6)
pry (>= 0.10.4)
public_suffix (3.0.0)
puma (3.10.0)
rack (2.0.3)
rack-test (0.7.0)
rack (>= 1.0, < 3)
rails (5.1.4)
actioncable (= 5.1.4)
actionmailer (= 5.1.4)
actionpack (= 5.1.4)
actionview (= 5.1.4)
activejob (= 5.1.4)
activemodel (= 5.1.4)
activerecord (= 5.1.4)
activesupport (= 5.1.4)
bundler (>= 1.3.0)
railties (= 5.1.4)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-erd (1.5.2)
activerecord (>= 3.2)
activesupport (>= 3.2)
choice (~> 0.2.0)
ruby-graphviz (~> 1.2)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (5.1.4)
actionpack (= 5.1.4)
activesupport (= 5.1.4)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.1.0)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
ruby-graphviz (1.2.3)
ruby-progressbar (1.9.0)
ruby_dep (1.5.0)
rubyzip (1.2.1)
sass (3.4.25)
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)
selenium-webdriver (3.6.0)
childprocess (~> 0.5)
rubyzip (~> 1.0)
simplecov (0.15.0)
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.0.1)
turbolinks-source (~> 5)
turbolinks-source (5.0.3)
tzinfo (1.2.3)
thread_safe (~> 0.1)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
web-console (3.5.1)
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.2)
will_paginate (3.1.6)
xpath (2.1.0)
nokogiri (~> 1.3)

PLATFORMS
ruby

DEPENDENCIES
aws-sdk (< 3.0)
better_errors
binding_of_caller
byebug
capybara (~> 2.13)
dotenv-rails
figaro
foundation-rails (= 6.4.1.2)
jbuilder (~> 2.5)
jquery-turbolinks
listen (>= 3.0.5, < 3.2)
minitest-rails
minitest-reporters
omniauth
omniauth-github
paperclip
pg (~> 0.18)
pry-rails
puma (~> 3.7)
rails (~> 5.1.4)
rails-erd
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)
will_paginate (~> 3.1.0)

BUNDLED WITH
1.16.0.pre.3
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# bEtsy
# bEtsy Completed - See it here >>>> https://glitzy-store.herokuapp.com/
[b]Etsy will be an online store where a wide variety of products can be listed and sold by any user. In this project we will focus on reinforcing the major components of Rails, Model Validation, as well as introducing some more complex logic such as user authentication.

This is a [Stage 3](https://github.com/Ada-Developers-Academy/pedagogy/blob/master/rule-of-three.md) project requiring you to expand upon what you have learned in class.
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
Binary file added app/assets/.DS_Store
Binary file not shown.
Loading