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

NYnJA #31

Open
wants to merge 381 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
381 commits
Select commit Hold shift + click to select a range
0277a79
added cart method
allisonhoke Oct 24, 2016
0cd972f
adjusted cart view from orderItem to order controller
allisonhoke Oct 24, 2016
c202e95
removed validation for email format
allisonhoke Oct 24, 2016
6c3cda9
added route for confirmation screen
allisonhoke Oct 24, 2016
3bbebba
Added basic tests to reviews controller.
nurlywhirly Oct 24, 2016
efd277f
added order routes not using id to be more secure
allisonhoke Oct 24, 2016
7efd04a
adjusting order routes
allisonhoke Oct 24, 2016
fb3104c
moved controller filter for cart to application controller
allisonhoke Oct 24, 2016
62f9d1d
WIP views for order
allisonhoke Oct 24, 2016
445562d
Added tests and some views for category controller
nurlywhirly Oct 24, 2016
618bdbf
Finished some reviews controller test logic
nurlywhirly Oct 24, 2016
e36a188
Merge branch 'master' of https://github.com/allisonhoke/betsy
nurlywhirly Oct 24, 2016
29f9e5f
WIP purchase method changes order status, product stock, and clears cart
allisonhoke Oct 24, 2016
f33041b
added link to home on purchase view. adjusted form on update view
allisonhoke Oct 24, 2016
6d32927
Merge branch 'b/amh/master'
allisonhoke Oct 24, 2016
a47f7d0
Messed with products index action to make browsing by category possible.
nurlywhirly Oct 24, 2016
d22febe
updated method call name in purchase method
allisonhoke Oct 24, 2016
8bbea95
Fixed one lingering review_test.rb test
nurlywhirly Oct 24, 2016
5c044fd
Merge branch 'nmu/conttesting'
nurlywhirly Oct 24, 2016
244d431
removed unnecessary cart route
allisonhoke Oct 24, 2016
c3f346b
changed heading
allisonhoke Oct 24, 2016
4105305
products show completed, working on add to cart method in products
Ynakashima Oct 24, 2016
8d90609
Merge branch 'b/yn/products'
Ynakashima Oct 24, 2016
7321d2d
added route to destroy order item (remove from cart)
allisonhoke Oct 24, 2016
2f4cc5d
Merge branch 'b/amh/master'
allisonhoke Oct 24, 2016
19f698b
Added model method to find total revenue; test for method passing; ad…
jmojennifer Oct 24, 2016
5f78320
Merge branch 'b/jmo/master'
jmojennifer Oct 24, 2016
867b9d9
changed delete to destroy in order item route
allisonhoke Oct 24, 2016
e4e64eb
added link to delete order item and added delete action in controller
allisonhoke Oct 24, 2016
7391fed
Merge branch 'master' of https://github.com/allisonhoke/betsy
allisonhoke Oct 24, 2016
92baa43
Merge branch 'b/amh/master'
allisonhoke Oct 24, 2016
f511cd7
removed unnecessary methods from order item controller
allisonhoke Oct 24, 2016
e7a7690
Deleted remaining json files
jmojennifer Oct 24, 2016
17c881f
Merge branch 'b/jmo/master'
jmojennifer Oct 24, 2016
9825388
Deleting additional_info sessions routes
nurlywhirly Oct 24, 2016
a70b398
Merge branch 'nmu/current_user'
nurlywhirly Oct 24, 2016
7755369
changed purchased to paid in attribute assignment in purchase method
allisonhoke Oct 24, 2016
ceec7c1
added necessary keys to order model
allisonhoke Oct 24, 2016
d98b2b3
Merge branch 'b/amh/master'
allisonhoke Oct 24, 2016
b4778bc
updated products index (well, Nicole did), still fighting with add to…
Ynakashima Oct 24, 2016
ba40b2e
Merge branch 'b/yn/products'
Ynakashima Oct 24, 2016
d6e9d68
Changed some CSS, failed miserably
nurlywhirly Oct 24, 2016
9303955
Merge branch 'nmu/current_user'
nurlywhirly Oct 24, 2016
9bc21c5
Migration changing default order status value
jmojennifer Oct 24, 2016
21d643f
Resolved merge conflict
jmojennifer Oct 25, 2016
47bcede
Adjusted controller to call current_user
jmojennifer Oct 25, 2016
8f2e17a
Updated schema from migration
jmojennifer Oct 25, 2016
0d99158
Added ability to use nickname as username if no github name; added te…
jmojennifer Oct 25, 2016
1bc311d
Only page's merchant's products show now
jmojennifer Oct 25, 2016
86c28c4
Fixed Product query error
jmojennifer Oct 25, 2016
b8df55c
WIP controller tests
allisonhoke Oct 25, 2016
3577655
added update route for order items to change quantity in cart
allisonhoke Oct 25, 2016
6741c62
added logic to update method for changing quantity in cart
allisonhoke Oct 25, 2016
02dfad8
added form to change quantity in cart
allisonhoke Oct 25, 2016
fc53807
Added ability to see a merchant's revenue by order status
jmojennifer Oct 25, 2016
e7f1e2e
Merge branch 'b/jmo/master'
jmojennifer Oct 25, 2016
91116d0
updated form for update and method to redirect to confirmation page. …
allisonhoke Oct 25, 2016
691f4e2
deleted unnecessary view files. added to update method so order item …
allisonhoke Oct 25, 2016
10e0a92
removed unnecessary commented out methods
allisonhoke Oct 25, 2016
58e94b6
changed before action to correct methods
allisonhoke Oct 25, 2016
047abfb
updated before action methods to call with proper actions
allisonhoke Oct 25, 2016
2518766
WIP order_items controller tests
allisonhoke Oct 25, 2016
1e09990
Added merchant revenue by order status method; revised unit tests for…
jmojennifer Oct 25, 2016
44acfdb
Merge branch 'b/jmo/master'
jmojennifer Oct 25, 2016
d4bddaf
Added merchant num of orders by status method; tests for method; rela…
jmojennifer Oct 25, 2016
ec50e5d
Merge branch 'b/jmo/master'
jmojennifer Oct 25, 2016
fa27721
added before action of cart
allisonhoke Oct 25, 2016
0c1f87a
Merge branch 'b/amh/master'
allisonhoke Oct 25, 2016
3e03810
Working on conditional button and OAuth login
nurlywhirly Oct 25, 2016
8463e1f
no changes but git thinks there are so commiting them before pulling
Ynakashima Oct 25, 2016
9b64059
Merge branch 'b/yn/products'
Ynakashima Oct 25, 2016
30feb34
Changed belongs_to from :user to :merchant
jmojennifer Oct 25, 2016
f94ff3f
WIP order_item controller tests
allisonhoke Oct 25, 2016
487af67
Merge branch 'master' of https://github.com/allisonhoke/betsy
jmojennifer Oct 25, 2016
3f929c6
Updated fixture data references to other fixture yml records
jmojennifer Oct 25, 2016
969906a
Fixed order_item fixture reference
jmojennifer Oct 25, 2016
b7938e3
Fixed merchant model tests/methods; changed products yml fixture for …
jmojennifer Oct 25, 2016
f1df3f2
moved add to cart out of products controller, calling create order it…
Ynakashima Oct 25, 2016
5b88133
Merge branch 'b/yn/products'
Ynakashima Oct 25, 2016
57d8d93
fixed merge conflict
allisonhoke Oct 25, 2016
b84beca
WIP add to cart logic needs tweaking in order_items controller
allisonhoke Oct 25, 2016
434265a
nothing
Ynakashima Oct 25, 2016
7b63d10
resolved merge conflicts on order items controller
Ynakashima Oct 25, 2016
cdf1570
fixed path add to cart/create order_item
allisonhoke Oct 25, 2016
badf802
fixed update logic and made view a bit more readable
allisonhoke Oct 25, 2016
84639e7
adjusted @product to self to access current product
allisonhoke Oct 25, 2016
05299d8
adjusted url to direct to update
allisonhoke Oct 25, 2016
f21859f
made variable to access product
allisonhoke Oct 25, 2016
00c4947
adjusted purchase method to correctly decrease stock of product
allisonhoke Oct 25, 2016
156af3a
added save to decrease stock
allisonhoke Oct 25, 2016
d872cbf
CSS-ing and finishing up OAuth controller filters
nurlywhirly Oct 26, 2016
702e964
Merge branch 'nmu/cond_button'
nurlywhirly Oct 26, 2016
ccc2220
Added a latest review option on products#show page, and a link to all…
nurlywhirly Oct 26, 2016
6d9d7a7
Added merchant only button view helper
nurlywhirly Oct 26, 2016
650c7d5
commiting so my pull request on master doesn't error
Ynakashima Oct 26, 2016
18e94e9
resolved merge confict
Ynakashima Oct 26, 2016
9133e99
Added skip require_login in sessions controller for the create action
nurlywhirly Oct 26, 2016
47644b0
Merge branch 'master' of https://github.com/allisonhoke/betsy
Ynakashima Oct 26, 2016
426fa0d
added route for merchant order view
allisonhoke Oct 26, 2016
5215016
deleted unnecessary views. WIP view for merchant to view order info
allisonhoke Oct 26, 2016
367e568
WIP adjusting update method to save only last four of cc
allisonhoke Oct 26, 2016
9098389
Merge branch 'b/amh/master'
allisonhoke Oct 26, 2016
a4fc266
Fixed products fixture data
jmojennifer Oct 26, 2016
fc4c290
updated product show page so that show page works even if there are n…
Ynakashima Oct 26, 2016
969d67f
Merge branch 'master' of https://github.com/allisonhoke/betsy
Ynakashima Oct 26, 2016
9ebabf1
Merge branch 'b/yn/products'
Ynakashima Oct 26, 2016
e7162ab
Revised model methods/tests; still testing to-do
jmojennifer Oct 26, 2016
bf3c911
Updated display logic; added HTML tag
jmojennifer Oct 26, 2016
e6df8b8
Merge branch 'master' of https://github.com/allisonhoke/betsy
jmojennifer Oct 26, 2016
b80d606
CSS adjustments to fix merchant_controller_test error
jmojennifer Oct 26, 2016
4449b37
Tests passing; coverage still needed
jmojennifer Oct 26, 2016
6b681d0
Cleaned up not needed HTML
jmojennifer Oct 26, 2016
742409a
mechant model method adjustments; model method tests passing (94.2% c…
jmojennifer Oct 26, 2016
609deb7
Merchant model method adjustments; model method tests passing (94.2% …
jmojennifer Oct 26, 2016
118c8c5
Merchant controller method adjustments; controller tests passing (100…
jmojennifer Oct 26, 2016
da6f206
Application view helpers
nurlywhirly Oct 26, 2016
3a68aa7
Added application helper to convert cents into dollar amounts
jmojennifer Oct 26, 2016
1fd09b7
Converted price into dollars
jmojennifer Oct 26, 2016
dbccde2
added merchant_view to view order information for orders with their p…
allisonhoke Oct 26, 2016
1ae68c8
added skip before action of require login for actions that don't requ…
allisonhoke Oct 26, 2016
3a5bb27
Merge branch 'b/amh/master'
allisonhoke Oct 26, 2016
e9f2533
Resolved merge conflict
jmojennifer Oct 26, 2016
20550ed
Merge branch 'master' of https://github.com/allisonhoke/betsy
jmojennifer Oct 26, 2016
961f6e5
Fixed a problem with duplicate products showing up on homepage if the…
nurlywhirly Oct 26, 2016
e43d264
Merge branch 'nmu/fixing_things'
nurlywhirly Oct 26, 2016
4438cf3
Changed some links to official buttons on categories views
nurlywhirly Oct 26, 2016
5b9d46e
fixed white space on controller and tests are a WIP
allisonhoke Oct 27, 2016
5b11f63
Merge branch 'b/amh/master'
allisonhoke Oct 27, 2016
c5ef348
Merge branch 'master' into nmu/fixing_things
nurlywhirly Oct 27, 2016
8da393a
wrote tests for order item controller actions
allisonhoke Oct 27, 2016
762272a
wrote tests for orders controller. all tests passing
allisonhoke Oct 27, 2016
1a1e6ed
Updated CSS/JS/HTML for merchant orders filtered table
jmojennifer Oct 27, 2016
5a77e59
Fixed find_orders model method; refactored methods in model/controller
jmojennifer Oct 27, 2016
4ebe0c6
Added fixture data for a cancelled order
jmojennifer Oct 27, 2016
f74cf43
Updated model methods/tests to account for cancelled orders
jmojennifer Oct 27, 2016
54429e5
Nicely formatting Order Date values
jmojennifer Oct 27, 2016
baf6a80
Merge branch 'master' of https://github.com/allisonhoke/betsy
jmojennifer Oct 27, 2016
7692e16
updated create order item functionality to add to quantity in cart ra…
allisonhoke Oct 27, 2016
002cf96
wrote test for item already in cart(add to quantity rather than creat…
allisonhoke Oct 27, 2016
c0f98e3
Merge branch 'b/amh/master'
allisonhoke Oct 27, 2016
ace9877
Migration and change reversal migration (as rollback errored)
jmojennifer Oct 27, 2016
ee18d65
Merge branch 'master' of https://github.com/allisonhoke/betsy
jmojennifer Oct 27, 2016
172aad0
Added comment with URLs I got the orders table code from
jmojennifer Oct 27, 2016
0fc49a6
WIP: merchant session validation on content
jmojennifer Oct 27, 2016
de9a7f9
Adjusted total revenue method to not include cancelled orders
jmojennifer Oct 27, 2016
11ab2fa
Fixed wording of Order Status
jmojennifer Oct 27, 2016
c89a5ea
added comment to refactor an action later
allisonhoke Oct 27, 2016
3f32959
Removed shuffle due to an error
jmojennifer Oct 27, 2016
d853a00
Add price formatting to various pages; changed Product-related pages …
jmojennifer Oct 27, 2016
d0baa95
products show now works, can either be routed through merchant produc…
Ynakashima Oct 27, 2016
6335e71
Changed new review form layout a bit
nurlywhirly Oct 27, 2016
5df81c7
Merge branch 'nmu/fixing_things'
nurlywhirly Oct 27, 2016
a3c8646
Merge branch 'master' into b/jmo/master
jmojennifer Oct 27, 2016
3e7159a
Limited content to logged-in merchant
jmojennifer Oct 27, 2016
fcd23f4
Added Foundation to form submit buttons
jmojennifer Oct 27, 2016
e6d328b
resolved merge conflict
Ynakashima Oct 27, 2016
d5a4d4d
resolved merge conflict
Ynakashima Oct 27, 2016
0cc04f3
Fixed things in controller so reviews weren't limited to logged in us…
nurlywhirly Oct 27, 2016
d92461e
Holy merge conflict, batman
nurlywhirly Oct 27, 2016
1580f29
Styling changes; edit product link behind merchant-only filter
jmojennifer Oct 27, 2016
28fca28
Fixed merge conflict
jmojennifer Oct 27, 2016
5448cf4
fixed ridiculous failing tests in controllers. why would they do that?
allisonhoke Oct 27, 2016
42d01b9
Merge branch 'b/amh/master'
allisonhoke Oct 27, 2016
ed5c777
added view cart link when user has a cart
allisonhoke Oct 27, 2016
2508fa9
fixed helper method location for money format
allisonhoke Oct 27, 2016
fa17d12
added conditional to not add to cart if quantity is greater than stoc…
allisonhoke Oct 28, 2016
acf37cd
Working on categories and reviews tests
nurlywhirly Oct 28, 2016
f7838e2
Merge branch 'nmu/fixing_things'
nurlywhirly Oct 28, 2016
8387b57
Fixed merge conflict
jmojennifer Oct 28, 2016
d651875
Merge branch 'b/jmo/master'
jmojennifer Oct 28, 2016
b38765d
reviews controller test little fix
nurlywhirly Oct 28, 2016
37dff81
Merge branch 'master' of https://github.com/allisonhoke/betsy
nurlywhirly Oct 28, 2016
b91323d
product edit and new now work. thank you Dan
Ynakashima Oct 28, 2016
d18c30e
resolved merge conflict
Ynakashima Oct 28, 2016
06bfba9
Added table for product name/quantity/subtotal on merchants account page
jmojennifer Oct 28, 2016
99ecdfd
Added add_decimal functionality to merchant model
jmojennifer Oct 28, 2016
7282e1a
Merge branch 'master' of https://github.com/allisonhoke/betsy
jmojennifer Oct 28, 2016
8fa334e
Fixed model method/model/tests
jmojennifer Oct 28, 2016
4fd7267
Merge branch 'b/jmo/master'
jmojennifer Oct 28, 2016
6002852
Test coverage on home_controller now at 100%
nurlywhirly Oct 28, 2016
4897ac6
Added one application helper test
nurlywhirly Oct 28, 2016
a06ca5a
ADDED SURPRISE SMALL FRYgit stgit st! :D
nurlywhirly Oct 28, 2016
6828199
Added a view all merchants page with links
nurlywhirly Oct 28, 2016
90ab0bc
Messed with the nav bar a bit so view cart doesn't go wonky
nurlywhirly Oct 28, 2016
cf2a6d2
Changed products index page to get rid of empty table header. Changed…
nurlywhirly Oct 28, 2016
2028cc7
Changed some things in the products index and show pages, sorry Yuri.
nurlywhirly Oct 28, 2016
e266c66
Changes to order fulfillment table on merchant show view (account pag…
jmojennifer Oct 28, 2016
6efc9d3
Resolved merge conflict
jmojennifer Oct 28, 2016
14cbbba
Merge branch 'master' of https://github.com/allisonhoke/betsy
jmojennifer Oct 28, 2016
8a06610
Added Product Details link to merchant show view; related changes to …
jmojennifer Oct 28, 2016
10d5b16
Added Order ID to order fulfillment
jmojennifer Oct 28, 2016
d3f5a39
Working out route_path error
jmojennifer Oct 28, 2016
b92e3e3
added functionality to mark order as shipped
allisonhoke Oct 28, 2016
b69a043
Merge branch 'master' into b/amh/master
allisonhoke Oct 28, 2016
82d437e
Add shipping link
jmojennifer Oct 28, 2016
d6c16db
Added a category option to edit product and new product
nurlywhirly Oct 28, 2016
cf2855f
Merge branch 'nmu/fixing_things'
nurlywhirly Oct 28, 2016
ece4b22
Merge branch 'b/amh/master'
allisonhoke Oct 28, 2016
4ee33f8
fixed controller action name
allisonhoke Oct 28, 2016
93e6733
updated products new view
Ynakashima Oct 28, 2016
82c5510
limited access to product edit page to the actual owner of the product.
nurlywhirly Oct 28, 2016
955c60e
Merge branch 'nmu/fixing_things'
nurlywhirly Oct 28, 2016
0cf6b86
added logic to check if stock is not nil
allisonhoke Oct 28, 2016
4dc65d4
Fixed redirect after editing a product
nurlywhirly Oct 28, 2016
68e97f0
Merge branch 'nmu/fixing_things'
nurlywhirly Oct 28, 2016
d6c38e6
resolved merge conflict in products new view
Ynakashima Oct 28, 2016
2841892
Merge branch 'master' of https://github.com/allisonhoke/betsy
Ynakashima Oct 28, 2016
f6a4d81
Shipping Link functional -- Allison rocks
jmojennifer Oct 28, 2016
6ec5f9d
Merge branch 'master' of https://github.com/allisonhoke/betsy
jmojennifer Oct 28, 2016
a7a2499
Referencing order id in both order fulfillment tables
jmojennifer Oct 28, 2016
d25574d
Merge branch 'master' into b/jmo/master
jmojennifer Oct 28, 2016
3277859
Added sad small fry to all the error pages
nurlywhirly Oct 28, 2016
df55109
working on products controller testing
Ynakashima Oct 28, 2016
cb1dc08
Merge branch 'b/yn/products'
Ynakashima Oct 28, 2016
b930a99
updated merchants path on homepage
Ynakashima Oct 28, 2016
a096b9b
Merge branch 'master' of https://github.com/allisonhoke/betsy
Ynakashima Oct 28, 2016
96042ac
Added content filtering by merchant back in
jmojennifer Oct 28, 2016
80cee29
Added gems for Heroku deployment
jmojennifer Oct 28, 2016
ce1ee7d
new review button on both reviews/index and reviews/show page
nurlywhirly Oct 28, 2016
e04a742
wrote test for ship method. added styling to links
allisonhoke Oct 28, 2016
4826bb2
Merge branch 'nmu/fixing_things'
nurlywhirly Oct 28, 2016
f93edc8
Merge branch 'b/amh/master'
allisonhoke Oct 28, 2016
046063e
Fixed negative test by removing fixture and used hardcoded invalid ex…
jmojennifer Oct 28, 2016
5959b1e
Changed layout of order fulfillment tables
jmojennifer Oct 28, 2016
56f3e64
removed errors from form
allisonhoke Oct 28, 2016
fb25aa6
Merge branch 'master' of https://github.com/allisonhoke/betsy
allisonhoke Oct 28, 2016
fe90091
Added button class to submit link
jmojennifer Oct 28, 2016
bbd6426
products controller testing completed
Ynakashima Oct 28, 2016
cd66e8d
Merge branch 'master' of https://github.com/allisonhoke/betsy
Ynakashima Oct 28, 2016
30cd01e
Merge branch 'b/yn/products'
Ynakashima Oct 28, 2016
c3fa602
Added button styling
jmojennifer Oct 28, 2016
ce48031
Merge branch 'master' of https://github.com/allisonhoke/betsy
jmojennifer Oct 28, 2016
fc3a034
Removed duplicate sqlite3 gem reference
jmojennifer Oct 28, 2016
95b9cdc
Added another application helper test
nurlywhirly Oct 28, 2016
ac79881
Merge branch 'nmu/fixing_things'
nurlywhirly Oct 28, 2016
b9eb8fd
added missing route for ship
allisonhoke Oct 28, 2016
f8c7b18
Merge branch 'b/amh/master'
allisonhoke Oct 28, 2016
8130d75
added missing tests to product controller
allisonhoke Oct 28, 2016
d8c28da
added logic to retire product
allisonhoke Oct 28, 2016
581f2f5
Merge branch 'b/amh/master'
allisonhoke Oct 28, 2016
41871c9
Added setting for Heroku images
jmojennifer Oct 28, 2016
a05e83d
Merge branch 'master' of https://github.com/allisonhoke/betsy
jmojennifer Oct 28, 2016
912dfb6
Added additional setting for Heroku images
jmojennifer Oct 28, 2016
df67901
Added some more pictures
nurlywhirly Oct 28, 2016
8c188ff
Toooootally spelled twister as twitter.
nurlywhirly Oct 28, 2016
611f9e5
Needed to uniq the categories/products path
nurlywhirly Oct 28, 2016
4ed5725
Added shipping to financials
jmojennifer Oct 28, 2016
d9bece8
Fixed error per Heroku console
jmojennifer Oct 28, 2016
0a44eaa
Fixed error per Heroku console pt 2
jmojennifer Oct 28, 2016
5baeb19
Added shipping to methods
jmojennifer Oct 28, 2016
File filter

Filter by extension

Filter by extension


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

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

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

.env

#DS Store
.DS_Store
1 change: 0 additions & 1 deletion .ruby-gemset

This file was deleted.

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

This file was deleted.

21 changes: 16 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
source 'https://rubygems.org'
ruby '2.3.1'


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.6'
# Use postgresql as the database for Active Record
# gem 'pg', '~> 0.15'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
Expand All @@ -22,7 +20,8 @@ gem 'turbolinks'
gem 'jbuilder', '~> 2.0'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc

gem "omniauth"
gem "omniauth-github"
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

Expand All @@ -35,12 +34,24 @@ gem 'sdoc', '~> 0.4.0', group: :doc
group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug'
gem 'simplecov'
gem 'sqlite3'
end

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

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'better_errors'
gem 'dotenv-rails'
end

group :test do
gem 'minitest-reporters'
end

group :production do
gem 'pg'
gem 'rails_12factor'
end
112 changes: 85 additions & 27 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -36,45 +36,83 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
ansi (1.5.0)
arel (6.0.3)
better_errors (2.1.1)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.2)
byebug (8.2.5)
byebug (9.0.6)
coderay (1.1.1)
coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
concurrent-ruby (1.0.1)
concurrent-ruby (1.0.2)
debug_inspector (0.0.2)
docile (1.1.5)
dotenv (2.1.1)
dotenv-rails (2.1.1)
dotenv (= 2.1.1)
railties (>= 4.0, < 5.1)
erubis (2.7.0)
execjs (2.6.0)
globalid (0.3.6)
execjs (2.7.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
globalid (0.3.7)
activesupport (>= 4.1.0)
hashie (3.4.6)
i18n (0.7.0)
jbuilder (2.4.1)
jbuilder (2.6.0)
activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2)
jquery-rails (4.1.1)
jquery-rails (4.2.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
jwt (1.5.6)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.4)
mime-types (>= 1.16, < 4)
mime-types (3.0)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0221)
mini_portile2 (2.0.0)
minitest (5.8.4)
multi_json (1.11.3)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.9.1)
minitest-reporters (1.1.11)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
multi_json (1.12.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
oauth2 (1.2.0)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
omniauth (1.3.1)
hashie (>= 1.2, < 4)
rack (>= 1.0, < 3)
omniauth-github (1.1.2)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-oauth2 (1.4.0)
oauth2 (~> 1.0)
omniauth (~> 1.2)
pg (0.19.0)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
Expand All @@ -97,40 +135,54 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (4.2.6)
actionpack (= 4.2.6)
activesupport (= 4.2.6)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (11.1.2)
rake (11.3.0)
rdoc (4.2.2)
json (~> 1.4)
ruby-progressbar (1.8.1)
sass (3.4.22)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
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)
sdoc (0.4.1)
sdoc (0.4.2)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
spring (1.7.1)
sprockets (3.6.0)
simplecov (0.12.0)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
spring (2.0.0)
activesupport (>= 4.2)
sprockets (3.7.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.0.4)
sprockets-rails (3.2.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.12)
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.2)
turbolinks (2.5.3)
coffee-rails
tilt (2.0.5)
turbolinks (5.0.1)
turbolinks-source (~> 5)
turbolinks-source (5.0.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (3.0.0)
uglifier (3.0.2)
execjs (>= 0.3.0, < 3)
web-console (2.3.0)
activemodel (>= 4.0)
Expand All @@ -142,20 +194,26 @@ PLATFORMS
ruby

DEPENDENCIES
better_errors
byebug
coffee-rails (~> 4.1.0)
dotenv-rails
jbuilder (~> 2.0)
jquery-rails
minitest-reporters
omniauth
omniauth-github
pg
rails (= 4.2.6)
rails_12factor
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
simplecov
spring
sqlite3
turbolinks
uglifier (>= 1.3.0)
web-console (~> 2.0)

RUBY VERSION
ruby 2.3.1p112

BUNDLED WITH
1.13.5
Binary file added app/assets/images/banana.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/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/bridge.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/bunny.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/colored_pencils.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/couch.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/horse.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/house.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/jeep.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/kfc.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/mcvalue.jpeg
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/minicooper.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/piano.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/small_fry.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/small_fry_sad.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/squid.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/starbucks.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/table.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/twister.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,26 @@
//= require jquery_ujs
//= require turbolinks
//= require_tree .

// http://www.w3schools.com/howto/howto_js_filter_table.asp & http://stackoverflow.com/questions/37634776/implementing-page-specific-java-script-and-css-in-a-ruby-on-rails-4-project

function myFunction() {
// Declare variables
var input, filter, table, tr, td, i;
input = document.getElementById("orderStatusInput");
filter = input.value.toUpperCase();
table = document.getElementById("merchantOrders");
tr = table.getElementsByTagName("tr");

// Loop through all table rows, and hide those who don't match the search query
for (i = 0; i < tr.length; i++) {
td = tr[i].getElementsByTagName("td")[2];
if (td) {
if (td.innerHTML.toUpperCase().indexOf(filter) > -1) {
tr[i].style.display = "";
} else {
tr[i].style.display = "none";
}
}
}
}
3 changes: 3 additions & 0 deletions app/assets/javascripts/categories.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/home.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/merchants.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/order_items.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/orders.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/products.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/reviews.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/sessions.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
Loading