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.

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

Sarah & Sky FarMar Rails #47

Open
wants to merge 72 commits into
base: b/sen+sky/master
Choose a base branch
from
Open

Sarah & Sky FarMar Rails #47

wants to merge 72 commits into from

Conversation

nahmisa
Copy link

@nahmisa nahmisa commented Oct 7, 2016 •
edited
Loading

Here is our website on the real-live internet!: https://still-badlands-75943.herokuapp.com

Our pair was Sarah & Sky

nahmisa and others added 30 commits October 4, 2016 12:06
@nahmisa
Sets up model relations
3e6bf4f
@nahmisa
Adds headers to seed_csvs
54ba956
@nahmisa
Fixes error on headers in sees_csvs
1854fc9
@nahmisa
Makes seed file
5ca3452
@LaurenSky
RESTful routes created with resources
d153dd7
@LaurenSky
Merge branch 'b/routes' into b/sen+sky/master
04da073
@LaurenSky
added .keep files to views folders
7a136e2
@nahmisa
Updates markets resource to include show action
6bd0ada
@nahmisa
Allows user to choose to act as a market or view all markets on '/'
dff3e26
@nahmisa
Adds index view for markets
3af5725
@nahmisa
Allows users to view a specific market and its attributes
f6a744d
@nahmisa
Lists vendors for a specific market
6319e5a
@nahmisa
Adds ability to add a new market
3653daa
@LaurenSky
added page to view vendors and view products by vendor & added gems
bd1b286
@nahmisa
Allows a market to edit a market
f62e891
@LaurenSky
added delete function and update function for product by vendor
6842515
@nahmisa
Refactors form partial for Markets new and edit
e704959
@LaurenSky
added erd gem
48a4a28
@LaurenSky
Merge branch 'b/sen+sky/master' of https://github.com/nahmisa/FarMarR…
d240d53 
…ails into b/sen+sky/master
@nahmisa
Moves database call for vendors to controller
fa79681
@nahmisa
Merge branch 'b/partials' into b/sen+sky/master
06b1c12
@nahmisa
Merge branch 'b/sen+sky/master' of github.com:nahmisa/FarMarRails int…
bd02ad6 
…o b/sen+sky/master
@nahmisa
Allows user to choose to act as a vendor on '/'
542beee
@nahmisa
Allows a market to delete a vendor
6137239
@nahmisa
Changes text on confirmation pop up for delete
f78164e
@nahmisa
Lunchtime commit - ability for maket to add a vendor in progress
86c37b7
@LaurenSky
vendor product add, edit and delete functions
a993db8
@LaurenSky
Merge branch 'b/sen+sky/master' of https://github.com/nahmisa/FarMarR…
3bce1b3 
…ails into b/sen+sky/master
@nahmisa
Allows a market to create a vendor
b56bdb8
@nahmisa
Fixes create method to handle instance that doesn't save
2345b00
nahmisa and others added 29 commits October 6, 2016 14:25
@nahmisa
Gives CSS to pair
728d350
@nahmisa
Merge branch 'b/sen+sky/master' of github.com:nahmisa/FarMarRails int…
a7b3de2 
…o b/sen+sky/master
@LaurenSky
created css for form class
56c84ee
@nahmisa
Styles and cleans-up of indetation/semantics in HTML
1d6eed8
@LaurenSky
resolved merge conflict in css
78c849e
@LaurenSky
fixed link to vendor/id page from sales and products in header
4066485
@nahmisa
Removes parens in vendor_form to fix tlabel error
07ee207
@LaurenSky
styled form headers for markets
28bf771
@LaurenSky
Merge branch 'b/sen+sky/master' of https://github.com/nahmisa/FarMarR…
778f226 
…ails into b/sen+sky/master
@nahmisa
Formats sale data in more human friendly way
e824d0a
@nahmisa
Adds chronic gem
43c1f50
@nahmisa
Formats sales table and date in sales to fit on one line and have col…
59a9bfb 
…ums line up
@nahmisa
Removes non-semantic / and updates styling for header links
9e00f6f
@nahmisa
Merge branch 'b/sen+sky/master' of github.com:nahmisa/FarMarRails int…
f17c811 
…o b/sen+sky/master
@nahmisa
Removes extra styling from icon links
6c46775
@LaurenSky
completed styling of all form pages
ee4de86
@LaurenSky
fixed merge conflict
5bd53c0
@LaurenSky
updated form
56fd660
@nahmisa
Fixes nil error when user tries to update product and fails validation
799289a
@LaurenSky
styled errors class for validation errors
f361bcd
@LaurenSky
Merge branch 'b/sen+sky/master' of https://github.com/nahmisa/FarMarR…
7b57d65 
…ails into b/sen+sky/master
@nahmisa
Updates validations for zipcode as range and sale to be more than 0
108fb1c
@nahmisa
Merge branch 'b/sen+sky/master' of github.com:nahmisa/FarMarRails int…
58fd00a 
…o b/sen+sky/master
@LaurenSky
added gems for heroku
3c24270
@LaurenSky
updated gem bundler
ddb2399
@LaurenSky
had removed last line in the config/application.rb that I added in la…
cdcf329 
…st commit to try to troubleshoot
@LaurenSky
fixed CSS error for heroku
d6ebc6f
@LaurenSky
added configs to production.rb so background image would show when de…
653fd6e 
…ployed
@LaurenSky
added nav bar to add a new vendor page from markets show page
bf3288d
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
3 participants
@nahmisa @droberts-sea @LaurenSky