Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
05dc250
Initial commit
Faiza1987 Apr 30, 2019
9638728
created models and controllers for products and categories
ChubbyCub May 1, 2019
fc59e2e
added model and controller for users
ChubbyCub May 1, 2019
6b7d82a
added relationship between product and user
ChubbyCub May 1, 2019
b2675be
added review model and controller
ChubbyCub May 1, 2019
4dd28cb
added relationship between review and product
ChubbyCub May 1, 2019
6d720d6
added controller and model for orders
ChubbyCub May 1, 2019
50a970f
added relationship between product orderitem and order
ChubbyCub May 1, 2019
917d767
Added routes
Faiza1987 May 1, 2019
d26900a
Added routes and fixed reviews controller naming convention
Faiza1987 May 2, 2019
465ef4f
added nested routes for product and review
ChubbyCub May 2, 2019
131f2cf
Removed last route from routes.rb and left a comment in its stead
Faiza1987 May 2, 2019
528d83a
removed column status in order table
ChubbyCub May 2, 2019
a052242
added column status to orderitem model
ChubbyCub May 2, 2019
16d723f
added a few more attributes to order model
ChubbyCub May 2, 2019
bb694ac
Added homepage controller and created a root path in routes.rb
Faiza1987 May 2, 2019
92c7e40
Added user login and logout actions in UsersController. Added omniaou…
Faiza1987 May 2, 2019
8b8db96
Added view to view list of users
Faiza1987 May 2, 2019
2345454
skeleton for orderitems controller
amythetester May 3, 2019
72d4c0b
added validation to product model
May 3, 2019
8bb482f
added average rating method in product model
May 3, 2019
6a84266
added product_params private method to products controller
May 3, 2019
8423b5c
add index method to products controller
May 3, 2019
34c9060
add new and create methods to products controller
May 3, 2019
3897bba
added show, edit, and product_merchant methods to products controller
May 3, 2019
b1f804d
added update method to products controller
May 3, 2019
08fbd23
added find_product and destroy to products controller
May 3, 2019
5be5faf
added review to products controller
May 3, 2019
038f868
add logged_in method and before actions to products controller
May 3, 2019
af4b3a0
added products form html
May 3, 2019
7408cd1
added review product html
May 3, 2019
344c0d5
added edit, index, new product html pages
May 3, 2019
35b98f6
added product show view
May 3, 2019
1a063b8
fix orderitem_ids syntax
May 3, 2019
f971df2
added nested routes for order and order items
ChubbyCub May 3, 2019
165ddd4
added index and new products controller tests
May 3, 2019
a06fc66
Created views with working links for log in, log out, and root paths
Faiza1987 May 3, 2019
6a63a29
Merge branch 'master' of https://github.com/Faiza1987/betsy into faiz…
Faiza1987 May 3, 2019
435fafc
added create method products controller test
May 3, 2019
6aac38c
added product show controller test
May 3, 2019
aa7a56f
added edit and update products controller tests
May 3, 2019
38521b7
destroy products controller tests
May 3, 2019
92b65ba
added review products controller test
May 3, 2019
8139a1c
order items controller actions and tests created
amythetester May 3, 2019
f26bd62
moved review methods to review controller
May 3, 2019
14d6eac
Merge pull request #1 from Faiza1987/order-items
laneia May 3, 2019
7be2100
Added passing tests for UsersController
Faiza1987 May 3, 2019
152c8ee
Merge branch 'master' into faiza-user-feature
ChubbyCub May 3, 2019
623575b
Merge pull request #2 from Faiza1987/faiza-user-feature
ChubbyCub May 3, 2019
99a4491
added cookies for order id and updated tests
amythetester May 4, 2019
eea140e
Merge pull request #3 from Faiza1987/create-order-orderitem-logic
ChubbyCub May 4, 2019
338db16
added billing zip code and cvv to order model
ChubbyCub May 4, 2019
efd6a72
added controller actions
ChubbyCub May 4, 2019
3db86e4
added status column back to order model due to required spec
ChubbyCub May 4, 2019
8890dee
Merge branch 'master' into order-controller-model
ChubbyCub May 4, 2019
3eefeb8
added actions for order controller and passed tests
ChubbyCub May 5, 2019
e0e7d22
additional test on authorization
ChubbyCub May 5, 2019
b36ebdc
added test for deleting cookies
ChubbyCub May 5, 2019
25ffec9
Merge pull request #4 from Faiza1987/order-controller-model
laneia May 5, 2019
ed801b1
pulled in changes from master for testing
May 5, 2019
277d9e0
got products controller tests passing
May 5, 2019
2769c4c
removed unused code
May 5, 2019
7707dc1
Merge pull request #5 from Faiza1987/laneia
ChubbyCub May 5, 2019
7f9fa8f
added add new product button
ChubbyCub May 5, 2019
f9e07ef
change new action from orderitem to product.new
ChubbyCub May 5, 2019
2d51631
Committing so I can git pull
Faiza1987 May 6, 2019
c05797d
making sure I don't lose work
amythetester May 6, 2019
ce075dd
Commiting gitignore
Faiza1987 May 6, 2019
74d677b
Resolved merge conflict
Faiza1987 May 6, 2019
e8d3444
added tests for new, create, index
ChubbyCub May 6, 2019
6a9fa39
added test for show action
ChubbyCub May 6, 2019
9a4b460
added tests for edit, still need to pass some more tests
ChubbyCub May 6, 2019
f87c824
Added confirmation message to Log Out button
Faiza1987 May 6, 2019
76c70ee
Added link to user products on user show page
Faiza1987 May 6, 2019
377924e
added test for edit and passed the test
ChubbyCub May 6, 2019
22efb23
product.category -> product.category_id
May 6, 2019
bbb92f8
added test for destroy and passed the test
ChubbyCub May 6, 2019
fa8869a
Merge branch 'master' into fixing-product-controller
ChubbyCub May 6, 2019
974f03d
Merge pull request #6 from Faiza1987/fixing-product-controller
ChubbyCub May 6, 2019
bfd0408
deleted a bunch of coverage files
ChubbyCub May 6, 2019
c8db830
Removed unncessary show method for user. Added tests for authication …
Faiza1987 May 6, 2019
d66d0bf
Merge branch 'master' of https://github.com/Faiza1987/betsy
Faiza1987 May 6, 2019
1f5ba82
Merge branch 'master' into more-user-stuff
Faiza1987 May 6, 2019
1cc6972
Merge pull request #7 from Faiza1987/more-user-stuff
amythetester May 6, 2019
83fc052
added show page for product, removed Laneia's code for reviews and ca…
ChubbyCub May 6, 2019
9d25b8b
index view
amythetester May 6, 2019
e64798a
Merge branch 'fixing-product-views' of https://github.com/Faiza1987/b…
amythetester May 6, 2019
cd820c4
added photo_url column to product
ChubbyCub May 6, 2019
de08a93
Merge branch 'master' of https://github.com/Faiza1987/betsy
ChubbyCub May 6, 2019
d0072e4
merge
ChubbyCub May 6, 2019
7272c7d
Added validation tests for users model
Faiza1987 May 7, 2019
1217090
added small details on product edit page
ChubbyCub May 7, 2019
deb6066
added description field to product table
ChubbyCub May 7, 2019
69f5486
Merge branch 'master' into fixing-product-views
ChubbyCub May 7, 2019
4f10a91
new view
amythetester May 7, 2019
546042d
added few more details on product views
ChubbyCub May 7, 2019
2c0d1c9
try to merge orderitem
ChubbyCub May 7, 2019
61842ce
edit view
amythetester May 7, 2019
de5793c
added users to seed
May 7, 2019
1fd324e
added categories to seed
May 7, 2019
dcb3322
added products to seed
May 7, 2019
573a95a
Merge branch 'fixing-product-views' of https://github.com/Faiza1987/b…
amythetester May 7, 2019
e24c444
added some details to products
ChubbyCub May 7, 2019
80be2c5
updated new view to be on product page
amythetester May 7, 2019
4daeb2d
Merge branch 'fixing-product-views' of https://github.com/Faiza1987/b…
amythetester May 7, 2019
8593512
added product_id to reviews controller
May 7, 2019
9b0c94d
added reviews controller test for new
May 7, 2019
7b75675
added test for create new product w/ valid data
May 7, 2019
deb6d22
added test for review with invalid data
May 7, 2019
9bd3886
added test for user reviewing own product and corrected path in revie…
May 7, 2019
0854e0f
Implemented a bootstrap navbar
Faiza1987 May 7, 2019
b428deb
removed destroy review method, unnecessary
May 7, 2019
a29ca82
added review new view page
May 7, 2019
1fe6b9f
all review tests passing
May 7, 2019
c3696d2
Merge pull request #9 from Faiza1987/user-model-tests
laneia May 7, 2019
bf61e5c
fixed order item tests
amythetester May 7, 2019
df12840
removed shuffling
amythetester May 7, 2019
941dc17
Merge branch 'master' into reviews
amythetester May 7, 2019
e5abfb1
Merge pull request #10 from Faiza1987/reviews
amythetester May 7, 2019
1a9ff5c
added some tests for orders
ChubbyCub May 7, 2019
fabddea
Merge branch 'master' of https://github.com/Faiza1987/betsy
ChubbyCub May 7, 2019
d561d11
pulled partial files from master
ChubbyCub May 7, 2019
8ba1034
try to merge
ChubbyCub May 7, 2019
3713d69
Merge pull request #11 from Faiza1987/fixing-product-views
amythetester May 7, 2019
ee58ca0
fixed duplicate username
May 7, 2019
e95afca
fixed test for order controller
ChubbyCub May 7, 2019
5a67814
Merge branch 'master' into fixing-order-tests
ChubbyCub May 7, 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
33 changes: 33 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# 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
.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
86 changes: 86 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
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
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]
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'
gem 'dotenv-rails'
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'
gem 'simplecov'
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