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 - Unicorns - LoreStore (bEtsy) #67

Open
wants to merge 478 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
478 commits
Select commit Hold shift + click to select a range
cd84b41
Merge branch 'order_related_controllers'
anemonekey Oct 23, 2017
cd79508
product controller coverage tests
Guribot Oct 23, 2017
e428467
Merge branch 'master' of https://github.com/anemonekey/betsy
Guribot Oct 23, 2017
a7d6d00
Merge branch 'master' of https://github.com/anemonekey/betsy
sairagula Oct 23, 2017
112ba9a
Increased test coverage in orders_controller_test
anemonekey Oct 23, 2017
2ba7115
Merge branch 'master' of https://github.com/anemonekey/betsy
sairagula Oct 23, 2017
f638182
remove unused render_404 method
Guribot Oct 23, 2017
ec6925b
Merge branch 'master' of https://github.com/anemonekey/betsy
sairagula Oct 23, 2017
426d4d8
add partial 'error messages'
Guribot Oct 23, 2017
43f5bc7
moved category pages out of product views folder
Guribot Oct 23, 2017
3e084ea
remove obsolete temp-errors partial renders
Guribot Oct 23, 2017
69a2337
add confirm login/ownership to application controller
Guribot Oct 23, 2017
7a23c7c
added view for merchant show
RAgerone Oct 23, 2017
c9cd2b1
Merge branch 'master' of https://github.com/anemonekey/betsy into Mer…
RAgerone Oct 23, 2017
f83cb55
added view to merchant show page
RAgerone Oct 23, 2017
4b20c68
removed categories from seed data
RAgerone Oct 23, 2017
39ceb4b
gave all the product seeds extremely large numbers for ids
RAgerone Oct 23, 2017
cad4043
made seed product ids a bit smaller
RAgerone Oct 23, 2017
c274c9f
Added form for orders/new
anemonekey Oct 23, 2017
634fc35
Merge branch 'master' of https://github.com/anemonekey/betsy
anemonekey Oct 23, 2017
428afcc
add categories + relationships + fix pkeys
Guribot Oct 23, 2017
05307e3
Merge branch 'master' of https://github.com/anemonekey/betsy
Guribot Oct 23, 2017
572b560
formatting for categories
Guribot Oct 23, 2017
3f35a8d
Started views for Review
sairagula Oct 23, 2017
1213732
Merge branch 'master' of https://github.com/anemonekey/betsy
sairagula Oct 23, 2017
ad8e943
fix formatting, merchant email validation
Guribot Oct 23, 2017
b7dff17
button formatting for categories page
Guribot Oct 23, 2017
8952377
added contact to merchant view
RAgerone Oct 23, 2017
d55bf33
Merge branch 'MerchantViews'
RAgerone Oct 23, 2017
3a31156
formatting formatting formatting
Guribot Oct 23, 2017
a763387
Merge branch 'master' of https://github.com/anemonekey/betsy
Guribot Oct 23, 2017
4e4f28b
Adding logic to order views; incomplete
anemonekey Oct 23, 2017
1d79d9b
Adding average rating
sairagula Oct 23, 2017
5ee8445
Moved code from order_products/index to orders/index
anemonekey Oct 23, 2017
d0b9af7
coverage added
sairagula Oct 23, 2017
985c930
solving merge conflict
sairagula Oct 23, 2017
4222c97
add_to_card method to main controller for shopping cart
sairagula Oct 23, 2017
b3a0f62
Working on shopping cart logic; not working
anemonekey Oct 23, 2017
ff28c14
Working on review view
sairagula Oct 24, 2017
cad2923
Merge branch 'master' of https://github.com/anemonekey/betsy
sairagula Oct 24, 2017
b1e24ef
Merging my branch to master
sairagula Oct 24, 2017
3403067
Partial page added for Review
sairagula Oct 24, 2017
e7bea85
Added logic to Review's edit and delete function
sairagula Oct 24, 2017
4340c52
Edited orders #index page
anemonekey Oct 24, 2017
40900da
tweaks to cart
Guribot Oct 24, 2017
3f4c78d
Merge branch 'master' of https://github.com/anemonekey/betsy
Guribot Oct 24, 2017
d3f0d60
Merge branch 'master' into order_related_controllers
anemonekey Oct 24, 2017
092ba34
mysterious buttons solved
sairagula Oct 24, 2017
e82bedf
formatting tweaks
Guribot Oct 24, 2017
68bc806
layout for order products index
Guribot Oct 24, 2017
adc4425
Trying to sign in
sairagula Oct 24, 2017
8977ee8
Added sold and purchased items to main page
sairagula Oct 24, 2017
fbde0c3
order product formatting
Guribot Oct 24, 2017
1e50b19
merge master
Guribot Oct 24, 2017
d82024f
Edited orders/index.html.erb file
anemonekey Oct 24, 2017
8d3c046
new review for the product show page
sairagula Oct 24, 2017
bc6cd9e
Resolving merge conflict
sairagula Oct 24, 2017
62c6325
fixing tests for reviews
RAgerone Oct 24, 2017
676e1f9
Working on a bug in controller
sairagula Oct 24, 2017
b607ed1
removed coverage file
RAgerone Oct 24, 2017
2be5b1a
PLEASE IGNORE COVERAGE
Guribot Oct 24, 2017
7a46ec7
merging
sairagula Oct 24, 2017
afdc546
money helper, fighting coverage
Guribot Oct 24, 2017
04bf9dc
use money helper for price
Guribot Oct 24, 2017
f7a2b79
merrrrgggeeee
Guribot Oct 24, 2017
cd95970
Edited orders/show.html.erb
anemonekey Oct 24, 2017
e1964d8
Merged
anemonekey Oct 24, 2017
f5d4830
fixing reviews tests with dan
RAgerone Oct 24, 2017
0306dc5
Merge branch 'master' of https://github.com/anemonekey/betsy
sairagula Oct 24, 2017
294f87f
Editing orders/show.html.erb
anemonekey Oct 24, 2017
584b312
Merge branch 'master' of https://github.com/anemonekey/betsy into myb…
sairagula Oct 24, 2017
6d24e84
Merge branch 'master' of https://github.com/anemonekey/betsy
RAgerone Oct 24, 2017
255bc62
Merge branch 'master' of https://github.com/anemonekey/betsy into myb…
sairagula Oct 24, 2017
d805915
Merge branch 'master' into order_related_controllers
anemonekey Oct 24, 2017
7285792
delete a test for reviews controller
RAgerone Oct 24, 2017
892e598
model helper methods, user profile page
Guribot Oct 24, 2017
504efe4
Added content to index and show pages for orders
anemonekey Oct 24, 2017
8f10f98
Merge branch 'master' of https://github.com/anemonekey/betsy
sairagula Oct 24, 2017
9d37ce6
Merge branch 'mybranch'
sairagula Oct 24, 2017
bcec5a4
Finished shopping cart functionality; added error messages partial
anemonekey Oct 24, 2017
fea0899
Merge branch 'order_related_controllers'
anemonekey Oct 24, 2017
642babd
Debugged nested routes, add review button works
sairagula Oct 24, 2017
e9f8ece
Merge branch 'master' of https://github.com/anemonekey/betsy
sairagula Oct 24, 2017
9f2d5ea
Merge branch 'master' into merchant-user-pages
Guribot Oct 24, 2017
4745d8d
reorder profile cards
Guribot Oct 24, 2017
8cb6c13
add pages for merchant pending and shipped orders
Guribot Oct 25, 2017
c0f5acf
add inventory management and income summary pages
Guribot Oct 25, 2017
395f8ea
decrement of products when an order is made completed
RAgerone Oct 25, 2017
63b9bf6
added ruby version
RAgerone Oct 25, 2017
6cdf604
added Procfile
RAgerone Oct 25, 2017
2cda731
Merge branch 'master' into product-controller-tests
Guribot Oct 25, 2017
375effd
formatting
Guribot Oct 25, 2017
1e04356
not really any changes
RAgerone Oct 25, 2017
6b22af2
redirect tests for products#update
Guribot Oct 25, 2017
a2312d7
Merge branch 'master' of https://github.com/anemonekey/betsy
Guribot Oct 25, 2017
918ac9d
fix formatting issues, add 'account home' button to nav bar
Guribot Oct 25, 2017
ee1ebf2
Merge branch 'merchant-user-pages'
Guribot Oct 25, 2017
56abaf0
Edit working for Review
sairagula Oct 25, 2017
51aa5b0
user page tests, duckify application controller methods
Guribot Oct 25, 2017
f508f46
Working on testing coverage
sairagula Oct 25, 2017
055fff7
use duckified controller filters
Guribot Oct 25, 2017
4970038
orders decrement the products in the model
RAgerone Oct 25, 2017
69ff5d2
fixes to controller filters
Guribot Oct 25, 2017
8254251
100% coverage for controller review
sairagula Oct 25, 2017
b1a052f
Merge branch 'master' of https://github.com/anemonekey/betsy
sairagula Oct 25, 2017
89215b3
guest user tests for user pages
Guribot Oct 25, 2017
78d5b06
changes
RAgerone Oct 25, 2017
e0a82e4
Products with quantity of 0 will not display on product lists
Guribot Oct 25, 2017
780dc1c
Merge branch 'master' of https://github.com/anemonekey/betsy
Guribot Oct 25, 2017
89b441c
fixing tests and fixtures
RAgerone Oct 25, 2017
92c404b
Merge branch 'master' of https://github.com/anemonekey/betsy
RAgerone Oct 25, 2017
ffcb21f
Merge branch 'MerchantController'
RAgerone Oct 25, 2017
88bb7e6
making html tag classes the same
RAgerone Oct 25, 2017
a821077
merge
Guribot Oct 25, 2017
de88c08
fix model overwrite method
Guribot Oct 25, 2017
fbebfa3
update dependent model methods, fix typo in account summary page
Guribot Oct 25, 2017
8cf57d1
Implemented order confirmation page
anemonekey Oct 25, 2017
f6823b9
Merge branch 'master' into order_related_controllers
anemonekey Oct 25, 2017
6c3b879
utilized test helper on merchants controller test
RAgerone Oct 25, 2017
4e5a877
removed redundant tests
RAgerone Oct 25, 2017
dd32db6
removed pry
RAgerone Oct 25, 2017
d88df8d
Added order confirmation page; edited show.html.erb
anemonekey Oct 25, 2017
c414e0e
Merge branch 'master' of https://github.com/anemonekey/betsy
anemonekey Oct 25, 2017
71e06d3
Edited show.html.erb for orders
anemonekey Oct 25, 2017
15ef89e
gemfile fix, merchant user summary cards added
Guribot Oct 25, 2017
9dc86b0
Merge branch 'master' of https://github.com/anemonekey/betsy
Guribot Oct 25, 2017
4a4d1b0
LoreStore website title
Guribot Oct 25, 2017
a1356d0
Changes in review
sairagula Oct 25, 2017
19f0d26
Merging with my branch
sairagula Oct 25, 2017
aa660d3
Added only review owner can edit/delete
sairagula Oct 25, 2017
42f6f61
Edited application and orders controllers and order.rb model
anemonekey Oct 25, 2017
8d12002
Merge branch 'master' of https://github.com/anemonekey/betsy
anemonekey Oct 25, 2017
26d9266
Fixed that user bug
sairagula Oct 25, 2017
62e28a0
Merge branch 'master' of https://github.com/anemonekey/betsy
sairagula Oct 25, 2017
e86d484
Added order_status method to orders model
anemonekey Oct 25, 2017
630ceda
Added order_status method to orders model
anemonekey Oct 25, 2017
f9d77d1
Merge branch 'master' of https://github.com/anemonekey/betsy
anemonekey Oct 25, 2017
d19ce69
mark_shipped updates order status
Guribot Oct 25, 2017
a7862fc
mererrrgggee
Guribot Oct 25, 2017
d3358b3
fixed order_status update method
Guribot Oct 25, 2017
010b0ba
add inventory to product fixtures
Guribot Oct 25, 2017
e54e909
hero img
Guribot Oct 25, 2017
b7a0f32
basic homepage
Guribot Oct 25, 2017
9c04811
basic formatting for hero page
Guribot Oct 25, 2017
451678a
Review works without bugs for now
sairagula Oct 25, 2017
a56562a
OrderProduct has status Pending upon creation
RAgerone Oct 25, 2017
0325ad0
Shopping cart can be edited
Guribot Oct 25, 2017
7ce55ae
fix validation message for order product quantitiy
Guribot Oct 25, 2017
80242d4
Merge branch 'master' of https://github.com/anemonekey/betsy
Guribot Oct 25, 2017
24f656e
make confirm_ownership errors message more generic
Guribot Oct 25, 2017
658daeb
Fixing Order controller tests
anemonekey Oct 25, 2017
e7bf0af
Merge branch 'master' of https://github.com/anemonekey/betsy
anemonekey Oct 25, 2017
569edf8
include assets
Guribot Oct 25, 2017
3b82426
Merge branch 'master' of https://github.com/anemonekey/betsy
Guribot Oct 25, 2017
bdb0a6c
Edited orders index and show pages
anemonekey Oct 25, 2017
14cf362
Merge branch 'order_related_controllers'
anemonekey Oct 25, 2017
67002f8
Fixed show.html.erb issue
anemonekey Oct 25, 2017
3e02258
change hero img url
Guribot Oct 25, 2017
56e7508
Merge branch 'master' of https://github.com/anemonekey/betsy
Guribot Oct 25, 2017
7c77456
added cvv and zip code to orders model
RAgerone Oct 25, 2017
5cb67df
add button to retire products
Guribot Oct 25, 2017
63d7e95
update button text
Guribot Oct 25, 2017
194028b
Merge branch 'merchant-user-pages'
Guribot Oct 25, 2017
37fc4c0
stars showing on average rating
sairagula Oct 25, 2017
fd8b482
Merge branch 'master' of https://github.com/anemonekey/betsy
RAgerone Oct 25, 2017
11f722f
added validations for orders fixtures
RAgerone Oct 25, 2017
0064378
fix card formatting for profile summary page
Guribot Oct 25, 2017
3cbf253
Merge branch 'merchant-user-pages'
Guribot Oct 25, 2017
c3ed1bd
Passed orders_controllers.rb basic tests
anemonekey Oct 25, 2017
45a4765
Merge branch 'master' of https://github.com/anemonekey/betsy
RAgerone Oct 25, 2017
3d9a5cb
added orders controller params
RAgerone Oct 25, 2017
857b35e
changed orders controller test
RAgerone Oct 25, 2017
63fe3e8
starter tests for main controller
Guribot Oct 26, 2017
dffcb81
Merge branch 'master' into main-controller-tests
Guribot Oct 26, 2017
42c2fef
test typo
Guribot Oct 26, 2017
29c2aa2
tests for add_to_cart
Guribot Oct 26, 2017
95ebe4b
add order date, link to product page to order status pages
Guribot Oct 26, 2017
c6a5ba0
Rating with stars works
sairagula Oct 26, 2017
e695750
Merge branch 'mybranch'
sairagula Oct 26, 2017
44e1b49
100% test coverage on order_controllers.rb
anemonekey Oct 26, 2017
2f92617
Editing order_products controller tests -- 1 error
anemonekey Oct 26, 2017
cfcb352
Added edit button and form to orders
anemonekey Oct 26, 2017
1a92f44
Merge branch 'order_related_controllers'
anemonekey Oct 26, 2017
bc7ceb7
add conditionals to shopping cart
Guribot Oct 26, 2017
f6a3fc8
Added rating condition
sairagula Oct 26, 2017
c0dec69
Merge branch 'master' of https://github.com/anemonekey/betsy
sairagula Oct 26, 2017
bdd2f69
Average review fixed, style for new review page
sairagula Oct 26, 2017
f7fdcf1
Changed CSS for application.css, main.scss, and edited application.ht…
anemonekey Oct 26, 2017
e2d3ec1
Rating method moved to Review model
sairagula Oct 26, 2017
a5e5b4a
added fun font awesome to products reviews. Thanks for the help, Kee.
RAgerone Oct 26, 2017
e4bce3a
Added background color to application.css
anemonekey Oct 26, 2017
49fb3db
Merge branch 'master' of https://github.com/anemonekey/betsy
anemonekey Oct 26, 2017
8b643c2
Review's get_rating_stars method is fully tested
sairagula Oct 26, 2017
6ef0e24
added SPOOKY animation
RAgerone Oct 26, 2017
b8f5831
Merge branch 'PracticeStyling'
RAgerone Oct 26, 2017
ddff6e0
oops
Guribot Oct 26, 2017
d5cd5c4
Colorin to stars added
sairagula Oct 26, 2017
5541431
Merging
sairagula Oct 26, 2017
0ebfa7b
styling for merchant summary page
Guribot Oct 26, 2017
073dfe4
styling for revenue page
Guribot Oct 26, 2017
e468baf
Added halloween images here and there; still working on orders index …
anemonekey Oct 26, 2017
4e5f16b
make titles navy, except for main page
Guribot Oct 26, 2017
9e84d5c
Some styles added to product detail page
sairagula Oct 26, 2017
9f547ba
Merge branch 'master' of https://github.com/anemonekey/betsy
sairagula Oct 26, 2017
6be8e6e
formatting for order tracking pages
Guribot Oct 26, 2017
169a592
Added additional styles to application.css, orders.scss, and orders #…
anemonekey Oct 26, 2017
3e07e17
formatting for inventory page, buttons
Guribot Oct 27, 2017
ec5158a
Merge branch 'master' of https://github.com/anemonekey/betsy
Guribot Oct 27, 2017
6b97147
formatting for product#index page
Guribot Oct 27, 2017
103a73b
formatting for add-categories page
Guribot Oct 27, 2017
50f6d0d
styling for shopping cart page
Guribot Oct 27, 2017
6cb8946
new/edit product form styling
Guribot Oct 27, 2017
38496da
styling for error messages
Guribot Oct 27, 2017
8e57fe6
kind of responsive nav bar
Guribot Oct 27, 2017
f703018
fix word wrap issues in header
Guribot Oct 27, 2017
210c162
Styles added to forms and review pages
sairagula Oct 27, 2017
01b9680
Merge branch 'master' of https://github.com/anemonekey/betsy
sairagula Oct 27, 2017
d11816b
just one change
sairagula Oct 27, 2017
f88f0e3
additional formatting for revenue card to avoid overflow
Guribot Oct 27, 2017
45d9371
change button colors
Guribot Oct 27, 2017
1071caf
border separates categories
Guribot Oct 27, 2017
4c9410b
Merge branch 'master' of https://github.com/anemonekey/betsy
Guribot Oct 27, 2017
ab7eb48
Some more styling added to buttons
sairagula Oct 27, 2017
b29d86e
Debugging output
RAgerone Oct 27, 2017
350623b
Dan got it working! YAYAYAYAYAYAYAYAY! Also, did I not push?
RAgerone Oct 27, 2017
0f67c1b
formatting for new-order form
Guribot Oct 27, 2017
af401f2
Merge branch 'master' of https://github.com/anemonekey/betsy
RAgerone Oct 27, 2017
dceffe4
Fixed order creation bugs
anemonekey Oct 27, 2017
591fc99
Merge branch 'master' of https://github.com/anemonekey/betsy
anemonekey Oct 27, 2017
4f13669
fix money helper
Guribot Oct 27, 2017
ab91cd4
Merge branch 'master' of https://github.com/anemonekey/betsy
Guribot Oct 27, 2017
5477c96
Added cancel and quantity increment methods
anemonekey Oct 27, 2017
2eeaf75
Merge branch 'master' of https://github.com/anemonekey/betsy
anemonekey Oct 27, 2017
b3a92f6
most popular will not return inactive orders
Guribot Oct 27, 2017
9a72904
Merge branch 'master' of https://github.com/anemonekey/betsy
Guribot Oct 27, 2017
09ce505
Edited order CSS and working on fixing cancel method
anemonekey Oct 27, 2017
4b05bd7
fix login flash ugliness
Guribot Oct 27, 2017
3ac5e07
Added styles to order confirmation page
anemonekey Oct 27, 2017
8353a15
fix order status on pending pg
Guribot Oct 27, 2017
2474b6c
add guest redirect for order conf page
Guribot Oct 27, 2017
8904d70
Merge branch 'master' of https://github.com/anemonekey/betsy
Guribot Oct 27, 2017
3170652
also this
Guribot Oct 27, 2017
2727e17
Adding spooky icons to pages
anemonekey Oct 27, 2017
06ad175
Merge branch 'master' of https://github.com/anemonekey/betsy
anemonekey Oct 27, 2017
3f5f48f
Added icons to all page titles
anemonekey Oct 27, 2017
37c1579
padddddiiiiinnnngggggggg
Guribot Oct 27, 2017
ae2a449
fix revenue table
Guribot Oct 27, 2017
b491384
link to live website in README
Guribot May 15, 2018
0e051be
fix formatting in README
Guribot May 15, 2018
4de26c8
fix README formatting again
Guribot May 15, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
23 changes: 23 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore bundler config.
/.bundle

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

