Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
318 commits
Select commit Hold shift + click to select a range
ebe21c8
Merge branch 'master' of https://github.com/aribray/betsy
aribray May 3, 2019
be7dee8
added new and create controllers and tests
aribray May 3, 2019
61fc412
re-add .env to gitignore
jessicacaley May 3, 2019
2c282f7
migration to increase integer limit of cc_number
jessicacaley May 3, 2019
95ba5d7
controller and test for orders#show
jessicacaley May 3, 2019
24b5a46
Merge branch 'master' into works-show-page
jessicacaley May 3, 2019
acaebc0
start orders#show view (will need to be edited)
jessicacaley May 3, 2019
af7c6f1
Merge pull request #12 from aribray/works-show-page
jessicacaley May 3, 2019
03c6237
Merge branch 'master' of https://github.com/aribray/betsy
aribray May 3, 2019
65e8e10
delete orders#index (not needed)
jessicacaley May 3, 2019
5772e18
created new product form
amyesh May 3, 2019
71cb054
Merge branch 'master' into productform
amyesh May 3, 2019
005ed39
Merge pull request #13 from aribray/productform
amyesh May 3, 2019
2cc3013
add find_order method to application_controller
jessicacaley May 3, 2019
8bd1f46
finished product-update action and tests
minams May 3, 2019
af3451a
category user show page
amyesh May 3, 2019
57f623c
passing tests for create new review with nested routes
aribray May 3, 2019
cc2538e
Merge pull request #15 from aribray/categoryusershow
minams May 3, 2019
90dacd7
made reviews into a table in products#show page
aribray May 3, 2019
8c36b33
Merge branch 'master' of https://github.com/aribray/betsy
aribray May 3, 2019
a416a13
updated describe block title for guest
minams May 3, 2019
a46f025
be able to add items to a cart/order via orderitems
jessicacaley May 3, 2019
7d09fd2
Merge branch 'master' into add_new_review
amyesh May 3, 2019
04d66bf
Merge pull request #16 from aribray/add_new_review
amyesh May 3, 2019
1c822a1
Merge branch 'master' into products_update
minams May 3, 2019
31cb79e
Merge pull request #14 from aribray/products_update
minams May 3, 2019
94293db
≈Merge branch 'master' of https://github.com/aribray/betsy
aribray May 3, 2019
d6a33b9
Merge branch 'master' into create-order
jessicacaley May 3, 2019
a648273
Merge pull request #17 from aribray/create-order
jessicacaley May 3, 2019
471b43f
Merge branch 'master' of https://github.com/aribray/betsy
aribray May 3, 2019
7bfddeb
removed hardcoded user from myaccount
aribray May 3, 2019
ea92188
added tests and functionality for retire product. updated view pages …
aribray May 4, 2019
564b5c7
added link to myorders
aribray May 4, 2019
b6ba9f0
saving changes
aribray May 5, 2019
d62c08a
working through order forms
amyesh May 6, 2019
2e1bda8
added average rating calculation
minams May 6, 2019
40d91bf
added products to seed file
amyesh May 6, 2019
6be9a24
changed routes and method actions to patch
aribray May 6, 2019
195a52b
added logged in and logged out user cases for retire product action
aribray May 6, 2019
700a6b3
added redirect for invalid product in controller and tests
aribray May 6, 2019
f4ff6b2
Merge pull request #19 from aribray/flash-messages
minams May 6, 2019
3c5e725
removed comments from products index
aribray May 6, 2019
5b07f9f
replaced comment
aribray May 6, 2019
bf886bd
fixed product_path
aribray May 6, 2019
5f3e952
Merge pull request #18 from aribray/retire_product
aribray May 6, 2019
2e13712
resolved conflict in productscontroller
aribray May 6, 2019
53a7732
Merge branch 'master' of https://github.com/aribray/betsy into myorders
aribray May 6, 2019
cd88992
flash messages
minams May 6, 2019
014706a
Merge branch 'master' into databaseadds
amyesh May 6, 2019
c210ef5
Merge pull request #21 from aribray/databaseadds
amyesh May 6, 2019
b6664fa
added table in myorders for orderitems
aribray May 6, 2019
b5e6700
Merge branch 'master' of https://github.com/aribray/betsy
aribray May 6, 2019
248c6d8
Merge branch 'master' into myorders
aribray May 6, 2019
8a89ea1
added orderitems shipped method
aribray May 6, 2019
cb451a1
working on error messages
minams May 6, 2019
f467a5e
added ship action and tests for myorders
aribray May 6, 2019
d1ab7c5
refactored to include different colors for various flash messages
minams May 6, 2019
ad1f883
Merge pull request #22 from aribray/flash-messages
minams May 6, 2019
cd7f993
Merge branch 'master' of https://github.com/aribray/betsy
aribray May 6, 2019
21c04b1
Comment out unused tests
jessicacaley May 6, 2019
3402e74
Merge pull request #25 from aribray/comment-out-tests
amyesh May 6, 2019
8c683c7
fixed tests and myaccount view page
aribray May 6, 2019
a100ff5
Merge pull request #23 from aribray/myorders
aribray May 6, 2019
478bae7
Merge branch 'master' of https://github.com/aribray/betsy
aribray May 6, 2019
db92fcf
fixed user controller test
amyesh May 6, 2019
4d2212e
Merge pull request #26 from aribray/orderform
amyesh May 6, 2019
e274c03
debugged cart checkout
amyesh May 6, 2019
6b1014b
fixed flash message
amyesh May 6, 2019
2eea759
Merge pull request #27 from aribray/ordercheckout
amyesh May 6, 2019
8ea90bf
change cart from order show page to cart page, freeing up order show …
jessicacaley May 6, 2019
9952329
remove old routes
jessicacaley May 6, 2019
8f9912c
remove flash for order creation
jessicacaley May 6, 2019
d56af20
Merge pull request #28 from aribray/cart-path
jessicacaley May 6, 2019
48390d7
adding user model tests for validations, relationships, and custom me…
aribray May 6, 2019
45e0a0f
Merge branch 'master' of https://github.com/aribray/betsy
aribray May 6, 2019
9d3f5f9
relationship model test for category
minams May 6, 2019
feb533a
Merge branch 'master' into usermodel
aribray May 6, 2019
ec04376
completed category model tests
minams May 6, 2019
21570a4
Merge pull request #29 from aribray/model-tests
minams May 6, 2019
af7f83f
working on fleshing out total_revenue method
aribray May 6, 2019
4e22e3b
Merge branch 'master' of https://github.com/aribray/betsy
aribray May 6, 2019
b6df691
removed status checks from total_revenue method and views
aribray May 7, 2019
1f7896b
add cc_expiration to orders
jessicacaley May 7, 2019
4ae2df2
add show route
jessicacaley May 7, 2019
fa6e33a
change show page to access params order instead of current order, add…
jessicacaley May 7, 2019
7b95c70
modify form to fix bug where credit card number wasn't saving and add…
jessicacaley May 7, 2019
08db76d
change cancel order path to order_path(@order.id)
jessicacaley May 7, 2019
ea25841
add order show view page
jessicacaley May 7, 2019
5b9187b
remove order cvv (not part of user story) from order show page
jessicacaley May 7, 2019
ecec9ec
change error status from found to not_found
jessicacaley May 7, 2019
6bc9a5f
orders#show tests and remove old commented out tests (not relevant as…
jessicacaley May 7, 2019
d68e5a5
remove tests themselves from simplecov coverage
jessicacaley May 7, 2019
23a5549
Merge pull request #31 from aribray/order-show
jessicacaley May 7, 2019
3d73973
Merge branch 'master' of https://github.com/aribray/betsy
aribray May 7, 2019
c61dbc1
submit methods tests etc
amyesh May 7, 2019
523cd3b
Merge pull request #30 from aribray/usermodel
aribray May 7, 2019
90c227e
Merge branch 'master' of https://github.com/aribray/betsy
aribray May 7, 2019
b6b0105
Merge branch 'master' into submitetc
amyesh May 7, 2019
b703d32
Merge pull request #32 from aribray/submitetc
amyesh May 7, 2019
d99c6da
changed name of one of category model test
minams May 7, 2019
d82c83a
installed money gem and fixed product prices
aribray May 7, 2019
d9161ae
changed all headers to h2 across views, added default height and alt …
aribray May 7, 2019
303bc1b
Merge pull request #33 from aribray/styling
aribray May 7, 2019
fae3c2b
add placeholders for future tests
jessicacaley May 7, 2019
bd27b95
if cart is empty, reset order_id and redirect to empty cart page
jessicacaley May 7, 2019
3100f1a
fix cc expiration on form
jessicacaley May 7, 2019
272621e
change quantity when order is place and only allow guest to add up to…
jessicacaley May 7, 2019
eaf86cb
resolved merge conflict
jessicacaley May 7, 2019
9bf2509
finished total_revenue model tests, refactored method
aribray May 7, 2019
be6ddc2
fix tests for orderitem creation
jessicacaley May 7, 2019
dbd08da
Merge pull request #34 from aribray/misc-orders
amyesh May 7, 2019
b21ea4f
finished product model tests
minams May 7, 2019
7e5c5bd
submit test
amyesh May 7, 2019
358ab73
finished user model tests
aribray May 7, 2019
49b5fa4
Merge branch 'master' into usermodel
aribray May 7, 2019
9425156
Merge pull request #36 from aribray/usermodel
aribray May 7, 2019
ca9318c
Merge branch 'master' into product-model-test
minams May 7, 2019
ebe8a5b
Merge pull request #35 from aribray/product-model-test
minams May 7, 2019
d44aa7c
fixed average_review
minams May 7, 2019
31c8cb4
did styling
jessicacaley May 7, 2019
001840f
merge conflicts
jessicacaley May 7, 2019
ecabf22
completed most of order model test. keeping validation test for maybe…
minams May 7, 2019
52d3cff
added dependency tests for orderitem model
minams May 7, 2019
dfca99e
more styling
jessicacaley May 8, 2019
f0ec283
Merge pull request #38 from aribray/styles
jessicacaley May 8, 2019
d89ecd9
created all tests for checkout
amyesh May 8, 2019
483d28c
added last test to order_test model
minams May 8, 2019
9801e44
completed model tests for orderitem
minams May 8, 2019
c448834
fixed confirmation test
amyesh May 8, 2019
0225254
new product form also creates new category
aribray May 8, 2019
11e0063
Merge pull request #39 from aribray/ordercontrollertest
amyesh May 8, 2019
25910f2
fixed errors
aribray May 8, 2019
cb89f23
Merge branch 'master' of https://github.com/aribray/betsy
aribray May 8, 2019
b2a0dc4
Merge pull request #37 from aribray/order-model-test
minams May 8, 2019
b135dc3
Merge pull request #40 from aribray/orderitem-model-test
minams May 8, 2019
e945446
fixed nilclass error in orderitems_controller
aribray May 8, 2019
5933dba
fixed review form not submitting initially
minams May 8, 2019
fac7e1c
Merge pull request #41 from aribray/review-model-test
amyesh May 8, 2019
034d277
completed review model tests
minams May 8, 2019
094165b
can add multiple categories
aribray May 8, 2019
c536c11
can add new category
aribray May 8, 2019
92c3782
started working on orders-controller-tests
jessicacaley May 8, 2019
6c4551a
devin's bug fix for application.js
jessicacaley May 8, 2019
0eb1347
Merge remote-tracking branch 'origin' into select_multiple_and_new_ca…
aribray May 8, 2019
20c1143
user can create new categories and use existing categories in product…
aribray May 8, 2019
ef850b0
working on nested attributes test
aribray May 8, 2019
d820da1
Merge pull request #42 from aribray/review-model-test
minams May 8, 2019
65a8c55
added nested attribute test for product
aribray May 8, 2019
33f565f
Merge pull request #43 from aribray/select_multiple_and_new_categories
aribray May 8, 2019
7955441
Merge pull request #44 from aribray/orders-controller-tests
jessicacaley May 8, 2019
e85b4c2
changed username logic and styles
jessicacaley May 8, 2019
a79ea67
merge conflict
jessicacaley May 8, 2019
d408708
better hover color
jessicacaley May 8, 2019
5a3bc4e
added cart total functionality and views
amyesh May 8, 2019
319eed7
Merge pull request #45 from aribray/username-name-logic
jessicacaley May 8, 2019
09133c7
Merge branch 'master' of https://github.com/aribray/betsy
jessicacaley May 8, 2019
e9347f8
Merge pull request #46 from aribray/cartcost
amyesh May 8, 2019
edaf16e
remove reviews#new (unused and unneeded)
jessicacaley May 8, 2019
00883c2
fixed new category in new product form
aribray May 8, 2019
d23bd63
Merge pull request #47 from aribray/refactor_create
aribray May 8, 2019
81c1a77
added nil check to split test in products_controller
aribray May 8, 2019
fb03f96
fixing heroku formatting
aribray May 9, 2019
6aa278f
added missing tests
jessicacaley May 9, 2019
0a610d1
more missing tests added
jessicacaley May 9, 2019
f40026c
Merge branch 'master' into add-missing-tests
jessicacaley May 9, 2019
7de05c4
remove unused orderitems_controller strong params
jessicacaley May 9, 2019
07ae413
remove users controller strong params (unused)
jessicacaley May 9, 2019
8386a40
add test for retired toggle from false to true
jessicacaley May 9, 2019
176076f
user controller tests for non-github requests and incomplete data sen…
jessicacaley May 9, 2019
e517aed
add view helper to show average rating as stars out of 5 on lists of …
jessicacaley May 9, 2019
6dd75b6
add test for view helper
jessicacaley May 9, 2019
bea3491
Merge pull request #49 from aribray/messing-around
jessicacaley May 9, 2019
723c8ca
homepage and logo styling
amyesh May 9, 2019
45811e8
fixed new category render on product edit form
aribray May 9, 2019
e47e7ce
fixed category adding section of update controller
aribray May 9, 2019
168a8db
merchant can edit categories and add new category in edit page.
aribray May 9, 2019
ac119e9
Merge pull request #50 from aribray/edit_product
aribray May 9, 2019
2754180
product show page styling
jessicacaley May 9, 2019
ebac9bf
added homepage styling
amyesh May 9, 2019
0f10594
Merge pull request #51 from aribray/product-show-styles
amyesh May 9, 2019
91204f0
Merge branch 'master' into styling
jessicacaley May 9, 2019
d0fd0b7
Merge pull request #52 from aribray/styling
jessicacaley May 9, 2019
dac1a2e
small changes
jessicacaley May 9, 2019
aad5c25
finalized homepage styling
amyesh May 9, 2019
363a86c
fixed order complete status and tests
aribray May 9, 2019
77d9f12
add and debug tests
jessicacaley May 9, 2019
08fe4df
Merge branch 'master' into orders-show-display-logic
jessicacaley May 9, 2019
ce1034f
Merge pull request #53 from aribray/orders-show-display-logic
jessicacaley May 9, 2019
d533de0
fixed order complete status and tests
aribray May 9, 2019
71c7a8b
resolved changes
aribray May 9, 2019
f5f7536
adjust background margin
jessicacaley May 9, 2019
a19f1f8
Merge pull request #54 from aribray/order_complete
aribray May 9, 2019
c9b2201
quick fix -- added closing tags for myaccount table
jessicacaley May 9, 2019
77be7af
tacky default product image (can change to a better one easily with a…
jessicacaley May 9, 2019
337155b
add another freaking animation
jessicacaley May 9, 2019
6dca853
Merge pull request #55 from aribray/default-image
jessicacaley May 9, 2019
e5125c8
change animation length
jessicacaley May 9, 2019
c244a6e
added number of orderitems by status to tables
aribray May 9, 2019
4aec394
fixed navbar and footer alignment
amyesh May 9, 2019
d1fcd1f
Merge pull request #57 from aribray/animation
jessicacaley May 9, 2019
86e219e
styling updates
amyesh May 9, 2019
7cb42ce
updated styling
amyesh May 9, 2019
4f00819
jessicas changes
amyesh May 9, 2019
d50769a
reinstate/retire colors
jessicacaley May 9, 2019
e2c2273
Merge branch 'master' of https://github.com/aribray/betsy
jessicacaley May 9, 2019
e1104e0
Merge pull request #58 from aribray/order_status
aribray May 9, 2019
1ca66d8
fixed merge conflicts
amyesh May 9, 2019
5902f17
fixed addl merge conflicts
amyesh May 9, 2019
912e499
fixed merge error in myorders.html.erb
aribray May 9, 2019
f6ba9b0
git is crazy
jessicacaley May 9, 2019
0347386
index action change - need to test?
minams May 9, 2019
e383e4d
tried to add old and new changes to myaccount
jessicacaley May 9, 2019
581ba72
Merge pull request #59 from aribray/tiny-little-fix
jessicacaley May 9, 2019
951f216
Merge pull request #60 from aribray/git-bug-fixes
amyesh May 9, 2019
268ae01
more fixes from git disaster
jessicacaley May 9, 2019
667cbf6
commit 363a86c
jessicacaley May 10, 2019
c2c96cc
commit 77be7af
jessicacaley May 10, 2019
0ff7858
Merge pull request #61 from aribray/go-through-missing-commits
jessicacaley May 10, 2019
7eef959
deleted beginning paragraph in shopping cart
minams May 10, 2019
14de14b
styling
jessicacaley May 10, 2019
a1d0a4e
fixed orders#show logic
jessicacaley May 10, 2019
4cb0457
updated social media links
amyesh May 10, 2019
8cad0c4
fixed orders#show tests
jessicacaley May 10, 2019
cdb1518
remove padding from image on show page
jessicacaley May 10, 2019
24cb763
fix myaccount link_to bug and make order show bootstrap table
jessicacaley May 10, 2019
25ab41f
Merge pull request #63 from aribray/order-show-logic-and-view
jessicacaley May 10, 2019
8e643cc
tweaked button and table styling
amyesh May 10, 2019
7d6df63
added shopping cart icon
amyesh May 10, 2019
9b38973
Merge pull request #62 from aribray/heroku-fixes
minams May 10, 2019
b85f74f
Merge branch 'master' into finalstyling
amyesh May 10, 2019
963d009
Merge pull request #64 from aribray/finalstyling
amyesh May 10, 2019
1992768
change myaccount to show full name
jessicacaley May 10, 2019
6b7165c
set image max width for lists of products
jessicacaley May 10, 2019
94d8177
add logic for if category is empty
jessicacaley May 10, 2019
55520d9
added alexis etc
amyesh May 10, 2019
bc09395
Merge pull request #65 from aribray/alexis
amyesh May 10, 2019
b70487c
display lists of products by most recently created
jessicacaley May 10, 2019
ba52ac9
Merge pull request #66 from aribray/little-fix
jessicacaley May 10, 2019
ec7d0fb
adjust image sizing
jessicacaley May 10, 2019
ef9f20c
remove empty h2 from product show page
jessicacaley May 10, 2019
6fb4a93
change view height to make it a little taller and adjust footer heigh…
jessicacaley May 10, 2019
38b70c4
add favicon
jessicacaley May 10, 2019
47a2fb1
Merge pull request #67 from aribray/random-styling
jessicacaley May 10, 2019
24c9ebf
sort product lists oldest to newest
jessicacaley May 10, 2019
35d4836
fix test errors
jessicacaley May 10, 2019
d9943ba
Merge pull request #68 from aribray/reverse-product-list-logic
jessicacaley May 10, 2019
2c42983
added travis.yml
aribray May 15, 2019
03c41cd
removed commented out code from categories yml
aribray May 15, 2019
be0a379
Merge pull request #69 from aribray/travis_branch
aribray May 15, 2019
00e71e4
added travis file to root
aribray May 15, 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.
31 changes: 31 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# 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
coverage

.env
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
14 changes: 14 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
language: ruby

rvm:
- 2.5.1

services:
- postgresql

before_script:
- bin/rails db:create
- bin/rails db:migrate

script:
- bin/rails test
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'

gem 'money-rails'

gem 'simplecov'
# 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'
end

gem 'omniauth'
gem 'omniauth-github'
Loading