Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
170 commits
Select commit Hold shift + click to select a range
8f72aaf
Initial rails app
bonara Apr 30, 2019
f2de0a2
Generated Products controller
bonara Apr 30, 2019
b114b6a
generates product model
nidhiparixitpatel Apr 30, 2019
35b3503
Merge branch 'np/start'
nidhiparixitpatel Apr 30, 2019
a6705fb
Adds products and merchants routes
bonara May 1, 2019
4dd44dd
Creates merchant model and adds merchant_id to products table
bonara May 1, 2019
3c2979d
Merge pull request #1 from bonara/merchant_feature
ranuseh May 1, 2019
0b48251
created category model and controller
nidhiparixitpatel May 1, 2019
0d7d54a
Creates merchants controller
bonara May 1, 2019
a6b37e7
created join table product and category
nidhiparixitpatel May 1, 2019
8734057
Merge branch 'nb/merchants'
bonara May 1, 2019
bca35f9
fixed join table error for category product
nidhiparixitpatel May 1, 2019
e76f5e1
Merge branch 'master' of https://github.com/bonara/betsy
nidhiparixitpatel May 1, 2019
4594587
added route
nidhiparixitpatel May 1, 2019
529ee47
Adding migration models
ranuseh May 1, 2019
d84b528
Fixed merge conflict
ranuseh May 1, 2019
ed82f96
Added order items model
ranuseh May 1, 2019
20cec68
added create and index test for categories
nidhiparixitpatel May 1, 2019
7ad1e30
Merge branch 'np/create-categories'
nidhiparixitpatel May 1, 2019
6fa12cd
Added methods to order controller
ranuseh May 1, 2019
939d63b
Methods to order controller
ranuseh May 1, 2019
5356693
Adds login and logout function
bonara May 1, 2019
f2e9eb7
Merge branch 'nb/merchants'
bonara May 1, 2019
e79284b
created view files for order
ranuseh May 1, 2019
aec9938
Added tests to controller
ranuseh May 2, 2019
ea53751
create review controller
KateAnnNichols May 2, 2019
d5d541f
Adds require login and current user methods to application controller
bonara May 2, 2019
3dcb3f5
Merchant controller test and merchant fixture
bonara May 2, 2019
90316ae
Resolved merge conflict when pulling from master
bonara May 2, 2019
c0b2ed2
Merge pull request #3 from bonara/nb/merchants
bonara May 2, 2019
40ff22e
skeleton of products controller and initial merchant db seed
nidhiparixitpatel May 3, 2019
b85803c
Adds merchant model tests and product fixtures
bonara May 3, 2019
fc7acfe
removed cart related methods from application controller
bonara May 3, 2019
a1c474b
Updates the nav bar and adds footer
bonara May 3, 2019
dcbf0c6
Merge branch 'master' into np/product-controller
nidhiparixitpatel May 3, 2019
338a776
Merge pull request #4 from bonara/np/product-controller
bonara May 3, 2019
46034a6
Merge branch 'master' into nb/merchant_features
bonara May 3, 2019
07b9c1d
Merge pull request #5 from bonara/nb/merchant_features
bonara May 3, 2019
40e7a7a
Adds migration to fix the categories_products table name
bonara May 3, 2019
d26e186
Adds product_id to reviews table
bonara May 3, 2019
5d54ce6
Adds product validations
bonara May 3, 2019
0e3f8cf
Adds product model test
bonara May 3, 2019
034d248
Added methods to orders controller
ranuseh May 3, 2019
f7c81f0
Adds product edit view
bonara May 4, 2019
c43cbee
Add controller filter and categories show page
bonara May 6, 2019
7c0c3f6
Adds merchant show page
bonara May 6, 2019
8c4464d
Dashboard controller method and view
bonara May 6, 2019
f0792f1
Updates layouts
bonara May 6, 2019
e05a528
Adds link to each object
bonara May 6, 2019
9d32c28
Update button for product if merchant's product
bonara May 6, 2019
3d0c3f2
Update method for product controller
bonara May 6, 2019
550a364
reviews
KateAnnNichols May 6, 2019
20ddd0e
Added methods to order controller
ranuseh May 6, 2019
d5ddca9
Accepted merge changes
ranuseh May 6, 2019
25143dd
Merged changew from master
ranuseh May 6, 2019
946ef93
cleaned up review method tests
KateAnnNichols May 6, 2019
8700614
reviews controller update
KateAnnNichols May 6, 2019
36cb7d7
Merge pull request #8 from bonara/kn/reviews
bonara May 6, 2019
612bd10
Updates merchant controller messages
bonara May 6, 2019
ca8402d
Merge branch 'master' into nb/product-merchant
bonara May 6, 2019
309b5a8
changed to allow login from github
nidhiparixitpatel May 6, 2019
2640a73
fixed login
nidhiparixitpatel May 6, 2019
82b6e6c
Added add to cart to products page
ranuseh May 6, 2019
3a8ae5c
merged rating test
ranuseh May 6, 2019
467d416
Updates view to add images
bonara May 6, 2019
9037082
Product view update to show images
bonara May 6, 2019
186c8af
added listed retired status to product
nidhiparixitpatel May 6, 2019
d7e9752
cleaned up product list retire status
nidhiparixitpatel May 6, 2019
d112327
Updates to add_to_cart method
bonara May 6, 2019
09f98c1
added categories to product
nidhiparixitpatel May 7, 2019
c495510
Adds cart functionality with updated views
bonara May 7, 2019
a2644de
Merge branch 'master' into np/category_product
bonara May 7, 2019
b46c82b
Merge pull request #10 from bonara/np/category_product
bonara May 7, 2019
83f9a72
removed visible column
nidhiparixitpatel May 7, 2019
a48f42c
confirmation html
KateAnnNichols May 7, 2019
96b770d
added methods for total on order, orderitem, merchant
nidhiparixitpatel May 7, 2019
ddebd6b
added nested route for reviews
KateAnnNichols May 7, 2019
7a69872
added revenue to view
nidhiparixitpatel May 7, 2019
4184c51
Updates order controller and order model
bonara May 7, 2019
16e23bb
added tests for revenue method in merchant
nidhiparixitpatel May 7, 2019
4498d23
Removed the visible column
bonara May 7, 2019
dc20243
working on merchant tests
nidhiparixitpatel May 7, 2019
fc259c7
Merge branch 'master' into np/revenue
nidhiparixitpatel May 7, 2019
d4bcb72
Updates order update controller
bonara May 7, 2019
aafc67f
git tMerge branch 'nb/product-merchant'
bonara May 7, 2019
3fb1e26
working on tests for revenue methods
nidhiparixitpatel May 7, 2019
d4d7960
confirmation erb
KateAnnNichols May 7, 2019
1ed2c82
Added ability to add multiple items to cart and update cart
ranuseh May 7, 2019
ea139ea
Empties cart imtems
bonara May 7, 2019
cd19fac
link to new review
nidhiparixitpatel May 7, 2019
758ab4d
cleaned up routes
nidhiparixitpatel May 7, 2019
43f0cb3
routes
KateAnnNichols May 7, 2019
4c994af
added flash message
nidhiparixitpatel May 7, 2019
e26276a
update
KateAnnNichols May 7, 2019
83c4b5d
Add to cart button on the products page
bonara May 7, 2019
e4e9a2f
Merge branch 'master' into nb/product-merchant
bonara May 7, 2019
21076bd
update cart button
ranuseh May 7, 2019
cc73829
Merge branch 'ra/orders_controller'
ranuseh May 7, 2019
0102bf8
Merge pull request #12 from bonara/np/review
bonara May 7, 2019
25b432f
rearranged dashboard for order fulfillment
nidhiparixitpatel May 7, 2019
0ea1824
working on method test for order item
nidhiparixitpatel May 7, 2019
73b04b6
added route for confirmation page
KateAnnNichols May 8, 2019
b33dbd1
Updates cc_num to string
bonara May 8, 2019
72e0d2f
Carousel on the main page
bonara May 8, 2019
674700f
Working on cart
ranuseh May 8, 2019
8eaca5c
Cart features
ranuseh May 8, 2019
ecb4fb6
Update cart quantity working
ranuseh May 8, 2019
a655bb1
Merge pull request #13 from bonara/ra/orders_controller
bonara May 8, 2019
5ec2955
Merge branch 'master' into nb/product-merchant
bonara May 8, 2019
fa7331a
merge
nidhiparixitpatel May 8, 2019
8217dda
orders
KateAnnNichols May 8, 2019
8e5ec05
changes to confirmation
KateAnnNichols May 8, 2019
739f219
confirmation page
KateAnnNichols May 8, 2019
0d90f7c
Updates category model test
bonara May 8, 2019
6b2e6e7
Updates review model testing
bonara May 8, 2019
1da7514
Removed a dropdown list for oder list
bonara May 8, 2019
f2b8006
removed total order
nidhiparixitpatel May 8, 2019
c5bfa2d
working confirmation
KateAnnNichols May 8, 2019
d992423
Merge branch 'master' into np/revenue
nidhiparixitpatel May 8, 2019
4015365
merge changes
KateAnnNichols May 8, 2019
486ed19
Merge branch 'master' of https://github.com/bonara/betsy
nidhiparixitpatel May 8, 2019
160ffcc
confirm changes
KateAnnNichols May 8, 2019
0e33956
Product model test
bonara May 8, 2019
e57aad4
update
KateAnnNichols May 8, 2019
c0ecea1
finalized confirmation page
KateAnnNichols May 8, 2019
2a5d552
updating confirmation
KateAnnNichols May 8, 2019
a9d7d0b
Order model testing
bonara May 8, 2019
8ce2c97
added confirmation page to dashboard
nidhiparixitpatel May 8, 2019
a9804d8
clean up dashboard
nidhiparixitpatel May 8, 2019
c2d4387
Updates order_item test
bonara May 8, 2019
c5ec41f
Resolved merge conflict
bonara May 8, 2019
60d2009
Resolved merge conflicts
bonara May 8, 2019
456c520
Order controller testing
ranuseh May 8, 2019
e5abaf9
Merge conflict solved
ranuseh May 8, 2019
092cc57
fixed order summary total
nidhiparixitpatel May 8, 2019
007e9fb
Fixing merge conflicts
ranuseh May 8, 2019
7262186
dashboard clean up
nidhiparixitpatel May 8, 2019
742bbd4
Merge branch 'master' of https://github.com/bonara/betsy
nidhiparixitpatel May 8, 2019
b628f44
Fixed a session issue with the confirmation page added
bonara May 9, 2019
978efee
Merge branch 'master' of github.com:bonara/betsy
bonara May 9, 2019
981a429
Merge conflict resolution
bonara May 9, 2019
eb66b54
Fixed the orders-controller private method
bonara May 9, 2019
0825f4a
Removes end from order_items controller
bonara May 9, 2019
ecb94e7
Updates formatting
bonara May 9, 2019
e6c452c
Order controller tests
ranuseh May 9, 2019
98396e5
Fixed orders controller test end
bonara May 9, 2019
7ce7cb2
Updates dashboard formatting and rounds rating
bonara May 9, 2019
ec16165
Updates review form
bonara May 9, 2019
4e9afeb
Working on order controller test. All passing
ranuseh May 9, 2019
de72b83
resolved merge conflicts
ranuseh May 10, 2019
8f83697
making changes to test after merging master
ranuseh May 10, 2019
44597c4
Merchant controller tests passing
ranuseh May 10, 2019
d41c223
Adds styling
bonara May 10, 2019
06864f8
Updates carousel
bonara May 10, 2019
8c31735
Merge pull request #15 from bonara/ra/order_controller_tests
bonara May 10, 2019
34aaed7
Merge branch 'master' into nb/product-merchant
bonara May 10, 2019
49a4282
Updates a bug if purchased product is equal to item quantity.
bonara May 10, 2019
208a4e8
SimpleCov gem
bonara May 10, 2019
5355c7c
All tests passing for categories controller
ranuseh May 10, 2019
38a0c39
Styling
bonara May 10, 2019
ec85371
Merge branch 'master' into nb/product-merchant
bonara May 10, 2019
a806f45
Fixed a bug with merchant reviewing their own item
bonara May 10, 2019
de918ce
Review test
KateAnnNichols May 10, 2019
9eef126
Passing review test
KateAnnNichols May 10, 2019
e2444a2
Review test update
bonara May 10, 2019
74dcbed
Styling cart
bonara May 10, 2019
9b3a01b
Fixing bugs in controlle test
ranuseh May 11, 2019
ae77f26
order item controller method passing
ranuseh May 11, 2019
153fdc5
All order item controller test passing
ranuseh May 11, 2019
02686a3
Merge pull request #17 from bonara/ra/order_controller_tests
bonara May 11, 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
30 changes: 30 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

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

gem "omniauth"
gem "omniauth-github"


# 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'
gem 'simplecov', require: false
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'
end
Loading