forked from AdaGold/betsy
-
Notifications
You must be signed in to change notification settings - Fork 9
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
Petsy #3
Open
jweeber
wants to merge
250
commits into
Ada-C5:master
Choose a base branch
from
abrown152: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
Petsy #3
Changes from all commits
Commits
Show all changes
250 commits
Select commit
Hold shift + click to select a range
f21684c
Created User model and controller.
abrown152 04b5cea
Created routes.
abrown152 294f111
model for product created, as well as relationships and validations. …
jweeber f65ba35
Yak shaving almost done.
abrown152 28a22e6
Merge branch 'master' of github.com:abrown152/betsy
abrown152 0c7ee6d
made models for order and order item and added some seeds to seeds.rb
DStorck 2a1def2
merging is super fun - Merge branch 'master' of github.com:abrown152/…
DStorck 011cb32
added some details to seed file
DStorck 22977e3
Merge commit.
abrown152 76f38f5
Merge branch 'acb_wave_1_branch'
abrown152 cf90f56
Update migration.
abrown152 ad2b941
took out animal attribute for product
DStorck 1d53370
created home controller and root path view. also changed routes for u…
jweeber ba279f2
home controller working with basics and needs links to other pages th…
jweeber c284ca6
we fixed the random sample of featured costumes so 3 show up. Fixed c…
jweeber 0db3f00
updated validations for user
DStorck df6e54c
created review model and validations
jweeber 7ba186d
merging review model Merge branch 'master' of github.com:abrown152/betsy
jweeber a69edda
Set up account registry and authentication.
abrown152 81d29a5
Created login view/action.
abrown152 2b5f24a
create view all for products. Show for products/id also working.
jweeber e1818fd
migration added to change column name in orders
DStorck fb5d56f
merge , yay Merge branch 'master' of github.com:abrown152/betsy
DStorck ee2bf1f
Fixed Sign-In path.
abrown152 c8845d4
tried to put some session info about orders
DStorck 2277d01
Added custom nav for current user login/logout.
abrown152 8f4d243
Merge branch 'master' of github.com:abrown152/betsy
abrown152 cf5ab7e
working on checkboxes for filtering but not quite working yet
jweeber bda73bf
Merge commit.
abrown152 10f964a
working through the orderitem and cart
DStorck 853000c
fixed a merge?
DStorck c2ae75b
reverting back to what we had before with categories and will revist …
jweeber 49fa63d
merge conflict - accepting changes that alysia made to index page for…
jweeber 7532584
think cart is working on a very basic level
DStorck f14a76b
added format to numbers on product page, link to add to cart on prod…
DStorck cb591f2
added precision number to index page
DStorck 6a380a4
fixed pathing on product show page to adjust for the route i made
DStorck 08bc6ef
fixed a bug so that user can actually sign in and logout option and w…
DStorck 486bb7a
made some changes but pulling to get Deirdre's changes first and merging
jweeber 5a0f82e
resolving merge conflicts
jweeber 47c5758
doing some css with bootstrap
jweeber fcba469
created routes for seller orders and seller products, plus views for …
jweeber ef9e406
your store link works and goes to sellers orders. deirdre helped me f…
jweeber 7563c83
Added order and review seeds.
abrown152 2dc0328
fixed product controller to have correct method name for seller produ…
jweeber 3d049e6
Reseeded DB
abrown152 0fab82a
Merge branch 'master' of github.com:abrown152/betsy
abrown152 d9849ca
oh my god it works nowgit add .! i'm so professional. okay really th…
DStorck ee484e3
Merge branch 'master' of github.com:abrown152/betsy
DStorck 32fb5ba
Added total seller revenue.
abrown152 cf990a3
Merge branch 'master' of github.com:abrown152/betsy
abrown152 5046f5a
new page for product working, but creating is not yet
jweeber 6921531
did minor css and worked on cart some more - also added adorable pict…
DStorck 5949ddc
Merge branch 'master' of github.com:abrown152/betsy
DStorck bb7715d
merging
jweeber 6ff0fac
merging again Merge branch 'master' of github.com:abrown152/betsy
jweeber b9b3f6c
did the before_action and require_login method for adding a new product
jweeber 1ba0da3
did some pretty bad css and tried to work on update cart, not super s…
DStorck 61d4f21
Merge branch 'master' of github.com:abrown152/betsy
DStorck 8444ca5
header working
DStorck 9aba737
Added seller specific orders.
abrown152 6a66ec6
Merge branch 'master' of github.com:abrown152/betsy
abrown152 eceb4a8
create product now works thanks to our superhero deidre. I added the …
jweeber adbb0ce
merging create products
jweeber 62f8d89
added urls to seed
DStorck 38d5e1b
added link to home page from petsy logo
DStorck 3c13758
did more css to get products index to display nicely
DStorck 6c19dbd
Created total revenue Bootstrap table.
abrown152 2e4d8b8
fixed current_user bug
DStorck 00898ff
working on edit for product. got the controller methods and view for …
jweeber 694fa8d
Merge branch 'edit_product'
jweeber 85e30e9
added taco cat pic to seeds
jweeber ffb183c
fixed bug
DStorck 28b5327
fixed commit with seller page
DStorck 7cb2443
edit button now working for products
jweeber 4c2d229
Merge branch 'edit_product'
jweeber 01944c4
photos are on user products page now
jweeber 1103280
okay now finally we can update cart item quantity
DStorck a8d0c9e
worked up update cart - can update quantity
DStorck ae2c7a3
Merge branch 'master' of github.com:abrown152/betsy
DStorck a26ba78
minor css
DStorck 9866459
Merge branch 'master' of github.com:abrown152/betsy
abrown152 a07c2d6
browse by category working
jweeber ac08f5d
browse by category merge
jweeber 3a8eddc
Added product_id column to Reviews.
abrown152 e4f8338
Merge branch 'master' of github.com:abrown152/betsy
abrown152 3d2ec43
added quantity button to show page for product
DStorck 4f7109e
Added hyperlink to seller's orderitem chart for individual order view.
abrown152 9e6b0b3
Merge branch 'master' of github.com:abrown152/betsy
abrown152 e983f18
merge
jweeber e930ad3
resolving merge conflict in routes
jweeber 8d877cb
forgot to branch
jweeber d41c4da
browse by category fully working
jweeber c586b7d
resolving a merge conflict with myself.
jweeber ee9b3ea
routes no longer broken
jweeber 6c80bdb
changed zip code to string with migration
jweeber a3b7aeb
got ratings up and running, including an average of all numeric ratin…
DStorck af0d8fd
Merge branch 'master' of github.com:abrown152/betsy
DStorck f1a2d89
can now view costumes by category or by pet/animal
jweeber 88f26bd
resolving merge conflict in seeds
jweeber 005c30a
got side nav bar lookin good and working on header.
jweeber 6e6458b
fixed padding in top header where current logged in user is listed
jweeber e38a3ca
confirmation page up and running, but doesn't show anything yet
DStorck 929192f
confirmation page now shows details of transation
DStorck b3d4968
when confirmation page displays, current_order session gets destroyed
DStorck 4c397c8
newed up current_order after confirmaion page
DStorck 882b3f4
got cart icon in header with number of order items in cart listed the…
jweeber acac31c
merging conflict in seeds since i added other pictures.
jweeber d22af20
fixed tiny redirect bug on cart
DStorck 4f5959b
updated confirmation page and a zillion other little things
DStorck 49d0f3e
missing end to method
DStorck ed6adc1
added descriptions for products to seeds. did some css for product/sh…
jweeber c54d0bc
merging some css work
jweeber e454ac6
adjusted location of view all costumes link on home page. view all co…
jweeber 9389fb4
Merge branch 'css'
jweeber e7f7d72
added a delete button to items in cart for easy removal
DStorck 4e06af1
wrote some fixtures
DStorck c5bad61
wrote some tests for user
DStorck 2a440dc
more css
jweeber 4359a3a
Merge branch 'css'
jweeber dd850cf
merging master with some css stuff
jweeber 31d7af6
committing so i can merge
jweeber 5f06ba4
Merge branch 'css' into product_create_edit
jweeber 678a5f6
added bootstrap stuff to sign up form
jweeber 2198e2f
more bootstrap
jweeber 7277100
made a footer with super cute paw prints
jweeber 45c0c7b
Merge branch 'product_create_edit' - made footer
jweeber 6dbd7a4
tried to fix weird issue with routes
DStorck e970658
fixed merge with routes
DStorck 7437dbd
css done for cart edit page
jweeber 0de5e72
merging to update css on cart page
jweeber c7a7bac
merging css for cart
jweeber b0e0e0e
routes getting messed up - fixed them. there were duplicates at the e…
jweeber 98d9369
removed a couple of useless files from a gem i tried to use earlier t…
jweeber f0c44b6
put user product path back in routes, it disappeared somehow
DStorck 5a49eef
starting on css and form for checkout view. also added helper method …
jweeber 54bb29c
working on getting dropdowns to only show available quantity
DStorck 6d5874a
bootstrap form for checkout done
jweeber 439b88e
Merge branch 'css' - form for checkout done
jweeber 608a40c
deirdre again is awesome and solved my problem with creating and upda…
jweeber f3a0e92
doing some weird stuff in products so probably should actually branch…
jweeber faec1dd
committing so i can merge without conflict
DStorck e599f03
still trying to fix merge conflict
DStorck ae10b45
grr routes are being terrible what happened??
DStorck 9c1e84e
fixed sign in
jweeber 3691d75
merging routes
jweeber cbd31f3
commiting so i can checkout older version and see what's happening wi…
DStorck ef13ba3
use these routes. all of them.
jweeber 0c06cc8
fixing merge conflict
DStorck 6403079
hadn't fully fixed merge conflict, working now
DStorck 9efb476
added route that got left behind to make your store work
jweeber 670ff91
Merge branch 'master' of github.com:abrown152/betsy
jweeber 02fc0c9
quantity of product now lowers after completed purchase
DStorck 6ba5a0d
Merge branch 'master' of github.com:abrown152/betsy
DStorck 3dfb948
trying to figure out why complete purchase page shows up twice
DStorck f30bb05
updated product show page to reflect available quantities
DStorck 5ed0c7d
product category working for text field but not drop-down
jweeber 6642ad0
Merge branch 'master' of github.com:abrown152/betsy
jweeber cb33da4
i dunno i think i removed an extra space somewhere
jweeber c7d1a78
commiting so i can branch out
DStorck 6e39b5d
got bootstrap for sign in form working
jweeber 41d65de
migration for making order cc exp into date datatype, and fixed weird…
DStorck 6533838
Merge branch 'master' of github.com:abrown152/betsy
DStorck 8ee0227
got the quantity to work on each show pageincluding your store products
jweeber f8c2bf1
quantity not working on home page as well
jweeber 751e4ce
merging css and quantity now working on all pages
jweeber 0282ddb
all order default to pending once they are created
DStorck 930419f
Merge branch 'master' of github.com:abrown152/betsy
DStorck 2988e31
working on getting add a review form up and running
DStorck a7b35d5
I CHANGED ROUTES. be careful. got delete and edit working for product…
jweeber 2d8131e
i changed routes, edit and delete for product
jweeber fe122f4
tried fixing adding new category but going to create a separate page …
jweeber c5cd1fc
wahoo we can now write descriptions for products
DStorck 8e3a8a1
Merge branch 'master' of github.com:abrown152/betsy
DStorck 1dca41d
changed something
jweeber ffc6484
adding new category now works like it should and is available as cate…
jweeber c324f0f
merging category creation feature
jweeber 165a37e
edit for product working with category and animal in there plus boots…
jweeber 47063e5
every time a review gets created it updated the products rating attri…
DStorck 4a096a5
Merge branch 'master' of github.com:abrown152/betsy
DStorck 2228646
Merge commit.
abrown152 6bcd1dd
Merge branch 'master' of github.com:abrown152/betsy
abrown152 599a7b9
added method to only take last 4 digits of credit card and display al…
DStorck f01dd4f
Merge branch 'master' of github.com:abrown152/betsy
DStorck d01fb97
added attribute to review so we can know who wrote it, it shows up on…
DStorck 6bb0bf6
retire product button working. now to work on making them not show up…
jweeber aa3c539
merge conflict in scheme and css resolved
jweeber 63ea797
controller methods to show only products that are not retired
jweeber f1d1ec8
Merge branch 'retire_prod' - retire product working
jweeber 0f2ffe1
starting validations for order
DStorck 90f5b04
Merge branch 'master' of github.com:abrown152/betsy
DStorck 201cbe6
products controller edits
jweeber 3f8a8bc
Merge branch 'master' of github.com:abrown152/betsy
jweeber 18f90ff
added some details to checkout forms to make certain parts mandatory …
DStorck 0e0598a
Merge branch 'master' of github.com:abrown152/betsy
DStorck d8d32a7
added required fields to forms and asterisks, so pretty
DStorck 9a28786
all show pages now updated to say when items are out of stock. signed…
jweeber d926315
merging show pages for out of stock feature
jweeber 1f8ab38
added a test that passed
jweeber 681fd22
added logic to make sure user can't review their own product
DStorck 13a2317
Merge branch 'master' of github.com:abrown152/betsy
DStorck 9ced0ae
everything is a link. click everything....ha ha
DStorck 97c6f66
added some tests for order model
DStorck b83de0e
added some tests for products model and users model
jweeber 086b361
merging fixtures
jweeber e851a11
finished tests for home controller
jweeber 0990345
tests for product model
jweeber b048f6c
finished model tests for products
jweeber d7382a8
worked on some tests for orderitems
jweeber 3e40f51
redirected user back to cart if out of stock
DStorck b2da32d
Merge branch 'master' of github.com:abrown152/betsy
DStorck 1f2462f
wrote test for review model
DStorck 14e300f
updated show page to use product.rating instead of a method to calcul…
DStorck ed658da
made home page pics into links to product show page
DStorck c4af490
some bootstrap for responsiveness on show product page, plus some css…
jweeber 693ccfe
merging css
jweeber 7a2a16c
added some checks in the account page for when authenticated user doe…
jweeber a83d7ca
styling for review page
jweeber eeb5f10
ten hours later, we have some seller metrics
DStorck 7f86b48
ten hours later, we have some seller metrics
DStorck bb32cdf
metrics are working well, need more details on deets page
DStorck e0c6690
got revenue methods working
jweeber 85a1dfa
messing around with css for the table. removed images that arent bein…
jweeber a9bf077
deleted useless file
jweeber 4c1fcbe
finished seller metrics for revenue and status
jweeber 216d771
got button to ship an orderitem working
jweeber 0a910d5
updated ratings so the seeds come in with rating already calculated
DStorck 6b2233d
updated ratings so the seeds come in with rating already calculated
DStorck df0c101
wrote test for new method in product model
DStorck 18ad917
finished user model testing
jweeber fcbab29
merge conflict
jweeber f301cd3
stupid merge conflict
jweeber 13a8334
last test for user model weeeeee
jweeber 943fc44
added flash message and redirect for when user tries to checkout with…
jweeber b1a6625
changed a fixture"
DStorck 15ef534
Merge branch 'master' of github.com:abrown152/betsy
DStorck 7ca13fe
did some css for review page and changed time to display nicely
DStorck a851a28
added logic to product show page in case there are no reviews or rati…
DStorck 076edaf
added many seeds of awesome things
jweeber 9fc1681
SEEDS Merge branch 'master' of github.com:abrown152/betsy
jweeber 48ba82a
updated review stuff so it doesn't display unless there is a review
DStorck 1751894
adding user ids to seeds
jweeber b079155
seeds
jweeber 2edfc79
fixed a rewiew bug and added some css to seller order page
DStorck bd9e2ce
fixed display on category page
DStorck 90b18d1
updated state to be a dropdown so we can't put in long state names an…
DStorck 4cbe856
adding lisa's fix to our cart
jweeber ac1b529
merge to make cart work with lisa's fixes
jweeber a9059aa
fixing order helpers bc somehow they disappeared.
jweeber 6dc1e63
fixed syntax error
jweeber 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
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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,3 @@ | ||
# Place all the behaviors and hooks related to the matching controller here. | ||
# All this logic will automatically be available in application.js. | ||
# You can use CoffeeScript in this file: http://coffeescript.org/ | ||
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,3 @@ | ||
# Place all the behaviors and hooks related to the matching controller here. | ||
# All this logic will automatically be available in application.js. | ||
# You can use CoffeeScript in this file: http://coffeescript.org/ |
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,3 @@ | ||
# Place all the behaviors and hooks related to the matching controller here. | ||
# All this logic will automatically be available in application.js. | ||
# You can use CoffeeScript in this file: http://coffeescript.org/ |
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,3 @@ | ||
# Place all the behaviors and hooks related to the matching controller here. | ||
# All this logic will automatically be available in application.js. | ||
# You can use CoffeeScript in this file: http://coffeescript.org/ |
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,3 @@ | ||
# Place all the behaviors and hooks related to the matching controller here. | ||
# All this logic will automatically be available in application.js. | ||
# You can use CoffeeScript in this file: http://coffeescript.org/ |
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,3 @@ | ||
# Place all the behaviors and hooks related to the matching controller here. | ||
# All this logic will automatically be available in application.js. | ||
# You can use CoffeeScript in this file: http://coffeescript.org/ |
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,3 @@ | ||
# Place all the behaviors and hooks related to the matching controller here. | ||
# All this logic will automatically be available in application.js. | ||
# You can use CoffeeScript in this file: http://coffeescript.org/ |
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,3 @@ | ||
# Place all the behaviors and hooks related to the matching controller here. | ||
# All this logic will automatically be available in application.js. | ||
# You can use CoffeeScript in this file: http://coffeescript.org/ |
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.
Best practice is to delete files like this that you never use.