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

Team Spanx! Noelle, Shari, Yeni and Suzannah #34

Open
wants to merge 172 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
172 commits
Select commit Hold shift + click to select a range
dffe300
Test gems and env stuff fully loaded
SSBinks Oct 18, 2016
2bc9672
Added .DS_Store to .gitignore and saved the routes we drafted together
sckirk Oct 18, 2016
194de3d
fixed a route, colon was missing
sckirk Oct 18, 2016
1204720
created REVIEW model
sckirk Oct 18, 2016
045f86f
model: review: set-up model table columns in the db migrate... file; …
sckirk Oct 19, 2016
769b984
model: review: set up validations and belongs_to relationship in the …
sckirk Oct 19, 2016
30832a4
raked db migrate
sckirk Oct 19, 2016
9b46e77
wrote 5 tests confirming reviews--model--rating validations
sckirk Oct 19, 2016
fc1a55b
wrote 2 tests confirming reviews--model--description validations
sckirk Oct 19, 2016
e18bb9a
wrote 1 test confirming reviews--model--product_id validations
sckirk Oct 19, 2016
b25f4ee
wrote 3 order item MODEL tests, one is not passing, too tired to figu…
sckirk Oct 19, 2016
b8fccf4
wrote 3 more tests for the remaining order item model validations--ho…
sckirk Oct 19, 2016
eac1b02
wrote 3 more tests for the remaining order item model validations--ho…
sckirk Oct 19, 2016
8ce365d
wrote Product model and tests
johnanmorris Oct 19, 2016
88082bf
Created the merchant model and made sure the Git login information wa…
SSBinks Oct 19, 2016
7502d5e
fixed order_item model validation to work with a boolean value so tha…
sckirk Oct 19, 2016
594f97c
modified test data for merchant validation
johnanmorris Oct 19, 2016
b4a4007
Erased data in the yml file, added some session set up in test_helper…
SSBinks Oct 19, 2016
c41976c
Other test added but commented out for market model
SSBinks Oct 19, 2016
5698a3d
index: true added to belongs_to :merchant
johnanmorris Oct 19, 2016
723c4b5
Created order and category models and created the tests for order. Ad…
yenicapotediaz Oct 19, 2016
0892841
fixed merge issue in schema
yenicapotediaz Oct 19, 2016
169478c
resolved merge conflicts in schema
johnanmorris Oct 19, 2016
4505aa7
added schema and am resolving conflicts
SSBinks Oct 19, 2016
195a234
schema changes
johnanmorris Oct 19, 2016
6eb420b
added 2 controllers: home and sessions
sckirk Oct 19, 2016
baae425
Created Products controller and added two tests for index and show
SSBinks Oct 19, 2016
6b692cb
Created views for product and passed tests
SSBinks Oct 19, 2016
a4e3975
created SESSIONS controller--and 2 views: index and login_failure. Cr…
sckirk Oct 19, 2016
2117754
Added Seed data to product and played around with the index page
SSBinks Oct 19, 2016
3215e94
Changed the index page for products
SSBinks Oct 19, 2016
451ddaa
Merge branch 'session'
sckirk Oct 19, 2016
72625b6
implemented join table for Products and Categories
johnanmorris Oct 20, 2016
e3f4c85
modified join table migration to remove primary key
johnanmorris Oct 20, 2016
aadb76a
added category seeds and generated categories controller
johnanmorris Oct 20, 2016
26ade11
WIP Product / Category tests
johnanmorris Oct 20, 2016
8530855
created (and ran) migration, adding an active? column [boolean dataty…
sckirk Oct 20, 2016
d0af4a0
created (and ran) migration adding total column back into the order t…
sckirk Oct 20, 2016
0d4fee2
CART set-up: updated order model
sckirk Oct 20, 2016
cfc33fe
finished tests for Product model
johnanmorris Oct 21, 2016
283274d
wrote tests for and implemented Category model
johnanmorris Oct 21, 2016
ea1158c
created (and ran) migrations to add two columns to the order items ta…
sckirk Oct 21, 2016
e1849d0
forgot to add schema to the previous commit
sckirk Oct 21, 2016
7e78a49
added test to merchant
SSBinks Oct 21, 2016
2bd7f59
modified views for Products, modified seeds to test Category show pages
johnanmorris Oct 21, 2016
90f2278
tried to implement all of the guidance website's code, customizing pi…
sckirk Oct 21, 2016
7d845dd
stubbed out necessary product controllers
johnanmorris Oct 21, 2016
30402bc
cleaned up views and product tests
johnanmorris Oct 21, 2016
e1b77c4
Merge branch 'cp-join-table'
johnanmorris Oct 21, 2016
a992011
started adding tests for order
SSBinks Oct 21, 2016
dd00a91
merged files from branch
yenicapotediaz Oct 21, 2016
d817b7b
GoodMerge branch 'testing'
SSBinks Oct 21, 2016
f57160b
friday refactoring with Shari
sckirk Oct 21, 2016
9182fcf
merging master into b/sck/master
sckirk Oct 21, 2016
8a55835
Created cart routes and put in functionality for cart in controller. …
SSBinks Oct 23, 2016
9fdff79
Fixed indentation
SSBinks Oct 23, 2016
958a26e
In Progress: Having items in cart get reduce or deleted
SSBinks Oct 23, 2016
4e7c727
edited tests for reviews, products, and categories; wrote helper meth…
johnanmorris Oct 23, 2016
d89ad9b
implemented review post function
johnanmorris Oct 23, 2016
88e2228
modified products show views to show reviews/links to reviews
johnanmorris Oct 23, 2016
db07b11
modified products show page
johnanmorris Oct 23, 2016
aebdc5f
modified views
johnanmorris Oct 23, 2016
ef8a823
added and refined some tests
sckirk Oct 24, 2016
54c967e
edited review
johnanmorris Oct 24, 2016
0b37765
created (and ran) migration that set the order model's default status…
sckirk Oct 24, 2016
e046ad6
debugging so that all of the following model tests now pass: orders a…
sckirk Oct 24, 2016
a2d54c5
added a test to confirm the private update_total method is running, g…
sckirk Oct 24, 2016
f871a2f
implemented Merchant show page; edited routes to allow all categories…
johnanmorris Oct 24, 2016
20f8aa1
cleanup merchant test
johnanmorris Oct 24, 2016
e516a9b
added uniqueness to join table:
johnanmorris Oct 24, 2016
0ec4610
Was playing around with different ways on how to have the cart add it…
SSBinks Oct 24, 2016
f1b0923
I changed some of the cart controller
SSBinks Oct 24, 2016
1ad4645
updated session routes and the controller.
yenicapotediaz Oct 24, 2016
ca138d5
one model order test not passing yet
sckirk Oct 24, 2016
67aaad5
adding foundation js and css files
yenicapotediaz Oct 24, 2016
eb5dc90
edited routes
johnanmorris Oct 24, 2016
4a7d5ce
Resolved some conflicts
SSBinks Oct 24, 2016
0890ddb
resolved merge conflicts in application helper
johnanmorris Oct 24, 2016
aa51ef5
resolved conflicts
SSBinks Oct 24, 2016
46f5ca4
Fixed an order list
SSBinks Oct 24, 2016
2b7087a
schema.rb
johnanmorris Oct 24, 2016
e85cb52
Fixed a few errors on homepage
SSBinks Oct 25, 2016
132f56f
temporarily commented out require login, updated path names for porta…
johnanmorris Oct 25, 2016
0ae47c7
Fixed error in shopping cart in helper as well as index page of cart
SSBinks Oct 25, 2016
eee534d
WIP product controller
johnanmorris Oct 25, 2016
af3a6e7
Working on the destroy method
SSBinks Oct 25, 2016
b0d8279
wrote home_controller test that ought to pass when require login is d…
sckirk Oct 25, 2016
ae56187
CATEGORIES controller: added index; created CATEGORIES index view; te…
sckirk Oct 25, 2016
3df1770
updated 5 controllers with a skip_before_action so that all of our te…
sckirk Oct 25, 2016
f0d5247
wrote tests and implemented the remaining Product controller actions
johnanmorris Oct 25, 2016
9fc18fb
added content to categories index view, minor updates elsewhere
sckirk Oct 25, 2016
603a600
merge fix
sckirk Oct 25, 2016
d1ab31b
destroying the cart
SSBinks Oct 25, 2016
8dacb59
worked on product show page css and html foundation
yenicapotediaz Oct 26, 2016
c27ab18
merging
yenicapotediaz Oct 26, 2016
0202739
Once again attempting cart logic
SSBinks Oct 26, 2016
ad7447c
moved PRODUCT-IMAGE class from products stylesheet to application sty…
sckirk Oct 26, 2016
139cb23
CATEGORY INDEX VIEW: added a placeholder image to spread out the cate…
sckirk Oct 26, 2016
c6461a0
product index view: added foundation grid and made images links to th…
sckirk Oct 26, 2016
462c759
category show view: added foundation grid, added product images and m…
sckirk Oct 26, 2016
1ac30ca
category index view: made all of the placeholder images into links to…
sckirk Oct 26, 2016
c230e66
merchant controller: created index action. merchant index view: set a…
sckirk Oct 26, 2016
af9ab5e
Re-did cart and am currently working on the index html
SSBinks Oct 26, 2016
4426377
fixed the footer to display better.
yenicapotediaz Oct 26, 2016
53422f4
worked on the homepage to display top 4 (random) products. Added inde…
yenicapotediaz Oct 26, 2016
5f91234
edited the products form to remove : that were including an extra lin…
yenicapotediaz Oct 26, 2016
1cc4f72
created a lot more products in the seeds. created merchant framework.…
sckirk Oct 27, 2016
848cf2d
added logic into reviews controller so that a merchant can't review t…
sckirk Oct 27, 2016
b820c43
Merge branch 'b/sck/cannot_review_own_products'
sckirk Oct 27, 2016
7ad3a5d
Cart pretty much works just clearning up add to logic
SSBinks Oct 27, 2016
701a9b7
All basic cart function works and moved the cart session to the appl…
SSBinks Oct 27, 2016
e73bb98
In the middle of refractoring cart
SSBinks Oct 27, 2016
617aa88
Fixing merging stuff
SSBinks Oct 27, 2016
c8d83d1
woo hoo! all merchants added and working--that rails server was the i…
sckirk Oct 27, 2016
f52062c
worked on categories index and updated the view to show the categorie…
yenicapotediaz Oct 27, 2016
81b7a5a
I had and extra } that needed to be deleted. yay, all good.
sckirk Oct 27, 2016
780873c
fixed merge conflict.
yenicapotediaz Oct 27, 2016
a1b2b5a
Merge branch 'b/sck/seeds'
sckirk Oct 27, 2016
71fcaf1
Fixed before action on cart
SSBinks Oct 27, 2016
043c006
Made small style changes
SSBinks Oct 27, 2016
1665e1a
Cleaned up a bit of sytling on Cart but should go back and make a change
SSBinks Oct 27, 2016
0c08e5a
fixed issue with spacing of categories in index view.
yenicapotediaz Oct 27, 2016
bb815c0
added a meaningful message where there was a duplicate link that is n…
sckirk Oct 27, 2016
6e57f5c
Created link to merchants portal in nav bar that toggles to not logge…
yenicapotediaz Oct 27, 2016
8baddbe
Updated form to include instructions for price in cents.
yenicapotediaz Oct 27, 2016
d7e7ca9
added title to app page.
yenicapotediaz Oct 27, 2016
5fa3209
updated merchant index to display like categories index, nice and uni…
yenicapotediaz Oct 27, 2016
f6763f9
playing around with merchant portal -- product management
sckirk Oct 27, 2016
1b57d7b
added retire functionality and routes, modified routes, edited produc…
johnanmorris Oct 27, 2016
e0410e9
fixed an issue with merchant css styling being applied to products (n…
yenicapotediaz Oct 27, 2016
9413cc3
rollbacked Noelle's migration
sckirk Oct 27, 2016
8b84c78
Merge branch 'prod-retire'
johnanmorris Oct 27, 2016
e2323e1
Set up purchace with new and create in Order
SSBinks Oct 27, 2016
056e184
changed tag name to class name in css to prevent it from applying any…
yenicapotediaz Oct 28, 2016
e6939f3
merge conflicts, etc
sckirk Oct 28, 2016
13fca3f
An order can be created
SSBinks Oct 28, 2016
b2415f5
fixing merge conflict.
yenicapotediaz Oct 28, 2016
3098b56
Fixed conflict
SSBinks Oct 28, 2016
4823022
removed retire button from product show page.
yenicapotediaz Oct 28, 2016
542a850
rewrote products controller test for login
johnanmorris Oct 28, 2016
87a5c21
added test for products controller, edited before_action for login on…
johnanmorris Oct 28, 2016
58ca1a3
Merge branch 'login-refactor'
johnanmorris Oct 28, 2016
91f31eb
products controller: find_product before action IS NOT on the manage …
sckirk Oct 28, 2016
89617de
able to create an order but working on how to display on for a merchant
SSBinks Oct 28, 2016
5ee977d
we can now add a new category as a signed in merchant
sckirk Oct 28, 2016
6ca6e72
tests for merchants controller, products, controller, and reviews con…
johnanmorris Oct 28, 2016
c129fb3
products#manage route needs to stay above the resources_products rout…
sckirk Oct 28, 2016
0446f3f
Have a page to let user know about order
SSBinks Oct 28, 2016
f0dda32
resolved merge conflicts in routes and products controller
johnanmorris Oct 28, 2016
c14def9
added a new seed for Dan
sckirk Oct 28, 2016
3241ec3
made changes for the orders to display and playing with a total session
SSBinks Oct 28, 2016
41dc20d
fixing conflict in routes
SSBinks Oct 28, 2016
609972b
fixed seeds, missing a pair of quotation marks
sckirk Oct 28, 2016
5e7066f
redirected retiring a product method to our products_manage_path
sckirk Oct 28, 2016
1c9f02a
Fixe total logic to make more sense but still not able to carry it to…
SSBinks Oct 28, 2016
a0fffe6
added a dragon costume from Yeni
sckirk Oct 28, 2016
013f406
added logic so that only active products are viewed when looking at p…
sckirk Oct 28, 2016
71d34f3
in the last commit--I meant viewing products by merchant. In this com…
sckirk Oct 28, 2016
f5b0ed5
minor updates to these two views, adding tbd: before links we don't h…
sckirk Oct 28, 2016
1da34b4
turned on the DELETE functionality for products, and standardized but…
sckirk Oct 28, 2016
e769f1e
fixed merge conflict
sckirk Oct 28, 2016
3bd3255
Working on order model
SSBinks Oct 28, 2016
3623b04
added categories to form for product. Can edit product and change cat…
yenicapotediaz Oct 28, 2016
69f17b8
fixed merge conflict.
yenicapotediaz Oct 28, 2016
6a2f52b
deleted the remote true so that the edit button works
sckirk Oct 28, 2016
18e7c91
Got total to work on order page
SSBinks Oct 28, 2016
96c6e2b
kkMerge branch 'total'
SSBinks Oct 28, 2016
0ab26b0
implemented rudimentary manage order action and view
johnanmorris Oct 28, 2016
277e24a
Deleted a method
SSBinks Oct 28, 2016
b89939f
resolved merge conflicts in orders controller and order model
johnanmorris Oct 28, 2016
767366e
Changed stuff
SSBinks Oct 28, 2016
efd0419
kkkMerge branch 'master' of https://github.com/SSBinks/betsy
SSBinks Oct 28, 2016
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
Prev Previous commit
Next Next commit
added a dragon costume from Yeni
sckirk committed Oct 28, 2016
commit a0fffe6f9d0bd886e97da7fbf307cc2e9fa65822
10 changes: 9 additions & 1 deletion db/seeds.rb
Original file line number Diff line number Diff line change
@@ -42,6 +42,14 @@


products = [
{
name: "dragon costume",
description: "For your gecko who's always wanted to be a dragon",
stock: 48,
price: 1798,
photo_url: "http://img05.deviantart.net/156d/i/2006/304/e/d/happy_halloween_by_snakeskii.jpg",
merchant_id: 1
},
{
name: "cat pants",
description: "a nice pair of slacks with an elastic waist",
@@ -234,7 +242,7 @@



categories = ["pants", "booties", "santa", "pirate", "scarves", "frog", "hoodies", "bagpipes", "pumpkin", "shirts", "beaver", "jackets", "cat", "track suits", "hats", "cowboy hats", "tutus", "bobsleds", "nyan", "sailors", "minnie mouse", "bunny", "leopard print", "mammals", "birds", "amphibians"]
categories = ["dragon", "pants", "booties", "santa", "pirate", "scarves", "frog", "hoodies", "bagpipes", "pumpkin", "shirts", "beaver", "jackets", "cat", "track suits", "hats", "cowboy hats", "tutus", "bobsleds", "nyan", "sailors", "minnie mouse", "bunny", "leopard print", "mammals", "birds", "amphibians"]

# categories = ["cat", "pants", "dog", "booties", "santa", "guinea pig", "pirate", "pig", "llama", "scarves", "frog", "pig", "pig", "hoodies", "hedgehog", "bagpipes", "pumpkin", "guinea pig", "penguin", "shirts", "beaver", "bagpipes", "dog", "jackets", "pirate", "cat", "dog", "track suits", "hats", "dog", "pig", "cowboy hats", "pig", "tutus", "dog", "bobsleds", "nyan", "cat", "cat", "sailors", "pig", "minnie mouse", "baby", "bunny", "mammals", "birds"]