forked from AdaGold/betsy
-
Notifications
You must be signed in to change notification settings - Fork 14
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
Gale, Maria, Sara, Kimberley - Carets #72
Open
galestorm
wants to merge
280
commits into
Ada-C8:master
Choose a base branch
from
galestorm:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
280 commits
Select commit
Hold shift + click to select a range
f3d7c04
Passing tests for relations between products and merchants/reviews.
kimberleyamackenzie 1d3fb56
Passing tests for review validations.
kimberleyamackenzie d34f359
Fixing merge conflict?
kimberleyamackenzie 4b2805c
category model tests passing for unqiueness and presence
mariamcgrew ac95b46
category model test passing for character length
mariamcgrew 6bde75a
Product controller actions & product index view.
kimberleyamackenzie 642a28f
fixed merge conflicts
mariamcgrew aab87bb
Validate order status
galestorm 29f3d1c
Merge branch 'master' of https://github.com/galestorm/betsy
galestorm efc6495
Functioning but not pretty products index view.
kimberleyamackenzie a70f5e1
Merge branch 'master' of https://github.com/galestorm/betsy
kimberleyamackenzie 50b55f1
Finish order model testing for validations and relations
galestorm 7f940bf
Merge branch 'master' of https://github.com/galestorm/betsy
galestorm a4cbefe
deleted git text from review_test
SaraChandler bcfbb51
deleted git text from review test
SaraChandler 4db2d3f
Orders controller tests index and new actions
galestorm 25f1088
Pass all works controller tests except update
galestorm 6a4a211
Basic categories controller tests.
kimberleyamackenzie 72cce1f
Category views.
kimberleyamackenzie 912b0dd
Categories controller tests.
kimberleyamackenzie 71327e4
Merge branch 'master' of https://github.com/galestorm/betsy
kimberleyamackenzie a64c4e3
Add relations tests to product and category
galestorm 04bece0
SC added tests to reviews controller
SaraChandler 75179a4
Merge branch 'master' of https://github.com/galestorm/betsy
galestorm d63639b
Merge branch 'master' of https://github.com/galestorm/betsy
SaraChandler 19046da
fixed table name for product categories, working in console
mariamcgrew c74765e
Merge?
galestorm f10c59f
fixing destroy test on reviews controller
SaraChandler d3a6ac5
Merge branch 'master' of https://github.com/galestorm/betsy
SaraChandler 1431d39
Resolve merge conflict
galestorm f9ab169
Merge branch 'master' of https://github.com/galestorm/betsy
galestorm 0ceba86
Remove typo
galestorm 6ac1b70
all tests passing for reviews controller
SaraChandler 23c4428
Merge branch 'master' of https://github.com/galestorm/betsy
SaraChandler 5cabd8d
Remove destroy action from orders controller: orders should never be …
galestorm a3c6ec0
Merge branch 'order-controller-tests'
galestorm 5504b72
Merge branch 'master' of https://github.com/galestorm/betsy
galestorm 50b68c5
merchants controller testing complete for index and show
mariamcgrew 55c62e1
Merge branch 'master' of https://github.com/galestorm/betsy
mariamcgrew 6a91287
tested remove one from stock model method - passing
mariamcgrew 771114a
method method for in stock product works correctly
mariamcgrew d17ad19
Passing tests for categories controller with edge cases.
kimberleyamackenzie 87edffb
Merge branch 'master' of https://github.com/galestorm/betsy
kimberleyamackenzie fcf9ad5
All products controller tests except the create.
kimberleyamackenzie 779ddc0
Order billing details form.
kimberleyamackenzie 9b337ba
Updated routes for merchant_products path.
kimberleyamackenzie ec1d06d
Working browse by merchants products path
kimberleyamackenzie c3d7b67
Slightly updated root path.
kimberleyamackenzie 8ea2975
Test user can add product to pending order
mariamcgrew a2dd4d7
Merge product controller tests
mariamcgrew 7ff8c1b
Saved file
mariamcgrew 0d82686
Test negative case for add_products action
mariamcgrew d06777c
pushing current version to gihub
mariamcgrew a46dc9c
added tests for product adding quantity to product in cart
SaraChandler 305db40
made nested routes for product reviews, added validation for product …
SaraChandler a8d92e4
Create show page for product. Add create_order action to application_…
galestorm 9ff370b
Add comment
galestorm 9a61a1f
Merge branch 'master' of https://github.com/galestorm/betsy
galestorm 30eb757
Link to product show page in index
galestorm 07cb2c5
Merge branch 'product-show-page'
galestorm edb2126
products by category tests passing
mariamcgrew 054cc92
Dropdown menus.
kimberleyamackenzie 3ba1124
Image tags for index views and updated dropdown menus.
kimberleyamackenzie 17ecbac
updated reviews controller to handle nested routes, not working yet
SaraChandler 4d1c593
Merge branch 'master' of https://github.com/galestorm/betsy
mariamcgrew 800ba53
Work on removing product from orderproducts
galestorm 6c43d59
Resolve merge conflict
galestorm fd27af2
fixed merge conflict with show.html products
SaraChandler 76a2ae4
added categories seeds
mariamcgrew 3517790
categories seeds working in console
mariamcgrew 3a39cfa
Merge branch 'master' of https://github.com/galestorm/betsy
mariamcgrew cf870b0
Remove_product_from_cart action working
galestorm 43b77f0
Add strong params back in, it was accidentally delteted in a merge
galestorm d781fac
Stashing these changes to reviews routing.
kimberleyamackenzie ea96257
Reviews still broken
SaraChandler 7e829c4
Merge branch 'master' of https://github.com/galestorm/betsy
SaraChandler 6bac4c2
Merge branch 'master' of https://github.com/galestorm/betsy
kimberleyamackenzie 391f655
Fix order controller test bug - it was mad order index view file was …
galestorm aaadffd
Add conditional to order index form
galestorm 1df0542
Product rating model method and links.
kimberleyamackenzie 45d419d
Show pages for products.
kimberleyamackenzie 3e93bfd
Shopping cart functionality.
kimberleyamackenzie a606d9f
Shopping cart creates new order only if new session id.
kimberleyamackenzie 9ce87fd
Add redirect to application controller create order method
galestorm f67409c
Merge branch 'master' of https://github.com/galestorm/betsy
galestorm 945f76e
Order subtotal method.
kimberleyamackenzie c21fab5
Merge branch 'master' of https://github.com/galestorm/betsy
kimberleyamackenzie 075d29e
moved links to categories page
mariamcgrew 710daee
removed merge conflicts
mariamcgrew 782117b
Updated routes for confirmation page & order create functionality.
kimberleyamackenzie 07dd692
Bug fix: can begin my order session by adding a product or clicking m…
galestorm 4aeeb4d
Merge branch 'master' of https://github.com/galestorm/betsy
galestorm 73c55d7
Confirmation page details.
kimberleyamackenzie f8eff83
Merge branch 'master' of https://github.com/galestorm/betsy
kimberleyamackenzie b5cb2a6
Working confirmation screen.
kimberleyamackenzie 2920547
Message if no roducts meet given parameters.
kimberleyamackenzie 80baa9b
Title created.
kimberleyamackenzie 44c06d2
Crystal ball tab icon.
kimberleyamackenzie 4beb554
changed path to redirect the shopping cart after adding a product
mariamcgrew b2f711c
Merchants show view.
kimberleyamackenzie a45cec8
Merge branch 'master' of https://github.com/galestorm/betsy
kimberleyamackenzie 33fcb46
Change to reflect that updating order should redirect to confirm orde…
galestorm 1577bbb
Test remove_product_from_cart action for bad requests
galestorm 2cdfd7f
Fix merge conflicts
galestorm 83c1993
Fix typo in order index view
galestorm 8fd9ecc
Redirects user back if can't add product to cart
galestorm 185fbcf
Include Paperclip in GEMFILE and configure environment to use ImageMa…
galestorm 3721746
changed expiration date data type, added validations to order form zi…
mariamcgrew 9fcfadb
added email formatting validation
mariamcgrew 8ee1e54
Add attachment photo field to products table
galestorm 31db625
Add Upload Product Photo to new product form
galestorm 4e3207d
Add Upload Merchant Photo buton to merchant form partial
galestorm b1a19b0
Add file attachment field photo to merchants table and Upload Merchan…
galestorm be26e6c
dried up validations
mariamcgrew a87a872
model tests for orders validations passing
mariamcgrew 0ede865
Controller updates and route cleanup.
kimberleyamackenzie 85437ce
Updated passing tests to match refactored controller methods.
kimberleyamackenzie 21c6bd7
added city and state columns to orders db
mariamcgrew 380e300
added city and state to form, with validations
mariamcgrew 6ec662b
updated orders controller params and order model validations test pas…
mariamcgrew e639eb5
Responsive normal sized shopping cart header.
kimberleyamackenzie cbf1a3e
Crystal ball! No header on home page.
kimberleyamackenzie 9e4ec8a
Background image on homepage.
kimberleyamackenzie 87fc679
Body container.
kimberleyamackenzie 9055189
Updated font for header.
kimberleyamackenzie 0904216
Updated index views and show views.
kimberleyamackenzie be4cf3f
Add and remove to cart button styling.
kimberleyamackenzie d0fa2e8
Order page styling updates.
kimberleyamackenzie eaf5e28
controllers updated with controller filters
mariamcgrew 682ad00
Root page logo styling.
kimberleyamackenzie d1dd9a9
Background styling.
kimberleyamackenzie 1781015
Merge conflcits unconflicted.
kimberleyamackenzie 5168b0e
Fixed failing order controller test.
kimberleyamackenzie 999fd48
JS scrolling featured product on homepage.
kimberleyamackenzie 7a670ac
merging changes_post_demo
mariamcgrew 921d6e2
REVIEWS ARE WORKING
SaraChandler 3b87bec
fixed merge conflict in orders.yml
mariamcgrew 37b3eb0
Styling changes for scrolling featured product.
kimberleyamackenzie 7e7876c
Merge branch 'master' of https://github.com/galestorm/betsy
kimberleyamackenzie 33d5127
removed extra yml lines in order.yml
mariamcgrew e3be10d
Merge branch 'master' of https://github.com/galestorm/betsy
mariamcgrew 8372923
fixed merge conflicts
SaraChandler 1819fd0
Merge branch 'master' of https://github.com/galestorm/betsy
SaraChandler 4712cfe
Weird funky problems being less funky and weird.
kimberleyamackenzie fc2dce6
Initial OAuth setup method and route
galestorm b01a779
Added logout button toggle
SaraChandler fdb1217
Toggle header for logged in merchant or guest.
kimberleyamackenzie 156b04c
New product params switch to automatically take in currently logged i…
kimberleyamackenzie 4e03b40
Migration for order status column to make item unavailable.
kimberleyamackenzie 297f235
Add multipart to new product form
galestorm f8e36d1
Merge branch 'image-rendering'
galestorm cee6ea7
Permit photo in product_params
galestorm 33c269f
Fix merge conflict
galestorm 748cfc0
Able to save image information
galestorm 9dfe09e
Uploaded product photos appear on product show page and product index…
galestorm c687c49
Permissions for only viewing available products unless you are the me…
kimberleyamackenzie 7a9ae9a
added order index method to get merchant orders and products
SaraChandler 7096931
Pretty background yay! (styling).
kimberleyamackenzie 49613bd
Background on all non-root pages.
kimberleyamackenzie 6aed509
Add category for products that you own functionality.
kimberleyamackenzie 52ff3aa
Show default image on index page if no image attached
galestorm b93bad8
Edit link available if you are a currently logged in merchant who own…
kimberleyamackenzie 8ef0b21
Updated text color for black background.
kimberleyamackenzie cdf0307
Paperclip working but not communicating with ImageMagick
galestorm 388e405
Merge conflicts fixed? Maybe?
kimberleyamackenzie 51c52c1
Resolved duplicate stylesheet issue.
kimberleyamackenzie 2ea6577
Buttons to add a new review and view reviews on product show page.
kimberleyamackenzie a2fdf30
Featured product on home page autoplays, booyah.
kimberleyamackenzie e44a6d8
Update forms styling.
kimberleyamackenzie c3f9f3b
Product price method experiments that I undid but accidentally had ea…
kimberleyamackenzie 1cfadc6
More user-friendly pathways and links through images.
kimberleyamackenzie 776c4dc
Alerts for flash text.
kimberleyamackenzie eb6d6ac
added Merchant order sort by status, set shipped button
SaraChandler 8a07119
Rollback unnecessary availability migration.
kimberleyamackenzie aa3195e
updated migration for default status products column, added .env file…
mariamcgrew c6bafe6
changed the application.scss file, lines 13 14 15
mariamcgrew 5d360ea
Added a handful of links to different views for UX.
kimberleyamackenzie 7a666c3
fixed merge conflict in add default product status migration
mariamcgrew d299fc1
Updated redirect for edit products path so it wouldn't redirect to pr…
kimberleyamackenzie cf64b62
Product description added in schema & all necessary references throug…
kimberleyamackenzie 525a6e8
changed products controller to fix bugs
SaraChandler 2ada102
Deleted unnecessary JS references and files.
kimberleyamackenzie ddba04f
Merge branch 'master' of https://github.com/galestorm/betsy
kimberleyamackenzie 791ae9b
fixed orders controller method
SaraChandler 78b9fc4
fixed merge conflicts with application html
SaraChandler 0cddbb7
changed logout to button so it would work, edited sessions controller…
SaraChandler 67c3aaf
Delete unnecessary reference to file.
kimberleyamackenzie a02835c
Delete application.js
galestorm 64d6bd5
Merge branch 'master' of https://github.com/galestorm/betsy
galestorm 529bcdb
Fixing merge conflicts.
kimberleyamackenzie 50d9ec1
changed application controller flash message to result text and added…
SaraChandler f6da33b
Add SimpleCov
galestorm 2ace3e0
Test custom order model methods
galestorm f82b780
Passing and expanded category model and category controller tests, up…
kimberleyamackenzie 7ab6412
Passing sessions controller tests with methods added in test helper f…
kimberleyamackenzie ad6e1e8
Pass order#show controller tests
galestorm 6a911a4
Pass order#edit controller tests
galestorm 2efcb82
Reviews model tests complete and passing.
kimberleyamackenzie 725b184
product model testing is finished, product controller started
SaraChandler 0102ba0
fixed merge conflicts in gemfile, gemfile.lock, test helper
SaraChandler 758a3e4
updated Order model and individual order page
SaraChandler e83efd4
All order controller tests except shipped action
galestorm bbbaaa1
deleted yarn dependency
mariamcgrew 8e19ec0
Trigger Heroku deploy after enabling collectstatic
mariamcgrew 9ae0d32
allow heroku auto assets precompilation
mariamcgrew 9505aed
Add back jquery tag so link_tos work now
galestorm ff9013d
Fix merge conflicts
galestorm 216882c
Transitions on button transform scale property.
kimberleyamackenzie 8683bcf
Resolved merge conflicts.
kimberleyamackenzie b23081a
fixed merge conflicts
mariamcgrew c4efa0a
Test negative case for shipped order controller action
galestorm b066221
Merge branch 'master' of https://github.com/galestorm/betsy
galestorm 47ea966
Bug Fix: flash message no longer appears when merchant navigates to a…
galestorm 726efcc
fixed individual order page and order model
SaraChandler 1e6f9f1
Merge branch 'master' of https://github.com/galestorm/betsy
SaraChandler 8a6ceb6
Merge branch 'master' of https://github.com/galestorm/betsy
kimberleyamackenzie 244c8de
Updated styling for merchant orders page.
kimberleyamackenzie 5be48fd
One more shipped action test passing on order controller tests
galestorm 6a94c29
completed test for merchants viewing orders
mariamcgrew c95e4c6
refactored the merchant orders index action
mariamcgrew 2fc35c5
Turn all buttons into divs so the whole button is clickable, not just…
kimberleyamackenzie 116a9cf
Turned merchant product images on merchant show view into links.
kimberleyamackenzie 65e1615
tests passing for restricting reviews bu merchant
mariamcgrew 0a6a892
Maybe fixed weird rectangles in background, exclamation point.
kimberleyamackenzie ca9a319
Commented out unneccessary index product by review id statement.
kimberleyamackenzie 853eead
updated order controller shipped method to find by order id, fixed bug
SaraChandler 684544f
Add session order id to nil when you logout to prevent items remainin…
kimberleyamackenzie d6bc938
All form text white to be viewable.
kimberleyamackenzie 00135ec
commented out merchant controller actions
mariamcgrew 083c474
Merge branch 'master' of https://github.com/galestorm/betsy
mariamcgrew 322b55c
No real change
galestorm d1f38c7
Merge branch 'master' of https://github.com/galestorm/betsy
galestorm 831c361
removed test from product model test
SaraChandler 6f7a1f4
fixed merge issues in review controller test, order controller
SaraChandler 14a3fd6
Styling for view individual orders page.
kimberleyamackenzie 4f23a94
Render show view after you create a new order
galestorm 3f9b5a5
updated dates to be readable
SaraChandler 0bdf33a
Merge branch 'master' of https://github.com/galestorm/betsy
SaraChandler 0c9bf2c
added validation message to order cart
mariamcgrew c0dfac9
Merge branch 'master' of https://github.com/galestorm/betsy
mariamcgrew 38d6916
Various and assorted small styling changes.
kimberleyamackenzie 52cc1bd
Resolved merge conflict.
kimberleyamackenzie 27329da
fixed html for order index
SaraChandler 97e4a8d
HTML alt tags and formatting.
kimberleyamackenzie b1eb832
Resolve merge conflicts.
kimberleyamackenzie e6448c0
Revenue styling details.
kimberleyamackenzie 84a3a21
Line item for paragraph descriptions.
kimberleyamackenzie f582272
Merchant views on account page.
kimberleyamackenzie 107b77d
fixed line of code in category show page
mariamcgrew 6f673ff
answered the questions
mariamcgrew File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
# 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 | ||
|
||
/node_modules | ||
/yarn-error.log | ||
|
||
.byebug_history | ||
.env | ||
|
||
public/assets/** | ||
|
||
/coverage/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
source 'https://rubygems.org' | ||
|
||
git_source(:github) do |repo_name| | ||
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") | ||
"https://github.com/#{repo_name}.git" | ||
end | ||
|
||
gem 'awesome_print' | ||
gem "paperclip", "~> 5.0.0" | ||
gem 'omniauth' | ||
gem 'omniauth-github' | ||
gem 'simplecov' | ||
|
||
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' | ||
gem 'rails', '~> 5.1.4' | ||
# Use postgresql as the database for Active Record | ||
gem 'pg', '~> 0.18' | ||
# Use Puma as the app server | ||
gem 'puma', '~> 3.7' | ||
# 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 'therubyracer', 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', '~> 3.0' | ||
# Use ActiveModel has_secure_password | ||
# gem 'bcrypt', '~> 3.1.7' | ||
|
||
# Use Capistrano for deployment | ||
# gem 'capistrano-rails', group: :development | ||
|
||
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] | ||
# Adds support for Capybara system testing and selenium driver | ||
gem 'capybara', '~> 2.13' | ||
gem 'selenium-webdriver' | ||
gem 'dotenv-rails' | ||
gem 'simplecov' | ||
gem 'pry-rails' | ||
end | ||
|
||
group :development do | ||
# Access an IRB console on exception pages or by using <%= 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 | ||
|
||
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem | ||
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] | ||
|
||
gem 'jquery-turbolinks' | ||
gem 'foundation-rails', '6.4.1.2' | ||
group :development do | ||
gem 'better_errors' | ||
|
||
gem 'binding_of_caller' | ||
end | ||
|
||
group :test do | ||
gem 'minitest-rails' | ||
gem 'minitest-reporters' | ||
end | ||
|
||
gem 'jquery-rails' |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also, these questions shouldn't be answered like this within this file!
github uses this file to automatically populate the text box for the description when you open a new Pull Request. Just edit that PR description. I went ahead and copied and pasted this into your PR for you :P