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

Space & Time - Charlotte, Katie, Mair, Yoyo #34

Open
wants to merge 219 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
219 commits
Select commit Hold shift + click to select a range
2df8736
initial set up
mheshmati-tech Jun 9, 2020
e81ded4
created the user model
ktvoort123 Jun 10, 2020
d9338c9
created the Users controller
ktvoort123 Jun 10, 2020
8de7973
created data base for products and created controller and model for p…
mheshmati-tech Jun 10, 2020
96db06c
created omniauth initializers file
ktvoort123 Jun 10, 2020
069ad27
created the index view for users
ktvoort123 Jun 10, 2020
5b6b9aa
added routes for products, added index, edit, show to the products co…
mheshmati-tech Jun 10, 2020
75e750e
add create and update action products controller
FreeMonkey19 Jun 10, 2020
59c0905
create destroy action
FreeMonkey19 Jun 10, 2020
ade0e6e
set up OAuth in users controller and model
ktvoort123 Jun 10, 2020
55d8441
created User Show view and update User index view
ktvoort123 Jun 10, 2020
3fb5f1e
added validations for the products
mheshmati-tech Jun 10, 2020
6a778e0
added index and show views for products
mheshmati-tech Jun 10, 2020
010a7dd
created controller tests for new user and existing user
ktvoort123 Jun 10, 2020
125e2d3
add fixtures and controller tests
FreeMonkey19 Jun 10, 2020
f1c4832
Added tests for the user model
ydunbar Jun 10, 2020
8d2266e
added controller tests for products- has some errors because the root…
mheshmati-tech Jun 10, 2020
823fb1f
updated app view nav
ydunbar Jun 10, 2020
ab33ec9
model validation testing
FreeMonkey19 Jun 10, 2020
5557e03
Added toggling login/logout button to nav
ydunbar Jun 10, 2020
f703b85
resolved merge conflict
mheshmati-tech Jun 10, 2020
7af94a9
added relationship between user and products
ktvoort123 Jun 10, 2020
8666577
added homepage controller and index view
ktvoort123 Jun 10, 2020
fb1fceb
Merge branch 'products' of github.com:mheshmati-tech/betsy
FreeMonkey19 Jun 11, 2020
72594fd
schema change
mheshmati-tech Jun 11, 2020
936a996
fixed merge conflict
mheshmati-tech Jun 11, 2020
3bed711
rails db:migrated for adding foreign key for product and user
mheshmati-tech Jun 11, 2020
543d31a
Merge branch 'master' of github.com:mheshmati-tech/betsy
FreeMonkey19 Jun 11, 2020
1b039ef
added the current user as the product user id - wrote a method to kno…
mheshmati-tech Jun 11, 2020
811da75
Merge branch 'master' of github.com:mheshmati-tech/betsy
FreeMonkey19 Jun 11, 2020
c231022
created order model and controller, created order item model, created…
ktvoort123 Jun 11, 2020
cdce606
added a form to the product show page to create an order item
ktvoort123 Jun 11, 2020
454e485
created orders view and added buttons to header in application
ktvoort123 Jun 12, 2020
2376801
added customer information to orders through a migration
mheshmati-tech Jun 12, 2020
a5104f9
added functionality for displaying (empty) cart and changed view of O…
mheshmati-tech Jun 12, 2020
aa3174b
Added categories model, controller, relationships, and join table
ydunbar Jun 12, 2020
a58dfe5
added route and action for destroying order item in cart and created …
mheshmati-tech Jun 12, 2020
ed3fb9a
Added category drop-down to new product form
ydunbar Jun 12, 2020
51247db
we added model method to calculate the total price for the cart and a…
mheshmati-tech Jun 12, 2020
e80eeb6
add env file to gitignore
FreeMonkey19 Jun 12, 2020
b1f812d
Merge branch 'adding-categories' of github.com:mheshmati-tech/betsy
FreeMonkey19 Jun 12, 2020
0848e59
rename join table between categories and products
FreeMonkey19 Jun 12, 2020
2d8ca2a
resolved conflicts
ydunbar Jun 12, 2020
4ead15b
rename table
FreeMonkey19 Jun 12, 2020
739dce2
Added routes for categories
ydunbar Jun 12, 2020
4d22e9b
Added link to new category view
ydunbar Jun 13, 2020
5ad2b01
turned quantity to drop down which changes the order item quantity fo…
mheshmati-tech Jun 13, 2020
33b654f
Added checkboxes for categories in new product form
ydunbar Jun 13, 2020
494a8ee
Merge branch 'master' into adding-categories
ydunbar Jun 13, 2020
844491a
Removed products_categories_joins table and added categories_products…
ydunbar Jun 13, 2020
ea22455
added helper method to return an array for in stock items
mheshmati-tech Jun 13, 2020
28abcba
added an edit and update function to order so that a user can input t…
mheshmati-tech Jun 13, 2020
468cf8e
Added missing relationship to product model to connect categories, ad…
ydunbar Jun 13, 2020
031b64c
Added category show action and route
ydunbar Jun 13, 2020
3253b4e
Added category show view
ydunbar Jun 13, 2020
ace9b91
added finalize and confirmation actions to orders controller for comp…
mheshmati-tech Jun 13, 2020
ed3c5ed
Added table to category show view
ydunbar Jun 14, 2020
c744df0
Added Browse by Category dropdown to App header
ydunbar Jun 14, 2020
9b7d189
Added and debugged tests for categories controller
ydunbar Jun 14, 2020
0766c9b
fix merge conflic in the routes file
mheshmati-tech Jun 15, 2020
12a1603
fix conflict
FreeMonkey19 Jun 15, 2020
8d52df5
fix conflict
FreeMonkey19 Jun 15, 2020
d8a5b7c
fix conflicts
FreeMonkey19 Jun 15, 2020
d75dc9a
resolved conflict in product form
ydunbar Jun 15, 2020
05a4d51
accept incoming change
FreeMonkey19 Jun 15, 2020
451c4f3
Merge branch 'master' of https://github.com/mheshmati-tech/betsy
ydunbar Jun 15, 2020
00953e1
create view, model and controller and added relationship to product a…
FreeMonkey19 Jun 15, 2020
3350af6
added logic so if an order item already exists within a cart, when ad…
mheshmati-tech Jun 15, 2020
3994728
Merge branch 'master' of https://github.com/mheshmati-tech/betsy
mheshmati-tech Jun 15, 2020
1261abc
Added reviews routes and rough views
ydunbar Jun 15, 2020
0ec69e0
Merge branch 'master' of github.com:mheshmati-tech/betsy into adding-…
FreeMonkey19 Jun 15, 2020
38330d1
added model validations for Order and Order items, changed the schema…
mheshmati-tech Jun 16, 2020
074e88e
set up simpleCov, add to Gemfile, test_helper, bin/rails and .gitigno…
FreeMonkey19 Jun 16, 2020
6fca681
add coverage file to .gitignore
FreeMonkey19 Jun 16, 2020
5818f7a
add user_id to fixtures and test file
FreeMonkey19 Jun 16, 2020
7c3ab7c
debugged reviews controller actions and added to new review form and …
ydunbar Jun 16, 2020
d7e10e7
test for price is greater than zero and price is not a number
FreeMonkey19 Jun 16, 2020
cada1bd
browse by merchant added to the navigation bar, changed the show page…
mheshmati-tech Jun 16, 2020
b430ec7
Added Review average_rating method and added average rating to produc…
ydunbar Jun 16, 2020
ca15e43
changed the schema to reflect product status, added a default product…
mheshmati-tech Jun 16, 2020
947eba9
updated the my account view to change the products' status using a cu…
mheshmati-tech Jun 16, 2020
d12ea36
added my account to the navigation bar
mheshmati-tech Jun 16, 2020
95d0b6c
added fulfillment page for the merchants account page
mheshmati-tech Jun 16, 2020
9d0db24
added logic for shipping an order item and once all order items are s…
mheshmati-tech Jun 16, 2020
4ba3639
Added reviews controller tests
ydunbar Jun 16, 2020
0b29d03
100 percent coverage in model and 91 percent coverage in controller
FreeMonkey19 Jun 16, 2020
4fe7e0f
Merge branch 'adding-review'
ydunbar Jun 16, 2020
8b5d6b6
resolved conflict
ydunbar Jun 16, 2020
dbf6f85
resolved conflicts
ydunbar Jun 16, 2020
320def3
resolved conflict
ydunbar Jun 16, 2020
d64f3d9
Added seeded data
ydunbar Jun 16, 2020
37bc8a5
changed seed file to look up users by name
ktvoort123 Jun 17, 2020
380b376
add /coverage for simpleCov
FreeMonkey19 Jun 17, 2020
58a7fe3
merge all braches as a group and fix conflicts
FreeMonkey19 Jun 17, 2020
cc1cef0
removed ID from all seed data
ktvoort123 Jun 17, 2020
8b38207
Merge branch 'master' of https://github.com/mheshmati-tech/betsy
ktvoort123 Jun 17, 2020
4610c08
fix conflict
FreeMonkey19 Jun 17, 2020
5f981c8
Merge branch 'master' of github.com:mheshmati-tech/betsy
FreeMonkey19 Jun 17, 2020
6eb4572
add coverage/ to gitignore
FreeMonkey19 Jun 17, 2020
a4f1d86
Changes to seed data
ydunbar Jun 17, 2020
9d7afaf
fixed typo in products route
ktvoort123 Jun 17, 2020
825ce5f
Merge branch 'master' of https://github.com/mheshmati-tech/betsy
ktvoort123 Jun 17, 2020
0b90547
removed seed data and seed file
ktvoort123 Jun 17, 2020
5b8c43e
merge adding-review
FreeMonkey19 Jun 17, 2020
1b9a388
retry migration for review and product
FreeMonkey19 Jun 17, 2020
c908bc9
added feature to redirect the user back to edit page when their input…
mheshmati-tech Jun 17, 2020
c6f4f25
Merge branch 'master' of https://github.com/mheshmati-tech/betsy
mheshmati-tech Jun 17, 2020
aa98ffa
added functionality to render the amount of stock order items as a dr…
mheshmati-tech Jun 17, 2020
e590748
resolved conflicts
ydunbar Jun 17, 2020
583be2e
changed the users render page to show their products image using an i…
mheshmati-tech Jun 17, 2020
a890df2
Got reviews controller tests passing
ydunbar Jun 17, 2020
37e9783
added users information to the confirm page at the end
mheshmati-tech Jun 17, 2020
b8ee5a8
Added and passed review model tests
ydunbar Jun 17, 2020
f813950
Merge branch 'master' into adding-review
ydunbar Jun 17, 2020
abe1a93
Added simplecov
ydunbar Jun 17, 2020
4413606
added functionality to filter the order fulfillment page and model me…
ktvoort123 Jun 17, 2020
4bb4fd6
changed the schema so that credit card information is string and not …
mheshmati-tech Jun 17, 2020
530f5c7
made adjustments to application navbar and body
ydunbar Jun 17, 2020
0f6bd87
deleted the destroy action for products, moved logic for decreasing s…
ktvoort123 Jun 17, 2020
1805ad5
resolved changes to merge
ktvoort123 Jun 17, 2020
0ad40bd
Merge branch 'master' of https://github.com/mheshmati-tech/betsy
ktvoort123 Jun 17, 2020
7773d70
Added model methods for homepage with implementation in ERB view
ydunbar Jun 17, 2020
22bd6d3
Added CSS for homepage
ydunbar Jun 18, 2020
82065ac
controller and model testing product
FreeMonkey19 Jun 18, 2020
857917d
product model testing spotlight and top rating
FreeMonkey19 Jun 18, 2020
8022deb
updaetd product
ydunbar Jun 18, 2020
12733cf
Merge branch 'homepage' into add-relationship-tests-product
ydunbar Jun 18, 2020
aa2e366
Merge branch 'master' of https://github.com/mheshmati-tech/betsy
ydunbar Jun 18, 2020
98e5815
retry push
FreeMonkey19 Jun 18, 2020
7ae776e
resolved conflicts
ydunbar Jun 18, 2020
25fa17c
setting up for testing
ktvoort123 Jun 18, 2020
300c49e
Merge branch 'master' of github.com:mheshmati-tech/betsy
FreeMonkey19 Jun 18, 2020
72bbb34
Merge branch 'homepage' of github.com:mheshmati-tech/betsy
FreeMonkey19 Jun 18, 2020
8f880be
Merge branch 'add-relationship-tests-product' of github.com:mheshmati…
FreeMonkey19 Jun 18, 2020
dffe36a
Merged and passed product model tests
ydunbar Jun 18, 2020
f6f85d2
created orders yml file
ktvoort123 Jun 18, 2020
9f92b1f
Setting up order testing
ktvoort123 Jun 18, 2020
80399f5
Merge branch 'master' into cart_testing
ktvoort123 Jun 18, 2020
caff9e2
model testing for order
ktvoort123 Jun 18, 2020
cbc6b38
remove comments and binding pry
FreeMonkey19 Jun 18, 2020
2bf82d0
Merge branch 'add-relationship-tests-product' of github.com:mheshmati…
FreeMonkey19 Jun 18, 2020
e688cb1
fix syntax
FreeMonkey19 Jun 18, 2020
b64b790
test decrease inventory, now 100 percent passing with simpleCov
FreeMonkey19 Jun 18, 2020
c5295bc
made the create action in order items into smaller helper methods for…
mheshmati-tech Jun 18, 2020
7d48abb
Merge branch 'master' of https://github.com/mheshmati-tech/betsy
mheshmati-tech Jun 18, 2020
42e7c39
controller testing for show action order
ktvoort123 Jun 18, 2020
9bb93e1
added validation testing for order items
mheshmati-tech Jun 18, 2020
5a92580
Added hero image to homepage
ydunbar Jun 18, 2020
8c6dd36
added controller test for cancel order
ktvoort123 Jun 18, 2020
1037b95
finished model testing for order items custom methods and relations
mheshmati-tech Jun 18, 2020
f46b9f3
added controller test for order edit and finalize order
ktvoort123 Jun 18, 2020
83731d8
Added placeholder footer
ydunbar Jun 18, 2020
e9c0045
made adjustments to html structure in views
ydunbar Jun 18, 2020
32cbca0
finished order controller testing
ktvoort123 Jun 18, 2020
e2fa7fb
removed create method from order controller
ktvoort123 Jun 18, 2020
27fc4e5
merge conflicts
ktvoort123 Jun 18, 2020
baac83c
fixed small bug in order controller test
ktvoort123 Jun 18, 2020
decb5b0
products controller testing and add user to fixtures
FreeMonkey19 Jun 18, 2020
96c39d1
Added cart icon to navbar
ydunbar Jun 18, 2020
2a1eb89
Added product card partial view
ydunbar Jun 18, 2020
1ccd6d1
Added flexbox to views listing products
ydunbar Jun 18, 2020
60f8764
added tests for create, destroy and changing order item status in ord…
mheshmati-tech Jun 18, 2020
e3e0e82
added tests to order item controller test
ktvoort123 Jun 18, 2020
6fa1933
Co-authored-by: Katie Vandervoort <katie.vandervoort@gmail.com>
FreeMonkey19 Jun 18, 2020
ef4c700
file clean up
FreeMonkey19 Jun 18, 2020
35f61d8
test for no update with invalid product id and test for default photo…
FreeMonkey19 Jun 19, 2020
079eb4d
added meet the team page
ktvoort123 Jun 19, 2020
dd5270e
added spacing in erb views
ydunbar Jun 19, 2020
c149e4a
Merge remote-tracking branch 'origin/products-controller-testing'
mheshmati-tech Jun 19, 2020
3861bd6
fixed merge conflict for yml files
mheshmati-tech Jun 19, 2020
a36ea85
Merge remote-tracking branch 'origin/meet_the_team'
mheshmati-tech Jun 19, 2020
135522f
fixed merge conflict for styling
mheshmati-tech Jun 19, 2020
cdaa552
removed bad mgiration
ktvoort123 Jun 19, 2020
6dd16e5
Fixed bug in homepage view
ydunbar Jun 19, 2020
0e63e1a
Fixed bug in homepage view
ydunbar Jun 19, 2020
7cad2a6
fixed order model tests
ktvoort123 Jun 19, 2020
b38c78a
Added missing test
ydunbar Jun 19, 2020
ea61ead
Merge branch 'adding-review'
ydunbar Jun 19, 2020
3148bb1
resolved conflicts
ydunbar Jun 19, 2020
df94aba
update order controller test
ktvoort123 Jun 19, 2020
549b387
added filter to the test helper file to filter out files that doesn't…
mheshmati-tech Jun 19, 2020
0abcc64
fixed things in order test
ktvoort123 Jun 19, 2020
898740a
added the coverage.assets folder to the .gitignore file
mheshmati-tech Jun 19, 2020
5ab7451
Merge branch 'master' of https://github.com/mheshmati-tech/betsy
ktvoort123 Jun 19, 2020
6f9e427
fixed merge confilict
mheshmati-tech Jun 19, 2020
0ffb206
fixed merge conflict?
mheshmati-tech Jun 19, 2020
215c170
added model tests for user
ktvoort123 Jun 19, 2020
78284c4
more testing
FreeMonkey19 Jun 19, 2020
13dd6e4
added user tests
ktvoort123 Jun 19, 2020
bd3acf6
fix merge conflict
FreeMonkey19 Jun 19, 2020
741e55f
ran simpleCov
mheshmati-tech Jun 19, 2020
7ae60eb
ignore coverage stuff
mheshmati-tech Jun 19, 2020
c136bfb
add to gitignore
FreeMonkey19 Jun 19, 2020
ff16984
coverage file issues
FreeMonkey19 Jun 19, 2020
21e6dae
hopefully fixed issues with testing
ktvoort123 Jun 19, 2020
44f95a5
don't want to commit these changes
mheshmati-tech Jun 19, 2020
060fcf7
delete coverage folder
FreeMonkey19 Jun 19, 2020
5b3f196
bundle install
mheshmati-tech Jun 19, 2020
dd163a0
Merge branch 'master' of https://github.com/mheshmati-tech/betsy
mheshmati-tech Jun 19, 2020
c087666
change yml file
FreeMonkey19 Jun 19, 2020
9175c3c
Merge branch 'master' of github.com:mheshmati-tech/betsy
FreeMonkey19 Jun 19, 2020
2a75f64
fix product contorller test
FreeMonkey19 Jun 19, 2020
5fd82c8
changed h1 sizes
ydunbar Jun 19, 2020
4951f40
make product card image full-bleed
ydunbar Jun 19, 2020
ef63634
added styling to meet the team page
ktvoort123 Jun 19, 2020
e97c898
mergeconflict
ktvoort123 Jun 19, 2020
3e242d6
added final styling to the myaccounts page
mheshmati-tech Jun 19, 2020
bc71094
featured centered product
ydunbar Jun 19, 2020
32b4dac
Merge branch 'master' of https://github.com/mheshmati-tech/betsy
ktvoort123 Jun 19, 2020
bd3e5c0
Merge remote-tracking branch 'origin/adding-styling'
ktvoort123 Jun 19, 2020
73089a4
Merge branch 'adding-styling' of github.com:mheshmati-tech/betsy
FreeMonkey19 Jun 19, 2020
1d72496
styling for product show page
mheshmati-tech Jun 19, 2020
0aa4628
Merge branch 'master' of github.com:mheshmati-tech/betsy
FreeMonkey19 Jun 19, 2020
ea1f554
added favicon
ktvoort123 Jun 19, 2020
4623be3
merge
ktvoort123 Jun 19, 2020
90d97d2
meet team page updates
ktvoort123 Jun 19, 2020
307eaa5
added filter to my orders page
ktvoort123 Jun 19, 2020
43cea46
meet the team bio changes
ktvoort123 Jun 19, 2020
6e863e0
fixed two failing tests
ktvoort123 Jun 19, 2020
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.
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
defaults
43 changes: 43 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# 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

# Ignore github credentials
/.env

/package-lock.json

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

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 'simplecov', require: false, group: :test

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

gem "omniauth"
gem "omniauth-github"
Loading