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

Tor, Angelica, Hannah - SuperMarket Betsy - Octos #18

Open
wants to merge 313 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
313 commits
Select commit Hold shift + click to select a range
990829d
Write sessions#create to authenticate and create new merchants via Go…
amcejamorales Apr 21, 2018
4c8dc50
added more tests for ProductsController and nested routes for merchan…
torshimizu Apr 21, 2018
0a5f8d7
Complete Google authentication log out functionality, link to log in/…
amcejamorales Apr 22, 2018
99a9c2c
ProductsController tests new, index, show, some update
torshimizu Apr 22, 2018
24a11c4
preliminary tests for product destroy, edit, show - waiting for authe…
torshimizu Apr 22, 2018
edeffea
added in links to add to cart and view additional merchant products -…
hannahlcameron Apr 22, 2018
91b29db
fixed routes typo
hannahlcameron Apr 22, 2018
4f0407d
ran pending migrations
hannahlcameron Apr 22, 2018
1a932e8
product display portion of products show page complete.
hannahlcameron Apr 22, 2018
018bb56
added reviews to product show. page built
hannahlcameron Apr 22, 2018
4ca9700
added a scope to find products by category/added to products#index
torshimizu Apr 22, 2018
0cb9498
added orderitem#viewcart, added in view file
hannahlcameron Apr 22, 2018
c5af839
built orders controller - moved viewcart method there. added in routes
hannahlcameron Apr 22, 2018
abbef96
initialized orders controller, added current_cart method to order model
hannahlcameron Apr 22, 2018
c12b61a
added in routes
hannahlcameron Apr 22, 2018
612a939
added in order edit view
hannahlcameron Apr 22, 2018
54774d7
included add category to new product form, added non-restful add_cate…
torshimizu Apr 22, 2018
4bc4b05
Set up nested route for merchant's orders
amcejamorales Apr 23, 2018
40f1546
Update Orders and OrderItem tests after changing DB table column name…
amcejamorales Apr 23, 2018
f10e493
Merge branch 'orders_controller' into merchant_controller
amcejamorales Apr 23, 2018
963a165
Set up test_helper to help with testing authentication
amcejamorales Apr 23, 2018
7af07c9
Test and write Orders#index for a logged in merchant; modify merchant…
amcejamorales Apr 23, 2018
73e46ca
Set up Merchant's Orders view
amcejamorales Apr 23, 2018
9cf0172
Resolve merge conflicts from latest pull
amcejamorales Apr 23, 2018
b449584
resolved merge conflict in routes file
hannahlcameron Apr 23, 2018
5b3c602
Resolve merge conflicts from latest pull
amcejamorales Apr 23, 2018
6a90dcf
added order#edit method
hannahlcameron Apr 23, 2018
716d3a9
ran db:migrations, give app.html som structure, finished up edit and …
hannahlcameron Apr 23, 2018
872812d
merged in master
torshimizu Apr 23, 2018
364f1be
merged routes
torshimizu Apr 23, 2018
abc3bda
pulled sessions_controller branch
torshimizu Apr 23, 2018
aae87c9
Merge branch 'sessions_controller' into product_category_testing
torshimizu Apr 23, 2018
930836a
added in methods to calculate total; written html for show view
hannahlcameron Apr 23, 2018
870e9ed
added .env/ google oauth info
hannahlcameron Apr 23, 2018
97eb91d
added .env and updated .gitignore
hannahlcameron Apr 23, 2018
c91f59e
Use .distinct to eliminate duplicate orders for a merchant
amcejamorales Apr 23, 2018
cfa83ae
Use latest migration
amcejamorales Apr 23, 2018
01a0d15
added google oauth stuff, added query for categories with works, adde…
torshimizu Apr 23, 2018
75902f2
product show page waiting for picture URL - will change once schemo u…
hannahlcameron Apr 23, 2018
c01ba78
updated products to have a photo_url column
torshimizu Apr 23, 2018
f53eb25
made a categories controller
torshimizu Apr 23, 2018
1e08595
"merging in from github"
hannahlcameron Apr 23, 2018
bccc340
resolved merge conflict inside routes file
hannahlcameron Apr 23, 2018
0958a1d
updated route file
hannahlcameron Apr 23, 2018
23fe849
merged in most up to date master; resolved merge conflicts in config/…
hannahlcameron Apr 23, 2018
11d6878
added actions to merchants controller and limited routes for merchant…
torshimizu Apr 23, 2018
87d6050
working on tests for products controller
torshimizu Apr 23, 2018
6d956be
removed duplicate method, changed path in viewcart html
hannahlcameron Apr 23, 2018
d3010b7
Write and test merchant_order_items in Merchant model
amcejamorales Apr 23, 2018
2fd24cd
update viewcart view to have dynamic qty updating, fixed route typo, …
hannahlcameron Apr 23, 2018
d1d474a
dried up viewcard method'
hannahlcameron Apr 23, 2018
2d58b16
tests written and passing for orders#viewcart
hannahlcameron Apr 23, 2018
a733d61
more tests for product controller, added a validation for stock on pr…
torshimizu Apr 23, 2018
27e06ef
Display table with merchant's orders information
amcejamorales Apr 23, 2018
405fd76
viewcart working - changed where method redirects and renders upon up…
hannahlcameron Apr 23, 2018
d44ce85
Merge latest changes to master
amcejamorales Apr 23, 2018
4548b4d
model testing for category
torshimizu Apr 23, 2018
2162b7b
revised where add product link redirects to; added before_action that…
hannahlcameron Apr 23, 2018
c146253
fixing routes in this branch
torshimizu Apr 23, 2018
7d071b9
Link orders and products in Merchant orders page
amcejamorales Apr 23, 2018
5259a1a
added new shared folder to house orderitem adding/editing.
hannahlcameron Apr 23, 2018
9484628
added flash errors
torshimizu Apr 23, 2018
445fd9b
Write and test subtotal method for OrderItem model
amcejamorales Apr 23, 2018
d393218
merged changes
torshimizu Apr 23, 2018
40008e2
merged in master
torshimizu Apr 23, 2018
f103231
added in form partial for updating orderitem quantity
hannahlcameron Apr 23, 2018
50558bb
fixed routes
torshimizu Apr 23, 2018
f3c7884
merged routes
torshimizu Apr 23, 2018
f466ad0
removed form partial - form was too dissimilar to have as a partial
hannahlcameron Apr 23, 2018
37554d4
Display OrderItem subtotal, update date, and status on Merchant Order…
amcejamorales Apr 23, 2018
7f49fd5
working on form to add new orderitem - currently nonfunctional
hannahlcameron Apr 23, 2018
29ba1bc
removed partial form - moved back into products#show due to incompati…
hannahlcameron Apr 23, 2018
9d25f3b
Copy in OrderItem validation tests from orderitem_model_testing branch
amcejamorales Apr 23, 2018
0232104
Test OrderItem relations
amcejamorales Apr 23, 2018
8bda384
added @merchant where session to application, changed auth_hash, upda…
torshimizu Apr 23, 2018
ede591f
working on add product form and img tag
hannahlcameron Apr 23, 2018
5f2769c
added links around merchant and updated top navbar
torshimizu Apr 23, 2018
ce92f26
fixed a bug where selecting a merchant would log you in as the merchant
torshimizu Apr 23, 2018
fecd75c
uncommented code
hannahlcameron Apr 23, 2018
106c193
updated test_helper. It had some testing in it
torshimizu Apr 24, 2018
ff2d2cd
added more tests for ProductsController
torshimizu Apr 24, 2018
5a4b858
added a reviews controller and some tests for merchant
torshimizu Apr 24, 2018
cfa9c49
building table in orders#show to display all orderitems; starting to …
hannahlcameron Apr 24, 2018
5e96d2c
wrote/passing tests for orderitem subtotal
hannahlcameron Apr 24, 2018
ed5775b
finished table -now shows all appropriate info
hannahlcameron Apr 24, 2018
af2993f
"merging master into order_show_view"
hannahlcameron Apr 24, 2018
b873d27
wrote order_total method, working on testing. worked on order show view
hannahlcameron Apr 24, 2018
b3138be
all required info displayed on order show page
hannahlcameron Apr 24, 2018
f328440
resolved merge conflict from master into order_edit_view
hannahlcameron Apr 24, 2018
d3abefa
can't get reviews_controller to pass
torshimizu Apr 24, 2018
424da5b
changed how order#update handles failure to save
hannahlcameron Apr 24, 2018
3df16c2
wrote out form_for more explicitly, data still not saving
hannahlcameron Apr 24, 2018
1e8d43f
working on form to add new orderitem
hannahlcameron Apr 24, 2018
bd43c12
Merge branch 'master' into merchant_controller
amcejamorales Apr 24, 2018
d4ead12
Write and test total_revenue_by method
amcejamorales Apr 24, 2018
6eaa195
Implement total_revenue_by method for Merchant Orders page
amcejamorales Apr 24, 2018
36a3f22
Write and test count_orders_by method
amcejamorales Apr 24, 2018
d6b9a85
Implement count_orders_by method in Merchant Orders page
amcejamorales Apr 24, 2018
83838d2
updated reviews controller
torshimizu Apr 24, 2018
dff4047
fixed path in describe viewcart testing
hannahlcameron Apr 24, 2018
d438942
"merged in origin master"
hannahlcameron Apr 24, 2018
f2ee917
resolved merge conflit, remove .env file again
hannahlcameron Apr 24, 2018
4461ed9
fixed tests on this branch
torshimizu Apr 24, 2018
54d9e06
Merge branch 'master' into merchant_controller
amcejamorales Apr 24, 2018
e1c1366
removed duplicate .env
hannahlcameron Apr 24, 2018
5a559f5
merged in master
torshimizu Apr 24, 2018
cc191fe
refactored, have passing tests, creating a review will always redirec…
torshimizu Apr 24, 2018
1e5d503
Call distinct on Merchant orders in count_orders_by method
amcejamorales Apr 24, 2018
052d739
updated routes to match master preemptively, edited img tag in show v…
hannahlcameron Apr 24, 2018
322d95b
"merge products_show_view into local master"
hannahlcameron Apr 24, 2018
29d3297
resolved merge conflict, merged in master
hannahlcameron Apr 24, 2018
a466772
Modify total_revenue_by so 'all' is the sum of 'paid' and 'completed'…
amcejamorales Apr 24, 2018
3e658eb
finished up testing for order_total
hannahlcameron Apr 24, 2018
395e9e3
Add status column to OrderItem db table
amcejamorales Apr 24, 2018
8a858d2
added conditional functionality to order#show based on order status
hannahlcameron Apr 24, 2018
0ab391c
Test validation for OrderItem status and set default in controller
amcejamorales Apr 24, 2018
b4db4d5
added seeds, updated products#index to use stored url
torshimizu Apr 24, 2018
64ce663
updated seeds to include categories for products
torshimizu Apr 24, 2018
c2a1739
updated products#index to have the image be a link to the product sho…
torshimizu Apr 24, 2018
f7ef233
added title page to filtered products#index
torshimizu Apr 24, 2018
77f1bcd
added addl functionality to show method, wrote new test and fixed tes…
hannahlcameron Apr 24, 2018
22a6a27
closed table
hannahlcameron Apr 24, 2018
4338984
preemptively matched routes file
hannahlcameron Apr 24, 2018
daef716
fixed merge conflicts when merging master in
hannahlcameron Apr 24, 2018
b02dbeb
moved status change inside validation that changes have been saved
hannahlcameron Apr 24, 2018
74d32c6
Write OrderItem ship controller method to change OrderItem status to …
amcejamorales Apr 24, 2018
4abf4f4
Merge in latest version of master
amcejamorales Apr 24, 2018
8be2a39
added a route and view for merchant#manage_products, fixed flow/links…
torshimizu Apr 24, 2018
9b17d03
Rewrite some OrderItems controller tests to match updates; not all te…
amcejamorales Apr 24, 2018
adc2050
uncommented order validations; updated update test 3; moved order sta…
hannahlcameron Apr 24, 2018
e7a2d86
updated tests for product controller
torshimizu Apr 24, 2018
4958cfc
Merge branch 'master' into seeds_and_others
torshimizu Apr 24, 2018
a948fa0
Test OrderItem controller method ship
amcejamorales Apr 24, 2018
7d9499a
added DS_Store to gitignore
torshimizu Apr 24, 2018
3217f61
Rewrite merchant model test from feedback
amcejamorales Apr 24, 2018
2e3ebff
fixing tests, fixtures, etc
torshimizu Apr 24, 2018
44d642e
trying to fix categories controller
torshimizu Apr 24, 2018
c3939dd
merged in master
torshimizu Apr 24, 2018
ebfab08
Write and test OrderItem cancel controller method
amcejamorales Apr 24, 2018
91946dd
removed require pry
hannahlcameron Apr 24, 2018
3bfd1a4
removed multiple require prys
hannahlcameron Apr 24, 2018
8e9835c
fixed some tests, persisted the cart, added a link to the cart path
torshimizu Apr 25, 2018
77467a8
Pull latest changes from master
amcejamorales Apr 25, 2018
f8a4feb
Give OrderItems a default pending status, adjust controller and tests…
amcejamorales Apr 25, 2018
87df630
added reviews form, added conversion of rating to lightening bolts to…
torshimizu Apr 25, 2018
831035a
Merge branch 'master' into seeds_and_others
torshimizu Apr 25, 2018
3df1c8b
dried up order#edit to utilize before_action order_params
hannahlcameron Apr 25, 2018
1a32f3a
moved order status change inside order save conditional
hannahlcameron Apr 25, 2018
45094c4
"merging in most current master"
hannahlcameron Apr 25, 2018
2eed1ad
set cart id in session, will give you message 'you do not have items …
torshimizu Apr 25, 2018
22b5dd6
ran migrations after merged in master; fixed glitch preventing order …
hannahlcameron Apr 25, 2018
0cd291b
persisted cart, can add more than one order item to cart
torshimizu Apr 25, 2018
cabae8d
Merge branch 'master' of https://github.com/hannahlcameron/betsy
torshimizu Apr 25, 2018
96ed760
merged in master
torshimizu Apr 25, 2018
7bb920e
Write and test some functionality for order_status method
amcejamorales Apr 25, 2018
a82135d
Finish order_status method and test
amcejamorales Apr 25, 2018
bde5d7a
Implement order_status method in view
amcejamorales Apr 25, 2018
599d9e7
Merge latest changes from master
amcejamorales Apr 25, 2018
b2e8521
fixed spacing
hannahlcameron Apr 25, 2018
8819e93
wrote stock_decriment method
hannahlcameron Apr 25, 2018
f1a319f
writing testing for stock_decrement method; wrote in beginning of whe…
hannahlcameron Apr 25, 2018
3fe8149
fixed test_helper for auth hash build, wrote tests for session
torshimizu Apr 25, 2018
fdaa3b7
updating tests for orders_controller
torshimizu Apr 25, 2018
1ecd7b0
Merge branch 'master' into sessions_test
torshimizu Apr 25, 2018
5397d4d
wrote out functionality to decrement product stock inside order updat…
hannahlcameron Apr 25, 2018
35d0e64
minor spacing corrections
hannahlcameron Apr 25, 2018
34b74ec
'merging latest remote master into master'
hannahlcameron Apr 25, 2018
01b0633
resolved merge conflicts in order model and order model test
hannahlcameron Apr 25, 2018
707f90d
fixing tests
torshimizu Apr 25, 2018
ee7b857
Correct order_status method
amcejamorales Apr 26, 2018
176b53f
Modify order_status method
amcejamorales Apr 26, 2018
9937264
attempts to make $ floats have two digits; changed the names of some …
hannahlcameron Apr 26, 2018
a951d67
added in two_digits method and modified product create method to utilize
hannahlcameron Apr 26, 2018
97569f3
no failing tests, most tests needed to be updated so as to create a s…
torshimizu Apr 26, 2018
d6d7b6b
Merge branch 'master' into sessions_test
torshimizu Apr 26, 2018
9521681
Write and implement search dropdown functionality to filter through a…
amcejamorales Apr 26, 2018
8ad7681
added a basic search bar method, fixed some show pages
torshimizu Apr 26, 2018
7cf0384
updated Category.categories_with_works method to alphabetize, attempt…
torshimizu Apr 26, 2018
5dd2c45
minor UX changes to button labels, removed commented out code no long…
hannahlcameron Apr 26, 2018
b88f257
added a search bar route and method
torshimizu Apr 26, 2018
9b4f07b
Merge branch 'master' of https://github.com/hannahlcameron/betsy
torshimizu Apr 26, 2018
c227f55
updated application.html.erb
torshimizu Apr 26, 2018
e844382
Merge branch 'master' into filter_merchant_orders
amcejamorales Apr 26, 2018
a01d44d
trying out some navbar css
torshimizu Apr 26, 2018
c84a9c2
merged in search bar branch
torshimizu Apr 26, 2018
afae1f6
Merge branch 'master' of https://github.com/hannahlcameron/betsy
torshimizu Apr 26, 2018
8ca44cd
changed select tag name for order status filtering
hannahlcameron Apr 26, 2018
47fbe30
changed link to see more products, removed unneeded route
hannahlcameron Apr 26, 2018
a7fe9a9
fixed reroute in orderitem controller destroy
hannahlcameron Apr 26, 2018
17da35c
changed labels on order#edit form, fixed route on product show for se…
hannahlcameron Apr 26, 2018
ac99a07
deleted extra end in order test; built method to prevent merchant fro…
hannahlcameron Apr 26, 2018
8c99381
updated test in orders_controller
torshimizu Apr 26, 2018
416b279
Merge branch 'master' of https://github.com/hannahlcameron/betsy
torshimizu Apr 26, 2018
d343e66
removed puts statements
hannahlcameron Apr 26, 2018
94703ec
Merge branch 'master' of https://github.com/hannahlcameron/betsy
torshimizu Apr 26, 2018
968be21
fixed route called in test
hannahlcameron Apr 26, 2018
d5d2e93
fixed typo in test; removed unneccesary test
hannahlcameron Apr 26, 2018
a0bc268
added back in merchants products index path
hannahlcameron Apr 26, 2018
423024c
updated test things
torshimizu Apr 26, 2018
ad32f38
decrements stock to 0 upon retirement
hannahlcameron Apr 27, 2018
7f13be9
added in text to footer
hannahlcameron Apr 27, 2018
684311d
orderitem will aggregate if trying to add the same item to cart
torshimizu Apr 27, 2018
8c4fb5b
Add banner to front page
amcejamorales Apr 27, 2018
b3a66ab
updated viewcart form, orderitems are now inline
torshimizu Apr 27, 2018
29cf874
styled search bar and button, some styling on left side nav
torshimizu Apr 27, 2018
77c64fb
product show page styling
torshimizu Apr 27, 2018
7f82357
more css stuff
torshimizu Apr 27, 2018
25353d7
Style header and nav bar
amcejamorales Apr 27, 2018
5678453
Update banner
amcejamorales Apr 27, 2018
b38e503
Add banner header
amcejamorales Apr 27, 2018
be073b0
further changes to footer
hannahlcameron Apr 27, 2018
585df2b
changed validation to allow for 0 stock
hannahlcameron Apr 27, 2018
20f76d5
Style product cards
amcejamorales Apr 27, 2018
ce5e52e
'merged master into footer branch'
hannahlcameron Apr 27, 2018
972c531
Merge Tor's branch
amcejamorales Apr 27, 2018
1f2e9cd
Merge branch 'master' of https://github.com/hannahlcameron/betsy
amcejamorales Apr 27, 2018
6c32fa2
replaced head not_found
torshimizu Apr 27, 2018
6e7e612
removed random s
hannahlcameron Apr 27, 2018
01a8f77
fixed route in test to match method
hannahlcameron Apr 27, 2018
2bb9097
changed redirect path for delete method
hannahlcameron Apr 27, 2018
dbf2efc
merged in master
torshimizu Apr 27, 2018
0c2f96e
"pull down latest master version"
hannahlcameron Apr 27, 2018
5ff72e9
Merge branch 'master' of https://github.com/hannahlcameron/betsy
torshimizu Apr 27, 2018
374e40e
Merge branch 'master' into tors_branch
torshimizu Apr 27, 2018
aba16e0
Add home page styles
amcejamorales Apr 27, 2018
485d46a
removed add to cart button from product show page when stock is 0
torshimizu Apr 27, 2018
68b4ccf
starting to add dropdown code
torshimizu Apr 27, 2018
e09a4b9
Merge branch 'master' of https://git.heroku.com/superheromarket
torshimizu Apr 27, 2018
2d6554c
fixed a bug in show add to cart button on products show
torshimizu Apr 27, 2018
b520c05
Put banner in home page only
amcejamorales Apr 27, 2018
9776652
updated where editing and creating a product redirects to
torshimizu Apr 27, 2018
fb33a73
changed redirect after retiring a product
torshimizu Apr 27, 2018
0843113
updated revenue on merchant orders to be formatted as currency
torshimizu Apr 27, 2018
5a81ff9
merchant can't see other merchant's products on order show page
torshimizu Apr 27, 2018
216a8da
Style merchant dashboard
amcejamorales Apr 27, 2018
b20eba8
updated order controller show to handle different situations
torshimizu Apr 27, 2018
d297e46
Style manage_products page
amcejamorales Apr 27, 2018
06964bd
Merge branch 'master' of https://github.com/hannahlcameron/betsy
amcejamorales Apr 27, 2018
04a78d8
updated tests for new redirect when things are not found
torshimizu Apr 27, 2018
df88e66
Merge branch 'master' of https://github.com/hannahlcameron/betsy
torshimizu Apr 27, 2018
cd22321
merged in master
torshimizu Apr 27, 2018
120a441
added a dropdown for categories and merchants
torshimizu Apr 27, 2018
715e8e0
Fix product cards
amcejamorales Apr 27, 2018
bed7c18
Stick footer to bottom of every page
amcejamorales Apr 27, 2018
3b37169
Get merchant show page to look like products show page
amcejamorales Apr 27, 2018
58fbd05
removed bullets in showing reviews, added a message when all products…
torshimizu Apr 27, 2018
4adf940
Final styles
amcejamorales Apr 27, 2018
2ea3d66
updated no products message
torshimizu Apr 27, 2018
fd167e4
Merge branch 'master' of https://github.com/hannahlcameron/betsy
torshimizu Apr 27, 2018
df36067
changed z-index of dropdowns
torshimizu Apr 27, 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
Binary file added .DS_Store
Binary file not shown.
23 changes: 23 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# 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
.env

/node_modules
/yarn-error.log

.byebug_history

/coverage/
.DS_Store
76 changes: 76 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
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-google-oauth2", "~> 0.2.1"

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'
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 'dotenv-rails'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
gem 'simplecov', require: false
end
275 changes: 275 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,275 @@
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-google-oauth2 (0.2.10)
addressable (~> 2.3)
jwt (~> 1.0)
multi_json (~> 1.3)
omniauth (>= 1.1.1)
omniauth-oauth2 (~> 1.3.1)
omniauth-oauth2 (1.3.1)
oauth2 (~> 1.0)
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)
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-google-oauth2 (~> 0.2.1)
pg (>= 0.18, < 2.0)
pry-rails
puma (~> 3.7)
rails (~> 5.1.6)
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
Loading