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

pipes - Tamira Kimberley Nkiru Diane - betsy #68

Open
wants to merge 525 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
525 commits
Select commit Hold shift + click to select a range
d473bc1
wrote expected pass and fail test for the update action in the OrderI…
tvojnar Oct 23, 2017
224fa90
Added standard controller actions
nkiruka Oct 23, 2017
9ed3ab2
created new model billings and ran migration
nkiruka Oct 23, 2017
a8c6e06
Merge branch 'master' of https://github.com/tvojnar/betsy into billings
nkiruka Oct 23, 2017
e95a7f2
fixed price issue
kimpossible1 Oct 23, 2017
1ec8a6b
merging master to my branch
kimpossible1 Oct 23, 2017
fd2ce43
Added form_for to new view
nkiruka Oct 23, 2017
e7c9183
fixed edit page
kimpossible1 Oct 23, 2017
72a0387
Added view partials for billing new and edit views
nkiruka Oct 23, 2017
3c1b89e
Added submit action to billing controller
nkiruka Oct 23, 2017
d56c446
can change the quantity of an order_item from the show page for order
tvojnar Oct 23, 2017
3a8eb79
wrote test stubs for all the tests I need to write for the update action
tvojnar Oct 23, 2017
7302b24
fixed some small issues in product controller and tests
kimpossible1 Oct 23, 2017
a5d2b29
Have a failing test for updating quantity when it should
tvojnar Oct 23, 2017
33d4076
updated controller tests for product
kimpossible1 Oct 23, 2017
8122484
Added custom route for submit
nkiruka Oct 24, 2017
faa41a8
Updates
nkiruka Oct 24, 2017
9f9f854
Merge pull request #26 from tvojnar/billings
nkiruka Oct 24, 2017
dc17b1e
merging with my branch Merge branch 'master' of https://github.com/tv…
kimpossible1 Oct 24, 2017
3948f9e
idk
lenertzd Oct 24, 2017
ce10b25
Merge branch 'master' of https://github.com/tvojnar/betsy into diane_…
lenertzd Oct 24, 2017
fd8bde5
passing test for updating the quantity when the order_item exisits, i…
tvojnar Oct 24, 2017
8478617
Passing test for not updating quantity when provided with invalid qua…
tvojnar Oct 24, 2017
431f12f
passing test for not updating quantity if new quantity requested is >…
tvojnar Oct 24, 2017
aeebf72
changed the way the update action checks if the quantity requested is…
tvojnar Oct 24, 2017
4adf005
passing test for the update action no updating the OrderItem's quanti…
tvojnar Oct 24, 2017
8f57b11
passing test for not updating the quantity if the OrderItem does not …
tvojnar Oct 24, 2017
90454be
addded comments to the update controller action
tvojnar Oct 24, 2017
332548a
fixed merge conflict after pulling origin master so I can do a pull r…
tvojnar Oct 24, 2017
1468e60
Merge pull request #27 from tvojnar/change-quantity
tvojnar Oct 24, 2017
07066dc
order_items_controller tests
lenertzd Oct 24, 2017
e2d9bc7
Merge branch 'master' of https://github.com/tvojnar/betsy into diane_…
lenertzd Oct 24, 2017
fba20ae
Finished most products controller tests except for visibility
kimpossible1 Oct 24, 2017
6ad92e8
debugged checking out cart and relationship test for order model
lenertzd Oct 24, 2017
86914be
fixed product model test for having a collection of orders
tvojnar Oct 24, 2017
e9f8eda
Merge pull request #28 from tvojnar/change-quantity
tvojnar Oct 24, 2017
d7c9971
total of order is shown on view page for current cart
tvojnar Oct 24, 2017
acbfb9e
Merge pull request #29 from tvojnar/add-order-total-to-order-show-page
tvojnar Oct 24, 2017
d8145f3
Add custom rout for current
tvojnar Oct 24, 2017
3f3f71b
Dan edited our order routes to use current instead of :id and changed…
tvojnar Oct 24, 2017
3404090
changed controller action and view to current and deleted instance va…
tvojnar Oct 24, 2017
076b9f4
Fixed tests for current action to rely on whether session[:order_id] …
tvojnar Oct 24, 2017
9a6f3ff
Merge pull request #30 from tvojnar/change-order-show-to-current
tvojnar Oct 24, 2017
73b8b8d
Changed current view to say shopping cart
tvojnar Oct 24, 2017
e15d3ad
positive and negative tests for calculate_total
tvojnar Oct 24, 2017
862edc5
Merge pull request #31 from tvojnar/test-calculate-total
tvojnar Oct 24, 2017
287eb3d
show/summary
lenertzd Oct 24, 2017
51b1d2b
show/summary
lenertzd Oct 24, 2017
fe5c9b0
merge conflicts
lenertzd Oct 24, 2017
4dfb679
updated gemfile.lock
tvojnar Oct 24, 2017
86d03eb
have visible fully working - need to test it still in tests but have …
kimpossible1 Oct 24, 2017
a175a7e
merging master into my branch
kimpossible1 Oct 24, 2017
006aba9
Added custom route for confirmation and confirmation action
lenertzd Oct 24, 2017
da185c9
removed require pry from orderItemsController
tvojnar Oct 24, 2017
1c357b1
Merge branch 'master' of https://github.com/tvojnar/betsy
tvojnar Oct 24, 2017
e9c599e
commented out fields we moved to billing in seed.rb from order
tvojnar Oct 24, 2017
e2d1d73
commented out fields that now belong to billing in the order secion o…
tvojnar Oct 24, 2017
067ab75
fixed logout buttons and logout controller action so that the session…
tvojnar Oct 24, 2017
92cf26b
changed create controller action for OrderItem to redirect to order_c…
tvojnar Oct 24, 2017
ab9b12d
Merge pull request #33 from tvojnar/change-cart-link
tvojnar Oct 24, 2017
ace5c80
added ability to add a category from Products Edit or New Pages
kimpossible1 Oct 24, 2017
be3c6ae
Merge branch 'master' of https://github.com/tvojnar/betsy into finish…
kimpossible1 Oct 24, 2017
435fc7c
changed field type from date to datetime for date_submitted:
lenertzd Oct 24, 2017
8e18706
merge conflict
lenertzd Oct 24, 2017
d9501be
Merge pull request #34 from tvojnar/diane_branch_tuesday
lenertzdiane Oct 24, 2017
aaf677f
passing test for not letting a user log in if they are allready logge…
tvojnar Oct 24, 2017
fbf5ed3
submit test in orders controller tests
lenertzd Oct 24, 2017
b2399e9
made some comments in the products_controller_tests for the tests tha…
tvojnar Oct 24, 2017
e4a11c0
Merge pull request #35 from tvojnar/cant-log-in-again
tvojnar Oct 24, 2017
537a0f4
have review functionality working
kimpossible1 Oct 24, 2017
a9ee901
got list of reviews by product working
kimpossible1 Oct 24, 2017
e75a635
updated the view for review list by product
kimpossible1 Oct 24, 2017
11b6943
checked merge conflicts
kimpossible1 Oct 24, 2017
e13baba
pulled origin master
tvojnar Oct 24, 2017
8166603
add before_action :require_correct_merchant for :show, :edit, :update…
tvojnar Oct 24, 2017
2f8c057
updated rating
kimpossible1 Oct 24, 2017
7847b30
updated review index view, product reviews view, and review controlle…
kimpossible1 Oct 24, 2017
35d72f6
edited update tests to work with haveing to be the correct logged in …
tvojnar Oct 24, 2017
ebe95f2
Merge pull request #32 from tvojnar/heroku-deployment
tvojnar Oct 25, 2017
4497c1e
orders controller testing
lenertzd Oct 25, 2017
e0e59af
Merge pull request #37 from tvojnar/cant-log-in-again
tvojnar Oct 25, 2017
bc62c30
uncommented login method
nkiruka Oct 25, 2017
d1cab49
Added before action to categories controller
nkiruka Oct 25, 2017
633fbb4
Modified index test
nkiruka Oct 25, 2017
e808a70
test logged in user
nkiruka Oct 25, 2017
8e44af0
test new action for categories controller
nkiruka Oct 25, 2017
e5403b9
test new action for logged in merchant
nkiruka Oct 25, 2017
446b2ae
test for create action for guest
nkiruka Oct 25, 2017
283b0f4
test for invalid data
nkiruka Oct 25, 2017
5ebe743
Updated billing yml
nkiruka Oct 25, 2017
08f5fb8
validation test for all fields
nkiruka Oct 25, 2017
54959f6
tested all fields to be validated
nkiruka Oct 25, 2017
698970f
Tested billing and order relationship
nkiruka Oct 25, 2017
6537950
tested new action
nkiruka Oct 25, 2017
9efd2db
tested create action
nkiruka Oct 25, 2017
27a0d9d
merge conflict
lenertzd Oct 25, 2017
a2cb52b
Merge pull request #38 from tvojnar/diane_branch_tuesday
lenertzdiane Oct 25, 2017
2bc0da1
updated review controller tests etc
kimpossible1 Oct 25, 2017
21743b0
updated testing
nkiruka Oct 25, 2017
3ed1df0
merged changes
nkiruka Oct 25, 2017
79643f3
Fixed bug, added colon to route
nkiruka Oct 25, 2017
822e4bf
Tests passing for billing
nkiruka Oct 25, 2017
1c1dbaa
Add key and secrect for heroku and modified omniauth.rb:
tvojnar Oct 25, 2017
fed55be
Merge pull request #39 from tvojnar/oauth-heroku
tvojnar Oct 25, 2017
b65878a
Added a comment to categories controller
nkiruka Oct 25, 2017
ca99082
Merge branch 'master' of https://github.com/tvojnar/betsy
nkiruka Oct 25, 2017
2d822c7
took away unneeded extra named env variables for heroku and removed e…
tvojnar Oct 25, 2017
046eac4
Merge branch 'master' of https://github.com/tvojnar/betsy
tvojnar Oct 25, 2017
ee810e2
small update"
kimpossible1 Oct 25, 2017
06ac8fc
Merge branch 'master' of https://github.com/tvojnar/betsy
kimpossible1 Oct 25, 2017
498afed
review testing coverage, add tests to orders controller
lenertzd Oct 25, 2017
3062599
Edited order show page to only show order_items that belong to the lo…
tvojnar Oct 25, 2017
2f06892
add table to order show page
tvojnar Oct 25, 2017
b5b928f
merge conflict
lenertzd Oct 25, 2017
3c0f82d
moved logic from view into application_helper.rb
tvojnar Oct 25, 2017
b08d87f
Adding merchants name to the order show page
tvojnar Oct 25, 2017
3e9dfd8
styling root/home page, nav bar andbanner
kimpossible1 Oct 25, 2017
18a86bf
Merge branch 'master' of https://github.com/tvojnar/betsy
kimpossible1 Oct 25, 2017
2f376fd
before starting to work on filter for table
tvojnar Oct 25, 2017
666118c
fix products controller update tests before do login issue
lenertzd Oct 25, 2017
4e93e6b
Mafe _filter_by_status form
tvojnar Oct 25, 2017
cd77f32
logic to filter from form_tag is not working! But I still need to wri…
tvojnar Oct 25, 2017
d6781e5
add tests
lenertzd Oct 25, 2017
42e31f4
Merge branch 'master' of https://github.com/tvojnar/betsy into diane_…
lenertzd Oct 26, 2017
e83fcae
update homepage
kimpossible1 Oct 26, 2017
f43f97b
more root page styling updates
kimpossible1 Oct 26, 2017
cb8194b
filter actually works now
tvojnar Oct 26, 2017
b740182
wrote passing tests for filter_by_status method
tvojnar Oct 26, 2017
eb363a8
changed view to have the html I want
tvojnar Oct 26, 2017
fc60e0a
wrote test stubs for find_by_merchant method, but I'm not sure how to…
tvojnar Oct 26, 2017
da7b74e
Merge pull request #40 from tvojnar/order-show-page
tvojnar Oct 26, 2017
9bf2102
updated homepage
kimpossible1 Oct 26, 2017
4328a11
Merge branch 'master' of https://github.com/tvojnar/betsy
kimpossible1 Oct 26, 2017
5416e77
fixed to @order_by_status is always availible
tvojnar Oct 26, 2017
7fbb862
updated the nav bar and banner hover
kimpossible1 Oct 26, 2017
e8f4851
Merge pull request #41 from tvojnar/order-show-page
tvojnar Oct 26, 2017
dfc8646
fixed banner margins etc
kimpossible1 Oct 26, 2017
80beda1
still messinga round with the banner and nav bar
kimpossible1 Oct 26, 2017
5db495f
updated nav bar
kimpossible1 Oct 26, 2017
47fe4d0
some basic css and foundations for show page
tvojnar Oct 26, 2017
1a3f65e
Merge pull request #42 from tvojnar/order-show-page
tvojnar Oct 26, 2017
ae71402
adjusted root/home page
kimpossible1 Oct 26, 2017
13dba9a
Trying to add fonts and failing
kimpossible1 Oct 26, 2017
70884dd
Merge branch 'master' of https://github.com/tvojnar/betsy
kimpossible1 Oct 26, 2017
04b36b4
got fonts working, updated some stuff in nav bar
kimpossible1 Oct 26, 2017
fed2402
update
kimpossible1 Oct 26, 2017
24cb5db
Merge branch 'master' of https://github.com/tvojnar/betsy into diane_…
lenertzd Oct 26, 2017
bcf7899
Merge pull request #43 from tvojnar/diane_branch_tuesday
lenertzdiane Oct 26, 2017
badad32
Updated products & category seed data
nkiruka Oct 26, 2017
1cfa0ec
Merge branch 'master' of https://github.com/tvojnar/betsy
nkiruka Oct 26, 2017
7c28a8a
fixed two tests in Order_controler_test and one in order_test
tvojnar Oct 26, 2017
984a56f
fixed the following model test for Order: will return an empty array …
tvojnar Oct 26, 2017
2be1ce3
Fixed the following test in order_controllers_test: returns success i…
tvojnar Oct 26, 2017
530193e
updated styling etc on all products page
kimpossible1 Oct 26, 2017
889a4a8
Merge branch 'master' of https://github.com/tvojnar/betsy
nkiruka Oct 26, 2017
cc35e3c
fixed merchant-show page to only show date_submitted if that attribut…
tvojnar Oct 26, 2017
58f5503
Merge pull request #44 from tvojnar/fix-model-tests
tvojnar Oct 26, 2017
a1b8b88
fixed mistake in my products index page code
kimpossible1 Oct 26, 2017
0b7591a
Added validation for cc_num
nkiruka Oct 26, 2017
a5fbf73
Merge branch 'master' of https://github.com/tvojnar/betsy
nkiruka Oct 26, 2017
de14eed
fixed order show page to only show billing info if the order has a bi…
tvojnar Oct 26, 2017
d8dc9e4
Merge pull request #45 from tvojnar/fix-model-tests
tvojnar Oct 26, 2017
0da9e67
fixed the following test in merchant_test: eturns the correct pending…
tvojnar Oct 26, 2017
979ddaa
fixed the folllowing test in merchat_test: returns total revenue rega…
tvojnar Oct 26, 2017
2a6f520
Merge pull request #46 from tvojnar/fix-model-tests
tvojnar Oct 26, 2017
b4ee14e
some row and columns added
tvojnar Oct 26, 2017
5f835b9
Merge branch 'master' of https://github.com/tvojnar/betsy into style-…
tvojnar Oct 26, 2017
2029217
fixed layout of table on merchant show page for pending orders
tvojnar Oct 26, 2017
2e925ba
made a couple changes to merchant show page
tvojnar Oct 26, 2017
8642e97
basic styling for add product done
tvojnar Oct 26, 2017
193a008
Merge pull request #47 from tvojnar/style-new-product
tvojnar Oct 26, 2017
fe405b3
style cart page and billing new page
lenertzd Oct 26, 2017
62800cb
Merge branch 'master' of https://github.com/tvojnar/betsy into diane_…
lenertzd Oct 26, 2017
620d393
Styled product show page
nkiruka Oct 26, 2017
1c79e45
styled product show page
nkiruka Oct 27, 2017
9008b80
ran bundle exec rake assets:precompile
tvojnar Oct 27, 2017
9dda12b
fix rounding errors on merchant show page and button override css issues
lenertzd Oct 27, 2017
1f90182
styled products page
nkiruka Oct 27, 2017
9eaafe2
Merge pull request #48 from tvojnar/diane_branch_tuesday
lenertzdiane Oct 27, 2017
cdaaa3b
Merge pull request #49 from tvojnar/product-show-styling
nkiruka Oct 27, 2017
c6b63ec
style for order sure page
lenertzd Oct 27, 2017
6871f36
Merge pull request #50 from tvojnar/diane_branch_tuesday
lenertzdiane Oct 27, 2017
6927be3
Edited width
nkiruka Oct 27, 2017
5c7690a
Merge branch 'master' of https://github.com/tvojnar/betsy
nkiruka Oct 27, 2017
515051c
small update
kimpossible1 Oct 27, 2017
e9a7471
update
kimpossible1 Oct 27, 2017
e8ac436
basic styling for add catagory page
tvojnar Oct 27, 2017
c91ff9f
Basic styling for edit merchant page
tvojnar Oct 27, 2017
3831783
pushing to checkout master cause wierd error is happening
tvojnar Oct 27, 2017
2c63549
basic styling for order show page
tvojnar Oct 27, 2017
e883c8a
Merge pull request #51 from tvojnar/tamira-styling
tvojnar Oct 27, 2017
24f0b28
commenting out line 9 in application.html.erb to see if that will mak…
tvojnar Oct 27, 2017
e4f6b86
merchant show page and order filter by status form
kimpossible1 Oct 27, 2017
e116913
Merge branch 'master' of https://github.com/tvojnar/betsy
kimpossible1 Oct 27, 2017
22c31fe
added fonts back in so we can work with them in development
tvojnar Oct 27, 2017
35db81a
Merge branch 'master' of https://github.com/tvojnar/betsy
kimpossible1 Oct 27, 2017
e55d24f
updates
kimpossible1 Oct 27, 2017
f2a0a94
more updates
kimpossible1 Oct 27, 2017
09c0503
updated
kimpossible1 Oct 27, 2017
f3a1038
Styled reviews and products
nkiruka Oct 27, 2017
bf804c8
confirmation page styling
lenertzd Oct 27, 2017
ed8833b
Merge pull request #52 from tvojnar/diane_branch_tuesday
lenertzdiane Oct 27, 2017
602fbae
Merge branch 'master' into reviews-products-styling
nkiruka Oct 27, 2017
c6f42fc
Merge pull request #53 from tvojnar/reviews-products-styling
nkiruka Oct 27, 2017
7a3afb5
Fixed the following test in the merchants_controller_test: returns ba…
tvojnar Oct 27, 2017
c840d4d
changed before do to a let in orders_controller checkout methods desc…
tvojnar Oct 27, 2017
cba7cf0
Merge pull request #54 from tvojnar/fix-tests-friday
tvojnar Oct 27, 2017
e319dd5
fixed up order show page
kimpossible1 Oct 27, 2017
451b767
Merge branch 'master' of https://github.com/tvojnar/betsy
kimpossible1 Oct 27, 2017
329393a
add comment to make h4 more specific
tvojnar Oct 27, 2017
f4d9b43
fixed filter by status to work again -- I had to capitalize the statu…
tvojnar Oct 27, 2017
f44ae6a
Merge branch 'master' of https://github.com/tvojnar/betsy
tvojnar Oct 27, 2017
4027fc6
editing styling on merchant show page and order filter
kimpossible1 Oct 27, 2017
dcca3dc
Merge branch 'master' of https://github.com/tvojnar/betsy
kimpossible1 Oct 27, 2017
79aa085
fix orders controller submit testing error fix
lenertzd Oct 27, 2017
2218884
Merge pull request #55 from tvojnar/diane_branch_tuesday
lenertzdiane Oct 27, 2017
0a1f806
fixed styling for order show page
tvojnar Oct 27, 2017
cdfbd71
fixed merge conflicts
tvojnar Oct 27, 2017
dd4b46b
fixed merge conflict with h3
tvojnar Oct 27, 2017
0b5c072
centered title
tvojnar Oct 27, 2017
88476f2
Added title to page
tvojnar Oct 27, 2017
edb3b16
final commit before doing pull request
tvojnar Oct 27, 2017
26190b1
Merge pull request #56 from tvojnar/order-show-page-friday
tvojnar Oct 27, 2017
fbc731c
updates to merchant account page
kimpossible1 Oct 27, 2017
3aa31a9
Merge branch 'master' of https://github.com/tvojnar/betsy
kimpossible1 Oct 27, 2017
bb75894
merchant account page
kimpossible1 Oct 27, 2017
9cb7854
styling for buttons
nkiruka Oct 27, 2017
f34f5e9
Merge branch 'master' of https://github.com/tvojnar/betsy
nkiruka Oct 27, 2017
94c215b
Add basic styling for flash messages
tvojnar Oct 27, 2017
87b9070
Merge pull request #57 from tvojnar/flash
tvojnar Oct 27, 2017
a0f7580
add styling to review read page
lenertzd Oct 27, 2017
3ddfc0e
Fixed prod description bug
kimpossible1 Oct 27, 2017
5f6597c
Merge branch 'master' of https://github.com/tvojnar/betsy into diane_…
lenertzd Oct 27, 2017
a2f4470
Merge pull request #58 from tvojnar/diane_branch_tuesday
lenertzdiane Oct 27, 2017
b80c302
update
kimpossible1 Oct 27, 2017
6c91758
Edit product index page to change title based on filter
tvojnar Oct 27, 2017
0f8832c
fixed merge conflict in merchant.scss
tvojnar Oct 27, 2017
799a6de
Merge pull request #59 from tvojnar/edit-product-index-page
tvojnar Oct 27, 2017
c0788ca
fix order paid total issue on confirmation page
lenertzd Oct 27, 2017
40ded4c
Merge pull request #60 from tvojnar/diane_branch_tuesday
lenertzdiane Oct 27, 2017
651deac
product show page
kimpossible1 Oct 27, 2017
30a97e6
Merge branch 'master' of https://github.com/tvojnar/betsy
kimpossible1 Oct 27, 2017
85da490
fixed merge conflict in current order view
tvojnar Oct 27, 2017
cda4e0c
last updates
tvojnar Oct 27, 2017
9aa5b44
Update README.md
tvojnar Apr 15, 2018
bec11d6
Update README.md
tvojnar Apr 15, 2018
76f367e
Update README.md
tvojnar Apr 15, 2018
2258678
Update README.md
tvojnar Apr 15, 2018
2dff7fa
Update README.md
tvojnar Apr 29, 2018
e59946b
Update README.md
tvojnar Apr 29, 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
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

/node_modules
/yarn-error.log

.byebug_history
.env
.DS_Store

coverage
70 changes: 70 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
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 'foundation-rails', '6.4.1.2'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.1.4'
# Use postgresql as the database for Active Record
gem 'pg', '~> 0.18'
# 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', '~> 3.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

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

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'
gem 'dotenv-rails'
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'
group :development do
gem 'better_errors'
gem 'pry-rails'
gem 'binding_of_caller'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
gem 'simplecov', :require => false
end
268 changes: 268 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,268 @@
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)
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)
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)
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)
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)
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)
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-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-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)
xpath (2.1.0)
nokogiri (~> 1.3)

PLATFORMS
ruby

DEPENDENCIES
better_errors
binding_of_caller
byebug
capybara (~> 2.13)
dotenv-rails
foundation-rails (= 6.4.1.2)
jbuilder (~> 2.5)
jquery-turbolinks
listen (>= 3.0.5, < 3.2)
minitest-rails
minitest-reporters
omniauth
omniauth-github
pg (~> 0.18)
pry-rails
puma (~> 3.7)
rails (~> 5.1.4)
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.0.pre.3
Loading