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

Robits #41

Open
wants to merge 342 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
342 commits
Select commit Hold shift + click to select a range
ebe5134
Adds skip login before payment details
nahmisa Oct 21, 2016
38005b1
Merge branch 'master' of github.com:Bella8/betsy
nahmisa Oct 21, 2016
ca64751
Cleans up order_items_controller
nahmisa Oct 21, 2016
62ceef7
Cleans up order item model
nahmisa Oct 21, 2016
73378d5
Adds semantic tags
nahmisa Oct 21, 2016
79e7d38
Adds semantic HTML
nahmisa Oct 21, 2016
b6e3daa
Refactors redirect in orders#create out
nahmisa Oct 21, 2016
8283e91
Cleans up payment controller and moves asks to model
nahmisa Oct 21, 2016
9586ca4
Cleaner
nahmisa Oct 21, 2016
72d6b1b
Will need to eventually make the comented out validation work
nahmisa Oct 21, 2016
729c79e
Purchasing the cart marks the order as paid
nahmisa Oct 21, 2016
d1d553e
Added Foundation CSS. Added background image. Modified application.cs…
KellyPT Oct 21, 2016
add5059
Added new route, new Session controller action, created merchant_logi…
KellyPT Oct 21, 2016
21d32fe
Merge branch 'master' of https://github.com/Bella8/betsy
KellyPT Oct 21, 2016
7a289b7
Fixes payment_details update
nahmisa Oct 21, 2016
a8ecbdf
Note to ask Guin about self method
nahmisa Oct 21, 2016
b18c153
Removes space
nahmisa Oct 21, 2016
7004b4b
Adds order detail to confirmation page
nahmisa Oct 21, 2016
591045f
Merge branch 'master' of github.com:Bella8/betsy
nahmisa Oct 21, 2016
135eb60
Corrects skip before action from only to except in products
nahmisa Oct 21, 2016
7769b70
removed a belongs to catagory from products.
Bella8 Oct 21, 2016
2c437fc
fixed merge conflict.
Bella8 Oct 21, 2016
3b8a1c5
schema change
Bella8 Oct 21, 2016
8d60747
added a way for a merchant can add a product
Bella8 Oct 21, 2016
d92a17c
changed new review path
Bella8 Oct 21, 2016
acaecfd
Changed the nav bar. Added new joint table csv file. Modified product…
KellyPT Oct 21, 2016
c3bc238
changes to schema.rb
KellyPT Oct 21, 2016
a62ef8a
Merge branch 'master' of https://github.com/Bella8/betsy
KellyPT Oct 21, 2016
ea0b4ee
Make Product#new and Product#create work
KellyPT Oct 21, 2016
98f0ecf
fixed catogireis products relationship
Bella8 Oct 22, 2016
f9f1b59
fixed categories new
Bella8 Oct 22, 2016
8bac409
Changes to schema and product model
guineveresaenger Oct 23, 2016
c4e6462
Schema version conflict resolution
guineveresaenger Oct 23, 2016
1c30cd3
Began testing on Review; found a bug in Product.rb update_quantity. S…
guineveresaenger Oct 23, 2016
0275a9f
Fixed problems in update_quantity in product.rb. Further work on revi…
guineveresaenger Oct 23, 2016
b5c8c19
Hopefully final fix for product.rb; tests and validation for review
guineveresaenger Oct 23, 2016
ba2fec6
More review tests and validations
guineveresaenger Oct 23, 2016
d78f85a
Test and validations for OrderItem
guineveresaenger Oct 23, 2016
3916eff
Added tests for Order; changed self.build method in Order model to re…
guineveresaenger Oct 24, 2016
04ebce7
Unified log in and log out view for Homepage by making them pointing …
KellyPT Oct 24, 2016
fd38e5b
Merge branch 'master' of https://github.com/Bella8/betsy
KellyPT Oct 24, 2016
46fcdce
Fixed some more product test messes. Added mostly blank test to Payme…
guineveresaenger Oct 24, 2016
9758408
Added validations, tests and fixtures for Category
guineveresaenger Oct 24, 2016
41f9fcc
Added CVV to payment_detail test and mocked it in fixtures(still need…
guineveresaenger Oct 24, 2016
262612d
Fixing some git trouble
guineveresaenger Oct 24, 2016
83bad24
Encountering trouble with testing CategoriesProduct. Possibly because…
guineveresaenger Oct 24, 2016
378e0f5
Merge branch 'master' of https://github.com/Bella8/betsy
guineveresaenger Oct 24, 2016
698a283
Fixes seed file to add join table
nahmisa Oct 24, 2016
6456024
Added the Sign Up button on nav bar in layouts/application
KellyPT Oct 24, 2016
7d14a00
Changed the Merchant.csv file to clear confusion. Modified create act…
KellyPT Oct 24, 2016
1ed1de8
Uses check_availability model method to avoid updating product count …
nahmisa Oct 24, 2016
02cb042
Merge branch 'master' of github.com:Bella8/betsy
nahmisa Oct 24, 2016
cbd89d8
added gem for simplecov
Bella8 Oct 24, 2016
9daab20
more simple Installation
Bella8 Oct 24, 2016
45387d6
Changes to payment_detail - credit card expiration date is now a Date…
guineveresaenger Oct 24, 2016
a85e95b
Changes to payment_detail - credit card expiration date is now a Date…
guineveresaenger Oct 24, 2016
dfa91cb
Merge branch 'master' of https://github.com/Bella8/betsy
guineveresaenger Oct 24, 2016
8c20668
Modified the new and create actions in Production Controller. Change …
KellyPT Oct 24, 2016
edba5be
Removed edit, update, destroy from reviews'routes. Removed the corres…
KellyPT Oct 24, 2016
3cb30ef
Removed destroy from merchant's routes. Removed destroy action from M…
KellyPT Oct 24, 2016
d5d7854
Removed new and create from merchants' routes. Removed new and create…
KellyPT Oct 24, 2016
bd52cc1
Merchant'routes now only have index, because Merchant's object is in…
KellyPT Oct 24, 2016
17362d3
Removed destroy from product's routes and products controller. Becaus…
KellyPT Oct 24, 2016
1255560
Modified Merchant.csv. Modified the controller filter in Products Con…
KellyPT Oct 24, 2016
03687b7
Added Dragonfly gem in order to add photo's and added image table, ad…
Bella8 Oct 24, 2016
ed27976
no change in routes
Bella8 Oct 24, 2016
fc1c542
Merge branch 'master' of https://github.com/Bella8/betsy
Bella8 Oct 24, 2016
82a6061
Removes products from stock upon purchasing
nahmisa Oct 24, 2016
65096c6
Merge branch 'master' of github.com:Bella8/betsy
nahmisa Oct 24, 2016
28c9391
Changed Merchant.csv file to allow unique user.
KellyPT Oct 24, 2016
44b4892
Allow index and show actions to be in Merchants Controller again.
KellyPT Oct 24, 2016
fd8b1a2
Add index and show routes to Merchants
KellyPT Oct 24, 2016
ed21914
Show a Merchant's list of products
KellyPT Oct 24, 2016
d72843c
Changed edit/update actions in Products Controller. Changed new/creat…
KellyPT Oct 25, 2016
a3ac4e0
Fixed conflicts. Merged kelly's personal branch to master branch
KellyPT Oct 25, 2016
309e71c
Fixed conflicts
KellyPT Oct 25, 2016
8dd9a33
Adds ability to cancel an order from before or after purchasing
nahmisa Oct 25, 2016
0f001a9
Fixes merge conflicts in products form
nahmisa Oct 25, 2016
e879d1a
Fixed controllers to support pictures
Bella8 Oct 25, 2016
add5547
Makes the method to sum order items prices a self method so it can be…
nahmisa Oct 25, 2016
60c7457
Removes commented out method
nahmisa Oct 25, 2016
6666a0e
Begins test for sum of order item product
nahmisa Oct 25, 2016
dbc5e2f
Put DS Store in gitignore file
guineveresaenger Oct 25, 2016
da612af
fixed merge conflict
Bella8 Oct 25, 2016
fb6af20
Added tests for payment details. Updated wrong attribute name number …
guineveresaenger Oct 25, 2016
c4d95a1
fixed more merge conflict
Bella8 Oct 25, 2016
4036ff6
Resolved merge conflicts in schema version and in orders fixture.
guineveresaenger Oct 25, 2016
45b62a0
removed unnecessary methods.
KellyPT Oct 25, 2016
d003acd
resolved conflicts
KellyPT Oct 25, 2016
adf1647
Resolved merge conflicts merging newtest into master
guineveresaenger Oct 25, 2016
f482b49
Adds test for sum method
nahmisa Oct 25, 2016
6ade2ec
Merge branch 'master' of github.com:Bella8/betsy
nahmisa Oct 25, 2016
cab0bb5
Changes to test for PaymentDetail
guineveresaenger Oct 25, 2016
a417c55
Adding coverage files
guineveresaenger Oct 25, 2016
ff592e1
Something?
guineveresaenger Oct 25, 2016
5068d6f
Added coverage to gitignore
guineveresaenger Oct 25, 2016
59b5f1e
Fixed the coverage git issues hopefully
guineveresaenger Oct 25, 2016
2147791
Adds ability to get merchant order items by all and status
nahmisa Oct 25, 2016
7c660de
Added active status column to Product with default value of true. Wro…
guineveresaenger Oct 25, 2016
5291724
Make the edit/update function in Product Controller work
KellyPT Oct 25, 2016
90e6b97
Merge branch 'master' of https://github.com/Bella8/betsy
KellyPT Oct 25, 2016
67c0cec
Merge branch 'master' of https://github.com/Bella8/betsy
guineveresaenger Oct 25, 2016
72b64a0
Add Guin into merchant.csv file
KellyPT Oct 25, 2016
0ece339
added link to create new product
Bella8 Oct 25, 2016
614eb66
merge
Bella8 Oct 25, 2016
f9cd68a
Added table for merchant login page. Added Edit function in merchant …
KellyPT Oct 25, 2016
7ac705a
fixed typo error.
KellyPT Oct 25, 2016
12c629b
resolved conflicts in merchant log in page.
KellyPT Oct 25, 2016
df13e4a
fixed error.
KellyPT Oct 25, 2016
f670e65
Makes order fulfilment page
nahmisa Oct 25, 2016
2bf2488
Merge branch 'master' of github.com:Bella8/betsy
nahmisa Oct 25, 2016
c778a20
Uncomments out CVV validation
nahmisa Oct 25, 2016
09ab44b
Starts test for get_merchant_orders
nahmisa Oct 25, 2016
b90b1a5
Removes comments
nahmisa Oct 25, 2016
7cb1ee0
Modified the routes for edit/update in Products Controller.
KellyPT Oct 26, 2016
e912223
deleted comments about require_login
KellyPT Oct 26, 2016
ff58568
Removed index, show, edit, update, destroy actions from Reviews contr…
KellyPT Oct 26, 2016
bb57517
Modified the merchant log-in page: add links to product details, and …
KellyPT Oct 26, 2016
5dc015f
Added a functionality for a new product to be categorized into catego…
Bella8 Oct 26, 2016
743b3ee
fixed merge conflict
Bella8 Oct 26, 2016
74113b3
I don't even know what the check I'm doing to merchant_login.html.erb !
guineveresaenger Oct 26, 2016
8d2fdfa
Hopefully reverted merchant_login page to what I want
guineveresaenger Oct 26, 2016
56b27da
Moves method to change stock to order model
nahmisa Oct 26, 2016
c871e7c
Missed a save - updates stock method for purchase
nahmisa Oct 26, 2016
a02dc83
Merchant page has button now
guineveresaenger Oct 26, 2016
a46831c
retire button stuff
guineveresaenger Oct 26, 2016
58bae73
Retire product functionality added.
guineveresaenger Oct 26, 2016
059c677
Added description field into product.
Bella8 Oct 26, 2016
2084d21
fixed merge conflict
Bella8 Oct 26, 2016
f90522f
Commented out most controller tests. Reset the class they inherit fro…
guineveresaenger Oct 26, 2016
fa96b10
Filters the index page for order status
nahmisa Oct 26, 2016
5e6e8cd
Starts styling
nahmisa Oct 26, 2016
601ccd0
Merge branch 'master' of github.com:Bella8/betsy
nahmisa Oct 26, 2016
f3c88f9
install gem 'foundation-rails' and gem 'jquery-turbolinks'. removed '…
KellyPT Oct 26, 2016
0115fe6
Makes order fulfillment page filter and have link for marking order a…
nahmisa Oct 26, 2016
4b64c44
changing the nav bar...
KellyPT Oct 26, 2016
ca3a17a
resolved conflicts
KellyPT Oct 26, 2016
9669e78
Some preliminary controller tests in Product
guineveresaenger Oct 26, 2016
97f64b0
Changes format for output on merchant fulfilment page
nahmisa Oct 26, 2016
03e344b
fixed routes
Bella8 Oct 26, 2016
45e8ca1
Renders date on confirmation page pretily
nahmisa Oct 26, 2016
180f6c1
erging
Bella8 Oct 26, 2016
55234ff
Merge branch 'master' of https://github.com/Bella8/betsy
Bella8 Oct 26, 2016
72f0480
Updates test so it works regardless of the day/month/year the test is…
nahmisa Oct 26, 2016
6788bbd
Merge branch 'master' of github.com:Bella8/betsy
nahmisa Oct 26, 2016
f94bc28
changed rating field back
Bella8 Oct 26, 2016
b8fe896
Merge branch 'master' of https://github.com/Bella8/betsy
Bella8 Oct 26, 2016
39e4e42
Makes test for get_merchant_orders method
nahmisa Oct 27, 2016
0568cc4
added rating image, if statments if there is no imgage or description
Bella8 Oct 27, 2016
6b20fea
changed product routes to be shallow
guineveresaenger Oct 27, 2016
55244ce
Merge branch 'master' of https://github.com/Bella8/betsy
guineveresaenger Oct 27, 2016
b87881d
Merge branch 'master' into testing
guineveresaenger Oct 27, 2016
9f8f933
tried some controller tests for Product
guineveresaenger Oct 27, 2016
618cbf7
Fixed important typo in routes. working test suite for Products contr…
guineveresaenger Oct 27, 2016
cbf5355
spacing
guineveresaenger Oct 27, 2016
5406c07
Fixed problem with retire button
guineveresaenger Oct 27, 2016
a747894
added welcome user_name function. Added functionality to view merchan…
Bella8 Oct 27, 2016
fe690f6
Merge branch 'master' of https://github.com/Bella8/betsy
Bella8 Oct 27, 2016
d6ab58c
Tests for ability to complete orders when all items have been shipped
nahmisa Oct 27, 2016
29624f0
Fixes merge conflict
nahmisa Oct 27, 2016
ced48e1
Fixes html for semantics
nahmisa Oct 27, 2016
a4d4725
Re-ordered routes, grouped them according to controllers.
KellyPT Oct 27, 2016
ce13105
Created setup for OmniAuth in test_helper. Wrote tests for Sessions C…
KellyPT Oct 27, 2016
13ae0fa
Changes order of requireing simplecov to generate coverage report of …
nahmisa Oct 27, 2016
68310b9
Fixes merge conflict
nahmisa Oct 27, 2016
9d20a3f
Makes record_time paid test pass for now
nahmisa Oct 27, 2016
20d985f
Tests for validation of credit card number
nahmisa Oct 27, 2016
a3ce08f
Test order build method
nahmisa Oct 27, 2016
15baef6
Fixed bugs in new method for Product
guineveresaenger Oct 27, 2016
548b7a3
Tests order_item build method; adds order_item to order
nahmisa Oct 27, 2016
47f4d0c
Merge branch 'testing'
guineveresaenger Oct 27, 2016
896b71c
Makes test for Mechant build from github method
nahmisa Oct 27, 2016
0a6b860
tests for merchant controller
KellyPT Oct 27, 2016
01d8bbf
Merge branch 'master' of https://github.com/Bella8/betsy
KellyPT Oct 27, 2016
a03618b
remove view_helpers from simplecov
KellyPT Oct 27, 2016
6c19b59
Added rewievs controller tests
guineveresaenger Oct 27, 2016
0e884d8
File added for image function
guineveresaenger Oct 27, 2016
db6dcad
Got drop down menus to work
nahmisa Oct 27, 2016
dac4f52
Merge branch 'master' of github.com:Bella8/betsy
nahmisa Oct 27, 2016
5f3fb0f
Merge branch 'master' of https://github.com/Bella8/betsy
guineveresaenger Oct 27, 2016
2c2ebfc
Fixed the edit prodiuct function
guineveresaenger Oct 27, 2016
4cb9258
Modified application controller and session controller. Added session…
KellyPT Oct 27, 2016
11806b9
Merge branch 'master' of https://github.com/Bella8/betsy
KellyPT Oct 27, 2016
bf160c9
added heroku gems
Bella8 Oct 27, 2016
d6bdef5
Merge branch 'master' of https://github.com/Bella8/betsy
Bella8 Oct 27, 2016
2871836
Categories Controllers Tests.
KellyPT Oct 27, 2016
ba47f4d
Merge branch 'master' of https://github.com/Bella8/betsy
KellyPT Oct 27, 2016
54591b6
Added error message to new product form, and changed response status …
guineveresaenger Oct 27, 2016
17f43f1
Merge branch 'master' of https://github.com/Bella8/betsy
guineveresaenger Oct 27, 2016
75b454f
Changed tests for Categories and Sessions Controllers.
KellyPT Oct 27, 2016
c191464
Styles headers and drop down menus
nahmisa Oct 27, 2016
b3e7939
Merge branch 'master' of github.com:Bella8/betsy
nahmisa Oct 27, 2016
6a6b647
Completed tests for Categories Controller
KellyPT Oct 28, 2016
7f6607c
Merge branch 'master' of https://github.com/Bella8/betsy
KellyPT Oct 28, 2016
0f09844
Fixed the product new/edit partial. Added some negative case controll…
guineveresaenger Oct 28, 2016
b13f664
Merge branch 'master' of https://github.com/Bella8/betsy
guineveresaenger Oct 28, 2016
f0d28bd
added link to images
Bella8 Oct 28, 2016
1d16ee3
Styles top-bar and page background
nahmisa Oct 28, 2016
5678ec1
modified the view for products
Bella8 Oct 28, 2016
9ec2918
Styles welcome message
nahmisa Oct 28, 2016
c4ca3e3
added images
Bella8 Oct 28, 2016
c701837
Update order_item_params method in Order Item Controller to include :…
KellyPT Oct 28, 2016
c84a377
Merge branch 'master' of https://github.com/Bella8/betsy
KellyPT Oct 28, 2016
03e25d7
added description to products category
Bella8 Oct 28, 2016
7f4a473
Merge branch 'master' of https://github.com/Bella8/betsy
Bella8 Oct 28, 2016
669f80d
Added order_item and order fixtures. Changed redirect_to route in shi…
KellyPT Oct 28, 2016
faa1371
Merge branch 'master' of https://github.com/Bella8/betsy
KellyPT Oct 28, 2016
f65c0bd
removed redundant method in categories controller test
KellyPT Oct 28, 2016
c31b705
Styles all products page
nahmisa Oct 28, 2016
511e4d5
Fixes merge conflict
nahmisa Oct 28, 2016
c1931f4
Some more controller tests...
guineveresaenger Oct 28, 2016
72448b1
merge
guineveresaenger Oct 28, 2016
4a60d50
Added more test
guineveresaenger Oct 28, 2016
5fdec55
Css styling
nahmisa Oct 28, 2016
87a3ee4
Merge branch 'master' of github.com:Bella8/betsy
nahmisa Oct 28, 2016
a23f0dd
Added semantic tags section, class 'body-text'
KellyPT Oct 28, 2016
8ebc72b
removed redundant templates for categories, merchants, sessions
KellyPT Oct 28, 2016
c108460
Added semantic tags in categories templates.
KellyPT Oct 28, 2016
a5475d2
Added HTML semantic tags.
KellyPT Oct 28, 2016
85f6819
Merge branch 'master' of github.com:Bella8/betsy
nahmisa Oct 28, 2016
984657f
added images
Bella8 Oct 28, 2016
ecb6349
Merge branch 'master' of https://github.com/Bella8/betsy
Bella8 Oct 28, 2016
00124c1
readed link to image
Bella8 Oct 28, 2016
b172c3d
added a link
Bella8 Oct 28, 2016
9ebaf2d
Added semantic HTML for orders/index and application.scss
KellyPT Oct 28, 2016
2149ca6
Merge branch 'master' of https://github.com/Bella8/betsy
KellyPT Oct 28, 2016
42a909b
Styles reviews
nahmisa Oct 28, 2016
e3acb9e
Merge branch 'master' of github.com:Bella8/betsy
nahmisa Oct 28, 2016
e4570ae
added a container around the body section, added margin, changed layo…
KellyPT Oct 28, 2016
9f0e88c
added random images if not image
Bella8 Oct 28, 2016
bfd31a4
Styling to Categories and Merchants index views
guineveresaenger Oct 28, 2016
559c55b
Merge branch 'master' of https://github.com/Bella8/betsy
guineveresaenger Oct 28, 2016
5c369ff
Resolves merge conflict
nahmisa Oct 28, 2016
7efd3f6
Merge branch 'master' of github.com:Bella8/betsy
nahmisa Oct 28, 2016
cd71e63
Makes button text visible
nahmisa Oct 28, 2016
85e9054
Something
guineveresaenger Oct 28, 2016
b8e6a9a
Merge branch 'master' of https://github.com/Bella8/betsy
guineveresaenger Oct 28, 2016
ee6a1ba
:q
KellyPT Oct 28, 2016
bcc63ba
Merge branch 'master' of https://github.com/Bella8/betsy
KellyPT Oct 28, 2016
6ea6bd9
added styles back'
KellyPT Oct 28, 2016
ae8936d
Fixes button that I messed up
nahmisa Oct 28, 2016
66ef93c
Begins styling order fulfilment page
nahmisa Oct 28, 2016
88e7ba6
added css to cart
Bella8 Oct 28, 2016
445da12
Merge branch 'master' of https://github.com/Bella8/betsy
Bella8 Oct 28, 2016
d8a0d1d
Finishes order fufilment page
nahmisa Oct 28, 2016
3b0db29
Merge branch 'master' of github.com:Bella8/betsy
nahmisa Oct 28, 2016
12fc7dd
Finishes order fufilment page
nahmisa Oct 28, 2016
408c5dd
Fixes font sizing issue
nahmisa Oct 28, 2016
b6abd27
Last-minute css fixes
nahmisa Oct 28, 2016
86da01a
something
KellyPT Oct 28, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,24 @@
# Ignore bundler config.
/.bundle

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

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

# Ignore Byebug command history file.
.byebug_history

# Ignore .env
.env

# Ignore .DS_Store
.DS_Store

# Ignore .DS_Store
/coverage
1 change: 0 additions & 1 deletion .ruby-gemset

This file was deleted.

1 change: 0 additions & 1 deletion .ruby-version

This file was deleted.

65 changes: 46 additions & 19 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,46 +1,73 @@
source 'https://rubygems.org'
ruby '2.3.1'
gem 'rack-cache', require: 'rack/cache', group: :production
gem 'dragonfly'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.6'
# Use postgresql as the database for Active Record
# gem 'pg', '~> 0.15'
gem 'rails', '4.2.7'
# Use sqlite3 as the database for Active Record
# Use Puma as the app server
gem 'puma', '~> 3.0'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.1.0'
gem 'coffee-rails', '~> 4.2'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

# Use jquery as the JavaScript library
gem 'jquery-rails'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks'
# 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.0'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc

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 Unicorn as the app server
# gem 'unicorn'

gem "omniauth"
gem "omniauth-github"
# 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'
gem 'byebug', platform: :mri
gem 'dotenv-rails'
gem 'sqlite3'
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console', '~> 2.0'
group :test do
gem 'minitest-reporters'
gem "pry-rails"
end

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

group :development do
# for bug bashing in the browser
gem "better_errors"
gem "binding_of_caller"
gem "pry-rails"
# for seeing our ERD for the visiual peeps
gem 'rails-erd'
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
gem 'web-console'
gem 'listen', '~> 3.0.5'
# 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]
# Foundation Rails Gem
gem 'foundation-rails'
# Required due to an incompatibility between TurboLinks and Foundation.
gem 'jquery-turbolinks'

group :production do
gem 'pg'
gem 'rails_12factor'
end
Loading