/node_modules
/yarn-error.log

.byebug_history
.env

/coverage
coverage
72 changes: 72 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
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

# 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 'simplecov', :require => false, :group => :test


#added these gems because the terminal told me to
ruby '2.4.1'
# 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'
gem "omniauth"
gem "omniauth-github"
# 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'
end

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

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

gem 'jquery-turbolinks'
gem 'foundation-rails', '6.4.1.2'
group :development do
gem 'better_errors'
gem 'binding_of_caller'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
end
271 changes: 271 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,271 @@
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)
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-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.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)
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
better_errors
binding_of_caller
byebug
capybara (~> 2.13)
dotenv-rails
foundation-rails (= 6.4.1.2)
jbuilder (~> 2.5)
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)

RUBY VERSION
ruby 2.4.1p111

BUNDLED WITH
1.16.0.pre.3
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: bundle exec puma -C config/puma.rb
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# Lore Store
Lore Store is a full stack Ruby on Rails web app developed by [@anemonekey](https://github.com/anemonekey), [@Guribot](https://github.com/Guribot), [@oxenran](https://github.com/oxenran), and [@sairagula](https://github.com/sairagula) for Ada Developers Academy Cohort 8. It utilizes PostgreSQL relational databases and Oauth user verification.

### See the live website [here](http://lorestore.herokuapp.com/).


Original assignment text below.

---

# bEtsy
[b]Etsy will be an online store where a wide variety of products can be listed and sold by any user. In this project we will focus on reinforcing the major components of Rails, Model Validation, as well as introducing some more complex logic such as user authentication.

Expand Down
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/001-zombie.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/002-eye.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/003-pumpkin.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/004-torch.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/005-trident.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/006-poison.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/007-castle.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/008-spellbook.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/009-candelabra.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/010-candle.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/011-tree.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/012-owl.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/013-bat.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/014-coffin.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/015-broom.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/016-skull.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/017-potion.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/018-potful.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/019-crescent-moon.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/020-full-moon.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/021-scythe.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/022-cleaver.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/023-knife.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/024-axe.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/025-grave.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/026-gravestone.png
Binary file added app/assets/images/027-eye-jar.png
Binary file added app/assets/images/028-heart.png
Binary file added app/assets/images/029-ghost.png
Binary file added app/assets/images/030-brain.png
Binary file added app/assets/images/hero.jpeg
Loading