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

Ampers - Kate, Steffany, Brittany, Lily #22

Open
wants to merge 343 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
343 commits
Select commit Hold shift + click to select a range
0840a44
merging db changes ot branch
brittanyrjones Apr 21, 2018
e33fd30
fixed wrong table drop, got rid of join table
brittanyrjones Apr 21, 2018
6a55103
merged db updates
brittanyrjones Apr 21, 2018
8c6eda3
fixed merge
brittanyrjones Apr 21, 2018
8e28d12
merge error resolution
lillers1122 Apr 22, 2018
1271988
DRYing up code for session. Moved before_action to application_contro…
steffnay Apr 22, 2018
76c341c
Merge branch 'master' of https://github.com/Oh-KPond/betsy
steffnay Apr 22, 2018
0885ab3
merging changes
steffnay Apr 22, 2018
f2921fe
added more basic tests to orders_controller
steffnay Apr 22, 2018
b0043a0
added user_id to orders table in schema
steffnay Apr 23, 2018
97c2a08
schema updated
steffnay Apr 23, 2018
e1d7ffa
Merge branch 'Adding_UID_to_Order' into feature_orders-controller
steffnay Apr 23, 2018
b0844f2
resolving merge conflict
steffnay Apr 23, 2018
b8d07bb
tests pass; categories can be created, but assignment when products c…
lillers1122 Apr 23, 2018
906aab3
categories assign - yay
lillers1122 Apr 23, 2018
5ac93ea
updated relationship between user and orders. Updated application_con…
steffnay Apr 23, 2018
c4d8a49
Product show pages show bare bones content
lillers1122 Apr 23, 2018
39550a9
starting functionality to add product to order
steffnay Apr 23, 2018
8d5d59a
deleted coverage file
steffnay Apr 23, 2018
25e2764
renamed order_items yml
steffnay Apr 23, 2018
59d9647
resolved merge conflict
steffnay Apr 23, 2018
059834c
Merge pull request #9 from Oh-KPond/feature_adds-review-seeds-more-pr…
steffnay Apr 23, 2018
77b1ff3
Merge branch 'master' of https://github.com/Oh-KPond/betsy
steffnay Apr 23, 2018
78cad06
merge conflicts resolved
steffnay Apr 23, 2018
9d56ca8
merge conflicts resolved
steffnay Apr 23, 2018
4eccc52
views
lillers1122 Apr 23, 2018
44a32d2
Merge branch 'master' of https://github.com/Oh-KPond/betsy into categ…
lillers1122 Apr 23, 2018
d99a7d7
Merge branch 'master' into Adding_UID_to_Order
steffnay Apr 23, 2018
e081653
Merge pull request #10 from Oh-KPond/Adding_UID_to_Order
steffnay Apr 23, 2018
39c4fc7
adding products to order
steffnay Apr 23, 2018
4bcce47
merged with master
brittanyrjones Apr 23, 2018
88654d0
conflict resolved
steffnay Apr 23, 2018
98d9331
merge resolution
lillers1122 Apr 23, 2018
4434fbd
resolving merge conflicts
steffnay Apr 23, 2018
10ab90e
fixed merge conflict
brittanyrjones Apr 23, 2018
c85b9f3
fixed merge
brittanyrjones Apr 23, 2018
12dc3e0
db reset after git pull
lillers1122 Apr 23, 2018
a0098ec
test naming error fixed
lillers1122 Apr 23, 2018
705ba18
removed coverage folder for merge prep
lillers1122 Apr 23, 2018
fe8a125
Merge branch 'master' into categories
Oh-KPond Apr 23, 2018
f837948
Update new.html.erb
Oh-KPond Apr 23, 2018
bc1f9cb
Update _form.html.erb
Oh-KPond Apr 23, 2018
542f644
Merge pull request #6 from Oh-KPond/categories
Oh-KPond Apr 23, 2018
9a47392
added review controller and tests
brittanyrjones Apr 23, 2018
5aec62c
Merge branch 'master' into review_controller
Oh-KPond Apr 23, 2018
89ac22f
merged to master
brittanyrjones Apr 23, 2018
f5df391
removed coverage files
brittanyrjones Apr 23, 2018
7fdaec5
deleted broken migrations
steffnay Apr 23, 2018
164863b
fixed merge
brittanyrjones Apr 23, 2018
ded6331
Merge pull request #11 from Oh-KPond/review_controller
Oh-KPond Apr 23, 2018
dff5eda
deleted the really annoying migrations
steffnay Apr 23, 2018
41686e1
resolving merge conflicts or something I don't even know anymore
steffnay Apr 23, 2018
934e7b4
merge conflicts resolve
steffnay Apr 23, 2018
4f051e0
sets up file structure for css
Oh-KPond Apr 23, 2018
5bda8f0
order_items can be created from the products page and will be connect…
steffnay Apr 23, 2018
422ad5b
nested review route; confirmed review-product relationship good; prod…
lillers1122 Apr 23, 2018
2db8eab
updated controllers so guest user is deleted upon login and guest's o…
steffnay Apr 23, 2018
d255bef
merged to master
brittanyrjones Apr 23, 2018
1a0512f
added form file for order
brittanyrjones Apr 23, 2018
5f92866
order form partially created
brittanyrjones Apr 23, 2018
40f8de6
edit partial order form
brittanyrjones Apr 23, 2018
f9848dd
test test test
lillers1122 Apr 23, 2018
8c46d47
added hidden field for user in form
brittanyrjones Apr 23, 2018
0648ebe
moves gem file
Oh-KPond Apr 23, 2018
a78f722
Merge pull request #14 from Oh-KPond/feature_move-faker-gem
lillers1122 Apr 23, 2018
06cf5ce
Merge pull request #12 from Oh-KPond/reviews-products-1
Oh-KPond Apr 23, 2018
af8d3fc
Merge branch 'master' of github.com:Oh-KPond/betsy into feature_start…
Oh-KPond Apr 23, 2018
aed5200
added 404 message to application controller
brittanyrjones Apr 23, 2018
5a858fb
flash message shows for success in creating product and review, as we…
brittanyrjones Apr 23, 2018
747c432
adds linked image to each product
Oh-KPond Apr 23, 2018
b0c4ccc
closes up space and adds padding to the body and a site font
Oh-KPond Apr 23, 2018
2a67b6d
adds a categories nav to the site
Oh-KPond Apr 23, 2018
bd6da11
updated so many controllers so that guest user is saved in session, d…
steffnay Apr 23, 2018
e56673f
Merge branch 'master' into feature_orders-controller
steffnay Apr 23, 2018
d436fa9
Merge branch 'master' into feature_order-form
steffnay Apr 23, 2018
f18a94f
image alt text references product's name
lillers1122 Apr 23, 2018
82e81be
image title text references product's name
lillers1122 Apr 23, 2018
f2ca719
Merge pull request #13 from Oh-KPond/feature_order-form
steffnay Apr 23, 2018
94f11c6
Merge branch 'master' of github.com:Oh-KPond/betsy into feature_start…
Oh-KPond Apr 23, 2018
3c1b6be
Merge pull request #15 from Oh-KPond/feature_orders-controller
brittanyrjones Apr 23, 2018
9d1cf27
added error flash message
brittanyrjones Apr 23, 2018
09f2564
resolved merge conflicts
steffnay Apr 23, 2018
7f8c846
fixed merge conflict
brittanyrjones Apr 23, 2018
a28345d
added flash messages for adding item to cart
brittanyrjones Apr 23, 2018
3ea1a5f
fixing merge conflicts
Oh-KPond Apr 23, 2018
ae701b2
fixes more merge conflicts
Oh-KPond Apr 23, 2018
efcca64
updated categories_controller
steffnay Apr 23, 2018
930508c
added file for order items tests
brittanyrjones Apr 23, 2018
f20a8a9
added before_action: get_categories to application controller
steffnay Apr 23, 2018
f64cff3
Merge pull request #16 from Oh-KPond/feature_start-css
steffnay Apr 23, 2018
fc7adfc
tiny form change
steffnay Apr 24, 2018
96aa6cd
resolved
steffnay Apr 24, 2018
1aa81ae
image updated
lillers1122 Apr 24, 2018
f8d40e3
Merge pull request #18 from Oh-KPond/feature_database-seed-images
Oh-KPond Apr 24, 2018
d550942
updated products_controller#index
steffnay Apr 24, 2018
2d38733
Merge branch 'master' of https://github.com/Oh-KPond/betsy
steffnay Apr 24, 2018
89108ee
added find order to application controller
steffnay Apr 24, 2018
3d52e02
removes a migration to get heroku to work
Oh-KPond Apr 24, 2018
978e55d
temporary readd of db migrations
Oh-KPond Apr 24, 2018
c8d3ee5
removing migrations that were causing problems for people on our team
Oh-KPond Apr 24, 2018
4bada08
added more flash
brittanyrjones Apr 24, 2018
9420561
fixed merge conflict
brittanyrjones Apr 24, 2018
04c4acc
added more user testing
steffnay Apr 24, 2018
0584edc
added another update test
steffnay Apr 24, 2018
5d8773c
starts styling root path
Oh-KPond Apr 24, 2018
0bed4b8
testing in progress
lillers1122 Apr 24, 2018
8d7b219
updated orders_controller_test and order_controller#create
steffnay Apr 24, 2018
56e1938
tests + updated product yml file
lillers1122 Apr 24, 2018
b4a4861
Merge branch 'master' of https://github.com/Oh-KPond/betsy into featu…
lillers1122 Apr 24, 2018
5de499f
product-controller reformatting of show method; commented out redirec…
lillers1122 Apr 24, 2018
3ff2d05
Merge pull request #19 from Oh-KPond/feature_controller-sort-model-me…
Oh-KPond Apr 24, 2018
e634c87
Merge branch 'master' of github.com:Oh-KPond/betsy into feature_homep…
Oh-KPond Apr 24, 2018
ddabff7
added update method to order_controller, added make_new_order method …
steffnay Apr 24, 2018
244c893
Merge branch 'master' into OrdersControllerMore
steffnay Apr 24, 2018
af4f68c
styles the header for each page
Oh-KPond Apr 24, 2018
651b0a7
updated orders_controller testing and added orders(:open) fixture
steffnay Apr 24, 2018
4c7cba0
Merge pull request #20 from Oh-KPond/feature_homepage-styling
lillers1122 Apr 24, 2018
6d692d6
Merge branch 'master' into OrdersControllerMore
steffnay Apr 24, 2018
8e56608
views for category show pages
lillers1122 Apr 24, 2018
4cfcea6
categories in nav to downcase
lillers1122 Apr 24, 2018
529acb0
Merge pull request #21 from Oh-KPond/OrdersControllerMore
Oh-KPond Apr 24, 2018
5d84bdd
Merge pull request #22 from Oh-KPond/feature_views-categories-show
Oh-KPond Apr 24, 2018
e213597
rails tests for contorllers run
lillers1122 Apr 24, 2018
92ecb95
Merge branch 'master' of https://github.com/Oh-KPond/betsy into test-…
lillers1122 Apr 24, 2018
083d456
Merge pull request #23 from Oh-KPond/test-tests
Oh-KPond Apr 24, 2018
d031b76
model tests run
lillers1122 Apr 24, 2018
1c2abe1
Merge pull request #24 from Oh-KPond/model-test-fix
Oh-KPond Apr 24, 2018
43b8517
yml files fixed; product belongs_to user relationship deleted for dat…
lillers1122 Apr 24, 2018
18614ea
Merge pull request #25 from Oh-KPond/fix-tests
steffnay Apr 24, 2018
c1d48fa
added product#change_stock to product model and orders_controller#update
steffnay Apr 24, 2018
fd433ae
user show page start
lillers1122 Apr 24, 2018
0eec39c
added show features
brittanyrjones Apr 24, 2018
8aadeba
guest user can now leave a review
brittanyrjones Apr 25, 2018
877a8dc
Removed duplicated p tags
Oh-KPond Apr 25, 2018
328c91d
Merge pull request #29 from Oh-KPond/feature_show-page
Oh-KPond Apr 25, 2018
6b07756
Merge branch 'master' into OrderChangeStock
steffnay Apr 25, 2018
a5261b3
Merge pull request #26 from Oh-KPond/OrderChangeStock
Oh-KPond Apr 25, 2018
fa9e901
added show.html.erb and orders_controller#show method
steffnay Apr 25, 2018
c24f8bd
added show.html.erb and orders_controller#show method
steffnay Apr 25, 2018
a7b4ac6
fixed orders.yml file
steffnay Apr 25, 2018
a94a922
added order model test for Order#get_total method
steffnay Apr 25, 2018
fcfd7ce
added order_items model test for OrderItems#get_subtotal
steffnay Apr 25, 2018
cb4f64a
trying and failing to get orders_controller#update test to work
steffnay Apr 25, 2018
d8941f0
created migration to add ID primary key to order_items, added order_i…
steffnay Apr 25, 2018
f40a547
Merge branch 'OrderChangeStock' into CartQuantity
steffnay Apr 25, 2018
21feb12
trying to add tests for order_items_controller, but failing
steffnay Apr 25, 2018
c1505ab
cannot get order information to show on merchant show pages
lillers1122 Apr 25, 2018
04ab6a8
merge
lillers1122 Apr 25, 2018
cbbe2f5
merge
lillers1122 Apr 25, 2018
4e10ee5
Merge branch 'master' into CartQuantity
steffnay Apr 25, 2018
f6283a1
@merchant added to show
lillers1122 Apr 25, 2018
3770408
merged
brittanyrjones Apr 25, 2018
d81205d
adds in comments for logic in the order model and puts a test in view
Oh-KPond Apr 25, 2018
0030edb
comments out non working code and ensures that functionality for the …
Oh-KPond Apr 25, 2018
398d877
tests all failing currently
brittanyrjones Apr 25, 2018
1d835eb
added order_items_controller test for create method
steffnay Apr 25, 2018
efe7ee6
merged
brittanyrjones Apr 25, 2018
e8ca031
fixed merge error
brittanyrjones Apr 25, 2018
bbbfc88
before_action :product_permission except show and index
lillers1122 Apr 25, 2018
bf040b6
added order_items_controller test for destroy and added method to con…
steffnay Apr 25, 2018
90b4d07
Merge pull request #30 from Oh-KPond/OrderConfirmation
lillers1122 Apr 25, 2018
2f0fadb
merged branch
brittanyrjones Apr 25, 2018
6b223e8
Merge branch 'master' into CartQuantity
steffnay Apr 25, 2018
1ef5b6e
merge resolution
lillers1122 Apr 25, 2018
bd18348
changed new order view
steffnay Apr 25, 2018
2afda34
Merge branch 'CartQuantity' of https://github.com/Oh-KPond/betsy into…
steffnay Apr 25, 2018
17bc96a
fixed duplicate flash
brittanyrjones Apr 25, 2018
c12bbfb
removed pry and deleted unused form
steffnay Apr 25, 2018
b7ab55a
fixed missing flash error
brittanyrjones Apr 25, 2018
fc34770
fixed merge
brittanyrjones Apr 25, 2018
8d67444
Merge pull request #32 from Oh-KPond/CartQuantity
Oh-KPond Apr 25, 2018
32c6f6b
Merge branch 'master' of https://github.com/Oh-KPond/betsy into featu…
lillers1122 Apr 25, 2018
c3206b6
edit page permissions working; new are not
lillers1122 Apr 25, 2018
0b037bc
cleaned up product routes
lillers1122 Apr 25, 2018
8a60a63
updated product routes
lillers1122 Apr 25, 2018
f07ae78
sessions controller tests not fully passing
brittanyrjones Apr 25, 2018
c6fca53
merged with master
brittanyrjones Apr 25, 2018
dde9753
removed extra file
brittanyrjones Apr 25, 2018
3c6f370
Merge branch 'master' into feature_flash-messages
Oh-KPond Apr 25, 2018
0a48df8
tests pass
lillers1122 Apr 25, 2018
01a541d
product model tests pass
lillers1122 Apr 25, 2018
3d148d5
product contoller tests pass
lillers1122 Apr 25, 2018
325f212
Merge pull request #34 from Oh-KPond/product-routes
brittanyrjones Apr 25, 2018
708f093
Merge branch 'master' of https://github.com/Oh-KPond/betsy into featu…
lillers1122 Apr 25, 2018
781f770
trying to figure out prodcut controller for adding category
steffnay Apr 25, 2018
12b68e3
Merge pull request #31 from Oh-KPond/feature_flash-messages
steffnay Apr 25, 2018
73f3d99
routes for new and edit work
lillers1122 Apr 25, 2018
ea52e9c
added link to create new category to product new view
steffnay Apr 25, 2018
5dc6f02
creator on product show page; access restrictions for new products form
lillers1122 Apr 25, 2018
bf44ad3
edit route actually isn't working...says product id is user id....
lillers1122 Apr 25, 2018
fffb6ef
completing merging
Oh-KPond Apr 25, 2018
b377f93
tutor saved the day with edit
lillers1122 Apr 25, 2018
3ebdc0a
merge resolution
lillers1122 Apr 25, 2018
6d2a18e
Merge branch 'feature_views-user-show' of https://github.com/Oh-KPond…
lillers1122 Apr 25, 2018
083bdd1
updated order_items create method
steffnay Apr 25, 2018
5af8c18
Merge pull request #33 from Oh-KPond/feature_sessions-controller-testing
steffnay Apr 25, 2018
0582386
Merge branch 'master' of https://github.com/Oh-KPond/betsy into Produ…
lillers1122 Apr 25, 2018
fc5da7f
Merge pull request #36 from Oh-KPond/feature_views-user-show
brittanyrjones Apr 25, 2018
e96e3b1
master merge resolution
lillers1122 Apr 25, 2018
21561a5
Merge branch 'master' into ProductAddCategory
lillers1122 Apr 25, 2018
843cc29
Merge pull request #35 from Oh-KPond/ProductAddCategory
lillers1122 Apr 26, 2018
3d8ab64
adding an end
lillers1122 Apr 26, 2018
c8a781a
updated routes so logout should work again
steffnay Apr 26, 2018
199a039
products method to show only true products; username links to store
lillers1122 Apr 26, 2018
c0a6dd2
order model methods to see orders related to a merchant; basic show i…
lillers1122 Apr 26, 2018
8186ce7
Merge branch 'master' of https://github.com/Oh-KPond/betsy into featu…
lillers1122 Apr 26, 2018
b3e9994
added some things to view page
brittanyrjones Apr 26, 2018
8178c06
merged master
brittanyrjones Apr 26, 2018
12eebed
category show pages only show available animals
lillers1122 Apr 26, 2018
28275b2
revenue amounts tally and display correctly
lillers1122 Apr 26, 2018
03cab8e
Merge pull request #37 from Oh-KPond/FixCartIssue
lillers1122 Apr 26, 2018
996ab70
Merge branch 'master' of https://github.com/Oh-KPond/betsy into featu…
lillers1122 Apr 26, 2018
e374644
creatures
lillers1122 Apr 26, 2018
f99defb
Merge pull request #38 from Oh-KPond/feature_views-products-merchants
Oh-KPond Apr 26, 2018
2232a00
order confirmation page updated; merchant show page updated for logge…
lillers1122 Apr 26, 2018
62881cd
semantics...article not p
lillers1122 Apr 26, 2018
b9f7974
oops, fixed class
lillers1122 Apr 26, 2018
7d7ddc7
Merge pull request #39 from Oh-KPond/merchant_show_styling
Oh-KPond Apr 26, 2018
74f7ded
merged to master
brittanyrjones Apr 27, 2018
aa06345
category tests pass; categories assign + can be created from user sho…
lillers1122 Apr 27, 2018
d4b4f52
updated order_controllers_test to with usable data, added before_acti…
steffnay Apr 27, 2018
f1d095f
tests need work
lillers1122 Apr 27, 2018
de3f2bf
added order model testing. self.merchant_orders is missing tests, tho…
steffnay Apr 27, 2018
120ccab
updated order_items_controller to render correct statuses and pass co…
steffnay Apr 27, 2018
58d5007
updated order_item model test to check model .already_exists? method
steffnay Apr 27, 2018
7f94e3b
working on sessions testing
steffnay Apr 27, 2018
5beba0e
updated sessions controller test
steffnay Apr 27, 2018
4412e1e
updated routes and order controller
steffnay Apr 27, 2018
bcc8f7d
category controller tests pass
lillers1122 Apr 27, 2018
90f1f80
category show test done; invalid category show redirects to root
lillers1122 Apr 27, 2018
e7c9576
Merge pull request #40 from Oh-KPond/edit_product_test
Oh-KPond Apr 27, 2018
f1396ab
trying to make final orders_controller_test pass
steffnay Apr 27, 2018
7c1600c
merged to master
brittanyrjones Apr 27, 2018
92f1b1d
removed binding.pry
steffnay Apr 27, 2018
bb406ad
Merge branch 'master' of https://github.com/Oh-KPond/betsy into Order…
steffnay Apr 27, 2018
2feeb8a
merged master
steffnay Apr 27, 2018
ef52818
made shops index a little nicer looking
brittanyrjones Apr 27, 2018
03f9a11
fixed some errors
brittanyrjones Apr 27, 2018
824a80f
hotfix for showing mechant shops while logged out
Oh-KPond Apr 27, 2018
dd78c18
removed binding.pry
steffnay Apr 27, 2018
1d4af28
Merge pull request #45 from Oh-KPond/hot-fix_get-to-user-show-logged-out
lillers1122 Apr 27, 2018
7a590d5
Merge pull request #44 from Oh-KPond/feature_all-users-page
Oh-KPond Apr 27, 2018
1213d0a
flash alert to application.html
lillers1122 Apr 27, 2018
8af5acb
Merge pull request #42 from Oh-KPond/OrderOrderItemsTesting
lillers1122 Apr 27, 2018
70c2e67
changes title of site
Oh-KPond Apr 27, 2018
e6d0345
removes require pry for heroku deploy
Oh-KPond Apr 27, 2018
ae00dee
Merge pull request #46 from Oh-KPond/hotfix_changes-title-for-app
steffnay Apr 27, 2018
0f0e916
hotfix for user show
Oh-KPond Apr 27, 2018
9fab51d
changed new method in product controller
brittanyrjones Apr 27, 2018
1ea9a86
Merge pull request #48 from Oh-KPond/remove_extra-new
Oh-KPond 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
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
.DS_store

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

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

gem "omniauth"
gem "omniauth-github"
gem 'simplecov', require: false, group: :test

gem 'faker', :git => 'https://github.com/stympy/faker.git', :branch => 'master'

# 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

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'
end
281 changes: 281 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,281 @@
GIT
remote: https://github.com/stympy/faker.git
revision: f8e1b81f8da82ea9eb88c4939a3a6801f97e5ac1
branch: master
specs:
faker (1.8.7)
i18n (>= 0.7)

GEM
remote: https://rubygems.org/
specs:
actioncable (5.1.6)
actionpack (= 5.1.6)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.6)
actionpack (= 5.1.6)
actionview (= 5.1.6)
activejob (= 5.1.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.1.6)
actionview (= 5.1.6)
activesupport (= 5.1.6)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.6)
activesupport (= 5.1.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.1.6)
activesupport (= 5.1.6)
globalid (>= 0.3.6)
activemodel (5.1.6)
activesupport (= 5.1.6)
activerecord (5.1.6)
activemodel (= 5.1.6)
activesupport (= 5.1.6)
arel (~> 8.0)
activesupport (5.1.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
ansi (1.5.0)
arel (8.0.0)
babel-source (5.8.35)
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
better_errors (2.4.0)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
bindex (0.5.0)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
builder (3.2.3)
byebug (10.0.2)
capybara (2.18.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (>= 2.0, < 4.0)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
coderay (1.1.2)
concurrent-ruby (1.0.5)
crass (1.0.4)
debug_inspector (0.0.3)
docile (1.1.5)
dotenv (2.2.2)
dotenv-rails (2.2.2)
dotenv (= 2.2.2)
railties (>= 3.2, < 6.0)
erubi (1.7.1)
execjs (2.7.0)
faraday (0.12.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.23)
foundation-rails (6.4.3.0)
railties (>= 3.1.0)
sass (>= 3.3.0, < 3.5)
sprockets-es6 (>= 0.9.0)
globalid (0.4.1)
activesupport (>= 4.2.0)
hashie (3.5.7)
i18n (1.0.1)
concurrent-ruby (~> 1.0)
jbuilder (2.7.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jquery-rails (4.3.3)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-turbolinks (2.1.0)
railties (>= 3.1.0)
turbolinks
json (2.1.0)
jwt (1.5.6)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
mini_mime (>= 0.1.1)
method_source (0.9.0)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
minitest-rails (3.0.0)
minitest (~> 5.8)
railties (~> 5.0)
minitest-reporters (1.2.0)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
nio4r (2.3.0)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
normalize-rails (4.1.1)
oauth2 (1.4.0)
faraday (>= 0.8, < 0.13)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
omniauth (1.8.1)
hashie (>= 3.4.6, < 3.6.0)
rack (>= 1.6.2, < 3)
omniauth-github (1.3.0)
omniauth (~> 1.5)
omniauth-oauth2 (>= 1.4.0, < 2.0)
omniauth-oauth2 (1.5.0)
oauth2 (~> 1.1)
omniauth (~> 1.2)
pg (1.0.0)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.6)
pry (>= 0.10.4)
public_suffix (3.0.2)
puma (3.11.4)
rack (2.0.4)
rack-test (1.0.0)
rack (>= 1.0, < 3)
rails (5.1.6)
actioncable (= 5.1.6)
actionmailer (= 5.1.6)
actionpack (= 5.1.6)
actionview (= 5.1.6)
activejob (= 5.1.6)
activemodel (= 5.1.6)
activerecord (= 5.1.6)
activesupport (= 5.1.6)
bundler (>= 1.3.0)
railties (= 5.1.6)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
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
faker!
foundation-rails
jbuilder (~> 2.5)
jquery-rails
jquery-turbolinks
listen (>= 3.0.5, < 3.2)
minitest-rails
minitest-reporters
normalize-rails
omniauth
omniauth-github
pg (>= 0.18, < 2.0)
pry-rails
puma (~> 3.7)
rails (~> 5.1.6)
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
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
1 change: 1 addition & 0 deletions ampers-petsy-app
Submodule ampers-petsy-app added at 3c1b6b
3 changes: 3 additions & 0 deletions app/assets/config/manifest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
//= link_tree ../images
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css
Empty file added app/assets/images/.keep
Empty file.
Loading