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

m^gj*c #62

Open
wants to merge 504 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
504 commits
Select commit Hold shift + click to select a range
0cd4439
add controller method to user to only show user's visible products
canaanwest Oct 23, 2017
80c29d3
added button for cart
julmeier Oct 23, 2017
4bacd62
adding filter for available products to categories
canaanwest Oct 23, 2017
35749a4
Changing button name for changing visibility
canaanwest Oct 23, 2017
7b5bd25
Merge pull request #28 from canaanwest/cw/user-profile
canaanwest Oct 23, 2017
c2e0718
Merge branch 'master' into mm/category_logic
canaanwest Oct 23, 2017
95c1e9e
Merge pull request #27 from canaanwest/mm/category_logic
canaanwest Oct 23, 2017
1ffa89e
Merge branch 'master' into users-show-page
canaanwest Oct 23, 2017
8bcb693
Merge pull request #26 from canaanwest/users-show-page
canaanwest Oct 23, 2017
e230b19
worked on methods in the orders and order_products models, and the or…
julmeier Oct 23, 2017
b0bb36d
merged pulled changes
julmeier Oct 23, 2017
64d0c30
pulled from master, merged changes
julmeier Oct 24, 2017
e96a25f
products can now be created with categories
Oct 24, 2017
a3b1a19
Merge pull request #29 from canaanwest/new_product_save_categories
canaanwest Oct 24, 2017
be71f17
merge
canaanwest Oct 24, 2017
9cbecac
merging conflicts with masteR
canaanwest Oct 24, 2017
9e63b20
fixing link to remove inventory
canaanwest Oct 24, 2017
acda26b
fixing button to remove inventory; spacing in controller
canaanwest Oct 24, 2017
6be5620
Redirecting create product method to user profile
canaanwest Oct 24, 2017
79ef527
Redirect update method back to user page
canaanwest Oct 24, 2017
145910a
created methods to check if the order_products already includes a spe…
julmeier Oct 24, 2017
d32b3b8
added permissions for modifying products
canaanwest Oct 24, 2017
a4fda2d
successfully added multiples of the same item to my cart. Need to do …
julmeier Oct 24, 2017
285eea4
Fixing headers on users index and create new product page
canaanwest Oct 24, 2017
1f9801f
Merg conflict in reviews controller
canaanwest Oct 24, 2017
6ad13f1
More merging for reviews controller
canaanwest Oct 24, 2017
9eb05e6
updating tests to reflect new constraints for products
canaanwest Oct 24, 2017
46aba4a
Updating billing and products tests; some tests still producing errors
canaanwest Oct 24, 2017
8fdd2e5
reintegrating reviews controller; added nothing
canaanwest Oct 24, 2017
0c69296
removed broken link for reviews
Oct 24, 2017
2a8bfcd
pulled in changes. merged conflicts
julmeier Oct 24, 2017
5453b2f
commented out line 46 in applications.html.erb file that was breaking…
Oct 24, 2017
f0573a2
fixed merge with foundation_and_overrides.scss and application.html.erb
julmeier Oct 24, 2017
8c1108f
Merge pull request #30 from canaanwest/mm/reviews_controller_tests
canaanwest Oct 24, 2017
65b544a
Merge branch 'master' into gm-order-controller
canaanwest Oct 24, 2017
709daa7
merge conflicts resolved
canaanwest Oct 24, 2017
5d5151a
Merge pull request #31 from canaanwest/gm-order-controller
canaanwest Oct 24, 2017
52861b1
Merging
canaanwest Oct 24, 2017
8a9c8dc
merging conflicts
canaanwest Oct 24, 2017
f03f100
merge conflicts
canaanwest Oct 24, 2017
7aa89ed
merge conflicts
canaanwest Oct 24, 2017
f5ebe85
pulled master and merged conflicts
julmeier Oct 24, 2017
57682d6
merge commits
canaanwest Oct 24, 2017
c3810cd
fixing syntax error in reviews controller test
canaanwest Oct 24, 2017
b0d78df
review create test
Oct 24, 2017
97f492f
added destroy method. Gives a are-you-sure message twice and then err…
julmeier Oct 24, 2017
a5f2555
Merge pull request #32 from canaanwest/mm/reviews_controller_tests
canaanwest Oct 24, 2017
a3810a2
after adding an inventory item, you are redirected to the user profil…
Oct 24, 2017
403384c
updated item destroy
Oct 24, 2017
23cda57
fixing tests for edge cases in products controller test
canaanwest Oct 24, 2017
017aac5
changed typo within order product files to be singular order can delete
murog Oct 24, 2017
053d391
updating products testing
canaanwest Oct 24, 2017
329ee88
tried using FOundation styling to style products#show form
julmeier Oct 24, 2017
2eacd62
can edit quantity of items in cart
murog Oct 24, 2017
82cf9e5
Merge branch 'master' into cw/user-profile
canaanwest Oct 24, 2017
52cd151
Merge pull request #33 from canaanwest/cw/user-profile
canaanwest Oct 24, 2017
bba308e
deleted empty line from order products controller
murog Oct 24, 2017
b4ce942
adding purchase and shipping methods to item, wrote passing tests
murog Oct 24, 2017
f4898a2
removed empty method price_change
murog Oct 24, 2017
2e514fe
updated show page to include subtotals, tax and totals. also updated…
murog Oct 24, 2017
d5ec82b
coverage files
murog Oct 24, 2017
cd62dac
private was written twice in the merge files in products_controller
julmeier Oct 24, 2017
16fcd55
items tests passing
Oct 24, 2017
0d78dfa
fixed tests in items, reviews, categories and 1 product test
Oct 24, 2017
d1f8aac
updated the reviews controller tests
Oct 24, 2017
683fd55
passing checkout controller method
murog Oct 24, 2017
0f38246
fixed available items method to be and instead of or
murog Oct 24, 2017
efe210c
updated ship
murog Oct 24, 2017
ee147c0
updated order model, routes, cart-page and order tests
murog Oct 24, 2017
0057e84
saving modifications to tests
canaanwest Oct 24, 2017
0d6ede3
Merge branch 'master' into mm/reviews_controller_tests
canaanwest Oct 24, 2017
fb40f75
Merge pull request #34 from canaanwest/mm/reviews_controller_tests
canaanwest Oct 24, 2017
01effe7
Merge branch 'master' into gm-order-controller
canaanwest Oct 24, 2017
3cfed66
Merge pull request #35 from canaanwest/gm-order-controller
canaanwest Oct 24, 2017
6bf1568
merge conflicts
canaanwest Oct 24, 2017
d1bb31f
added foundation styling to products@show, added show method to produ…
julmeier Oct 24, 2017
c7fce26
Merge branch 'master' of https://github.com/canaanwest/betsy
julmeier Oct 24, 2017
3951255
billing data saving and autopopulating for pending orders
canaanwest Oct 24, 2017
33ccea0
Removing persmission restrictions for add_product; adding logic to sa…
canaanwest Oct 25, 2017
d31a733
same foundatio and overrides repeat lines
julmeier Oct 25, 2017
c11cab9
Cosmetic changes to new and edit forms for billing data
canaanwest Oct 25, 2017
a7fc36e
changes order status to paid
canaanwest Oct 25, 2017
9ff57bd
Add number available to product index page
canaanwest Oct 25, 2017
e288047
Cart resets after order status has been set to paid
canaanwest Oct 25, 2017
31f79d3
Order Confirmation Page
canaanwest Oct 25, 2017
b8b143c
Cart resets via logout function when user session ends
canaanwest Oct 25, 2017
dbe9567
created route for order fulfillment, passing tests for order fulfillm…
murog Oct 25, 2017
c98dfd5
passing tests for orderproduct methods items_available and pending? u…
murog Oct 25, 2017
d2242bf
removed checkout method test from order test
murog Oct 25, 2017
41104e3
passing test for user method merchant entries
murog Oct 25, 2017
ae6508e
updated merchant entries tests updated fixtures session ids to reflec…
murog Oct 25, 2017
54900f0
added order product methods for paid canceled and shipped orders, add…
murog Oct 25, 2017
b2196d2
organize entries for a merchant by order status
murog Oct 25, 2017
26ab505
removed pending entries method
murog Oct 25, 2017
f4b5a1d
split ship action into a private method
murog Oct 25, 2017
1e365e5
fixed typos in organize entries private method from orders to entries
murog Oct 25, 2017
f973c44
added shipped and items shipped methods to order products, no tests yet
murog Oct 25, 2017
781d15c
populated order fulfillment page with order and revenue information, …
murog Oct 25, 2017
9e01b2e
created route action and view to view the billing datum info for any …
murog Oct 25, 2017
d5be5af
Merge pull request #37 from canaanwest/cwmm/billing-data
canaanwest Oct 25, 2017
8f0b285
line 54
julmeier Oct 25, 2017
c599bfc
Merge branch 'master' into fulfillment-page
julmeier Oct 25, 2017
75afea6
Merge pull request #36 from canaanwest/fulfillment-page
julmeier Oct 25, 2017
d13dad6
Merge branch 'master' of https://github.com/canaanwest/betsy
julmeier Oct 25, 2017
e4495f5
merging
canaanwest Oct 25, 2017
3613cb3
Merge branch 'master' of https://github.com/canaanwest/betsy into cwm…
canaanwest Oct 25, 2017
cd0737f
completed migration
julmeier Oct 25, 2017
c857bcf
Merge pull request #39 from canaanwest/cwmm/billing-data
canaanwest Oct 25, 2017
cf3fada
Merge pull request #40 from canaanwest/add-exp-date-to-billing-datum
canaanwest Oct 25, 2017
0db656f
removed uneeded styling.
Oct 25, 2017
148c7c6
merging conflicts in tests
canaanwest Oct 25, 2017
6b5963e
created migration for product_photo and set default value to fillmurr…
julmeier Oct 25, 2017
8a2ee6c
refactored organize entries in user controller
murog Oct 25, 2017
18ebec8
created entries for users to know their merchant orders by order status
murog Oct 25, 2017
fcb0253
updated order fulfillment page to include revenue and refactored inst…
murog Oct 25, 2017
87a4b9f
updated billing data section to avoid errors when a logged in user do…
murog Oct 25, 2017
73eeb4d
removing coverage
canaanwest Oct 25, 2017
4ed8d6c
updating billing info form to include info from migration
canaanwest Oct 25, 2017
867468c
updated application helpers to include date and money format methods
murog Oct 25, 2017
54d0be8
updated gitignore again to ignore coverage folder
murog Oct 25, 2017
f30e7ab
needs someone to look at save method on pending cart
canaanwest Oct 25, 2017
de91a01
migrated project_photo. Displays on site.
julmeier Oct 26, 2017
147dbb6
can successfully modify the image of the product from the vendor prof…
julmeier Oct 26, 2017
525849d
In the profile, changed product name to be a hyperlink to the product…
julmeier Oct 26, 2017
4c0ab96
used thumbnail class and some foundation sizing to make photos smaller
julmeier Oct 26, 2017
d1ee11d
Creating confirmation page
canaanwest Oct 26, 2017
bb2faf3
merging this monster of a conflict omg pls help me god
canaanwest Oct 26, 2017
d34b6e2
Merge pull request #41 from canaanwest/add-image-to-product
canaanwest Oct 26, 2017
6a08a0e
adding greater than 0 numericality validator
canaanwest Oct 26, 2017
256ed09
Merge branch 'master' of https://github.com/canaanwest/betsy
canaanwest Oct 26, 2017
8f56b06
fixed billing data tests
canaanwest Oct 26, 2017
5128a19
fixed billing data tests
canaanwest Oct 26, 2017
d524cdd
fixed billing data tests
canaanwest Oct 26, 2017
15870b3
adding methods for permissions
canaanwest Oct 26, 2017
7d9e75c
homepage styling
Oct 26, 2017
14858b9
updated button hover
Oct 26, 2017
6c1f51e
title animation. deleted uneeded code.
Oct 26, 2017
6488516
small changes
Oct 26, 2017
dcd384c
Merge branch 'master' into mm/homepage_styling
canaanwest Oct 26, 2017
b6f149b
Merge pull request #42 from canaanwest/mm/homepage_styling
canaanwest Oct 26, 2017
acfa558
Merge branch 'master' of https://github.com/canaanwest/betsy into cw/…
canaanwest Oct 26, 2017
39c7185
tests updates
canaanwest Oct 26, 2017
7fa62ed
Update .resultset.json
canaanwest Oct 26, 2017
a8677fc
Update .last_run.json
canaanwest Oct 26, 2017
e55f9da
Update index.html
canaanwest Oct 26, 2017
2def23d
Merge pull request #43 from canaanwest/cw/testing
canaanwest Oct 26, 2017
a15dc79
finished testing user model- now 100%
julmeier Oct 26, 2017
da8d907
Pulled from master and resolved conflicts (removed HEAD stuff from it…
julmeier Oct 26, 2017
b239310
merge orders/show
murog Oct 26, 2017
94959a7
passing test for creating new cart for user when they do not have one
murog Oct 26, 2017
5d5c690
deleted yarn
Oct 26, 2017
cf58ce9
allow heroku auto assets precompilation
Oct 26, 2017
4ac73ec
Merge branch 'master' of https://github.com/canaanwest/betsy
Oct 26, 2017
78ee473
adding changed file
Oct 26, 2017
5ba3686
updated the .env file
Oct 26, 2017
edd2287
Edit update permissions working; tests still failing related to fixtu…
canaanwest Oct 26, 2017
707f5f4
Merge pull request #44 from canaanwest/mm_heroku_login
canaanwest Oct 26, 2017
073c1ac
updated checkout link
murog Oct 26, 2017
3369094
heroku login changes
Oct 26, 2017
b53940c
rearranging the user param for billing data
canaanwest Oct 26, 2017
4721374
fixing omniauth issue
canaanwest Oct 26, 2017
ae083ba
Merge branch 'master' into cw/testing
murog Oct 26, 2017
628bd16
Merge pull request #45 from canaanwest/cw/testing
murog Oct 26, 2017
bf5ec22
Merge branch 'master' into mm_heroku_login
murog Oct 26, 2017
ed821df
Merge pull request #46 from canaanwest/mm_heroku_login
murog Oct 26, 2017
7ce169f
updated to create and permisions
murog Oct 26, 2017
85b9341
merged changes
murog Oct 26, 2017
f51c3d9
commented out review methods that are not being used. Added edge case…
Oct 27, 2017
5ce88e9
removed wonky profile styling
Oct 27, 2017
63e4738
testing order.rb model
julmeier Oct 27, 2017
79bf48d
merging conflicts
canaanwest Oct 27, 2017
0cec658
pulled down changes from master and merged. added order_product tests
julmeier Oct 27, 2017
0986f55
adding logout test to sessions controller
canaanwest Oct 27, 2017
40b0ad5
completed profile styling
Oct 27, 2017
d61f564
Update .resultset.json
canaanwest Oct 27, 2017
8509d7d
Update .last_run.json
canaanwest Oct 27, 2017
6040bb5
Merge pull request #47 from canaanwest/mm/reviews_controller_testing
canaanwest Oct 27, 2017
b1fb511
merge
canaanwest Oct 27, 2017
01c04c1
merge conflicts
canaanwest Oct 27, 2017
f6909e3
completed cart styling
Oct 27, 2017
4bbcb4e
billing data styled
Oct 27, 2017
2740d91
updated background image styling
Oct 27, 2017
b6372ae
added two line so background on heroku will work
Oct 27, 2017
096a3ed
Merge branch 'master' of https://github.com/canaanwest/betsy into mer…
murog Oct 27, 2017
baf8f2c
continued model testing. Now at .97 coverage
julmeier Oct 27, 2017
1defd5d
pulled from master
julmeier Oct 27, 2017
36da334
testing shows 97.45 coverage on model tests
julmeier Oct 27, 2017
e20edb2
updated orderproduct model to return false if entry does not have a q…
murog Oct 27, 2017
6fa63dd
updated 404 method for testing
murog Oct 27, 2017
5bcb6fc
3 out of 4 passing tests, thinking test 2 should-return-404-if-items-…
murog Oct 27, 2017
c4e107f
updated destroy action to redirect to cart path instead of show path
murog Oct 27, 2017
b8345f4
added some fixtures
murog Oct 27, 2017
5c9a926
added fixtures for order_product tests
murog Oct 27, 2017
932ed92
91% coverage, considering taking out extraneous methods that arent re…
murog Oct 27, 2017
bc5bf1e
updated permission methods, removed unused actions
murog Oct 27, 2017
c5adb97
added fixtures for user with no access to billing info
murog Oct 27, 2017
f552a26
80 % coverage
murog Oct 27, 2017
1a54fbe
changed checkout method to redirect to cartpath with a status of 400,…
murog Oct 27, 2017
33d8851
92 % coverage
murog Oct 27, 2017
b5a9f0c
removed extra variables
murog Oct 27, 2017
210e512
updated render and redirect back to be redirect_to for the purpose of…
murog Oct 27, 2017
f82a22f
100% coverage wahooooo
murog Oct 27, 2017
c5bad3f
updated user model paid,shipped,canceled entries methods to return fa…
murog Oct 27, 2017
c8f7896
commented out actions that are not being used
murog Oct 27, 2017
e47da0a
added fixtures for user tests
murog Oct 27, 2017
47f6417
100% coverage
murog Oct 27, 2017
82aed81
Merge pull request #48 from canaanwest/styling
canaanwest Oct 27, 2017
5e971be
Merge branch 'master' of https://github.com/canaanwest/betsy into sty…
Oct 27, 2017
d8b22e3
removing some headers from views
canaanwest Oct 27, 2017
6897a1c
Merge pull request #50 from canaanwest/styling
julmeier Oct 27, 2017
58dad30
merged orders show page to include styling html
murog Oct 27, 2017
afcc7d3
fixed typo
murog Oct 27, 2017
d2e63e6
button color and hover changed to white
Oct 27, 2017
887e60b
changed pending_orders
murog Oct 27, 2017
45deb0b
updated show_available to be uncommented
murog Oct 27, 2017
37fea0f
Merge pull request #49 from canaanwest/Julia-testing
murog Oct 27, 2017
e24aeb9
merge conflicts in fixtures
murog Oct 27, 2017
a3ecef3
updated typo in order model
murog Oct 27, 2017
e2e41e7
fixed merge errors in products yml
murog Oct 27, 2017
88482b5
Merge pull request #51 from canaanwest/merchant-refactor
canaanwest Oct 27, 2017
ed178f1
product show page
Oct 27, 2017
1f6fee6
new reveiw page
Oct 27, 2017
be9c06e
small changes to tests
canaanwest Oct 27, 2017
b984efd
merging conflicts
canaanwest Oct 27, 2017
0f5d6b9
category page
Oct 27, 2017
3400eaa
fixed background
Oct 27, 2017
02fe8a3
fixing last 4 view
canaanwest Oct 27, 2017
b6a4c95
removing duplicate order id number
canaanwest Oct 27, 2017
9df812c
small changes
Oct 27, 2017
57a37dc
Merge branch 'master' into styling
canaanwest Oct 27, 2017
764b4e7
Merge pull request #52 from canaanwest/styling
canaanwest Oct 27, 2017
a3cfa33
fixing billing expiration date
canaanwest Oct 27, 2017
0ba793f
Merge pull request #53 from canaanwest/cw/views-fixes
canaanwest Oct 27, 2017
35d0a9a
fixing checkout method
canaanwest Oct 27, 2017
c7f7d53
Removing header from billing datum edit page
canaanwest Oct 27, 2017
2eaad95
adding julia's paid purchase history
canaanwest Oct 27, 2017
2eb71b6
removing edit button from item in cart
canaanwest Oct 27, 2017
9cbbf17
changing a link to be a button in billing/show
canaanwest Oct 27, 2017
caeefe8
removing coverage
canaanwest Oct 27, 2017
d80902a
Merge pull request #54 from canaanwest/cw/views-fixes
canaanwest Oct 27, 2017
76de44a
final deployment for show
canaanwest Oct 27, 2017
8662c1f
Merge pull request #55 from canaanwest/cw/views-fixes
canaanwest Oct 27, 2017
646dad6
removed duplicate price
Oct 27, 2017
c01f7a7
added defalt photo to product index page
Oct 27, 2017
a0644bc
Merge pull request #56 from canaanwest/styling
julmeier Oct 27, 2017
2c8a5b7
proceed to checkout
Oct 27, 2017
962780e
Merge pull request #57 from canaanwest/styling
canaanwest Oct 27, 2017
0bb962c
one edit
canaanwest Oct 27, 2017
01f774c
commet
Oct 27, 2017
9d5e084
fixed comments
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.
30 changes: 30 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# 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'

.env
/coverage

# Ignore bundler config.
/.bundle


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

/node_modules
/yarn-error.log
/coverage

/coverage

.byebug_history

.env

public/assets/**
76 changes: 76 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
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 'awesome_print'
gem "omniauth"
gem "omniauth-github"
gem 'jquery-rails'

# 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

# 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 'jquery-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'
gem 'foundation-rails', '6.4.1.2'


# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '~> 2.13'
gem 'selenium-webdriver'
gem 'pry-rails'
gem 'dotenv-rails'
gem 'simplecov'
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
gem 'web-console', '>= 3.3.0'
gem 'listen', '>= 3.0.5', '< 3.2'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

gem 'jquery-turbolinks'
group :development do
gem 'better_errors'

gem 'binding_of_caller'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
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.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)
awesome_print (1.8.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)
foundation-rails (6.4.1.2)
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
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)
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)
pry (0.11.2)
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.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.0.1)
turbolinks-source (~> 5)
turbolinks-source (5.0.3)
tzinfo (1.2.3)
thread_safe (~> 0.1)
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

DEPENDENCIES
awesome_print
better_errors
binding_of_caller
byebug
capybara (~> 2.13)
dotenv-rails
foundation-rails (= 6.4.1.2)
jbuilder (~> 2.5)
jquery-rails
jquery-turbolinks
listen (>= 3.0.5, < 3.2)
minitest-rails
minitest-reporters
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.16.0.pre.3
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
3 changes: 3 additions & 0 deletions app/assets/config/manifest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
//= link_tree ../images
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css
Empty file added app/assets/images/.keep
Empty file.
Binary file added app/assets/images/PNW-logo3.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/PNWdefaultphoto.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/PNWhummingbirdpillow.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/PNWpintglasses.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/Triad B.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/background.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/banner-Rainier1.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/banner-Rainier2.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/campfire-on-beach.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/clothing_placeholder.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/hoh_boundary_waters.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/lake.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/mountain.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/pendleton-1.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/purple.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/shopping-cart (1).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/shopping-cart.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/three.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/two.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading