Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
264 commits
Select commit Hold shift + click to select a range
1e832cf
Merge branch 'master' of https://github.com/xLJohnsonx/betsy
tfrego Oct 18, 2018
3b80421
fixed seed_generator
elle-johnnie Oct 18, 2018
11b8dcc
generate seeds
elle-johnnie Oct 18, 2018
5f367a7
Merge branch 'master' of https://github.com/xLJohnsonx/betsy
elle-johnnie Oct 18, 2018
a697359
Merge branch 'master' of https://github.com/xLJohnsonx/betsy
tfrego Oct 18, 2018
5974f83
added seed data
jazziesf Oct 18, 2018
51a85b1
Merge branch 'master' of https://github.com/xLJohnsonx/betsy
jazziesf Oct 18, 2018
77f97e5
added seed file
jazziesf Oct 18, 2018
8ba1767
Omni files set up
jazziesf Oct 18, 2018
8ec4b1a
seeds
elle-johnnie Oct 18, 2018
588cbcb
resolved merge conflicts
elle-johnnie Oct 18, 2018
051b7a5
add seed file
tfrego Oct 18, 2018
2938a7c
create add item to cart feature
tfrego Oct 18, 2018
873acae
format of email
lauracodecreations Oct 18, 2018
7c43e0f
Merge pull request #1 from xLJohnsonx/validations
lauracodecreations Oct 18, 2018
210a793
orderproduct relationship
lauracodecreations Oct 18, 2018
a8987bb
set up relationships
lauracodecreations Oct 18, 2018
082e36f
working on product testing
jazziesf Oct 18, 2018
8f98dd0
create cart show page
tfrego Oct 18, 2018
04a8481
fix merge conflicts
tfrego Oct 18, 2018
b5b2f38
fix merge conflicts
tfrego Oct 19, 2018
7e2b3dd
resolved merges
lauracodecreations Oct 19, 2018
fb86bf8
order testing model in progress
jazziesf Oct 19, 2018
7cdc5cc
Merge branch 'testing'
jazziesf Oct 19, 2018
13812ab
minor edit with head tag
jazziesf Oct 19, 2018
70fa419
fixed a merge conflict
lauracodecreations Oct 19, 2018
bcbc5a2
updated params method to allow id for user
lauracodecreations Oct 19, 2018
f8d2247
updated new user form so the user cannot choose id-it is generated by…
lauracodecreations Oct 19, 2018
02aa801
formatting index complete
jazziesf Oct 19, 2018
588bc8b
removed unnecesary methods and test using ERD, updated create method,…
lauracodecreations Oct 19, 2018
5682bb9
fixed model validations, relationships, seed data and seed.rb - db:se…
elle-johnnie Oct 19, 2018
f154a8d
user session and oauth integration complete
elle-johnnie Oct 19, 2018
151867a
update shopping cart
tfrego Oct 19, 2018
f0e6c98
add initializer action_view file and update shoppingcart form
tfrego Oct 19, 2018
fb1f7b8
update shoppingcart form
tfrego Oct 19, 2018
4e39e1d
Merge branch 'master' into shoppingcart
tfrego Oct 19, 2018
3473a17
Merge branch 'master' of https://github.com/xLJohnsonx/betsy
tfrego Oct 19, 2018
7f63b9b
edits to view pages
jazziesf Oct 19, 2018
6045e77
Merge branch 'master' of https://github.com/xLJohnsonx/betsy
jazziesf Oct 19, 2018
18d1475
fix merge conflict
jazziesf Oct 19, 2018
0325f21
Merge branch 'user_session_oauth'
elle-johnnie Oct 19, 2018
4d074fe
merging test data
jazziesf Oct 19, 2018
4cc0722
merge conflicts resolved
jazziesf Oct 19, 2018
fc00792
Merge branch 'master' into controllertesting
lauracodecreations Oct 19, 2018
00aaf04
Merge pull request #2 from xLJohnsonx/controllertesting
lauracodecreations Oct 19, 2018
60a5bf5
merge conflict
tfrego Oct 19, 2018
329eba1
merge conflict
tfrego Oct 19, 2018
3088835
reseeded data
lauracodecreations Oct 19, 2018
3b89a90
root link, github auth
jazziesf Oct 19, 2018
d600459
updated faker
lauracodecreations Oct 19, 2018
ae65e5f
hide index page, add github logo
jazziesf Oct 19, 2018
b555c6d
add category to seeds
tfrego Oct 19, 2018
7eff80c
add category to seeds
tfrego Oct 19, 2018
ea4c8ce
fixed merchant show
elle-johnnie Oct 19, 2018
af462fe
merge conflicts resolved
elle-johnnie Oct 19, 2018
adebf72
pull master
jazziesf Oct 19, 2018
581c126
Merge branch 'master' of https://github.com/xLJohnsonx/betsy
jazziesf Oct 19, 2018
ca34e76
small changes to make links work
lauracodecreations Oct 19, 2018
e504db5
categories showing
elle-johnnie Oct 19, 2018
56a15d8
fixed shopping cart create order_item bug
tfrego Oct 20, 2018
229d9fe
fix merge conflict
tfrego Oct 20, 2018
328895a
pulling master
jazziesf Oct 20, 2018
85aeb2f
Merge branch 'master' of https://github.com/xLJohnsonx/betsy
jazziesf Oct 20, 2018
a1fba57
fixed merge conflict
jazziesf Oct 20, 2018
8630692
fix quick_shop link and remove pry
tfrego Oct 20, 2018
1880896
added alternate link for login when fa fa login not working
elle-johnnie Oct 20, 2018
82b1747
create partial for products_list
tfrego Oct 20, 2018
80bdf2f
fix order_controller error for deployment
tfrego Oct 20, 2018
58d4935
remove scaffolding css defaults
tfrego Oct 21, 2018
cc3f81b
add merchant link to nav
tfrego Oct 21, 2018
20985be
review link, display
jazziesf Oct 21, 2018
b0cb3f5
merchant info and functionality - list products, designate categories…
elle-johnnie Oct 21, 2018
e7f793b
Merge branch 'master' into merchant_info
elle-johnnie Oct 21, 2018
f54816e
removed more json files
elle-johnnie Oct 21, 2018
e98f0c9
merchant interactions with categories
elle-johnnie Oct 21, 2018
f08b2bf
merchant can view all cats and create a new one
elle-johnnie Oct 21, 2018
20f3882
added review
jazziesf Oct 21, 2018
fadf62a
merchant can retire-activate product - if retired prod does not show …
elle-johnnie Oct 21, 2018
439e555
pull master
jazziesf Oct 21, 2018
9409f9a
Merge branch 'master' of https://github.com/xLJohnsonx/betsy
jazziesf Oct 21, 2018
86d9ac9
merge master conflicts resolved
jazziesf Oct 21, 2018
8fd89ea
working on model test
jazziesf Oct 22, 2018
e4bb6e8
added review test, 2 user test
jazziesf Oct 22, 2018
87a6aff
order_status table created
elle-johnnie Oct 22, 2018
92c0962
order_status migration
elle-johnnie Oct 22, 2018
9d11e69
styled nav and home
tfrego Oct 22, 2018
6b1db70
order_status to order_items
elle-johnnie Oct 22, 2018
3e72536
seeds show page of products updated
lauracodecreations Oct 22, 2018
15b0686
merged
lauracodecreations Oct 22, 2018
456a286
updated order form
lauracodecreations Oct 22, 2018
0a3ee2d
date order was placed
lauracodecreations Oct 22, 2018
3b231ed
confirmation page
lauracodecreations Oct 22, 2018
1ccfc6e
flash notices
lauracodecreations Oct 22, 2018
43ab274
added checkout button and links place order page
lauracodecreations Oct 22, 2018
8ef0ee7
edited confirmation page
lauracodecreations Oct 22, 2018
5d595aa
confirmation page shows order items
lauracodecreations Oct 22, 2018
7d21a5b
pulling master
jazziesf Oct 22, 2018
72fa28d
add styling
tfrego Oct 22, 2018
805b29b
link confirmation page to current session
lauracodecreations Oct 22, 2018
0c07c5a
git merge master
jazziesf Oct 22, 2018
586ab56
resolve merge conflict css
jazziesf Oct 22, 2018
e21406f
css conflict
jazziesf Oct 22, 2018
53fe81c
Merge branch 'master' into reviews/rating
jazziesf Oct 22, 2018
62400e3
merchant orderfulfillment
elle-johnnie Oct 22, 2018
b001450
add fa fa github
tfrego Oct 22, 2018
9e88ef3
fixed merge conflict
lauracodecreations Oct 22, 2018
d20f376
resolving merge conflicts
elle-johnnie Oct 22, 2018
3c5ea0c
resolving merge conflicts
elle-johnnie Oct 22, 2018
b023ce7
resolving merge conflicts
elle-johnnie Oct 22, 2018
5388191
fixed avg rating when 0 reviews
elle-johnnie Oct 22, 2018
c7f9214
fixed order.id bug via rm order belongs to
elle-johnnie Oct 22, 2018
aaf2112
find total for order
lauracodecreations Oct 22, 2018
61d015d
added dollar signs
lauracodecreations Oct 22, 2018
2dd586b
temp nav links of github oauth
elle-johnnie Oct 22, 2018
dadd615
add fa fa log out
tfrego Oct 22, 2018
4f440ea
add account info link
tfrego Oct 22, 2018
5460991
decrease inventory and change status from pending to paid
lauracodecreations Oct 22, 2018
422cd1b
minor tweaks to confirmation
elle-johnnie Oct 22, 2018
d5b427b
minor tweaks to confirmation
elle-johnnie Oct 22, 2018
3863bab
add account info
tfrego Oct 22, 2018
4d11f88
merge conflict
tfrego Oct 22, 2018
eccdc88
merge conflict application css
jazziesf Oct 22, 2018
ae2ba4c
stash apply to this branch
jazziesf Oct 22, 2018
849d334
clears cart
lauracodecreations Oct 22, 2018
adfb793
Merge pull request #3 from xLJohnsonx/ordermethods
lauracodecreations Oct 22, 2018
5392e85
rollback order item order status reference
elle-johnnie Oct 23, 2018
1edcb93
testing debugged, styles ideas added to page
jazziesf Oct 23, 2018
4d42674
order_status
elle-johnnie Oct 23, 2018
2d37220
oauth user fixture added
elle-johnnie Oct 23, 2018
de83a13
quantity of product gets updated with purchase
lauracodecreations Oct 23, 2018
51da54c
sucessfully decreases inventory quantity in the db, but product show …
lauracodecreations Oct 23, 2018
a04813e
add number of items to display on shopping cart
tfrego Oct 23, 2018
f104f6e
merge conflict
tfrego Oct 23, 2018
8eb97da
customer info is saved to the right order
lauracodecreations Oct 23, 2018
a749bbd
order items from the sessions are saved to the order that contains cl…
lauracodecreations Oct 23, 2018
7b1544f
cart styling
tfrego Oct 23, 2018
c6072b9
save order items to the order
lauracodecreations Oct 23, 2018
3d5e099
completing test
jazziesf Oct 23, 2018
5c4ed4d
merge conflicts styling
jazziesf Oct 23, 2018
6b95c53
merge conflicts resolved
jazziesf Oct 23, 2018
9751800
validate merchant can't review own work, navbar fix
jazziesf Oct 23, 2018
43e8323
merge conflicts
tfrego Oct 23, 2018
2e655a2
Merge branch 'master' of https://github.com/xLJohnsonx/betsy
tfrego Oct 23, 2018
1820854
wrote test to for place_order method and fixed method. The method works
lauracodecreations Oct 23, 2018
9413874
uncommented tests
lauracodecreations Oct 23, 2018
6450de8
added comments and put place_order methods in the right place
lauracodecreations Oct 23, 2018
96494ff
oauth tests, flash partials and only show logged in users own show page
elle-johnnie Oct 23, 2018
9816796
comments
lauracodecreations Oct 23, 2018
3b47332
removed pry
lauracodecreations Oct 23, 2018
7014e73
Merge branch 'master' of https://github.com/xLJohnsonx/betsy
elle-johnnie Oct 23, 2018
dfe5f1c
Merge branch 'master' into ordermethods
lauracodecreations Oct 23, 2018
d8e2b7b
Merge pull request #4 from xLJohnsonx/ordermethods
lauracodecreations Oct 23, 2018
b3f511e
Merge branch 'master' of https://github.com/xLJohnsonx/betsy
elle-johnnie Oct 23, 2018
53ad1b8
model testing review, products, order
jazziesf Oct 24, 2018
e0709ce
merge conflicts resolved test/oauth added
elle-johnnie Oct 24, 2018
911a0cd
fixed nil categories
elle-johnnie Oct 24, 2018
cda3c5d
Merge branch 'master' into showpages
jazziesf Oct 24, 2018
d140970
fixed order validations to on place_order
elle-johnnie Oct 24, 2018
ef8c437
flash message username on logout
elle-johnnie Oct 24, 2018
bd0e9e0
order_items testing
tfrego Oct 24, 2018
f645913
merge conflicts
tfrego Oct 24, 2018
5dec77c
removed session clear on logout
elle-johnnie Oct 24, 2018
42c656b
review controller testing almost complete
jazziesf Oct 24, 2018
3ebcf6f
Merge branch 'master' into showpages
jazziesf Oct 24, 2018
70ac662
merge conflicts
tfrego Oct 24, 2018
9e6ce60
merge conflicts
tfrego Oct 24, 2018
abd78e0
OrderItem model testing
tfrego Oct 24, 2018
6dd143e
fixed order item placement from product show page
elle-johnnie Oct 24, 2018
0eaaedc
solving merge conflict and fixing route id difference
lauracodecreations Oct 24, 2018
cdc7e33
stash changes ffrom master
jazziesf Oct 24, 2018
7aecb51
add confirm method to order
jazziesf Oct 24, 2018
eb4d515
Merge branch 'master' of https://github.com/xLJohnsonx/betsy
elle-johnnie Oct 24, 2018
f41680d
change path for checkout button updates order instead of creating new…
lauracodecreations Oct 24, 2018
f6772af
merged fixed
lauracodecreations Oct 24, 2018
02e04b2
complete create tests
tfrego Oct 24, 2018
69f920a
remove fa-stack if items in cart is zero
tfrego Oct 24, 2018
8e1d693
order work flow, but the confirm_order is never called
lauracodecreations Oct 24, 2018
60c7df7
add new view when order_items is empty
tfrego Oct 24, 2018
3b449e1
merge
tfrego Oct 24, 2018
682164a
merge conflicts
tfrego Oct 24, 2018
b556aa5
test to check total price method in order model
lauracodecreations Oct 24, 2018
838bccd
order flow works sucessfully, and cart is cleared after user returns …
lauracodecreations Oct 24, 2018
b497ab7
removed link at the bottom of edit form to not show all orders
lauracodecreations Oct 24, 2018
7ea3e58
Merge pull request #5 from xLJohnsonx/order
lauracodecreations Oct 24, 2018
1c58088
Merge branch 'master' of https://github.com/xLJohnsonx/betsy
elle-johnnie Oct 24, 2018
5c10e3f
complete update tests
tfrego Oct 24, 2018
6b6e907
show customer name and order status
lauracodecreations Oct 24, 2018
ef6f40a
comments
lauracodecreations Oct 24, 2018
b326ef6
Merge pull request #6 from xLJohnsonx/order
lauracodecreations Oct 24, 2018
64a2d01
finish OrderItem controller testing
tfrego Oct 24, 2018
1b56b78
merge conflicts
tfrego Oct 24, 2018
9e46779
remove add to cart button if product is out of stock
lauracodecreations Oct 24, 2018
20e9c27
show out of stock in cart if inv_qty is less than 1
lauracodecreations Oct 24, 2018
061db10
make out of stock align
lauracodecreations Oct 24, 2018
f39b0ae
format decimal in total price
lauracodecreations Oct 24, 2018
c98a82a
removed extra $
lauracodecreations Oct 24, 2018
df08c39
update OrderItemController, ProductShow and fix when cart is empty
tfrego Oct 25, 2018
5cb925b
Merge branch 'master' of https://github.com/xLJohnsonx/betsy
elle-johnnie Oct 25, 2018
f52be28
cart controller testing
tfrego Oct 25, 2018
c759730
product controller testing
jazziesf Oct 25, 2018
c5228f5
test Order model for items_in_cart
tfrego Oct 25, 2018
e651e0a
add nested routes products nested inusers
elle-johnnie Oct 25, 2018
e31b27e
added merchant order info
elle-johnnie Oct 25, 2018
3e62221
added order id link for editing but links to order confirmation CC en…
elle-johnnie Oct 25, 2018
798ff1d
order show page add option to cancel order
elle-johnnie Oct 25, 2018
3c3ae4a
deactivate a product when product inv is less than 0
lauracodecreations Oct 25, 2018
0fc977a
fixed bugs in order fulfillments, order status creation set to pendin…
elle-johnnie Oct 25, 2018
f5291eb
moved confirmation page to away from show page, and remove validation…
lauracodecreations Oct 25, 2018
49afecf
controller product testing in progress
jazziesf Oct 25, 2018
70ec391
product test complete
jazziesf Oct 25, 2018
bd94dd8
add search order button
tfrego Oct 25, 2018
a42b73d
do not let user save an order with invalid personal information
lauracodecreations Oct 25, 2018
a9909ad
Merge branch 'master' into order
lauracodecreations Oct 25, 2018
f87aad0
Merge pull request #7 from xLJohnsonx/order
lauracodecreations Oct 25, 2018
c3d0e4c
removed binding
elle-johnnie Oct 25, 2018
701af12
order controller test
jazziesf Oct 25, 2018
870aa01
fixed merge conflicts
jazziesf Oct 25, 2018
95f6fd6
fix test errors to product controller.
jazziesf Oct 25, 2018
2fd3da8
seed reset
tfrego Oct 25, 2018
9619feb
udpate products list page
tfrego Oct 25, 2018
a381445
merge conflicts
tfrego Oct 25, 2018
6fcda67
fix conflicts
tfrego Oct 25, 2018
f001356
fix application.html yield
tfrego Oct 25, 2018
065ec14
delete require pry to deploy
tfrego Oct 26, 2018
4c06a61
add padding to main pages
tfrego Oct 26, 2018
03770c2
fix photo links and resize products img on index and show
tfrego Oct 26, 2018
bafed52
remove current_order from users show page
tfrego Oct 26, 2018
88db406
orders controller test complete
jazziesf Oct 26, 2018
129b0d4
css styling for merchant and orders
elle-johnnie Oct 26, 2018
dddfd5d
removed unnec link
elle-johnnie Oct 26, 2018
78bb126
cart styling and button add - still needs category edit button on pro…
elle-johnnie Oct 26, 2018
ef267ed
informs the user if something was missing for the order
lauracodecreations Oct 26, 2018
8bff2b6
removed uncessesary routes
lauracodecreations Oct 26, 2018
902e183
add image to product params
tfrego Oct 26, 2018
ccf5569
merge
tfrego Oct 26, 2018
7a560b4
remove double flash notices
lauracodecreations Oct 26, 2018
75eeeee
added format price to the product page to fix the 5.0 price
lauracodecreations Oct 26, 2018
15e608f
commented methods that are not being used to increase % coverage
lauracodecreations Oct 26, 2018
7ba53ef
merchant show shipped and complete status
elle-johnnie Oct 26, 2018
7e14421
add simplecov
tfrego Oct 26, 2018
c51db84
remove raise in code
elle-johnnie Oct 26, 2018
a058b0c
Merge branch 'master' of https://github.com/xLJohnsonx/betsy
tfrego Oct 26, 2018
4f7361c
merge conflicts resolving
elle-johnnie Oct 26, 2018
1ef5866
product controller updated, style sheets updates
jazziesf Oct 26, 2018
7f21e9b
pulled from master merging the whole project
jazziesf Oct 26, 2018
713b1f2
update cart show and products controller
tfrego Oct 26, 2018
7f14f58
merge conflict
tfrego Oct 26, 2018
22aa064
Update README.md
lauracodecreations Apr 30, 2019
c1ce3ea
Update README.md
lauracodecreations Apr 30, 2019
f70feb1
Update README.md
lauracodecreations May 1, 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
.idea
.env
/coverage
.DS_Store
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
100 changes: 100 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
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.1'
# 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
#
gem "omniauth"
gem "omniauth-github"





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

gem 'faker'
gem 'dotenv-rails'
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'

# Bakesy installed test gems
gem 'factory_bot_rails'
gem 'factory_bot'

gem 'simplecov'

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

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