Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
341 commits
Select commit Hold shift + click to select a range
11002d4
Merge branch 'master' of https://github.com/Lindseyls/betsy
emilcecarlisa Apr 23, 2018
7957eed
added categories controller
Jcornick21 Apr 23, 2018
b8302e0
Merge branch 'master' of https://github.com/Lindseyls/betsy
Jcornick21 Apr 23, 2018
a929211
Updated the nav bar, working on the category model and controller
Lindseyls Apr 23, 2018
09757af
Added link from products page to product detail page
emilcecarlisa Apr 23, 2018
201fd79
Fixed bug to show users summary.
brendarios Apr 23, 2018
bfbc887
Added a helper method to format prices.
brendarios Apr 23, 2018
1e8f409
update format price method in helper.
brendarios Apr 23, 2018
9274b63
created view for all categories
Jcornick21 Apr 23, 2018
e12cc97
added to do
Jcornick21 Apr 23, 2018
1a104a7
working on the partial form for reviews
Lindseyls Apr 23, 2018
092feb4
Working on paths from product to merchant users
emilcecarlisa Apr 23, 2018
619527a
Merge branch 'product-show'
emilcecarlisa Apr 23, 2018
db96a11
added form to create a new category
Jcornick21 Apr 23, 2018
44b85d5
Resolve merge conflict
Lindseyls Apr 23, 2018
5d28399
Added relations tests for user model, all tests passing for user model.
brendarios Apr 23, 2018
f36daaf
all tests passing for model user.
brendarios Apr 23, 2018
18e0907
Merge branch 'usersmodel'
brendarios Apr 23, 2018
dafe1e4
migrations done to add foreign keys for order_items and added a defau…
brendarios Apr 23, 2018
4d86ca8
Created and updated the review form and reder on the product show pag…
Lindseyls Apr 23, 2018
fb0b635
create method done but flash messages not showing
emilcecarlisa Apr 23, 2018
e8aef9a
Resolve merge conflict
Lindseyls Apr 23, 2018
d792511
Merge branch 'branch-l'
Lindseyls Apr 23, 2018
e61095c
modified categories model
Jcornick21 Apr 23, 2018
2aaaf09
changes tu schema
brendarios Apr 23, 2018
139f6f2
Fixed merge issues
emilcecarlisa Apr 23, 2018
92e7383
resolving merge conflicts
Jcornick21 Apr 23, 2018
111679d
Merge branch 'master' of https://github.com/Lindseyls/betsy
emilcecarlisa Apr 23, 2018
fb9a851
fixed review view
brendarios Apr 23, 2018
99048a2
Merge branch 'master' of https://github.com/Lindseyls/betsy
brendarios Apr 23, 2018
e35d1f1
Fixed other merge issues
emilcecarlisa Apr 23, 2018
700a79b
Merge branch 'usersmodel'
brendarios Apr 23, 2018
d25ad9e
Merge branch 'master' of https://github.com/Lindseyls/betsy
brendarios Apr 23, 2018
0590f9f
Updated gemfile for simpleCov
Lindseyls Apr 23, 2018
8d5d088
added simplecov
brendarios Apr 23, 2018
5266613
Merge branch 'master' of https://github.com/Lindseyls/betsy
brendarios Apr 23, 2018
62d0100
simple cov
Jcornick21 Apr 23, 2018
cc257a5
resolve merge conflicts
Jcornick21 Apr 23, 2018
8320562
merge conflict
Jcornick21 Apr 23, 2018
5fcbb80
changed names of join tables
Jcornick21 Apr 23, 2018
54bdabc
resolve merge conflict
Lindseyls Apr 23, 2018
74c4981
Updated test_heler.rb
Lindseyls Apr 23, 2018
dcf830b
Tests for product model started
brendarios Apr 23, 2018
78d098a
Changed modem name for items_order back to order_items
Lindseyls Apr 23, 2018
04d8167
tests passing
brendarios Apr 23, 2018
9c0ba3f
untrack coverage files
Lindseyls Apr 23, 2018
c304162
untrack coverage files
brendarios Apr 23, 2018
3c6afd0
Merge branch 'master' of https://github.com/Lindseyls/betsy
brendarios Apr 23, 2018
b6709c6
untrack coverage files
Jcornick21 Apr 23, 2018
13846fa
Merge branch 'master' of https://github.com/Lindseyls/betsy
Jcornick21 Apr 23, 2018
dd91bc9
making sure things are up to date
Jcornick21 Apr 23, 2018
df0f781
modified categories model
Jcornick21 Apr 23, 2018
de2ad6f
Updated the format_price method in the application_helper.rb and appl…
Lindseyls Apr 23, 2018
bfb5095
Updated the product show page to include pricing and reviews
Lindseyls Apr 23, 2018
feb07c0
The review form is now redering on the product show page and the revi…
Lindseyls Apr 24, 2018
5b9d91c
Custom methods tests for products.
brendarios Apr 24, 2018
c823a9f
Merge branch 'master' of https://github.com/Lindseyls/betsy
brendarios Apr 24, 2018
ed87c74
added categories to create new product page
Jcornick21 Apr 24, 2018
549b604
Merge branch 'master' of https://github.com/Lindseyls/betsy
Jcornick21 Apr 24, 2018
9d402d3
Merge branch 'all_categories'
Jcornick21 Apr 24, 2018
239caa8
resolve merge conflicts
Lindseyls Apr 24, 2018
e51348f
Uptrack coverage
Lindseyls Apr 24, 2018
b2507a7
modified products controller
Jcornick21 Apr 24, 2018
a0a4006
updated the partial form for adding new products
Lindseyls Apr 24, 2018
3b3ccaa
Got rid of add product button in nav bar
emilcecarlisa Apr 24, 2018
35cb92a
Updated the product_controller.rb create and new method and removed t…
Lindseyls Apr 24, 2018
a3f40fc
Updated the testing for review model and controller. Updated the test…
Lindseyls Apr 24, 2018
c463884
Tests for user and products model.
brendarios Apr 24, 2018
40df4c9
Made #create controller test in products and added validations in pro…
emilcecarlisa Apr 24, 2018
dfc820b
Resolving merge conflict in product.rb
emilcecarlisa Apr 24, 2018
5a33895
Small aesthetic changes in nav bar or code
emilcecarlisa Apr 24, 2018
d8d2675
Added a test at model review
brendarios Apr 24, 2018
fbbcc98
Added methods in model of orders and order_items.
brendarios Apr 24, 2018
2abe284
Merge branch 'usersmodel'
brendarios Apr 24, 2018
a18f81b
Resolve merge conflicts
Lindseyls Apr 24, 2018
06f9e75
modified sessions test
Jcornick21 Apr 24, 2018
78557f8
Merge branch 'master' of https://github.com/Lindseyls/betsy
Jcornick21 Apr 24, 2018
8e4818d
Fixing syntax error
Lindseyls Apr 24, 2018
140e22e
Fiddling with product method for listing by pet type
emilcecarlisa Apr 24, 2018
dff8c97
modified test file and test helper file for sessions
Jcornick21 Apr 24, 2018
0882bb4
Updated testing for category controller and model
Lindseyls Apr 24, 2018
27f5326
Merge branch 'luxi-branch'
Lindseyls Apr 24, 2018
1108875
Completed the product functionality to organize the by pet type
emilcecarlisa Apr 24, 2018
53f7e09
Merge branch 'product-show'
emilcecarlisa Apr 24, 2018
89d09cf
testing failing for sessions
Jcornick21 Apr 24, 2018
af54971
Merge branch 'sessions_tests'
Jcornick21 Apr 24, 2018
b99b86c
Added tests to order model
brendarios Apr 24, 2018
8863caa
Created order_seeds.csv file
Lindseyls Apr 24, 2018
339f552
Merge branch 'testing'
brendarios Apr 24, 2018
4bd4b3d
Merge branch 'luxi-branch'
Lindseyls Apr 24, 2018
1acbdb2
Updated the orders model with extra columns
Lindseyls Apr 24, 2018
4dc23f4
Fixed bug in the fixtures for orders.
brendarios Apr 24, 2018
ecd0469
sessions tests passing
Jcornick21 Apr 24, 2018
b2bbad8
Resolving merge
emilcecarlisa Apr 24, 2018
ad935c6
Again, resolving merge conflict
emilcecarlisa Apr 24, 2018
a3794ab
Again, resolving merge conflict
emilcecarlisa Apr 24, 2018
c70aa82
Tests for model order passing.
brendarios Apr 24, 2018
970ce15
Merge branch 'master' of https://github.com/Lindseyls/betsy
emilcecarlisa Apr 24, 2018
8befc27
Changed mains controller method
emilcecarlisa Apr 24, 2018
858ca35
renamed mains view page
Jcornick21 Apr 24, 2018
aeec7d8
Changed product show page to use application helper method
emilcecarlisa Apr 24, 2018
8a35c7f
Recovering work that was lost
Lindseyls Apr 24, 2018
753ca03
refactor model order tests.
brendarios Apr 24, 2018
ce6380e
Added order params in orders controller.
brendarios Apr 24, 2018
54cc5e0
Dan fixed some stuff
emilcecarlisa Apr 24, 2018
aaf1e57
Added the ability to add to cart from product page
emilcecarlisa Apr 24, 2018
9ceddcc
modified order_items controller
Jcornick21 Apr 24, 2018
65f6f2a
Added methods to orders controllers.
brendarios Apr 25, 2018
3deabd4
Added pseudocode to orders controller.
brendarios Apr 25, 2018
b0729e5
Working on the shopping cart
Lindseyls Apr 25, 2018
db2cfa9
working on shopping cart through order controller
Lindseyls Apr 25, 2018
6e55063
Created make_cart method in order controller. Updated application con…
emilcecarlisa Apr 25, 2018
8a8c04e
Updated the update method in orders_controller.rb
Lindseyls Apr 25, 2018
e1dd0f3
Added foundation-rails gem
emilcecarlisa Apr 25, 2018
edc3f80
Fiddling with Order Controller and view
emilcecarlisa Apr 25, 2018
550ad20
Rolled back commit
emilcecarlisa Apr 25, 2018
4607445
Created and updated the order index and new html page and also a form…
Lindseyls Apr 25, 2018
ce14bd2
Remove belong to relationship in orders model.
brendarios Apr 25, 2018
8d4ed0a
changes
Jcornick21 Apr 25, 2018
30a0173
Created two methods in order model. Applied the new methods to the or…
Lindseyls Apr 25, 2018
3ef5ddd
Resolve merge conflict
Lindseyls Apr 25, 2018
ca45c02
Added orders confirmation view page.
brendarios Apr 25, 2018
27dd763
modified error filled out form with Dan
Jcornick21 Apr 25, 2018
3bb6d78
changes
Jcornick21 Apr 25, 2018
cece9cc
modified error filled out form with Dan
Jcornick21 Apr 25, 2018
987508f
Merge branch 'cart' of https://github.com/Lindseyls/betsy into cart
Jcornick21 Apr 25, 2018
75ccb91
Merge branch 'cart'
Jcornick21 Apr 25, 2018
2521407
Added html and css to main page
brendarios Apr 25, 2018
9d36e14
Fiddling with the order items controller methods and views. Adding th…
Jcornick21 Apr 26, 2018
93e7754
Rebasing to master
emilcecarlisa Apr 26, 2018
2f80838
Fixed edit link in products show page
brendarios Apr 26, 2018
4d44bd5
Added navigation bar and links
brendarios Apr 26, 2018
7ae6a26
Started to style homepage.
brendarios Apr 26, 2018
8f98b85
Added styling to products index and show page.
brendarios Apr 26, 2018
f941fe5
Added css to products and users pages.
brendarios Apr 26, 2018
7c4b4bc
Modified size of pictures.
brendarios Apr 26, 2018
c2e75a4
Html and css for view pages.
brendarios Apr 26, 2018
e2e2c66
Merge branch 'master' of https://github.com/Lindseyls/betsy
emilcecarlisa Apr 26, 2018
7247cf5
refactoring view and model methods for cart
Jcornick21 Apr 26, 2018
3138cfc
Merge branch 'cart'
Jcornick21 Apr 26, 2018
56dd97a
Fixed bugs on the functionality of the shopping cart.
brendarios Apr 26, 2018
4ceec89
fixed html on products show page.
brendarios Apr 26, 2018
5a8213d
Added functionality to place my order.
brendarios Apr 26, 2018
9cba758
Created star average ratings
emilcecarlisa Apr 26, 2018
2c6d57a
Added some css to orders and order_items pages.
brendarios Apr 26, 2018
76690a1
button place your order now is working.
brendarios Apr 26, 2018
7de7120
Working proceed to checkout button. still need to fix busg on retriev…
brendarios Apr 26, 2018
b246baf
Added condition to review controller so that the merchant cannot revi…
brendarios Apr 26, 2018
35e243c
Working on categories loop
emilcecarlisa Apr 26, 2018
035824e
Resolving merge?
emilcecarlisa Apr 26, 2018
1d786e3
Merge branch 'random-branch'
emilcecarlisa Apr 26, 2018
6737e78
Refactor products controller so that only the merchant can create a p…
brendarios Apr 26, 2018
83cfdea
resolved merge conflicts
brendarios Apr 26, 2018
84110e7
Now user need to log in to be able to add a new product.
brendarios Apr 26, 2018
5aa4637
fixed bugs on cart.
brendarios Apr 26, 2018
4a98c7f
Updated the product show page and index page and refactored the review
Lindseyls Apr 26, 2018
2309684
Working on the category show page
Lindseyls Apr 26, 2018
99ab8f6
refactoring controllers
brendarios Apr 26, 2018
63ae46c
Worked on getting the starts to show up for reviews. Also updated the…
Lindseyls Apr 26, 2018
086fa48
Fixed bug now guest users cannot create products.
brendarios Apr 27, 2018
c3c8293
Merge branch 'master' of https://github.com/Lindseyls/betsy
brendarios Apr 27, 2018
bc30359
Merge branch 'cart'
brendarios Apr 27, 2018
df86a88
resolving rebase
emilcecarlisa Apr 26, 2018
4f8f77a
Created the error message file and add flash to the application html …
Lindseyls Apr 27, 2018
f328ea3
Working on logout button and the merchant show page
Lindseyls Apr 27, 2018
f6d4fca
Added some categories to products
emilcecarlisa Apr 27, 2018
fa7036b
Merge branch 'random-branch'
emilcecarlisa Apr 27, 2018
dcb3d11
Fixed bugs in the cart.
brendarios Apr 27, 2018
07b7c34
Merge branch 'master' of https://github.com/Lindseyls/betsy
brendarios Apr 27, 2018
94e04f0
clean up
brendarios Apr 27, 2018
bb081f6
Saved new products with categories to the database
emilcecarlisa Apr 27, 2018
09cf3c4
Merge branch 'random-branch'
emilcecarlisa Apr 27, 2018
4527ab0
Looking for the bug
brendarios Apr 27, 2018
de1bf7b
Merge branch 'master' of https://github.com/Lindseyls/betsy
brendarios Apr 27, 2018
165541f
trying to fix functionality that broke in last merge
Jcornick21 Apr 27, 2018
bfe0c5c
trying to merge again
Jcornick21 Apr 27, 2018
3ce086e
something is still broken
Jcornick21 Apr 27, 2018
987576d
faux changes
Jcornick21 Apr 27, 2018
4be5330
trying to fix what broke
Jcornick21 Apr 27, 2018
7170504
Working on sessions
Lindseyls Apr 27, 2018
b5fa2a2
Added the all merchant link to user show page
Lindseyls Apr 27, 2018
261ab8a
Working on user log in and updating forms and html pages
Lindseyls Apr 27, 2018
1292b69
Worked on the logout and login button
Lindseyls Apr 27, 2018
2e026da
Woked on validations for shopping cart
Lindseyls Apr 27, 2018
3e8084f
Added method type in user show and update_attributes method in update…
emilcecarlisa Apr 27, 2018
4613024
Getting ready to merge into master
Lindseyls Apr 27, 2018
971b637
Getting ready to merge my branch into the master
Lindseyls Apr 27, 2018
662dc65
solving merging conflicts
brendarios Apr 27, 2018
ddab350
Fixed the product controller method for update to find_product and up…
emilcecarlisa Apr 27, 2018
ce35593
Working on the merchant index page
Lindseyls Apr 27, 2018
25378e3
solving merging conflicts
brendarios Apr 27, 2018
71c503d
Refactor sessions controller to unbug login and logout.
brendarios Apr 27, 2018
397a752
refactoring and working on layouts and css
Lindseyls Apr 27, 2018
c54ff87
when you click an item already in cart it adds to its quantity
Jcornick21 Apr 27, 2018
b4cf158
stashing changes
Jcornick21 Apr 27, 2018
a0db17b
Working with the bugs in the cart.
brendarios Apr 27, 2018
d0f14db
Added footer and footer nav section and CSS
Lindseyls Apr 27, 2018
a120eee
update in cart functionality broke
Jcornick21 Apr 27, 2018
02c7838
Fixed bug in the cart now it clears.
brendarios Apr 27, 2018
9dafe87
Working on CSS on the home page
Lindseyls Apr 27, 2018
6d5212c
Merge branch 'friday-branch'
Lindseyls Apr 27, 2018
59b19a2
Adjusting images in products page
emilcecarlisa Apr 27, 2018
4ce095c
fix patch instead of put for cart update
Jcornick21 Apr 27, 2018
e7b37e6
resolved merge issues
emilcecarlisa Apr 27, 2018
15aa6fe
merging cart with duplicate choice feature
Jcornick21 Apr 27, 2018
e876a36
Updated main.scss
Lindseyls Apr 27, 2018
8861479
merge cart
Jcornick21 Apr 27, 2018
b8be68b
Merge branch 'master' of https://github.com/Lindseyls/betsy
Jcornick21 Apr 27, 2018
31cfbb8
resolve merge conflict
Lindseyls Apr 27, 2018
73ecec4
added total sum
brendarios Apr 27, 2018
9b735e1
solving merging conflicts
brendarios Apr 27, 2018
2669443
updated main page
Lindseyls Apr 27, 2018
740bd9b
Working on css
Lindseyls Apr 27, 2018
d9127b6
Able to have the total sum of an order.
brendarios Apr 27, 2018
ce1c05a
Merge branch 'master' of https://github.com/Lindseyls/betsy
Lindseyls Apr 27, 2018
0992360
Cleaning orders controller.
brendarios Apr 27, 2018
503e21f
Cleaning order items controller.
brendarios Apr 27, 2018
0dcb7cd
Updated the product controller edit method so that only the product's…
Lindseyls Apr 27, 2018
baed553
Merge branch 'master' of https://github.com/Lindseyls/betsy
Lindseyls Apr 27, 2018
122c311
resolve merge conflict:
Lindseyls Apr 27, 2018
4c4485b
fix bug in flash message of edit product
brendarios Apr 27, 2018
c9d7288
Added reduce and add inventory methods in the order items controller.
brendarios Apr 27, 2018
7a6360d
trying to fix bug in products index
brendarios Apr 27, 2018
7a396fa
add mutliple of same item feature
Jcornick21 Apr 27, 2018
11b574b
merge cart with feature
Jcornick21 Apr 27, 2018
fd4afc7
Merge branch 'master' of https://github.com/Lindseyls/betsy
brendarios Apr 27, 2018
4dd7474
Fixed bug in the remove button.
brendarios Apr 27, 2018
09f8aae
cleaning routes.
brendarios Apr 28, 2018
1d284a2
cleaning up controllers.
brendarios Apr 28, 2018
c474cb4
fixed bug in form to create product.
brendarios Apr 28, 2018
a57d65b
modified application helper so that the price is viewed as entered.
brendarios Apr 28, 2018
b82a74f
fixed bug to add a review.
brendarios Apr 28, 2018
adb947d
Now an authenticated user can also make a review.
brendarios Apr 28, 2018
0d78a49
Now working the flash message when an authenticated user wants to edi…
brendarios Apr 28, 2018
bb08314
Added code so that the credit card number only shows the last four di…
brendarios Apr 28, 2018
2a99f0e
Now a logged in user can write a review.
brendarios Apr 28, 2018
c70922b
Added tests and refactor controller and model for users.
brendarios Apr 30, 2018
4558993
Added test for products in controller and model.
brendarios Apr 30, 2018
38c532c
Added tests for orders model and controller.
brendarios Apr 30, 2018
9c6e3fa
Added tests for order items controller and model
brendarios Apr 30, 2018
e42f485
Added tests and refactor for category controller and model.
brendarios Apr 30, 2018
3aaa822
Added and refactor tests for sessions controller.
brendarios Apr 30, 2018
24f0321
Refactor tests for review controller
brendarios Apr 30, 2018
d596c71
test for main controller.
brendarios Apr 30, 2018
bf1db46
refactor order item model.
brendarios Apr 30, 2018
d391d50
created table for revenue
brendarios Apr 30, 2018
5170319
refactor users views.
brendarios Apr 30, 2018
b36bc19
refactor orders views.
brendarios Apr 30, 2018
32b522a
cleaning files.
brendarios Apr 30, 2018
ec5de69
Fixed bug to link user with product.
brendarios May 2, 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.
22 changes: 22 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# 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

coverage/*
79 changes: 79 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
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 'foundation-rails'
gem 'autoprefixer-rails'

# 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-github"

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'
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'
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'
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)
autoprefixer-rails (8.3.0)
execjs
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.3.0)
dotenv-rails (2.3.0)
dotenv (= 2.3.0)
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
autoprefixer-rails
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-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
Binary file added app/.DS_Store
Binary file not shown.
Binary file added app/assets/.DS_Store
Binary file not shown.
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
Binary file added app/assets/images/.DS_Store
Binary file not shown.
Empty file added app/assets/images/.keep
Empty file.
Binary file added app/assets/images/Bag-Dispenser.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Bandana.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Buffalo-Skull.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Cat-Bed.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Cat-Bow-Tie.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Cat-Brush.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Cat-Can-Food.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Cat-Dry-Food.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Cat-Dry-Shampoo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Cat-Harness.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Cat-Litter.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Cat-Shampoo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Cat-Wet-Food.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Cattree.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Chewsen.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Dog-Bed.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Dog-Brush.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Dog-Dry-Food.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Dog-Harness.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Dog-Leash.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Dog-Shampoo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Dog-Waste-Bags.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Dog-Wet-Food.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Fishbone-Bow-Tie.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Heat-Lamp.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Hideaway.jpg
Binary file added app/assets/images/Jungle-Plant.jpg
Binary file added app/assets/images/KONG.jpg
Binary file added app/assets/images/Laser.jpg
Binary file added app/assets/images/Mices.jpg
Binary file added app/assets/images/Nail-Clipper.jpg
Binary file added app/assets/images/Pads.jpg
Binary file added app/assets/images/Pickles.jpg
Binary file added app/assets/images/Plush-Vader.jpg
Binary file added app/assets/images/Rep-Bedding.jpg
Binary file added app/assets/images/Rep-Clip.jpg
Binary file added app/assets/images/Rep-Food.jpg
Binary file added app/assets/images/Rep-Leash.jpg
Binary file added app/assets/images/Rep-Veg-Food.jpg
Binary file added app/assets/images/Skull-Hideaway.jpg
Binary file added app/assets/images/Teaser.jpg
Binary file added app/assets/images/Teepee.jpg
Binary file added app/assets/images/Terrarium.jpg
Binary file added app/assets/images/Tug-Rope.jpg
Binary file added app/assets/images/Tunnel.jpg
Binary file added app/assets/images/cat.jpg
Binary file added app/assets/images/cat_home.jpg
Binary file added app/assets/images/dog_home.jpg
Binary file added app/assets/images/dog_shopping.jpg
Binary file added app/assets/images/download.jpg
Binary file added app/assets/images/pet_shopping.jpg
Binary file added app/assets/images/reptile_home.jpg
Binary file added app/assets/images/star.png
Loading