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

BAE BAE BAE #59

Open
wants to merge 390 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
390 commits
Select commit Hold shift + click to select a range
8f39e41
Change stars to triangles for reviews
anderschenders Oct 22, 2017
b00bb8c
Rearrange ReviewsController tests to have clear distinction between l…
anderschenders Oct 22, 2017
66805bd
styling, dropdown menus and category show pages
laurenelee Oct 22, 2017
2adecad
new styling- weird choices... i sort of hate it
laurenelee Oct 22, 2017
4a0d50b
Nothing really to add. Committing to start a new branch.
anderschenders Oct 22, 2017
2f606bd
Add inventory display on product show page
anderschenders Oct 22, 2017
c44551a
Add functionality to OrderProductsController#create to update quantit…
anderschenders Oct 22, 2017
430f9d0
i think i want to get rid of all products page
laurenelee Oct 22, 2017
90c1f59
Nothing really to commit. Changing branches
anderschenders Oct 22, 2017
2ab194b
Merge pull request #14 from bennettrahn/anders-tests-2
bennettrahn Oct 22, 2017
f160566
Add functionality to OrderProducts#update to update quantity of an in…
anderschenders Oct 22, 2017
52a5dc8
Revise OrderProductsController#create test so that it creates a new o…
anderschenders Oct 22, 2017
53ae5a0
Add test to ensure that a new orderproduct object is not being create…
anderschenders Oct 22, 2017
0333746
Add test to check that the quantity of an existing OrderProduct would…
anderschenders Oct 22, 2017
24c6ea4
Attempt to test for OrderProductsController#update, not passing.
anderschenders Oct 22, 2017
74c447a
i hate columns
laurenelee Oct 22, 2017
7f7bb46
small show page change
laurenelee Oct 22, 2017
d607b42
Merge branch 'master' into lauren-css
laurenelee Oct 22, 2017
d0ba898
continuing styling
laurenelee Oct 22, 2017
bd1c95b
what do pretty websites even look like though?
laurenelee Oct 22, 2017
8a61c80
fixed a bug in review creation, updated tests
bennettrahn Oct 22, 2017
f60d64c
Merge branch 'master' into anders-playing-with-OrderProductsController
bennettrahn Oct 22, 2017
18f4b0f
Merge pull request #15 from bennettrahn/anders-playing-with-OrderProd…
bennettrahn Oct 22, 2017
83fee99
Merge pull request #16 from bennettrahn/lauren-css
bennettrahn Oct 22, 2017
fd9d013
font stolen from the HP page
laurenelee Oct 22, 2017
4b81cc1
merge in master
bennettrahn Oct 22, 2017
4ed97ac
fix the merge mistake whoops
bennettrahn Oct 22, 2017
b405ea1
fix failing merchant and product tests
bennettrahn Oct 22, 2017
bacf7d5
Merge pull request #17 from bennettrahn/lauren-css
anderschenders Oct 23, 2017
f8507c8
Add to MerchantsController#create to reset cart when merchant logs in
anderschenders Oct 23, 2017
ac1f86e
prepping css
laurenelee Oct 23, 2017
521dc1c
home page styling
laurenelee Oct 23, 2017
3c4e87d
i mean this is ridic
laurenelee Oct 23, 2017
79f92ec
I mean I really can't decide...
laurenelee Oct 23, 2017
47975a6
new coloring, blah
laurenelee Oct 23, 2017
baa98e8
lauren new styling
laurenelee Oct 23, 2017
bf08446
Merge pull request #18 from bennettrahn/lauren-css
bennettrahn Oct 23, 2017
ef7c603
centering things
laurenelee Oct 23, 2017
3cb8033
css is for fwiends
laurenelee Oct 23, 2017
5c933e4
css final bits
laurenelee Oct 23, 2017
4bfd0f6
various testing fixes and not so fixes
bennettrahn Oct 23, 2017
6a552a5
Merge pull request #19 from bennettrahn/sunday-tests-bennett
laurenelee Oct 23, 2017
ce3784a
Merge pull request #20 from bennettrahn/lauren-css
bennettrahn Oct 23, 2017
cffc703
Merge branch 'master' into anders-sundaynight
anderschenders Oct 23, 2017
a3f8939
fix application.html to have only one kind of flash message section
bennettrahn Oct 23, 2017
2cf039c
fricken params.
laurenelee Oct 23, 2017
d7a945b
Fix failing tests for OrderProductsController#create and #update
anderschenders Oct 23, 2017
1c59012
Remove #increase_inventory from Product model and OrderProductsContro…
anderschenders Oct 23, 2017
f5f6328
commented out see all orders
laurenelee Oct 23, 2017
9555a60
Add test to OrderProductsController#update for when not enough invent…
anderschenders Oct 23, 2017
eceee2e
edit flash messaging and remove some obsolete routes/tests
bennettrahn Oct 23, 2017
8c9b532
Merge pull request #22 from bennettrahn/bennett-flash-messages
bennettrahn Oct 23, 2017
a6f09d3
Merge pull request #21 from bennettrahn/anders-sundaynight
bennettrahn Oct 23, 2017
d3c300e
finish fixing up flash messages, and running tests
bennettrahn Oct 23, 2017
c8bb416
Add icons to nav. Change wireframe
anderschenders Oct 23, 2017
ad1e0a8
receipt for order
laurenelee Oct 23, 2017
12cf1bf
fix a validation problem in op
bennettrahn Oct 23, 2017
aee9be9
new page for receipt
laurenelee Oct 23, 2017
e39bf9a
Merge branch 'master' into lauren-monday
bennettrahn Oct 23, 2017
98b37dc
Merge pull request #23 from bennettrahn/lauren-monday
bennettrahn Oct 23, 2017
a32194f
Trying to do dropdown menus
anderschenders Oct 23, 2017
aa5148c
receipt is invisible after one view
laurenelee Oct 24, 2017
789ca96
Still working on dropdown
anderschenders Oct 24, 2017
9fe94b9
Merge branch 'master' into anders-styling-trys
anderschenders Oct 24, 2017
6d2b1bf
create a few seed files
bennettrahn Oct 24, 2017
19db0f3
merge conflict fixes in orders_controller
bennettrahn Oct 24, 2017
151dfda
tests and decrease inventory
laurenelee Oct 24, 2017
978b3c6
Merge pull request #24 from bennettrahn/lauren-css
bennettrahn Oct 24, 2017
a20d24e
add relationships and some relationship tests
bennettrahn Oct 24, 2017
6394b38
add validations to payment_info and tests
bennettrahn Oct 24, 2017
5e4cfc7
add payment info to order checkout stuff
bennettrahn Oct 24, 2017
61ff755
Change layout of root page
anderschenders Oct 24, 2017
cf94c82
Work on products show page. Can't get images to be the same size
anderschenders Oct 24, 2017
82ded46
Minor
anderschenders Oct 24, 2017
83ef7fe
Attempt to format columns on Products show page
anderschenders Oct 24, 2017
0d8c80c
Merge pull request #25 from bennettrahn/bennett-flash-messages
anderschenders Oct 24, 2017
909afef
Merge pull request #26 from bennettrahn/anders-styling-trys
bennettrahn Oct 24, 2017
349f63b
Minor
anderschenders Oct 24, 2017
cd8c69b
Merge branch 'master' of https://github.com/bennettrahn/betsy
anderschenders Oct 24, 2017
bd2bd7f
playing with receipt test
laurenelee Oct 24, 2017
e3f6a32
Merge pull request #27 from bennettrahn/lauren-css
anderschenders Oct 24, 2017
ec6daf7
Fix stringify bug
anderschenders Oct 24, 2017
cf72bae
Merge branch 'master' of https://github.com/bennettrahn/betsy
anderschenders Oct 24, 2017
be033bd
Change one image
anderschenders Oct 24, 2017
82b78b1
Create new Product method to for root show page (needs a test), refac…
anderschenders Oct 24, 2017
b4047d2
add tables to each order on merchant show with product details
bennettrahn Oct 24, 2017
31426c6
Add test for [email protected]
anderschenders Oct 24, 2017
c1ad67d
Add tests for Category#self.root_page_seasonal_pick. One is failing
anderschenders Oct 24, 2017
5d32139
empty cart
laurenelee Oct 24, 2017
c1f429a
Merge branch 'master' of https://github.com/bennettrahn/betsy
laurenelee Oct 24, 2017
2632627
add status to order_products
bennettrahn Oct 24, 2017
c14ffc2
Merge pull request #28 from bennettrahn/anders-styling-trys
laurenelee Oct 24, 2017
90720a4
Merge pull request #29 from bennettrahn/bennett-merchant-show
laurenelee Oct 24, 2017
91e8bdf
SEEDED DATABASE
laurenelee Oct 24, 2017
da0969a
Still failing test
anderschenders Oct 24, 2017
db34600
add update_status functionality and link on merchant_show
bennettrahn Oct 24, 2017
bb6b5c1
Merge pull request #30 from bennettrahn/lauren-tuesday
bennettrahn Oct 24, 2017
cf996ce
merge seeded database
bennettrahn Oct 24, 2017
0703978
fix spotlight
laurenelee Oct 24, 2017
3910059
Merge pull request #31 from bennettrahn/lauren-tuesday
anderschenders Oct 24, 2017
cc180fa
Merge pull request #32 from bennettrahn/anders-styling-trys
laurenelee Oct 24, 2017
a235ce5
Merge branch 'master' into bennett-merchant-show
bennettrahn Oct 24, 2017
951b697
Delete weird extra mysterious Merchant index doc
anderschenders Oct 24, 2017
7cb0da7
add merchants product info to merchant show with update inventory fun…
bennettrahn Oct 24, 2017
f402423
Add private method to check if merchant signed in is owner of product…
anderschenders Oct 24, 2017
b72f56f
css thangs
laurenelee Oct 24, 2017
81d377d
Add PaymentInfo#last_four_cc, needs testing.
anderschenders Oct 24, 2017
a22d8b4
Merge pull request #33 from bennettrahn/lauren-tuesday
anderschenders Oct 24, 2017
7280fda
Merge pull request #34 from bennettrahn/anders-merchant-show-order
laurenelee Oct 24, 2017
e33fb35
orange
laurenelee Oct 24, 2017
5889732
Merge branch 'master' into anders-merchant-show-order
anderschenders Oct 24, 2017
684da30
Merge pull request #35 from bennettrahn/lauren-tuesday
anderschenders Oct 24, 2017
d7eb719
Merge branch 'master' into anders-merchant-show-order
anderschenders Oct 24, 2017
4ec3fdd
Add test for PaymentInfo
anderschenders Oct 24, 2017
4be00c8
commented out error in css
laurenelee Oct 24, 2017
277f5d0
Merge pull request #36 from bennettrahn/anders-merchant-show-order
laurenelee Oct 24, 2017
d71c3de
Merge pull request #37 from bennettrahn/lauren-tuesday
anderschenders Oct 24, 2017
fabaf67
add scope
bennettrahn Oct 24, 2017
bc9fba7
Merge branch 'master' into bennett-merchant-show
bennettrahn Oct 24, 2017
80f3f58
Merge pull request #38 from bennettrahn/bennett-merchant-show
bennettrahn Oct 24, 2017
1411ec3
quick fixes, disclaimer
laurenelee Oct 25, 2017
32e643a
fix error
bennettrahn Oct 25, 2017
ac538e5
Merge branch 'master' into lauren-tuesday
bennettrahn Oct 25, 2017
eb9257f
Merge pull request #39 from bennettrahn/lauren-tuesday
bennettrahn Oct 25, 2017
f977345
add retire functionality and buttons, play with who can see what on m…
bennettrahn Oct 25, 2017
09c73d2
Add content to receipt page
anderschenders Oct 25, 2017
430b7de
Add tests for PaymentInfo#last_four_cc
anderschenders Oct 25, 2017
57ee0e4
Add to receipt show page so that merchants can only see their orderpr…
anderschenders Oct 25, 2017
928f4ea
Merge pull request #41 from bennettrahn/bennett-merchant-show
anderschenders Oct 25, 2017
a2630f3
Merge branch 'master' into anders-receipt
anderschenders Oct 25, 2017
2216eca
lots of money/revenue stuff happening tonight
laurenelee Oct 25, 2017
bd26461
Merge pull request #42 from bennettrahn/lauren-tuesday
anderschenders Oct 25, 2017
d0130de
Merge pull request #43 from bennettrahn/anders-receipt
laurenelee Oct 25, 2017
3d6cc94
price syntax
laurenelee Oct 25, 2017
aef67cf
Merge pull request #44 from bennettrahn/lauren-tuesday
laurenelee Oct 25, 2017
4f260c6
trying css
laurenelee Oct 25, 2017
3c0520b
Merge pull request #45 from bennettrahn/lauren-tuesday
laurenelee Oct 25, 2017
66244f7
Receipt show page now works
anderschenders Oct 25, 2017
7a0e656
total revenue
laurenelee Oct 25, 2017
950be13
Merge branch 'master' of https://github.com/bennettrahn/betsy
laurenelee Oct 25, 2017
54e05fc
default status false for retired
bennettrahn Oct 25, 2017
aeeba2f
play with show
bennettrahn Oct 25, 2017
a7593a7
merge?
bennettrahn Oct 25, 2017
32bfa6e
Fix two failing tests. Add test for receipt
anderschenders Oct 25, 2017
d35802a
Add test for OrdersController#receipt
anderschenders Oct 25, 2017
0b215f6
update show tables
bennettrahn Oct 25, 2017
f49b999
passing test for merchant
laurenelee Oct 25, 2017
5b9f361
Merge pull request #46 from bennettrahn/anders-receipt-contoller-tests
laurenelee Oct 25, 2017
d55d25d
Merge pull request #47 from bennettrahn/lauren-wednesday-25
anderschenders Oct 25, 2017
ef29904
Change dropdown colour
anderschenders Oct 25, 2017
133eb12
considering style changing
laurenelee Oct 25, 2017
bb82e33
some css changes
bennettrahn Oct 25, 2017
a4f13a5
Merge pull request #48 from bennettrahn/anders-opc-tests
laurenelee Oct 25, 2017
efcdcd0
Merge pull request #49 from bennettrahn/bennett-merchant-show
laurenelee Oct 25, 2017
adb11f2
Merge pull request #50 from bennettrahn/lauren-wednesday-25
laurenelee Oct 25, 2017
eaac310
rgba fix
laurenelee Oct 25, 2017
16791c6
new background pic
laurenelee Oct 25, 2017
71b213b
Add OrderProductsController#destroy test
anderschenders Oct 26, 2017
591aaec
Merge pull request #51 from bennettrahn/anders-opc-tests
laurenelee Oct 26, 2017
be2afca
Add test for OrderProductsController#destroy
anderschenders Oct 26, 2017
e509949
Add test for Order model #order_complete?
anderschenders Oct 26, 2017
1a6a699
Add negative test for Order model #order_complete?
anderschenders Oct 26, 2017
4b02015
Specs for potential test
anderschenders Oct 26, 2017
75037b4
add filtering
bennettrahn Oct 26, 2017
87e2789
Root page is done being styled
laurenelee Oct 26, 2017
e0f6ccd
Nothing really here
anderschenders Oct 26, 2017
748e6e3
products index page
laurenelee Oct 26, 2017
e751e0c
all categories links to all products now
laurenelee Oct 26, 2017
e78d237
add tests for the show page changes
bennettrahn Oct 26, 2017
a3cdfa6
Add functionality to MerchantsController#create to handle a logged in…
anderschenders Oct 26, 2017
6a24135
colors
laurenelee Oct 26, 2017
e9e30ce
Merge pull request #53 from bennettrahn/bugs-and-structures
anderschenders Oct 26, 2017
b55269b
css centering
laurenelee Oct 26, 2017
598fcf2
Merge pull request #52 from bennettrahn/anders-opc-tests
laurenelee Oct 26, 2017
80ec3e8
Merge pull request #54 from bennettrahn/anders-auth-controller
laurenelee Oct 26, 2017
9291a91
Merge branch 'master' into lauren-css-wednesday
laurenelee Oct 26, 2017
e2334bb
Merge pull request #55 from bennettrahn/lauren-css-wednesday
laurenelee Oct 26, 2017
6ad1c57
Minor change to Merchant Controller
anderschenders Oct 26, 2017
dd63bc3
Fix one failing test
anderschenders Oct 26, 2017
bbd83a9
Fix one failing test
anderschenders Oct 26, 2017
2c99875
new home page
laurenelee Oct 26, 2017
28d1ede
Merge branch 'master' of https://github.com/bennettrahn/betsy
laurenelee Oct 26, 2017
05cbd91
all products page
laurenelee Oct 26, 2017
6a361b9
touch up revenues and totals methods
bennettrahn Oct 26, 2017
9967b18
fix a dumb error
bennettrahn Oct 26, 2017
73dcc05
Merge pull request #57 from bennettrahn/bugs-and-structures
laurenelee Oct 26, 2017
bd7a0c9
Merge pull request #56 from bennettrahn/lauren-final-css
bennettrahn Oct 26, 2017
2d91a4d
wrapping thangs
laurenelee Oct 26, 2017
b2cd849
Merge pull request #58 from bennettrahn/lauren-final-css
laurenelee Oct 26, 2017
1f399d9
Modify receipt show page
anderschenders Oct 26, 2017
b902b57
merge
anderschenders Oct 26, 2017
da34643
more styling
laurenelee Oct 26, 2017
da37fe1
Merge branch 'master' of https://github.com/bennettrahn/betsy
laurenelee Oct 26, 2017
4b81f1a
Receipt page
anderschenders Oct 26, 2017
65aabc1
new font create
laurenelee Oct 26, 2017
763fd89
Receipt page
anderschenders Oct 26, 2017
a625876
Merge pull request #59 from bennettrahn/lauren-final-css
laurenelee Oct 26, 2017
e5c4e18
Merge branch 'master' of https://github.com/bennettrahn/betsy
anderschenders Oct 26, 2017
e509940
receipt css
laurenelee Oct 26, 2017
8d9d95d
Merge branch 'master' of https://github.com/bennettrahn/betsy
laurenelee Oct 26, 2017
b1dd347
Receipt page update
anderschenders Oct 26, 2017
396896f
Merge branch 'master' of https://github.com/bennettrahn/betsy
anderschenders Oct 26, 2017
459e9be
anders demands better font
laurenelee Oct 26, 2017
dd59b14
bae bae bae
laurenelee Oct 26, 2017
434d613
center title
laurenelee Oct 26, 2017
42ce5ec
Add view helper for date
anderschenders Oct 26, 2017
2c99a67
Receipt fix
anderschenders Oct 26, 2017
06b7fe0
Merge branch 'master' of https://github.com/bennettrahn/betsy
anderschenders Oct 26, 2017
917b208
Start making form helper for receipt page
anderschenders Oct 26, 2017
8a501a7
Middle of view partial
anderschenders Oct 26, 2017
6ce1a20
Minor
anderschenders Oct 26, 2017
3c54160
Refactoring receipt page
anderschenders Oct 26, 2017
cee18bb
Final receipt stuff. Partial failure at DRYing it up
anderschenders Oct 26, 2017
b5f4e10
Add tests for CategoriesController#show. Add find_id_by_params privat…
anderschenders Oct 26, 2017
cf983ad
finish some css for product show page
bennettrahn Oct 27, 2017
0c03f5c
fix a sizing error
bennettrahn Oct 27, 2017
636c094
Merge pull request #60 from bennettrahn/anders-thursdayaft
bennettrahn Oct 27, 2017
0291cdf
Merge pull request #61 from bennettrahn/anders-thurs-review
bennettrahn Oct 27, 2017
aef2312
Merge branch 'master' into show-page-css
bennettrahn Oct 27, 2017
629f294
Merge pull request #62 from bennettrahn/show-page-css
bennettrahn Oct 27, 2017
4e3dcc6
fixed inline text fields on merchant and order show
bennettrahn Oct 27, 2017
3198f4f
Merge branch 'show-page-css'
bennettrahn Oct 27, 2017
a94c81b
clickable pics
laurenelee Oct 27, 2017
0eb3470
Merge pull request #63 from bennettrahn/lauren-final-css
laurenelee Oct 27, 2017
17d947b
fix a couple broken tests, start working on missing ones
bennettrahn Oct 27, 2017
a334d96
add edit button back to show page whoops
bennettrahn Oct 27, 2017
2970957
Merge branch 'master' of https://github.com/bennettrahn/betsy
bennettrahn Oct 27, 2017
7d7e326
add tests for some model methods/relationships
bennettrahn Oct 27, 2017
ba3ba84
add total to cart
bennettrahn Oct 27, 2017
362cd82
Merge pull request #65 from bennettrahn/bugs-and-structures
bennettrahn Oct 27, 2017
b5c962c
Merge pull request #64 from bennettrahn/tests-final-wave
bennettrahn Oct 27, 2017
3d04ad2
add readable-date to review
bennettrahn Oct 27, 2017
6aee162
Add button to receipt show page for merchant. Some clean up
anderschenders Oct 27, 2017
ba4c1d8
Fix bug on receipt page. Add test for OrdersController#receipt
anderschenders Oct 27, 2017
56ec90a
Changing some price and date stuff
anderschenders Oct 27, 2017
c98f948
clickable images
laurenelee Oct 27, 2017
a085a77
Merge branch 'master' into anders-thurseve
laurenelee Oct 27, 2017
d00715a
Merge pull request #66 from bennettrahn/anders-thurseve
laurenelee Oct 27, 2017
300161a
Merge branch 'master' of https://github.com/bennettrahn/betsy
bennettrahn Oct 27, 2017
b4256fa
product page
laurenelee Oct 27, 2017
09fc327
Merge pull request #67 from bennettrahn/lauren-friday-final
laurenelee Oct 27, 2017
2e3e3da
empty cart image
laurenelee Oct 27, 2017
dad35b8
change the merchant show page to have #secret
bennettrahn Oct 27, 2017
56f6512
Moved average rating on Product show page
anderschenders Oct 27, 2017
c9c4fd2
add a test for order filter show page merchant
bennettrahn Oct 27, 2017
c2ab889
Merge conflict fix
anderschenders Oct 27, 2017
a4466ef
Move average rating up on product show page
anderschenders Oct 27, 2017
8cd9213
Merge pull request #68 from bennettrahn/anders-update
laurenelee Oct 27, 2017
48588ac
Fix little bug on order show page
anderschenders Oct 27, 2017
58617ad
Merge pull request #69 from bennettrahn/anders-update
laurenelee 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
25 changes: 25 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# 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

# Keep secrets secret
.env
coverage

coverage/index.html
79 changes: 79 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
source 'https://rubygems.org'

git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
"https://github.com/#{repo_name}.git"
end

gem '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 'turbolinks', '~> 5'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.5'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 3.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

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

gem "omniauth"

gem "omniauth-github"

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

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

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

gem 'jquery-turbolinks'
group :development, :test do
gem 'pry-rails'
end

group :development do
gem 'better_errors'
gem 'binding_of_caller'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
gem 'simplecov', :require => false
end

gem 'awesome_print'
gem 'foundation-rails', '6.4.1.2'
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.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
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
Binary file added app/.DS_Store
Binary file not shown.
3 changes: 3 additions & 0 deletions app/assets/config/manifest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
//= link_tree ../images
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css
Empty file added app/assets/images/.keep
Empty file.
Binary file added app/assets/images/33.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/3friends.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/address-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/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/blue_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/boo2.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/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/cart_circle.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/circle_cart.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/icecream.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/lock-open-blue.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/login.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/login_key.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/logout.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/pine.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/pineapple1.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/unlock.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/you.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/your_page.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading