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

Sockets - Sarah, Bita, Carla, Kelly #82

Open
wants to merge 492 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
492 commits
Select commit Hold shift + click to select a range
c6f63e5
Add cards and styling to homepage
kdow May 5, 2019
99f385a
Merge branch 'homepage'
kdow May 5, 2019
ff26e18
Merge branch 'master' into reviews
kdow May 5, 2019
93a644b
Add new review link on product show and reformat
kdow May 5, 2019
af9be07
Reformat categories index and show views
kdow May 5, 2019
b3e1d5c
comented the empty cart line out
Bitaman May 6, 2019
9989709
added more validations to order
Bitaman May 6, 2019
31281f3
minor html edit
sjscotton May 6, 2019
481fa3d
Merge branch 'cat-cart'
carlabosco May 6, 2019
522b413
fixed bug where we couldnt add to the shopping cart or checkout
sjscotton May 6, 2019
ad8339d
debugging the checkout
Bitaman May 6, 2019
cd8f18b
merge master to my branch
Bitaman May 6, 2019
9670b23
Solving merge conflicts
carlabosco May 6, 2019
a9068a2
Remove underline from header
kdow May 6, 2019
9d30346
merge
kdow May 6, 2019
b4f10e5
Solving merge conflicts
carlabosco May 6, 2019
74075e5
Solving merge conflicts
carlabosco May 6, 2019
93b09e6
added contextual validations for order
sjscotton May 6, 2019
eafa847
Merge branch 'master' of https://github.com/kdow/betsy
sjscotton May 6, 2019
b3200df
merging with the master
Bitaman May 6, 2019
a41f517
merge with master
Bitaman May 6, 2019
e4f970c
Put products on index view in cards
kdow May 6, 2019
97d38b3
Style product show view
kdow May 6, 2019
c471735
Merge pull request #22 from kdow/products
kdow May 6, 2019
134a60e
minor edit
sjscotton May 6, 2019
14c2a90
Convert cart currency display
kdow May 6, 2019
282534a
created the confirmation page
Bitaman May 6, 2019
17d0d5e
added tests for seller get unique orders
sjscotton May 6, 2019
306ae93
updated flash messages
sjscotton May 6, 2019
bb594e4
Merge branch 'master' of https://github.com/kdow/betsy
sjscotton May 6, 2019
078f453
mergeing
sjscotton May 6, 2019
6f22fdd
pulled the master
Bitaman May 6, 2019
e64681f
Add link for seller dashboard to header
kdow May 6, 2019
a437910
merge
kdow May 6, 2019
bafbb9f
Fix categories in header
kdow May 6, 2019
db01a86
Merge branch 'master' of https://github.com/kdow/betsy
kdow May 6, 2019
7cdcce5
added the requirement for checkout page
Bitaman May 6, 2019
defbe4b
Merge branch 'master' of https://github.com/kdow/betsy into bita-test
Bitaman May 6, 2019
851a4d4
changed some more flash messages
sjscotton May 6, 2019
d46d752
added the requirements for chckout page
Bitaman May 6, 2019
be5b2a0
merging
sjscotton May 6, 2019
5b26849
minor html edit
sjscotton May 6, 2019
76783fc
Added view for seller products
carlabosco May 6, 2019
4ed07e3
Solving merge conflicts
carlabosco May 6, 2019
05cde49
Merge branch 'master' of https://github.com/kdow/betsy
sjscotton May 6, 2019
2938f39
Reformat currency display on order confirmation
kdow May 6, 2019
43a080b
Merge pull request #24 from kdow/order-confirmation
kdow May 6, 2019
82e9514
Add styling to table
kdow May 6, 2019
0f4bf2e
Merge pull request #25 from kdow/order-confirmation
kdow May 6, 2019
2f16bbd
Changed named path for seller products
carlabosco May 6, 2019
7a6d6bf
merge
sjscotton May 6, 2019
7e262e1
Merge branch 'master' of https://github.com/kdow/betsy into ss-seller
sjscotton May 6, 2019
82bdb99
Add functionality for seller to add a new category
kdow May 6, 2019
51a3419
Add category name validation
kdow May 6, 2019
aadfcc5
Merge pull request #26 from kdow/CATegories
kdow May 6, 2019
5951799
can't remember what I did
Bitaman May 6, 2019
22b7c79
Fixed bug where new orders didnt have 'in prograss' status
sjscotton May 6, 2019
9fcc5fd
merge
sjscotton May 6, 2019
2883501
Merge branch 'ss-seller'
sjscotton May 6, 2019
152b217
deleted the create for order controller
Bitaman May 7, 2019
06ec2a5
User cannot select more items than available
carlabosco May 7, 2019
74e22ff
added tests for product model
Bitaman May 7, 2019
da2f978
Solving merge conflicts
carlabosco May 7, 2019
c9f6c2e
Solving merge conflicts
carlabosco May 7, 2019
5fa9d19
Display message on seller page when no items available
carlabosco May 7, 2019
be37100
Added tests to order product controller
carlabosco May 7, 2019
86b697e
added the check quantity to order
Bitaman May 7, 2019
ef6ee3c
Merge branch 'master' of https://github.com/kdow/betsy into bita-test
Bitaman May 7, 2019
e7b851e
add is_active column to products
kdow May 7, 2019
c8aba5b
merged with master
Bitaman May 7, 2019
aaa6d74
merged with bita test
Bitaman May 7, 2019
3f72fc0
added the changes
Bitaman May 7, 2019
2fd35f5
migration to change cvv in orders
Bitaman May 7, 2019
2cdfa9f
remove the cvv
Bitaman May 7, 2019
f68ed38
changed the cvv data type from integer to string
Bitaman May 7, 2019
3143f9b
Merge branch 'master' into product-retire
kdow May 7, 2019
334be30
Changed button position inside card
carlabosco May 7, 2019
aefdac1
Merge conflicts
carlabosco May 7, 2019
19ff1e1
Merge conflicts
carlabosco May 7, 2019
2f1c037
Add product retire action, tests, route
kdow May 7, 2019
2ff89ed
Number field won't go bellow 0
carlabosco May 7, 2019
330d57d
Number field won't go bellow 0
carlabosco May 7, 2019
6d6e47e
added seller order_revenue method in model, with tests
sjscotton May 7, 2019
fc9bd07
Add retired products to seller product dashboard
kdow May 7, 2019
4e56937
merge
sjscotton May 7, 2019
4444208
Added 4 last cc digits to summary and added validation to cc length
carlabosco May 7, 2019
a2b91f9
Updated flash messages
carlabosco May 7, 2019
3a4bb71
Add active product method and tests
kdow May 7, 2019
04ab2f5
added seller total_revenue_by_status method with tests
sjscotton May 7, 2019
d96248b
updated the order and the cart view
Bitaman May 7, 2019
a97cf6d
Change views to only display active products
kdow May 7, 2019
4aea985
merged with master
Bitaman May 7, 2019
cb3a875
Merge pull request #27 from kdow/product-retire
kdow May 7, 2019
4db9307
merged with master
Bitaman May 7, 2019
981d2a9
Updated checkout form and order summary
carlabosco May 7, 2019
c30584c
merge conflict
carlabosco May 7, 2019
15f0ad9
Merge commit
carlabosco May 7, 2019
18c899d
Merge pull request #28 from kdow/bita-test
Bitaman May 7, 2019
dc5a137
minor edit
sjscotton May 7, 2019
37b43c7
Merge commit
carlabosco May 7, 2019
574e692
Removed duplicate line in cart
carlabosco May 7, 2019
af99afe
added test for order controller
Bitaman May 8, 2019
31a7af4
added seller dashboard navigation buttons product and order dashboards
sjscotton May 8, 2019
70c825c
changed path link for view my catboard
sjscotton May 8, 2019
f9d9af9
added partial for _dashboard_header
sjscotton May 8, 2019
6cf2dbb
finished testing the order controller, all the tests are passing
Bitaman May 8, 2019
163ab69
added format dollars view helper method
sjscotton May 8, 2019
a41f713
added order revenue to seller dashboard
sjscotton May 8, 2019
f6a4fde
merge
sjscotton May 8, 2019
f2e846d
Test for destroy order product passes
carlabosco May 8, 2019
6a4f7f9
Destroy test in order product
carlabosco May 8, 2019
70d36cb
Destroy test in order product
carlabosco May 8, 2019
cca5986
Changed navbar to Browse by
carlabosco May 8, 2019
521b8e0
merged with master
Bitaman May 8, 2019
a422952
Add avg review method, test, and product show view
kdow May 8, 2019
e4cf4d3
Fix currency display formatting
kdow May 8, 2019
0bfbe16
Merge branch 'master' into order-confirmation
kdow May 8, 2019
6f8a597
Merge pull request #30 from kdow/order-confirmation
kdow May 8, 2019
2ff39e3
Merge pull request #31 from kdow/reviews
kdow May 8, 2019
3541b42
added the self method to orderproduct to check if the item is already…
Bitaman May 8, 2019
d257608
added seller sidebar managment
sjscotton May 8, 2019
60ad6b1
added test for the self method on order product model
Bitaman May 8, 2019
fbb2d80
Add large photos
kdow May 8, 2019
ff1d14c
Add large photo to product show view
kdow May 8, 2019
93a3288
Merge pull request #32 from kdow/images
kdow May 8, 2019
0d24afb
Merge pull request #29 from kdow/bita-test
kdow May 8, 2019
ef01146
Reformat product show
kdow May 8, 2019
c6b19f1
Add availability notice and spacing
kdow May 8, 2019
ea14ba0
Merge pull request #33 from kdow/products
kdow May 8, 2019
5e5621d
added reqire login for categories new and create, plus some styling
sjscotton May 8, 2019
2c3bd6a
added header styling
sjscotton May 8, 2019
2717072
added require login for category new and create, added tests
sjscotton May 8, 2019
4b0e854
Added route and view to browse by seller
carlabosco May 8, 2019
647a211
Merge branch 'master' of https://github.com/kdow/betsy
sjscotton May 8, 2019
81fa598
Added route and view for browse sellers, changed update order product
carlabosco May 8, 2019
9234676
Add review index action, route, test, view
kdow May 8, 2019
5533fb5
Merge pull request #35 from kdow/reviews
kdow May 8, 2019
638dbb6
merge commit
carlabosco May 8, 2019
394ef07
minor html edits
sjscotton May 8, 2019
2cac8a3
Merge branch 'master' of https://github.com/kdow/betsy
sjscotton May 8, 2019
8ebd75a
remove pry
kdow May 8, 2019
13350e8
Changed shop names
carlabosco May 8, 2019
7fe6df4
Merge commit
carlabosco May 8, 2019
0b5a38d
Merge branch 'master' of https://github.com/kdow/betsy
kdow May 8, 2019
6c89495
minor html edit in seller_orders
sjscotton May 8, 2019
d9fb0f2
Changed shop names
carlabosco May 8, 2019
8b7df6b
added stat box styles for orders controller
sjscotton May 8, 2019
4439a25
styled the product page
Bitaman May 8, 2019
d633355
merge with master
Bitaman May 8, 2019
b4b616d
added styling to seller order dashboard
sjscotton May 8, 2019
1fbe6f8
Merge branch 'master' of https://github.com/kdow/betsy
sjscotton May 8, 2019
472931a
Merge branch 'master' into ss-seller
sjscotton May 8, 2019
faa5fb8
styled the product cards in category page
Bitaman May 9, 2019
dc32a06
Merge branch 'master' of https://github.com/kdow/betsy
Bitaman May 9, 2019
ff60827
chenged the checkout form
Bitaman May 9, 2019
c1eb1ab
merge
sjscotton May 9, 2019
8e92e7d
merging
sjscotton May 9, 2019
fa046c1
added Guest user test for retire
sjscotton May 9, 2019
a9ed175
Styled products page for seller
carlabosco May 9, 2019
03a23af
Fixed bug in nav bar
carlabosco May 9, 2019
c94ac2b
Merge commit
carlabosco May 9, 2019
b01cf9f
Fixed navbar bug and added style to sellers products
carlabosco May 9, 2019
56eb5d6
Added cards to sellers products view
carlabosco May 9, 2019
ceb30ca
Added cards to seller products view
carlabosco May 9, 2019
26e52c8
Merge branch 'master' of https://github.com/kdow/betsy
kdow May 9, 2019
963e785
Styling dashboard
sjscotton May 9, 2019
1da35ea
Merge branch 'master' into ss-seller
sjscotton May 9, 2019
1d085a2
styled the cards on the main page
Bitaman May 9, 2019
3964784
Merge branch 'master' of https://github.com/kdow/betsy into bita-last
Bitaman May 9, 2019
870b519
added logo styling
sjscotton May 9, 2019
0b150d5
changed link route of 'view my catboard' to go to seller products page
sjscotton May 9, 2019
78df13c
Merge pull request #36 from kdow/bita-last
Bitaman May 9, 2019
bd8b70a
Merge branch 'master' of https://github.com/kdow/betsy
kdow May 9, 2019
7d3a1eb
minor seller dashboard style changes
sjscotton May 9, 2019
f5014bc
Merge branch 'master' of https://github.com/kdow/betsy
sjscotton May 9, 2019
7d98f05
added footer styling
sjscotton May 9, 2019
0e6f835
Edited secondary font, plus styling on dashboard
sjscotton May 9, 2019
2abbace
Styled browse by category
carlabosco May 9, 2019
2caab78
Merge commit
carlabosco May 9, 2019
a97822c
Changed navbar in categories
carlabosco May 9, 2019
567da39
added total items sold for seller dashboard
sjscotton May 9, 2019
3f39133
removed binding.pry
sjscotton May 9, 2019
a2e5956
Merge branch 'master' of https://github.com/kdow/betsy
sjscotton May 9, 2019
e8c0c25
Merge branch 'master' of https://github.com/kdow/betsy
kdow May 9, 2019
aa88a17
Add paws to product show review average
kdow May 10, 2019
1ce03d8
Style reviews index page
kdow May 10, 2019
41bbe25
added extra tests for seller model methods
sjscotton May 10, 2019
06850e2
added relationship testing for seller
sjscotton May 10, 2019
231ecd1
added validation testing for Seller
sjscotton May 10, 2019
460dc9f
Added top sellers and styled homepage
carlabosco May 10, 2019
f7a601b
Added top sellers method and styled homepage
carlabosco May 10, 2019
94428d3
Add paws to new reviews
kdow May 10, 2019
8bbf52f
Merge pull request #38 from kdow/reviews
kdow May 10, 2019
1adace3
pulling from master
sjscotton May 10, 2019
7836019
Merge branch 'ss-seller'
sjscotton May 10, 2019
d16fc4a
Added link in cart view
carlabosco May 10, 2019
9da703c
Minor changes to cart view
carlabosco May 10, 2019
26116e4
styled page for seller purchase details
sjscotton May 10, 2019
09053b2
added styling to the order show page (after checkout)
sjscotton May 10, 2019
cb4c107
styling for sellers
sjscotton May 10, 2019
acc4dd3
added mark_as_shipped method
sjscotton May 10, 2019
8eeb50b
added tests for mark_as_shipped
sjscotton May 10, 2019
1772c44
Merge commit
carlabosco May 10, 2019
59fecda
merge commit
carlabosco May 10, 2019
a7cc6ec
merge commit
carlabosco May 10, 2019
11e049d
Add color to product availability
kdow May 10, 2019
9136480
Merge pull request #39 from kdow/products
kdow May 10, 2019
8ecab46
Changed header name in homepage and capitalization in sellers
carlabosco May 10, 2019
776997e
Merge commit
carlabosco May 10, 2019
4292133
Add icons to header and change colors
kdow May 10, 2019
9e849f9
styled the checkout form
Bitaman May 10, 2019
7459f40
Merge pull request #40 from kdow/header
kdow May 10, 2019
6adcb21
Centralized footer
carlabosco May 10, 2019
9130a2f
all the added tests for model
Bitaman May 10, 2019
50c5eac
Changed cart style
carlabosco May 10, 2019
5e11c79
edited products card
sjscotton May 10, 2019
34807a3
merge commit
carlabosco May 10, 2019
cc916c7
merge commit
carlabosco May 10, 2019
946e304
merge cat-cart
carlabosco May 10, 2019
41823df
styled the checkout form
Bitaman May 10, 2019
09f228a
Merge branch 'master' of https://github.com/kdow/betsy
Bitaman May 10, 2019
a758698
fixed the cvv validation and test on order
Bitaman May 10, 2019
91dabb6
created cat card partial
sjscotton May 10, 2019
c313493
merging
sjscotton May 10, 2019
de318f5
Added spacing in products page
carlabosco May 10, 2019
1f01bf5
merge commit
carlabosco May 10, 2019
40e7fce
Disallow seller reviewing own products
kdow May 10, 2019
1ddbfd1
Merge pull request #41 from kdow/reviews
kdow May 10, 2019
c995133
merge commit
carlabosco May 10, 2019
fb62bfa
trying to style the drop down menue in order
Bitaman May 10, 2019
4693587
merge commit
carlabosco May 10, 2019
daf89a9
merge commit
carlabosco May 10, 2019
ba56135
Merge branch 'master' of https://github.com/kdow/betsy
Bitaman May 10, 2019
4737455
Reformat currency display in cart show view
kdow May 10, 2019
c809053
Merge pull request #42 from kdow/order-confirmation
kdow May 10, 2019
90baf8c
changed main blue color/ main hover blue
sjscotton May 10, 2019
6ac1104
merging
sjscotton May 10, 2019
e9c57d3
Aligned buttons
carlabosco May 10, 2019
a5d423a
merge commit
carlabosco May 10, 2019
af74d82
made order table columns consistant width
sjscotton May 10, 2019
9027e66
Merge branch 'master' of https://github.com/kdow/betsy
sjscotton May 10, 2019
3cb4963
Change paw color and spacing
kdow May 10, 2019
6de2baa
Merge branch 'master' of https://github.com/kdow/betsy
kdow May 10, 2019
328c47b
Merge branch 'master' of https://github.com/kdow/betsy
Bitaman May 10, 2019
43eca74
styled the drop down menue
Bitaman May 10, 2019
94e4a1e
Adjust image height
kdow May 10, 2019
11626e8
Merge pull request #43 from kdow/images
kdow May 10, 2019
501b787
Adjust height
kdow May 10, 2019
c1b5fd6
Changed top-sellers to 5
carlabosco May 10, 2019
5bc99d5
merge commit
carlabosco May 10, 2019
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.
32 changes: 32 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# 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

# Ignore uploaded files in development
/storage/*
!/storage/.keep

/node_modules
/yarn-error.log

/public/assets
.byebug_history

# Ignore master key for decrypting credentials and more.
/config/master.key


.env
coverage
/coverage
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ruby-2.5.1
91 changes: 91 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.5.1'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.3'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 3.11'
# 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 'mini_racer', 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 ActiveStorage variant
# gem 'mini_magick', '~> 4.8'

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

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.1.0', require: false

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]
end

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

group :test do
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '>= 2.15'
gem 'selenium-webdriver'
# Easy installation and use of chromedriver to run system tests with Chrome
gem 'chromedriver-helper'
end

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

gem 'jquery-rails'
gem 'jquery-turbolinks'
gem 'bootstrap', '~> 4.1.3'
group :development, :test do
gem 'pry-rails'
end

group :development do
gem 'better_errors'
gem 'binding_of_caller'
gem 'guard'
gem 'guard-minitest'
gem 'dotenv-rails'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
gem 'simplecov'
end

gem 'faker'

gem "omniauth"
gem "omniauth-github"

gem "font-awesome-rails"
gem 'font-awesome-sass', '~> 5.8.1'
Loading