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

Octos: Sweatsy: Sam, Brandy, Maja, Kiera #23

Open
wants to merge 347 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
347 commits
Select commit Hold shift + click to select a range
538aaaf
Merge branch 'development' into reviews_categories_tests_and_logic
mgraonic Apr 23, 2018
d814ecf
made root route and root view
mgraonic Apr 23, 2018
0bd17ea
Basic Html structure for homepage and upload home image
samanthaberk Apr 23, 2018
9ec8a0e
built new category form on merchant dashboard
mgraonic Apr 23, 2018
8989b8f
Merge branch 'homepage' of https://github.com/samanthaberk/betsy into…
mgraonic Apr 23, 2018
c338622
More updates to homepage
samanthaberk Apr 23, 2018
0abf819
Merge branch 'homepage' of https://github.com/samanthaberk/betsy into…
samanthaberk Apr 23, 2018
98cdf2b
Add links to navbar
samanthaberk Apr 23, 2018
0915f1e
Add background image to homepage
samanthaberk Apr 23, 2018
78160c8
Fix navbar dropdown sticking issue
samanthaberk Apr 23, 2018
ea8748e
Change color on homepage title text for readability
samanthaberk Apr 23, 2018
42d1320
Make Sweatsy at top of navbar to home button
samanthaberk Apr 23, 2018
6624974
Merge pull request #14 from samanthaberk/homepage
brandyaustinseattle Apr 23, 2018
0a45dc1
create review with good data test passing
mgraonic Apr 23, 2018
138585a
Merge branch 'homepage' of https://github.com/samanthaberk/betsy into…
mgraonic Apr 23, 2018
9e7b55d
Fixed review seeds
brandyaustinseattle Apr 23, 2018
db45cf7
Removed debugging statements
brandyaustinseattle Apr 23, 2018
4507d53
fix show page image
Krashaune Apr 23, 2018
beb2428
Merge branch 'homepage' of https://github.com/samanthaberk/betsy into…
mgraonic Apr 23, 2018
dfb9a42
Merge pull request #15 from samanthaberk/homepage
brandyaustinseattle Apr 23, 2018
1ed5a89
Merge pull request #16 from samanthaberk/order
mgraonic Apr 23, 2018
7a2a00e
Merge branch 'development' of https://github.com/samanthaberk/betsy i…
mgraonic Apr 23, 2018
b44c122
Merge pull request #17 from samanthaberk/products
samanthaberk Apr 23, 2018
0d7232d
Merge branch 'development' of https://github.com/samanthaberk/betsy i…
mgraonic Apr 23, 2018
65ac342
added review form to product show page
mgraonic Apr 23, 2018
5d8fa89
product review gets logged correctly
mgraonic Apr 23, 2018
e58e121
built average rating calculation for product show page
mgraonic Apr 23, 2018
aa8aa00
transferred review calculation logic to prodct model
mgraonic Apr 23, 2018
fea8a2a
created reviews table on product show page
mgraonic Apr 23, 2018
41195ba
completed review model tests
mgraonic Apr 23, 2018
3857a22
moved average rating method to product helpers and updated views acco…
mgraonic Apr 23, 2018
4c4efac
updated controller index to call new model method products_by_categor…
Krashaune Apr 23, 2018
eeaca59
reviews save if valid; and dont save if mssing info
mgraonic Apr 23, 2018
fcc98b9
update products index view add link to merchant.
Krashaune Apr 23, 2018
a461a92
Merge pull request #18 from samanthaberk/reviews_categories_tests_and…
brandyaustinseattle Apr 23, 2018
0961975
Add config lines so images will appear when delopyed
samanthaberk Apr 23, 2018
74ea934
deleting extraneous code and custom route for reviews
mgraonic Apr 23, 2018
3adba82
Merge branch 'master' of https://github.com/samanthaberk/betsy
mgraonic Apr 23, 2018
1657bc2
Added current order method to app controller
brandyaustinseattle Apr 23, 2018
8c0d7fd
Modified index method in products and added order_products controller
brandyaustinseattle Apr 23, 2018
f2e5ec1
Added routes for order_products
brandyaustinseattle Apr 23, 2018
a5d8ade
Generate carts controller
brandyaustinseattle Apr 23, 2018
23496b9
Added carts controller and cart show route
brandyaustinseattle Apr 23, 2018
6fe1ab6
changed login buttons to route to oauth; created sessions controller
mgraonic Apr 23, 2018
80d4e79
Made shopping cart work except items aren't aggregated
brandyaustinseattle Apr 24, 2018
962a71d
Merge pull request #20 from samanthaberk/order
Krashaune Apr 24, 2018
05d3d60
Merge pull request #19 from samanthaberk/oauth
samanthaberk Apr 24, 2018
3e79c86
Added destroy method
samanthaberk Apr 24, 2018
d6b820e
Add font awesome cdn to application layout view
samanthaberk Apr 24, 2018
e53d164
merge development into order
samanthaberk Apr 24, 2018
469c534
Replace end in routes
samanthaberk Apr 24, 2018
4adad14
Fix bug in routes again
samanthaberk Apr 24, 2018
7740ff2
added methods to session controller and merchant model; added login b…
mgraonic Apr 24, 2018
c5475dc
Add cart button to navigation
samanthaberk Apr 24, 2018
560ac03
Update sessions_controller.rb
samanthaberk Apr 24, 2018
f3cfe4e
Merge pull request #21 from samanthaberk/oauth
samanthaberk Apr 24, 2018
03c277e
Merge branch 'development' into order
mgraonic Apr 24, 2018
426ec1c
Merge pull request #22 from samanthaberk/order
mgraonic Apr 24, 2018
75778ee
Update sessions_controller.rb
brandyaustinseattle Apr 24, 2018
94c24d5
patching authentication fix
mgraonic Apr 24, 2018
402268e
Added flash mssgs for putting item in cart
brandyaustinseattle Apr 24, 2018
cfd7987
Merge pull request #23 from samanthaberk/oauth
mgraonic Apr 24, 2018
982de99
Added controller filter to order_products
brandyaustinseattle Apr 24, 2018
f86c785
Merge remote-tracking branch 'origin/development' into order
brandyaustinseattle Apr 24, 2018
336ddf4
added current user and require login.
Krashaune Apr 24, 2018
9900071
solved for order 5 not found
mgraonic Apr 25, 2018
2789c9b
Fixed adding 0 items issue
brandyaustinseattle Apr 25, 2018
78473d5
Merge pull request #24 from samanthaberk/order
samanthaberk Apr 25, 2018
c9f2233
remaining changes from sessions.
Krashaune Apr 25, 2018
0fac4cb
Merge branch 'oauth' of https://github.com/samanthaberk/betsy into oauth
Krashaune Apr 25, 2018
373afec
Fixed nested merchant page
brandyaustinseattle Apr 25, 2018
dea1dc6
Merge pull request #26 from samanthaberk/order
Krashaune Apr 25, 2018
1b59871
Merge pull request #25 from samanthaberk/oauth
Krashaune Apr 25, 2018
d045ee4
Remove add to cart from product index
brandyaustinseattle Apr 25, 2018
b1a2b63
Merge pull request #27 from samanthaberk/order
Krashaune Apr 25, 2018
fef74ef
patch to fix new order persistence in application controller
mgraonic Apr 25, 2018
17f8c03
Merge branch 'oauth' of https://github.com/samanthaberk/betsy into oauth
mgraonic Apr 25, 2018
23694f2
Merge pull request #28 from samanthaberk/oauth
Krashaune Apr 25, 2018
71c0820
Style cart page
brandyaustinseattle Apr 25, 2018
defedd3
Merge remote-tracking branch 'origin/development' into order
brandyaustinseattle Apr 25, 2018
a66cd30
fixed rendering product show page after submitting invalid review data
mgraonic Apr 25, 2018
e433ee7
Merge pull request #30 from samanthaberk/oauth
samanthaberk Apr 25, 2018
277996e
updated seed file to include description and photo url. Added additio…
Krashaune Apr 25, 2018
fe1f71a
restricted merchant dashboard view to users who are logged in
mgraonic Apr 25, 2018
7c44dca
update products index and view page to include photo from seed data.
Krashaune Apr 25, 2018
83b0e6d
Merge branch 'development' into seeds
Krashaune Apr 25, 2018
0dff7ae
Add uid and provider to merchants yaml files
samanthaberk Apr 25, 2018
d3c23e6
three tests for order_products controller
samanthaberk Apr 25, 2018
bd645ee
added ability for merchant to post a new product; this includes new n…
mgraonic Apr 25, 2018
355bf4d
Some styling to homepage
samanthaberk Apr 25, 2018
6d852f6
updated csv photo url.
Krashaune Apr 25, 2018
ae49897
update csv files to remove errors.
Krashaune Apr 25, 2018
e609ca8
Updated photo for neon head band.
Krashaune Apr 25, 2018
6c3d6ee
resized image for product show page. Centered main content.
Krashaune Apr 25, 2018
cbda2fd
Remove body styling
brandyaustinseattle Apr 25, 2018
8a19750
Merge pull request #31 from samanthaberk/oauth
brandyaustinseattle Apr 25, 2018
518c96b
Merge pull request #32 from samanthaberk/seeds
mgraonic Apr 25, 2018
9a3e321
Merge pull request #29 from samanthaberk/order
samanthaberk Apr 25, 2018
99918ff
Merge branch 'order' of https://github.com/samanthaberk/betsy into order
samanthaberk Apr 25, 2018
235dde3
Add decrement method to order model
samanthaberk Apr 25, 2018
43248f7
Add clarifying comment to decrement method
samanthaberk Apr 25, 2018
f2b1b43
adding restrictions for guest users
mgraonic Apr 25, 2018
b231efb
Added checkout and pay paths
brandyaustinseattle Apr 25, 2018
155bf13
Added conditional to login buttons to display name when logged in.
Krashaune Apr 25, 2018
9a21ed3
Proceed to Checkout and Place Order paths
brandyaustinseattle Apr 25, 2018
a3cbbad
conditionals log in buttons.
Krashaune Apr 25, 2018
81a3fc9
group orders on shopping cart page
samanthaberk Apr 25, 2018
3aec409
Checkout page complete minus styling, confirmation in progress
brandyaustinseattle Apr 25, 2018
33bd831
Merge branch 'order' into order-sam
samanthaberk Apr 25, 2018
4074926
Basic functionality to restrict user from adding more than total avai…
samanthaberk Apr 25, 2018
9ed1d52
Added logic to login buttons. updated categories on merchant products…
Krashaune Apr 25, 2018
d561c62
updated image link on categories index.
Krashaune Apr 25, 2018
4bc2831
changed some routes; restricted product access, generation, and editi…
mgraonic Apr 25, 2018
04a88ff
updated conditions on product view to allow merchants to edit.
Krashaune Apr 25, 2018
634f474
order grouping
samanthaberk Apr 25, 2018
139ea8c
One step closer to being able to pay
brandyaustinseattle Apr 25, 2018
defbbaa
Merge pull request #33 from samanthaberk/oauth
samanthaberk Apr 26, 2018
7faca2f
Merge branch 'development' into products
mgraonic Apr 26, 2018
831f14f
Merge pull request #34 from samanthaberk/products
mgraonic Apr 26, 2018
b80bfe9
Update order.rb
mgraonic Apr 26, 2018
37e4e71
Merge branch 'development' into order
mgraonic Apr 26, 2018
d7a17d9
Merge pull request #35 from samanthaberk/order
mgraonic Apr 26, 2018
08e5055
changed new product link on merchant show page
mgraonic Apr 26, 2018
99ffe8e
Possible to add products
brandyaustinseattle Apr 26, 2018
ea1ad84
Merge branch 'development' of https://github.com/samanthaberk/betsy i…
mgraonic Apr 26, 2018
52fbe48
Working cart again
brandyaustinseattle Apr 26, 2018
d9744d6
Merge pull request #36 from samanthaberk/oauth
Krashaune Apr 26, 2018
2c9743f
merchant cannot review own products
mgraonic Apr 26, 2018
2e5686d
Updated logic for merchants to only review their own products.
Krashaune Apr 26, 2018
7e0a786
Changed logged in as to a link to merchant dashboard.Added div around…
Krashaune Apr 26, 2018
55321fb
basic login testing done; no edge cases
mgraonic Apr 26, 2018
8637e56
dashboard button
mgraonic Apr 26, 2018
4243f3d
Merge pull request #37 from samanthaberk/oauth
mgraonic Apr 26, 2018
e59967e
Added product route for retire.Added corresponding changes to show pa…
Krashaune Apr 26, 2018
4cd4819
Merge branch 'development' into homepage
samanthaberk Apr 26, 2018
1dfe3c5
updated primary foundation colors.Added fonts to application.css.styl…
Krashaune Apr 26, 2018
01ed382
deleted extraneous new review action; dont need it
mgraonic Apr 26, 2018
44e2aaa
Style homepage
samanthaberk Apr 26, 2018
7ae9533
Added new background color. updated other css.
Krashaune Apr 26, 2018
394fac5
Add favicon to site
samanthaberk Apr 26, 2018
8e296d6
remove background color and change font
Krashaune Apr 26, 2018
b1f0366
Add footer to all pages
samanthaberk Apr 26, 2018
fbe0ea3
Merge branch 'development' into homepage
Krashaune Apr 26, 2018
906b199
Merge pull request #38 from samanthaberk/homepage
Krashaune Apr 26, 2018
bca31db
Merge branch 'development' into css_color_scheme
Krashaune Apr 26, 2018
c19ebe3
Merge pull request #40 from samanthaberk/css_color_scheme
Krashaune Apr 26, 2018
f441650
Merge branch 'development' into products
Krashaune Apr 26, 2018
e5bd05e
Merge pull request #39 from samanthaberk/products
Krashaune Apr 26, 2018
34dd263
Merge branch 'development' of https://github.com/samanthaberk/betsy i…
mgraonic Apr 26, 2018
172732b
fixed NaN printing when 0 reviews
mgraonic Apr 26, 2018
e19440d
guest cannot create new merchant; merchant cant sign in or sign up wh…
mgraonic Apr 26, 2018
08d2dfb
Fix bug photos now show from url when merchant adds a new product
samanthaberk Apr 26, 2018
154e52d
Unknown?
brandyaustinseattle Apr 26, 2018
f4e9809
Merge branch 'development' of https://github.com/samanthaberk/betsy i…
brandyaustinseattle Apr 26, 2018
db49c7b
Fix photo display again and change color of cart icon
samanthaberk Apr 26, 2018
ff7dabe
Merge pull request #41 from samanthaberk/order
mgraonic Apr 26, 2018
0c8a912
More styles
samanthaberk Apr 26, 2018
bc0805a
Merge branch 'development' of https://github.com/samanthaberk/betsy i…
samanthaberk Apr 26, 2018
1680d8c
more styles
samanthaberk Apr 26, 2018
cefa50f
made secret files secret
mgraonic Apr 26, 2018
137f38a
Merge branch 'master' of https://github.com/samanthaberk/betsy
samanthaberk Apr 26, 2018
6b02cfe
Fix css error so can deploy
samanthaberk Apr 26, 2018
fa6d4e3
remove border from navbar
samanthaberk Apr 26, 2018
57c6c1c
over 90 percent sessions controller test passing
mgraonic Apr 26, 2018
b0dc080
Add test fixtures for categories
samanthaberk Apr 26, 2018
401dc11
sessions controller tests passing
mgraonic Apr 26, 2018
258e1ce
Merge pull request #42 from samanthaberk/oauth
mgraonic Apr 26, 2018
38f2a16
changes
mgraonic Apr 26, 2018
6e23ea2
Merge branch 'master' of https://github.com/samanthaberk/betsy
mgraonic Apr 26, 2018
b845740
changes
mgraonic Apr 26, 2018
12126cf
added logout to test-helper,updated create method to require login.
Krashaune Apr 26, 2018
ec84664
Merge branch 'oauth' of https://github.com/samanthaberk/betsy into de…
mgraonic Apr 26, 2018
390be3c
working on merchant controller tests
mgraonic Apr 26, 2018
4a03787
Merge branch 'development' of https://github.com/samanthaberk/betsy i…
mgraonic Apr 26, 2018
83c70d1
Working on tests
brandyaustinseattle Apr 27, 2018
7bddc0c
made changes to fix errors
Krashaune Apr 27, 2018
850313d
Making progress on order page for merchant
samanthaberk Apr 27, 2018
5201562
Finish chart for order summary
samanthaberk Apr 27, 2018
77a54ea
Add instagram photos
samanthaberk Apr 27, 2018
901737c
Fix footer
samanthaberk Apr 27, 2018
e6c8a26
Fixed validations for cart checkout and solved example.com error in o…
brandyaustinseattle Apr 27, 2018
5176a77
made changes to seed file to remove activerecord association errors.
Krashaune Apr 27, 2018
768d0e6
Order validations tests working
brandyaustinseattle Apr 27, 2018
188e614
Change intro on homepage
samanthaberk Apr 27, 2018
b05146d
Seeds working due to removal of leggings
brandyaustinseattle Apr 27, 2018
4ab399c
Update env
samanthaberk Apr 27, 2018
d69c861
Delete .env
samanthaberk Apr 27, 2018
fb96156
Reducted failures and errors for tests
brandyaustinseattle Apr 27, 2018
17ee926
Confirmed site works after testing
brandyaustinseattle Apr 27, 2018
9b0971f
Add text to footer
samanthaberk Apr 27, 2018
430c532
Move new category label to button on merchant dashboard
samanthaberk Apr 27, 2018
d9c43a5
updated track pants picture.
Krashaune Apr 27, 2018
4a4db99
Add sweatsy definition to homepage
samanthaberk Apr 27, 2018
9d3e137
Merge pull request #45 from samanthaberk/development
brandyaustinseattle Apr 27, 2018
2c92147
Merge branch 'development' into brandy_testing
Krashaune Apr 27, 2018
d7be6e7
Merge pull request #43 from samanthaberk/brandy_testing
Krashaune Apr 27, 2018
b4ef5ad
Merge branch 'development' into kieratest
Krashaune Apr 27, 2018
3886817
Merge pull request #44 from samanthaberk/kieratest
Krashaune Apr 27, 2018
5691f61
more changes to order
samanthaberk Apr 27, 2018
8859b87
Delete .env
samanthaberk Apr 27, 2018
da30a15
Merge branch 'merchant-order' of https://github.com/samanthaberk/bets…
samanthaberk Apr 27, 2018
2d83748
Merge pull request #46 from samanthaberk/merchant-order
Krashaune Apr 27, 2018
61697f5
model
samanthaberk Apr 27, 2018
2840530
merchant controller tests passing
mgraonic Apr 27, 2018
4a982d4
Updated application controller to find @current_user to fix log in bug.
Krashaune Apr 27, 2018
4ad0a42
merge conflict
mgraonic Apr 27, 2018
ff461b6
Merge branch 'development' of https://github.com/samanthaberk/betsy i…
Krashaune Apr 27, 2018
bb260d6
merchants can only view own orders
mgraonic Apr 27, 2018
c8c5639
no longer including test files in simplecov
mgraonic Apr 27, 2018
9f9aeef
Add total revenue from paid not shipped orders to merchant order summ…
samanthaberk Apr 27, 2018
de112cf
Merge branch 'development' of https://github.com/samanthaberk/betsy i…
samanthaberk Apr 27, 2018
73a6c47
Add total revenue for shipped orders to merchant order summary
samanthaberk Apr 27, 2018
26a9b26
filtered out some simplecove test files
mgraonic Apr 27, 2018
f1cf0a3
Add total revenue to merchant order summary page
samanthaberk Apr 27, 2018
4fa0350
Add ship order method, route, and button
samanthaberk Apr 27, 2018
83d30c8
Fixed address issue w cart
brandyaustinseattle Apr 27, 2018
9efca1f
Solve merge conflict
brandyaustinseattle Apr 27, 2018
23b76a7
No more cat photos on categories page
samanthaberk Apr 27, 2018
5f73a18
Merge branch 'development' of https://github.com/samanthaberk/betsy i…
samanthaberk Apr 27, 2018
456e309
category controller tests passing; minor change to category save redi…
mgraonic Apr 27, 2018
cb25977
Merge branch 'development' of https://github.com/samanthaberk/betsy i…
mgraonic Apr 27, 2018
b914d11
Ship order button changes status to shipped
samanthaberk Apr 27, 2018
3669b3b
fix product name on merchant order summary
samanthaberk Apr 27, 2018
ae07b41
controller testing
mgraonic Apr 27, 2018
4e4d577
Styled order pages
brandyaustinseattle Apr 27, 2018
bc90d75
merge conflicts
mgraonic Apr 27, 2018
cedd1fc
Merge pull request #47 from samanthaberk/testing
mgraonic Apr 27, 2018
9cd6e48
order revenues working
samanthaberk Apr 27, 2018
65ce26f
Merge branch 'merchant-order' of https://github.com/samanthaberk/bets…
samanthaberk Apr 27, 2018
40b9cde
Finished styling cart
brandyaustinseattle Apr 27, 2018
ea68ccc
Styled alert/success boxes
brandyaustinseattle Apr 27, 2018
234a31c
Merge remote-tracking branch 'origin/development' into brandy_testing
brandyaustinseattle Apr 27, 2018
aa68deb
cannot ship unpaid orders; changed redirect to dash
mgraonic Apr 27, 2018
8c4ea03
Merge branch 'development' of https://github.com/samanthaberk/betsy i…
brandyaustinseattle Apr 27, 2018
33a1cdd
Add photos to categories on homepage
samanthaberk Apr 27, 2018
f77b134
Add styling to homepage
samanthaberk Apr 27, 2018
4fb853d
Merge branch 'development' of https://github.com/samanthaberk/betsy i…
samanthaberk Apr 27, 2018
740000c
Merge remote-tracking branch 'origin'
Krashaune Apr 27, 2018
db490d7
Merge branch 'development'
Krashaune Apr 27, 2018
a54fd46
Change top products to 3 products
samanthaberk Apr 27, 2018
b6518c4
Merge branch 'development'
Krashaune Apr 27, 2018
b929a64
update ig link
Krashaune Apr 27, 2018
6447b56
Merge branch 'master' of https://github.com/samanthaberk/betsy
samanthaberk Apr 27, 2018
07a3d91
Updated development
brandyaustinseattle Apr 27, 2018
e10f71f
fixed categories tiles
mgraonic Apr 27, 2018
601e8cd
Merge branch 'development' of https://github.com/samanthaberk/betsy i…
mgraonic Apr 27, 2018
9ac7147
Merge branch 'development' of https://github.com/samanthaberk/betsy
mgraonic Apr 27, 2018
edfc68b
merging with master
samanthaberk Apr 27, 2018
cd16150
Merge branch 'master' of https://git.heroku.com/sweatsy
samanthaberk Apr 27, 2018
a9cc768
fixed categories alignment
samanthaberk Apr 27, 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
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
.env
.DS_Store
.env

# Ignore coverage
coverage
77 changes: 77 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
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.6'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# 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', '~> 4.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

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

gem 'simplecov', require: false, group: :test
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'
gem 'jquery-rails'
gem 'foundation-rails'
gem 'normalize-rails'
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'
end
272 changes: 272 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,272 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.1.6)
actionpack (= 5.1.6)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.6)
actionpack (= 5.1.6)
actionview (= 5.1.6)
activejob (= 5.1.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.1.6)
actionview (= 5.1.6)
activesupport (= 5.1.6)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.6)
activesupport (= 5.1.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.1.6)
activesupport (= 5.1.6)
globalid (>= 0.3.6)
activemodel (5.1.6)
activesupport (= 5.1.6)
activerecord (5.1.6)
activemodel (= 5.1.6)
activesupport (= 5.1.6)
arel (~> 8.0)
activesupport (5.1.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
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.8.0)
debug_inspector (>= 0.0.1)
builder (3.2.3)
byebug (10.0.2)
capybara (2.18.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (>= 2.0, < 4.0)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
coderay (1.1.2)
concurrent-ruby (1.0.5)
crass (1.0.4)
debug_inspector (0.0.3)
docile (1.1.5)
dotenv (2.2.2)
dotenv-rails (2.2.2)
dotenv (= 2.2.2)
railties (>= 3.2, < 6.0)
erubi (1.7.1)
execjs (2.7.0)
faraday (0.12.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.23)
foundation-rails (6.4.3.0)
railties (>= 3.1.0)
sass (>= 3.3.0, < 3.5)
sprockets-es6 (>= 0.9.0)
globalid (0.4.1)
activesupport (>= 4.2.0)
hashie (3.5.7)
i18n (1.0.1)
concurrent-ruby (~> 1.0)
jbuilder (2.7.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jquery-rails (4.3.3)
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.1.0)
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.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
mini_mime (>= 0.1.1)
method_source (0.9.0)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
minitest-rails (3.0.0)
minitest (~> 5.8)
railties (~> 5.0)
minitest-reporters (1.2.0)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
nio4r (2.3.0)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
normalize-rails (4.1.1)
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.8.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.5.0)
oauth2 (~> 1.1)
omniauth (~> 1.2)
pg (1.0.0)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.6)
pry (>= 0.10.4)
public_suffix (3.0.2)
puma (3.11.4)
rack (2.0.4)
rack-test (1.0.0)
rack (>= 1.0, < 3)
rails (5.1.6)
actioncable (= 5.1.6)
actionmailer (= 5.1.6)
actionpack (= 5.1.6)
actionview (= 5.1.6)
activejob (= 5.1.6)
activemodel (= 5.1.6)
activerecord (= 5.1.6)
activesupport (= 5.1.6)
bundler (>= 1.3.0)
railties (= 5.1.6)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (5.1.6)
actionpack (= 5.1.6)
activesupport (= 5.1.6)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.1)
rb-fsevent (0.10.3)
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.7)
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.11.0)
childprocess (~> 0.5)
rubyzip (~> 1.2)
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.1.1)
turbolinks-source (~> 5.1)
turbolinks-source (5.1.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.9)
execjs (>= 0.3.0, < 3)
web-console (3.6.0)
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.3)
xpath (3.0.0)
nokogiri (~> 1.8)

PLATFORMS
ruby

DEPENDENCIES
better_errors
binding_of_caller
byebug
capybara (~> 2.13)
dotenv-rails
foundation-rails
jbuilder (~> 2.5)
jquery-rails
jquery-turbolinks
listen (>= 3.0.5, < 3.2)
minitest-rails
minitest-reporters
normalize-rails
omniauth
omniauth-github
pg (>= 0.18, < 2.0)
pry-rails
puma (~> 3.7)
rails (~> 5.1.6)
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.1
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/Red_Sweater.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/favicon.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/home_img.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/placeimg_200_250_any (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/placeimg_200_250_any.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/placeimg_200_250_nature (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/placeimg_200_250_nature.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/sweatsy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading