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 - Iuliia, Eva, Lindsey, Rebecca - Betsy #66

Open
wants to merge 328 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
Show all changes
328 commits
Select commit Hold shift + click to select a range
b25cf10
fix merge conflict
Esawyer25 Oct 20, 2017
254cc17
Add shop by category button to nav
julalam Oct 20, 2017
6863aeb
Seed new data for products
julalam Oct 20, 2017
3650acd
Add some styles
julalam Oct 20, 2017
c7a125f
Merge branch 'master' of https://github.com/julalam/betsy
julalam Oct 20, 2017
319ff14
changed seeds to fix login bug
Esawyer25 Oct 20, 2017
7a2b31d
changed seeds to fix login bug
Esawyer25 Oct 20, 2017
89dd04f
fixed seeds
Esawyer25 Oct 20, 2017
35e355b
add categories and categories products seed data
rbergena Oct 20, 2017
9e29134
Merge branch 'master' of https://github.com/julalam/betsy into catego…
rbergena Oct 20, 2017
abc57bf
Merge pull request #10 from julalam/categoriesproducts
rbergena Oct 20, 2017
91c0fd5
trouble shooting ProductController tests
Esawyer25 Oct 20, 2017
d2c15a0
Fix spelling
julalam Oct 20, 2017
b7e8c86
Merge branch 'master' of https://github.com/julalam/betsy into ES1019
Esawyer25 Oct 20, 2017
b944f83
Add dashboard
julalam Oct 20, 2017
ec657bf
checked CategoryController tests
Esawyer25 Oct 20, 2017
9cacb4d
checked MainController tests
Esawyer25 Oct 20, 2017
52773ea
Remove edit for merchant
julalam Oct 20, 2017
0b5f487
Merge branch 'master' of https://github.com/julalam/betsy into views
julalam Oct 20, 2017
3b17d53
Checked MerchantController tests
Esawyer25 Oct 20, 2017
54a7e7e
Add routes for products by merchant
julalam Oct 20, 2017
4af5087
first pass at order_itemController tests. Need clarification on role…
Esawyer25 Oct 20, 2017
752bba8
Reviews tests
VirtualLindsey Oct 20, 2017
c183da0
Merge pull request #11 from julalam/tests
VirtualLindsey Oct 20, 2017
934d482
Add custom view for merchant products
julalam Oct 20, 2017
c2b4986
Fix creating a new product and view merchant products
julalam Oct 20, 2017
be31093
Fix products#index view to not show retired products
julalam Oct 20, 2017
2b29991
we can now buy things
Esawyer25 Oct 20, 2017
9ce955f
Merge branch 'ES1019'
Esawyer25 Oct 20, 2017
4287697
Last changes
julalam Oct 20, 2017
1c64e38
merge problems
Esawyer25 Oct 20, 2017
0842b8b
Fix merge conflict
julalam Oct 20, 2017
228bf00
Merge pull request #12 from julalam/views
julalam Oct 20, 2017
26ea601
fix routes
Esawyer25 Oct 20, 2017
909b35f
Merge branch 'master' of https://github.com/julalam/betsy
Esawyer25 Oct 20, 2017
55140ca
Add partial view for form
julalam Oct 20, 2017
2c40322
Add view for both statuses of products
julalam Oct 21, 2017
2a0d8c8
Add categories#index view
julalam Oct 21, 2017
b625077
Add categories page for merchants
julalam Oct 21, 2017
5d2c7fc
Merge pull request #13 from julalam/product_views
julalam Oct 21, 2017
e09db29
Add join table for products and categories and set relationships
julalam Oct 21, 2017
29a0b38
Fix merchant_category route
julalam Oct 21, 2017
4a153ba
Add check boxes to product form
julalam Oct 21, 2017
3bbec13
Fix new and update for creating product with categories
julalam Oct 21, 2017
92b46f1
Add max quantity to cart
julalam Oct 21, 2017
0f9f6bf
Add nice view of cart button and merchant to product page
julalam Oct 21, 2017
747d592
Add categories to product show page and double nested route for produ…
julalam Oct 21, 2017
3360941
Fix create new category
julalam Oct 22, 2017
d82d817
Add require login method to application controller
julalam Oct 22, 2017
6cc8df5
nested merchants/orders
rbergena Oct 22, 2017
86baae4
Fix categories controller tests
julalam Oct 22, 2017
5592d19
Fix merchants controller tests
julalam Oct 22, 2017
67b0c73
Add tests for category model
julalam Oct 22, 2017
eca521b
Merge pull request #14 from julalam/categories
julalam Oct 22, 2017
cce236d
Fix random products method
julalam Oct 22, 2017
3004402
Fix tests for product model
julalam Oct 22, 2017
3d02ae0
Add method new_products and tests for model product
julalam Oct 22, 2017
49e819f
Merge pull request #15 from julalam/random_products
julalam Oct 22, 2017
5157edd
Add styles to aside on main page
julalam Oct 22, 2017
8ac5cb4
Add styles to drop down menues
julalam Oct 22, 2017
c936539
Fix button sizes
julalam Oct 22, 2017
e62df5e
Merge pull request #16 from julalam/drop-down
julalam Oct 22, 2017
8e00c16
Add new nested route and method for viewing products by merchant
julalam Oct 22, 2017
d059d85
Add new nested route and method for viewing products by category
julalam Oct 22, 2017
33debf4
Fix tests for product controller
julalam Oct 23, 2017
5b1a6ab
Fix link to guest merchant page from product show page
julalam Oct 23, 2017
73780ca
Merge pull request #17 from julalam/by_merchant
julalam Oct 23, 2017
1e30830
Delete comments from routes
julalam Oct 23, 2017
245b809
fixed merge conflict
Esawyer25 Oct 23, 2017
e26f859
Merge branch 'master' of https://github.com/julalam/betsy into ES1019
Esawyer25 Oct 23, 2017
18458af
fixed routes
Esawyer25 Oct 23, 2017
72cf218
Change login method
julalam Oct 23, 2017
f9cc85e
add manage orders views for merchant and edit nested merchant orders …
rbergena Oct 23, 2017
652b4ed
Add test for double login case
julalam Oct 23, 2017
2f467e0
resolve styling merge conflicts
rbergena Oct 23, 2017
c68f674
Add new relation of product with review and tests
julalam Oct 23, 2017
5f0f4b5
Fix fixtures for reviews and add relations of product with reviews an…
julalam Oct 23, 2017
20379cb
add status to order item and add functionality to merchant manage ord…
rbergena Oct 23, 2017
5392335
Add tests for review validations
julalam Oct 23, 2017
40d36cb
Merge pull request #19 from julalam/merchantorders
rbergena Oct 23, 2017
4fc4205
added delete order item
Esawyer25 Oct 23, 2017
9fc1990
fixed merge conflicts
Esawyer25 Oct 23, 2017
abb20a7
Merge branch 'master' of https://github.com/julalam/betsy
Esawyer25 Oct 23, 2017
b1645c4
Merge branch 'ES1019'
Esawyer25 Oct 23, 2017
49dd9a2
fixed bug with placing order
Esawyer25 Oct 23, 2017
470805a
Add some tests for reviews controller
julalam Oct 23, 2017
4dd0539
met min requirements for order confirmation page
Esawyer25 Oct 23, 2017
2b93458
fixed merge conflicts
Esawyer25 Oct 23, 2017
b44a1eb
Add stars
julalam Oct 23, 2017
3017899
remove stray heads
rbergena Oct 23, 2017
89a9b00
adding logic for order items
VirtualLindsey Oct 23, 2017
2ea0edb
Add method for average rating
julalam Oct 23, 2017
e606f4d
Fix controller test for reviews
julalam Oct 23, 2017
8ac8439
Merge branch 'master' of https://github.com/julalam/betsy
julalam Oct 23, 2017
27748a7
Fix css
julalam Oct 23, 2017
ba69edb
Add test for average rating custom method in product model
julalam Oct 23, 2017
c13b7c0
Fex merge conflict
julalam Oct 23, 2017
456b1bb
Merge pull request #20 from julalam/ic_reviews
julalam Oct 23, 2017
bbad050
Merge pull request #21 from julalam/quantityCheck
VirtualLindsey Oct 23, 2017
98adcb7
worked on layout for order_item summary
Esawyer25 Oct 23, 2017
4dad993
Merge branch 'ES1019'
Esawyer25 Oct 23, 2017
6999806
Add bestseller method to product
julalam Oct 23, 2017
1bf4c5f
merge conflict
VirtualLindsey Oct 24, 2017
7477097
resolivng merge conflicts
VirtualLindsey Oct 24, 2017
977807b
Order model tests are not working
julalam Oct 24, 2017
84f776c
Add styles to shopping cart
julalam Oct 24, 2017
85d40f4
typo
Esawyer25 Oct 24, 2017
36ba618
typo
Esawyer25 Oct 24, 2017
c77ae02
cleaning up order item methods and layouts
Esawyer25 Oct 24, 2017
af4f468
merchant and order items model tests and custom methods
rbergena Oct 24, 2017
39b301d
minor fix
Esawyer25 Oct 24, 2017
f387a02
Add test for relations product and orders
julalam Oct 24, 2017
15e6bc5
bestseller test is still not working
julalam Oct 24, 2017
a5fd360
fix merge conflicts
rbergena Oct 24, 2017
bace2e8
fixing merge conflicts
rbergena Oct 24, 2017
025b8d4
Merge pull request #22 from julalam/merchantordersclean
rbergena Oct 24, 2017
9160d9f
Fix merge conflicts
julalam Oct 24, 2017
552aac5
Merge pull request #23 from julalam/bestseller
julalam Oct 24, 2017
eace045
removing coverage files
VirtualLindsey Oct 24, 2017
3a77d0d
fixing coverage issues
VirtualLindsey Oct 24, 2017
d1bef67
Fix shopping cart view
julalam Oct 24, 2017
e16b5fc
Fix merge conflicts
julalam Oct 24, 2017
6be9664
Merge pull request #24 from julalam/order_views
julalam Oct 24, 2017
48f5f1a
Fix layout for edit order page
julalam Oct 24, 2017
c6b2f53
restricted merchants from reviewing their own products
Esawyer25 Oct 24, 2017
31c7bbf
Add confirmation page layout
julalam Oct 24, 2017
5aa56c2
Add tests for custom methods for totals
julalam Oct 24, 2017
b43a78b
Complete all model tests for order_item
julalam Oct 24, 2017
e8639e7
Fix layout for shopping cart
julalam Oct 24, 2017
9cb327a
Merge pull request #25 from julalam/order-confirmation-page
julalam Oct 24, 2017
db97be2
Add link to shopping cart icon
julalam Oct 24, 2017
fe7d678
Remove links from shop by buttons
julalam Oct 24, 2017
2ca6c58
Remove capital letter from logged in button
julalam Oct 24, 2017
d2f3c9f
Add banner to retired products
julalam Oct 24, 2017
657e95a
Merge pull request #26 from julalam/fix-main-page
julalam Oct 24, 2017
46dcbd0
Add shipping cost to total cost
julalam Oct 24, 2017
8fdd730
Merge pull request #27 from julalam/shipping-cost
julalam Oct 24, 2017
79adbc3
fixed bug with duplicate order items in cart
Esawyer25 Oct 24, 2017
274f6ef
fixed bug in duplicate order items
Esawyer25 Oct 24, 2017
99afbf5
again trying to get rid of coverage
Esawyer25 Oct 24, 2017
9ed61df
Merge branch 'ES1019'
Esawyer25 Oct 24, 2017
f525827
restricted access to account pages to the correct merchants
Esawyer25 Oct 24, 2017
aa0c802
Some revenue logic
julalam Oct 24, 2017
589aa76
Fix merge conflict
julalam Oct 24, 2017
e2e718e
add merchant order show page and tests
rbergena Oct 24, 2017
e0f96e6
fix merge conflicts
rbergena Oct 24, 2017
9d45bdf
Merge pull request #28 from julalam/fixmerchantorders
rbergena Oct 24, 2017
2bc016d
change subtotal method in merchant_orders view to total
rbergena Oct 25, 2017
ba70608
Merge branch 'fixmerchantorders'
rbergena Oct 25, 2017
e396baa
Add something
julalam Oct 25, 2017
1f60f9c
Merge branch 'master' of https://github.com/julalam/betsy into revenu
julalam Oct 25, 2017
c964db7
Add link to product page and products by merchant to shopping cart page
julalam Oct 25, 2017
138a19d
adding logic to decrease stock after order status changes
VirtualLindsey Oct 25, 2017
f38701f
Merge pull request #29 from julalam/nightWork
VirtualLindsey Oct 25, 2017
01132d9
adding stock logic to consoldate_order_items
VirtualLindsey Oct 25, 2017
77be0ee
Complete revenue summary page
julalam Oct 25, 2017
416e1d9
Add total for merchant revenue table
julalam Oct 25, 2017
88f82fc
Add new tests for merchant model
julalam Oct 25, 2017
6f23219
Merge pull request #30 from julalam/revenue
julalam Oct 25, 2017
e3540f7
saving work so far
VirtualLindsey Oct 25, 2017
a98b9e4
Fix comments in the product_test
julalam Oct 25, 2017
4395720
pushing more tests
VirtualLindsey Oct 25, 2017
d5fc8fc
Merge pull request #31 from julalam/testing
VirtualLindsey Oct 25, 2017
d56da5d
fixed bug of ordering more orders than there are stock
Esawyer25 Oct 25, 2017
5cdd437
Fix layout to make it fit the page
julalam Oct 25, 2017
6e21345
added back lindsey's stock logic I had accidently lost
Esawyer25 Oct 25, 2017
a8b3f6b
This commit might be a mistake...sorry everyone. I am trying to fix …
Esawyer25 Oct 25, 2017
f1780d5
money gem, view helper, format money in views
rbergena Oct 25, 2017
cf3665e
fix merge conflicts
rbergena Oct 25, 2017
6147366
Merge pull request #32 from julalam/moneygemandformat
rbergena Oct 25, 2017
6418b58
Add loginc to view orders by status
julalam Oct 25, 2017
b556ada
returning my order_items changes that fix the bug of ordering more th…
Esawyer25 Oct 25, 2017
2cdb434
Add dropdowns for status
julalam Oct 25, 2017
2153d97
updating test
VirtualLindsey Oct 25, 2017
e3779aa
Add links to order by status html
julalam Oct 25, 2017
ee5548c
adding additional check for stock
VirtualLindsey Oct 25, 2017
464656b
should be and not or
VirtualLindsey Oct 25, 2017
07371b3
Add styles to drop down status buttons
julalam Oct 25, 2017
5986243
checked order_item model tests. all ok
Esawyer25 Oct 25, 2017
f549995
Merge pull request #33 from julalam/ES1025
Esawyer25 Oct 25, 2017
c318e5c
Add empty cells in orders table and - for pending orders
julalam Oct 25, 2017
a68f618
Resolve merge conflict
julalam Oct 25, 2017
c4c8d68
Merge pull request #34 from julalam/dropdown-by-status
julalam Oct 25, 2017
ed17260
Add colspan to orders table
julalam Oct 25, 2017
fc7d8e3
Fix custom methods on main page
julalam Oct 25, 2017
89b0669
Fix minor layout problems
julalam Oct 25, 2017
90b4da6
Add total to confirmation page for order
julalam Oct 25, 2017
21bc3ce
Fix the total cost method to accept cents
julalam Oct 25, 2017
ab12491
Fix flash messages on category and product pages
julalam Oct 25, 2017
2e512f1
Fix case whith no orders in category
julalam Oct 25, 2017
ceb9125
Merge pull request #35 from julalam/flash-message
julalam Oct 25, 2017
59db761
Fix redirect path while updating order status
julalam Oct 25, 2017
7b1c6da
merchant model tests OK
Esawyer25 Oct 25, 2017
1a228fa
Move order summary to partial
julalam Oct 25, 2017
b7215e9
Merge pull request #36 from julalam/ES1025
Esawyer25 Oct 25, 2017
5b19b8d
Complete merchant order page
julalam Oct 25, 2017
752ca7a
Merge pull request #37 from julalam/order-view
julalam Oct 25, 2017
fc377cd
Fix out of stock bug
julalam Oct 26, 2017
bc6dcff
Add money format to product show page
julalam Oct 26, 2017
d3067df
Merge pull request #38 from julalam/out-of-stock
julalam Oct 26, 2017
fa93b57
Change create and new in reviews
julalam Oct 26, 2017
ba95cd5
Fix tests for reviews controller
julalam Oct 26, 2017
cea5b8b
Merge pull request #41 from julalam/out-of-stock
julalam Oct 26, 2017
995a761
Fix updates an existing order
julalam Oct 26, 2017
beb31a3
adding back my changes to order_items controller and tests after the …
Esawyer25 Oct 26, 2017
a396f9c
Merge branch 'master' of https://github.com/julalam/betsy
Esawyer25 Oct 26, 2017
08c2d7f
redo categories controller changes
rbergena Oct 26, 2017
94de48c
Merge pull request #42 from julalam/redo-categories-controller
rbergena Oct 26, 2017
21008bb
fixed bug with restricting merchants from seeing other's accounts
Esawyer25 Oct 26, 2017
2503f6c
Merge branch 'master' of https://github.com/julalam/betsy into EvaTes…
Esawyer25 Oct 26, 2017
a027244
Fix index action for orders controller
julalam Oct 26, 2017
68869f3
OrderItemsController tests are at 100%
Esawyer25 Oct 26, 2017
c16b9e8
Merge pull request #43 from julalam/EvaTesting
Esawyer25 Oct 26, 2017
941ea8e
merchants controller tests
rbergena Oct 26, 2017
d0292b5
Merge pull request #44 from julalam/merchants-controller-tests-2
rbergena Oct 26, 2017
05be74c
end of day, product controller testing
Esawyer25 Oct 27, 2017
12c1103
Merge branch 'master' of https://github.com/julalam/betsy
Esawyer25 Oct 27, 2017
2973b50
product controller tests at nearly 100% and seem logical, need help w…
Esawyer25 Oct 27, 2017
5717e3d
Add test for update and move show page to update
julalam Oct 27, 2017
5805b1e
Remove unused lines in show
julalam Oct 27, 2017
d01012a
Merge pull request #45 from julalam/orders-controller
julalam Oct 27, 2017
4ca1152
Add redirect to 404 if page does not exist
julalam Oct 27, 2017
a4c1a9f
Merge pull request #46 from julalam/404-page
julalam Oct 27, 2017
ff9c64a
model tests and 404 page
rbergena Oct 27, 2017
c0f9dc3
finalize render 404 route
rbergena Oct 27, 2017
03a2106
Merge pull request #47 from julalam/review-model-tests
rbergena Oct 27, 2017
ee92e1d
Fix view of order for merchant
julalam Oct 27, 2017
9f701c3
Fix names of fields in edit page
julalam Oct 27, 2017
bdd6196
made 404 page available to guest users
Esawyer25 Oct 27, 2017
f83b28c
Merge pull request #48 from julalam/order-merchant-view
julalam Oct 27, 2017
343015b
Fix quantity for items by status
julalam Oct 27, 2017
9f8e148
Fix revenue by status
julalam Oct 27, 2017
f1b0eac
Remove link to product page if order pending
julalam Oct 27, 2017
0dcfccd
Merge pull request #49 from julalam/fix-total-cost
julalam Oct 27, 2017
ef5ca73
fixed all the tests but one
Esawyer25 Oct 27, 2017
83579a7
Merge pull request #50 from julalam/EvaTesting
Esawyer25 Oct 27, 2017
7525961
Change layout for 404 page
julalam Oct 27, 2017
b8ba78f
Merge pull request #51 from julalam/404-layout
julalam Oct 27, 2017
6e72711
change categories for seed data
rbergena Oct 27, 2017
ed727cc
Merge branch 'master' of https://github.com/julalam/betsy
rbergena Oct 27, 2017
22c6df6
quick fix for order index page
Esawyer25 Oct 27, 2017
7868d9c
Merge branch 'master' of https://github.com/julalam/betsy
Esawyer25 Oct 27, 2017
c7f0b15
Fix typo
julalam Oct 27, 2017
7dcf4c1
Merge branch 'master' of https://github.com/julalam/betsy
julalam Oct 27, 2017
5fe8eb9
fixed last test
Esawyer25 Oct 27, 2017
082f56d
Merge branch 'master' of https://github.com/julalam/betsy
Esawyer25 Oct 27, 2017
8f50529
CSS for cart hover
julalam Oct 27, 2017
e059e21
Merge branch 'master' of https://github.com/julalam/betsy
julalam Oct 27, 2017
5d50b46
Fix revenue money format
julalam Oct 27, 2017
7c2404b
Fix format money again
julalam Oct 27, 2017
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.
24 changes: 24 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# 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
.bundle

.coverage
coverage
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 'simplecov', :require => false, :group => :test
# 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
gem 'pry-rails'
# 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

gem 'jquery-rails'

gem 'money'


gem 'foundation-rails', '~> 6.3.1'

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

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
end
284 changes: 284 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,284 @@
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)
ffi (1.9.18-x86-mingw32)
foundation-rails (6.3.1.0)
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-rails (4.3.1)
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.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
money (5.0.0)
i18n (~> 0.4)
json
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)
nokogiri (1.8.1-x86-mingw32)
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)
pg (0.21.0-x86-mingw32)
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)
tzinfo-data (1.2017.2)
tzinfo (>= 1.0.0)
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
x86-mingw32

DEPENDENCIES
better_errors
binding_of_caller
byebug
capybara (~> 2.13)
dotenv-rails
foundation-rails (~> 6.3.1)
jbuilder (~> 2.5)
jquery-rails
jquery-turbolinks
listen (>= 3.0.5, < 3.2)
minitest-rails
minitest-reporters
money
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.15.4
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/BlueJay.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/Canary.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/Cockatoo.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/Eagle.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/Flamingo.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/Goldfinch.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/Hawk.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/Hummingbird.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/Owl.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/Pelican.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/birds.png
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/birdsy.png
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/cart-icon.png
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/phone.png
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/sad-bird.png
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/truck-1.gif
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/truck.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading