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

Water && Fire @ THE BESTIES: Sandy, Ida, Beatrice and Hanh Solo #62

Open
wants to merge 179 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 178 commits
Commits
Show all changes
179 commits
Select commit Hold shift + click to select a range
11a6e97
Ran rails nw
Beatress Nov 17, 2020
d288751
Updated gitignore to exclude env and idea
Beatress Nov 17, 2020
886093c
Generated migrations for product, merchant, order, orderitem
Beatress Nov 17, 2020
8dbc181
Ran rails db:migrate and made model relations
Beatress Nov 18, 2020
5f5923e
Updated lockfile and generated Merchants controller
Beatress Nov 18, 2020
7b40d2b
Added controllers to petsy
Nov 19, 2020
f17c7eb
Removed order_item_id reference column from order table
Beatress Nov 19, 2020
d7d1861
Added seed data
Beatress Nov 19, 2020
06a5d70
added indirect relationship
Nov 19, 2020
04052dd
added indirect relationship
Nov 19, 2020
6ca9594
added merchant and product views and index controller action
idago123 Nov 19, 2020
1b13306
initial style push to sandy-pEtsy-theme
Nov 19, 2020
2501dd0
Added basic product CRUD
Beatress Nov 19, 2020
67f1e8e
Some basic CRUD and view refinements for product/merchant
Beatress Nov 19, 2020
7df9f20
add validations for merchant class
idago123 Nov 19, 2020
09a74c1
added validations for product and orderitem classes
idago123 Nov 19, 2020
df59510
updated product validation
idago123 Nov 19, 2020
48be2df
added validation and relationship tests for Product class
idago123 Nov 19, 2020
f12b296
updated merchant and product test validations
idago123 Nov 19, 2020
45bdd50
Set up omniauth, .env and initilaizer
seattlefurby17 Nov 19, 2020
0b4ef09
create method and helper method for merchants
seattlefurby17 Nov 19, 2020
65d4f10
added products controller tests
idago123 Nov 19, 2020
c979cef
log_out, current_user methods
seattlefurby17 Nov 19, 2020
ce46b2c
Updated Oauth testing for merchants
seattlefurby17 Nov 19, 2020
421bd5f
Merge pull request #2 from seattlefurby17/testing
idago123 Nov 20, 2020
82a6ca5
Merge pull request #1 from seattlefurby17/product-crud
Beatress Nov 20, 2020
ac761e8
Fixed merchant controller tests
seattlefurby17 Nov 20, 2020
3ab82b3
Merge branch 'master' into Oauth_Users
seattlefurby17 Nov 20, 2020
a29232a
Merge pull request #3 from seattlefurby17/Oauth_Users
seattlefurby17 Nov 20, 2020
beeec44
Merged conflict fixed
seattlefurby17 Nov 20, 2020
4041721
Merge fixed
seattlefurby17 Nov 20, 2020
02ffd3a
adding theme
Nov 20, 2020
be6f55c
Testing new theme with master
Beatress Nov 20, 2020
eaac552
created new data
idago123 Nov 20, 2020
64904d6
Merge branch 'test-branch-theme' into sandy-pEtsy-theme
Beatress Nov 20, 2020
139767d
Merge pull request #4 from seattlefurby17/sandy-pEtsy-theme
Beatress Nov 20, 2020
239b16f
Merge pull request #5 from seattlefurby17/seed
Beatress Nov 20, 2020
7d8c6fb
Updated products controller
Beatress Nov 20, 2020
9c01b1c
Merge branch 'test-branch-theme' of github.com:seattlefurby17/betsy i…
Beatress Nov 20, 2020
7069b38
Moved homepages content to application
Beatress Nov 20, 2020
5e001f0
Product CRUD almost finished, need review of create product bug
Beatress Nov 20, 2020
33d1441
added products show view
idago123 Nov 20, 2020
a8a62b8
Added hidden merchant to form
Beatress Nov 20, 2020
adda9eb
added tests to product controller and show view
idago123 Nov 20, 2020
cbc7bf6
Merge pull request #6 from seattlefurby17/view
Beatress Nov 20, 2020
370da19
Merge branch 'master' into test-branch-theme
Beatress Nov 20, 2020
677e01d
Merge pull request #7 from seattlefurby17/test-branch-theme
Beatress Nov 20, 2020
24fe640
Product page integrated with theme
Beatress Nov 20, 2020
c385924
Fixed bug preventing add product - needed product_params
Beatress Nov 20, 2020
f44ff47
updated Order controller and views
idago123 Nov 20, 2020
c307476
Updated application_controller shopper method
seattlefurby17 Nov 21, 2020
9013f4d
Added new indirect model relation and refactored shopper method
Beatress Nov 21, 2020
fbd8129
Refactored add_to_cart and edit_quantity to be in order_item controll…
Beatress Nov 21, 2020
02fa0b3
added fixtures file for products
idago123 Nov 21, 2020
9aaeae7
Apply suggestions from code review
Beatress Nov 21, 2020
4b5a930
Merge pull request #8 from seattlefurby17/quantity
Beatress Nov 21, 2020
a25fd18
Merge pull request #9 from seattlefurby17/fixtures
Beatress Nov 21, 2020
71d3a56
cart changes
idago123 Nov 21, 2020
3e4cf79
Added missing quotation mark
Beatress Nov 21, 2020
1f27ec5
view change
idago123 Nov 21, 2020
e85952e
Merge branch 'master' of https://github.com/seattlefurby17/betsy into…
idago123 Nov 21, 2020
901a251
Fixed merge conflicts
Beatress Nov 21, 2020
5e40a97
Checkout form, method, routes and migrate
seattlefurby17 Nov 21, 2020
c84c00a
Order processing method
seattlefurby17 Nov 21, 2020
7d5a15d
Added redirect to order controller, added show page, and finished pro…
Nov 22, 2020
c429473
initial commit
Nov 22, 2020
1339a44
removed search bar and made footer sticky from application.html.erb
Nov 22, 2020
651c577
Removed unused routes
Beatress Nov 22, 2020
53650d7
Removed old cart view code from merge
Beatress Nov 22, 2020
b073386
Added padding to body and cards
Nov 22, 2020
f07a358
Fixed tests
Beatress Nov 22, 2020
7c95836
Added products to merchants page and editing of products only by auth…
Beatress Nov 22, 2020
87abd3a
All tests passing
Beatress Nov 22, 2020
b04bb7a
Added checkout form styling
Nov 22, 2020
935a9ea
Added correct labels to checkout styling form
Nov 22, 2020
9828a11
order model - validations testing
seattlefurby17 Nov 22, 2020
0dc4001
added remove from cart feature to order items and updated the cart view
idago123 Nov 22, 2020
19f7aa2
Merge pull request #10 from seattlefurby17/bea-saturday
Beatress Nov 22, 2020
eee87b1
Merge pull request #12 from seattlefurby17/removecart
Beatress Nov 22, 2020
9e5d541
Merge pull request #11 from seattlefurby17/model_testing
Beatress Nov 22, 2020
b5061b4
Added order items path to routes file
Beatress Nov 22, 2020
188a729
Order model validation tests
seattlefurby17 Nov 22, 2020
db193ca
merge fixed
seattlefurby17 Nov 22, 2020
8d7f074
checkout-client side validation
seattlefurby17 Nov 22, 2020
ef33814
updated order and order_item methods for testing
seattlefurby17 Nov 22, 2020
5c01dbe
Spotlight for homepage
Nov 23, 2020
0c9ae2f
Added styling to checkout form, added fields for city and state, adde…
Nov 23, 2020
efdcfb0
Added styling to checkout form, added fields for city and state, adde…
Nov 23, 2020
6733a7c
Updating testing and show err message in order
seattlefurby17 Nov 23, 2020
657b79f
Merge branch 'master' into sandy-bootstrap-form
Beatress Nov 23, 2020
dcf98c1
Merge pull request #13 from seattlefurby17/sandy-bootstrap-form
Beatress Nov 23, 2020
a67c5c8
Fixed syntax error on cart page
Beatress Nov 23, 2020
e6373ab
merge fixed
seattlefurby17 Nov 23, 2020
66bb561
Updated order model tests
seattlefurby17 Nov 23, 2020
a0a78ef
Added photo urls to seed data
Beatress Nov 23, 2020
d314c3d
Added files
Beatress Nov 23, 2020
45924d1
updated order model testing and simplcov
seattlefurby17 Nov 23, 2020
d83de66
Fixed cart bug with validations, added allow_nil
Beatress Nov 23, 2020
b593d70
Worked on homepage, recreated schema
Nov 23, 2020
5ea0d44
Created styling for churro pic
Nov 23, 2020
248203e
More styling for homepage
Nov 23, 2020
7ec2233
updating show merchant
seattlefurby17 Nov 24, 2020
1b36523
added order tests, total revenue and total_num methods to merchant mo…
idago123 Nov 24, 2020
ecf530c
added links to each individual order
idago123 Nov 24, 2020
1ad4853
deleted commented out code
idago123 Nov 24, 2020
ccc8b41
updated view
idago123 Nov 24, 2020
cbac1b7
index view for order
idago123 Nov 24, 2020
ee629b8
Created order details page
Nov 24, 2020
f275dad
orders show page
Nov 24, 2020
5d99ee2
index on master: 7ec2233 updating show merchant
Beatress Nov 24, 2020
5808777
WIP on master: 7ec2233 updating show merchant
Beatress Nov 24, 2020
2ada46a
Merge pull request #15 from seattlefurby17/fullfilment
Beatress Nov 24, 2020
512df63
Fixed merge conflict
Beatress Nov 24, 2020
cb80407
Merge branch 'master' of github.com:seattlefurby17/betsy
Beatress Nov 24, 2020
ca89b5d
order_item testing, merchant relation testing
seattlefurby17 Nov 24, 2020
2e7c776
Updated orders.yml
seattlefurby17 Nov 24, 2020
ea5b8f1
Fixed bugs, all tests passing
Beatress Nov 24, 2020
fd0c2c5
Tests updated
seattlefurby17 Nov 24, 2020
0edbc8f
updated tests
seattlefurby17 Nov 24, 2020
4d5f356
Changed a space
seattlefurby17 Nov 24, 2020
8c9b789
fixed order page authentication bug
Beatress Nov 24, 2020
d03a136
added conditional logic to show cart or order details page in navigat…
Beatress Nov 24, 2020
b4a31ff
added shopper details to order details page
Beatress Nov 24, 2020
6a0b954
Fixed order show page authentication
Beatress Nov 24, 2020
f5eb69a
Merchant dashboard finished
Beatress Nov 24, 2020
520de93
Added product retire/unretire functionality
Beatress Nov 24, 2020
c5cc31d
Merge pull request #16 from seattlefurby17/bea_Monday
Beatress Nov 24, 2020
0b722fe
application_controller fixed spacing
seattlefurby17 Nov 24, 2020
7f9d68f
updated testing and require login for merchant
seattlefurby17 Nov 24, 2020
900d6cd
Added ability to have multiple orders per user
Beatress Nov 24, 2020
c5dc460
Added proper currency formatting everywhere
Beatress Nov 24, 2020
2617d41
Update orders_table.html.erb
Beatress Nov 24, 2020
0462a6f
Merge pull request #18 from seattlefurby17/multiple_orders
idago123 Nov 24, 2020
76463e0
Merge branch 'master' into model_testing
seattlefurby17 Nov 24, 2020
6e4988e
Merge pull request #17 from seattlefurby17/model_testing
seattlefurby17 Nov 24, 2020
fc32d7c
Applied suggestions from code review
Beatress Nov 24, 2020
b60c7bd
Merges fixed
seattlefurby17 Nov 24, 2020
575a7db
merges fixed
seattlefurby17 Nov 24, 2020
223efd1
product model relations tests
seattlefurby17 Nov 24, 2020
b881304
order model tests completed
seattlefurby17 Nov 24, 2020
06bc5f5
updated test helper for simplecov
seattlefurby17 Nov 24, 2020
ca1c2d8
Added google font
Nov 25, 2020
1693325
Added rounded corners to pics
Nov 25, 2020
ed9e258
updated homepages controller test
seattlefurby17 Nov 25, 2020
5e8133d
added retire tests
idago123 Nov 25, 2020
61bd34a
Updated test_helper simplecov
seattlefurby17 Nov 25, 2020
71c1ce7
Wrote tests for merchant and order controller
Beatress Nov 25, 2020
edbdfd6
Merge pull request #19 from seattlefurby17/tuesday-tests
Beatress Nov 25, 2020
8053698
added find product
idago123 Nov 25, 2020
9d10aba
added find product test
idago123 Nov 25, 2020
7889dc9
Merge pull request #20 from seattlefurby17/productcontroller
Beatress Nov 25, 2020
efc6f5f
Added test framework for order items
Nov 25, 2020
8128bc9
Added test framework for order items
Nov 25, 2020
3478614
merchant model tests
seattlefurby17 Nov 25, 2020
7d665b7
Merge pull request #21 from seattlefurby17/sandy-branch-03
Nov 25, 2020
b1cc87e
initial push
Nov 25, 2020
e43ea79
Merge pull request #22 from seattlefurby17/sandy-tests-branch
Nov 25, 2020
0fc8e38
merchant model tests
seattlefurby17 Nov 25, 2020
8a73d31
Merge branch 'master' of https://github.com/seattlefurby17/betsy into…
seattlefurby17 Nov 25, 2020
b5059a7
Added check for product not found in add to cart
Beatress Nov 25, 2020
b777715
order item tests
Nov 25, 2020
0a8bedc
Merge branch 'master' into sandy-tests-branch
Nov 25, 2020
8ebf23f
Merge pull request #23 from seattlefurby17/sandy-tests-branch
Nov 25, 2020
02c9e5f
added more tests including edge cases for total rev, total num and to…
idago123 Nov 25, 2020
d62d556
updated total orders test
idago123 Nov 25, 2020
3c96e68
more files
Nov 25, 2020
7bf7307
98% coverage
Beatress Nov 25, 2020
a39fe27
Merge branch 'master' of github.com:seattlefurby17/betsy
Beatress Nov 25, 2020
471c5d6
Added social media icons to footer
Nov 25, 2020
ac3fa61
added social media icons
Nov 25, 2020
00e351d
Added social media icons to footer
Nov 25, 2020
18391ea
Added styling to order summary receipt
Nov 25, 2020
6b54a8c
Merge pull request #24 from seattlefurby17/sandy-bootstrap-form
Beatress Nov 25, 2020
7d9789e
deleted currency conversion total num of orders
idago123 Nov 25, 2020
c8d7995
updated orders index view
idago123 Nov 25, 2020
970822b
Removed coverage files from repo
Beatress Nov 25, 2020
38ba9bf
view for order index
idago123 Nov 26, 2020
f7bd54f
Merge branch 'master' of https://github.com/seattlefurby17/betsy into…
idago123 Nov 26, 2020
82f14af
added margins for better look
Jan 25, 2021
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
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
defaults
8 changes: 8 additions & 0 deletions .generators
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Settings><!--This file was automatically generated by Ruby plugin.
You are allowed to:
1. Reorder generators
2. Remove generators
3. Add installed generators
To add new installed generators automatically delete this file and reload the project.
--><GeneratorsGroup><Generator name="active_record:migration" /><Generator name="active_record:model" /><Generator name="active_record:observer" /><Generator name="active_record:session_migration" /><Generator name="controller" /><Generator name="erb:controller" /><Generator name="erb:mailer" /><Generator name="erb:scaffold" /><Generator name="generator" /><Generator name="helper" /><Generator name="integration_test" /><Generator name="mailer" /><Generator name="metal" /><Generator name="migration" /><Generator name="model" /><Generator name="model_subclass" /><Generator name="observer" /><Generator name="performance_test" /><Generator name="plugin" /><Generator name="resource" /><Generator name="scaffold" /><Generator name="scaffold_controller" /><Generator name="session_migration" /><Generator name="stylesheets" /><Generator name="test_unit:controller" /><Generator name="test_unit:helper" /><Generator name="test_unit:integration" /><Generator name="test_unit:mailer" /><Generator name="test_unit:model" /><Generator name="test_unit:observer" /><Generator name="test_unit:performance" /><Generator name="test_unit:plugin" /><Generator name="test_unit:scaffold" /></GeneratorsGroup></Settings>
40 changes: 40 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# 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 pidfiles, but keep the directory.
/tmp/pids/*
!/tmp/pids/
!/tmp/pids/.keep

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

/public/assets
.byebug_history

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

/public/packs
/public/packs-test
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity

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

ruby '2.6.5'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.0.3', '>= 6.0.3.4'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 4.1'
# Use SCSS for stylesheets
gem 'sass-rails', '>= 6'
# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
gem 'webpacker', '~> 4.0'
# 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.7'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 4.0'
# Use Active Model has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Active Storage variant
# gem 'image_processing', '~> 1.2'

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.4.2', 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.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'
# .env file
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 web drivers to run system tests with browsers
gem 'webdrivers'
#
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'
group :development, :test do
gem 'pry-rails'
end

group :development do
gem 'guard'
gem 'guard-minitest'
gem 'debase', '>= 0.2.4.1'
gem 'ruby-debug-ide', '>= 0.7.0'
end

group :development do
gem 'better_errors'
gem 'binding_of_caller'
end

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