Skip to content

B/mem+gs/master - Guinevere & Mary #54

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 39 commits into
base: b/mem+gs/master
Choose a base branch
from
Open

B/mem+gs/master - Guinevere & Mary #54

wants to merge 39 commits into from

Conversation

morrime
Copy link

@morrime morrime commented Oct 7, 2016

guineveresaenger and others added 30 commits October 4, 2016 12:28
@guineveresaenger
Created models and migrated with relationships
41ee7ed
@guineveresaenger
Added relationships to model classes
21bc111
@guineveresaenger
Created controllers for market and vendor
8671a8b
@guineveresaenger
Added view files for market and vendor
1771b4d
@guineveresaenger
Nonworking seeds file that won't run from the command line
0fde98e
@guineveresaenger
working seeds file for Markets
673d5e4
@morrime
read in CSV files for markets, vendors, products, and sales in seed.r…
5ca0b79 
…b file
@morrime
controllers for product and sale, added nested routes for products an…
bcdc4d7 
…d sales within vendors
@morrime
added home controller, routes and views, linking to a list of the mar…
5f1ca1c 
…kets
@morrime
added home controller, routes and views, linking to a list of the mar…
9ced093 
…kets
@guineveresaenger
Hopefully cleaned up the file mess
b4b148e
@guineveresaenger
Final cleanup hopefully
7ba24ba
@guineveresaenger
Merge branch 'b/mem+gs/master' of https://github.com/morrime/FarMarRails
62c0464 
 into b/mem+gs/master
@guineveresaenger
Added user view for individual markets
715446d
@guineveresaenger
Began Wave 3; added market controller actions, and views. Markets can…
72ccb4a 
… be edited.
@morrime
still working on Wave 3: Market: As a market, I can create, edit, or …
b729c8e 
…delete any Vendor
@guineveresaenger
Just put a comment in about how and where to create/edit vendors as a…
9875832 
… Market
@guineveresaenger
Added Vendor functions and views
30dd508
@morrime
As a market, I can create, edit, or delete any Vendor
245192c
@guineveresaenger
Resolved merge conflict in vendors controller
5af1e95
@morrime
renested routes, fixed resulting errors...
0ba1e00
@guineveresaenger
Added create Sate functionality to vendor via product
1d0cdb5
@morrime
as vendor, can see list of all sales
9a9ed6f
@guineveresaenger
merged sales controller
318d7f2
@guineveresaenger
For safekeeping
a15b2c9
@guineveresaenger
Monthly and total sales amount functionality added.
abf98f8
@morrime
added monthly sales display
9c50aea
@morrime
validations in place for all models, cleaned up routes
748ccc7
@guineveresaenger
Edited the views for consistency. Added nav bar to application view.
a4f716f
@guineveresaenger
Resolved merge conflicts
97130bc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

Brackets

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@morrime @droberts-sea @guineveresaenger