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

Alyssa and Briana love Farmers Markets! #53

Open
wants to merge 141 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
141 commits
Select commit Hold shift + click to select a range
5cbb024
Initial commit
alyssahursh Oct 4, 2016
04eb7a4
Added three gems to Gemfile
alyssahursh Oct 4, 2016
b57cf37
Added models for market, vendor, product, and sale
brianaeng Oct 4, 2016
e26250b
Saving gemfile.lock
alyssahursh Oct 4, 2016
cb875e0
Merge branch 'master' of https://github.com/alyssahursh/FarMarRails
alyssahursh Oct 4, 2016
480ac07
Added controllers for market, vendor, sale, and product
brianaeng Oct 4, 2016
f212bde
Created CSV read-in for markets, updated zip to string for read-in
alyssahursh Oct 4, 2016
f5d8508
Merge pull request #1 from alyssahursh/seeds
alyssahursh Oct 4, 2016
4afd325
Merge pull request #2 from alyssahursh/controllers
brianaeng Oct 4, 2016
005da12
Seeded vendors
brianaeng Oct 4, 2016
ab7aaf3
Merge pull request #3 from alyssahursh/vendor_seed
brianaeng Oct 4, 2016
e3a0447
Seeded sales and products
brianaeng Oct 4, 2016
3e921fc
Merge pull request #4 from alyssahursh/seeds
brianaeng Oct 4, 2016
11be6af
Added pages controller and created resource routes for all controllers
alyssahursh Oct 4, 2016
4a2052d
Merge pull request #5 from alyssahursh/resources
alyssahursh Oct 4, 2016
14b1509
Adding model relationships
brianaeng Oct 4, 2016
c6828c9
Merge pull request #6 from alyssahursh/relationships
brianaeng Oct 4, 2016
e902ffc
Added methods for market controller
brianaeng Oct 5, 2016
b4379d5
Added thoughts on how to make find method DRY...er
brianaeng Oct 5, 2016
ff8b850
Added methods for all controllers
brianaeng Oct 5, 2016
d4592f4
Merge pull request #7 from alyssahursh/methods_start
brianaeng Oct 5, 2016
4259df2
Added reset.css
alyssahursh Oct 5, 2016
b0765b7
Regenerated the controllers since they were incorrectly named and tes…
brianaeng Oct 5, 2016
1e2769d
Added market vendor and admin pages
alyssahursh Oct 5, 2016
a488233
Updated pages routes
alyssahursh Oct 5, 2016
af9622c
Began creating navbar
alyssahursh Oct 5, 2016
373a78e
Merge pull request #9 from alyssahursh/controllers_update
alyssahursh Oct 5, 2016
02066f8
Basic navbar complete
alyssahursh Oct 5, 2016
616d639
Added view for displaying all markets
brianaeng Oct 5, 2016
cd84e98
Created view for each market, showing market details and vendors
brianaeng Oct 5, 2016
e619960
Added view for displaying all products
brianaeng Oct 5, 2016
0c2b1c5
Started view to show all sales, need to refine so it only shows sales…
brianaeng Oct 5, 2016
ff4c151
Added view for displaying all vendors
brianaeng Oct 5, 2016
b968441
Created view for each vendor, showng vendor details, their products, …
brianaeng Oct 5, 2016
881d10b
Navbar design upgrades
alyssahursh Oct 5, 2016
c74c758
Created new/edit form for market
brianaeng Oct 5, 2016
5dcc2d4
Created new/edit form for product
brianaeng Oct 5, 2016
dc18554
Created new/edit form for sale
brianaeng Oct 5, 2016
44500af
Created new/edit form for vendor
brianaeng Oct 5, 2016
df2b303
Added link to go to any given market
brianaeng Oct 5, 2016
46cd428
Rendered partial form for markets
brianaeng Oct 5, 2016
9b66c01
Rendered partial form for products
brianaeng Oct 5, 2016
f02b4e4
Rendered partial form for sales
brianaeng Oct 5, 2016
bd75e50
Added link to any specific vendor
brianaeng Oct 5, 2016
970faae
Rendered partial form for vendors
brianaeng Oct 5, 2016
f497c62
Added ids to the index pages of markets, products, sales, vendors
brianaeng Oct 5, 2016
c70da08
Added individual show page for products
brianaeng Oct 5, 2016
0c01a1e
Beautified search bar on homepage
alyssahursh Oct 5, 2016
eb24c0e
Merge pull request #10 from alyssahursh/testing_views
alyssahursh Oct 5, 2016
c8c07cf
Merge pull request #11 from alyssahursh/styles
alyssahursh Oct 5, 2016
788d9b9
Added ransack gem for search
brianaeng Oct 5, 2016
f63576d
Merge pull request #12 from alyssahursh/search_testing
brianaeng Oct 5, 2016
c524cb5
Sidetracked to fix seed issue after gem install
alyssahursh Oct 6, 2016
479e424
Merge pull request #13 from alyssahursh/styles
alyssahursh Oct 6, 2016
a031b3b
Fixed navbar links
alyssahursh Oct 6, 2016
dbc1a42
Search is pulling the right results but I'm not sure how?
brianaeng Oct 6, 2016
71c25e4
Search stopped working after I closed last time, seems to be fixed wi…
brianaeng Oct 6, 2016
128e47b
Resolved search button propagation
alyssahursh Oct 6, 2016
020afc8
Market index html/css complete
alyssahursh Oct 6, 2016
0460a62
Added submit button
brianaeng Oct 6, 2016
46df09d
Set search variables for each type of search
brianaeng Oct 6, 2016
687c795
Renamed variables so they're specific to markets
brianaeng Oct 6, 2016
61f9cb9
Added product search
brianaeng Oct 6, 2016
9b3e865
Added vendor search
brianaeng Oct 6, 2016
c71583c
Added routes for new searches
brianaeng Oct 6, 2016
a4d4945
Halfway implemented homepage buttons
alyssahursh Oct 6, 2016
cb0922b
Merge pull request #14 from alyssahursh/styles
alyssahursh Oct 6, 2016
6334de9
Merging searching branch with master
brianaeng Oct 6, 2016
50f05cc
Moved forms to center of page
alyssahursh Oct 6, 2016
49a6cb2
Fixed home search bar
alyssahursh Oct 6, 2016
cad8e3c
Search bar functions for vendor product and market
alyssahursh Oct 6, 2016
73a1f76
Updated markets/vendors edit forms so they work, added redirects
brianaeng Oct 6, 2016
6ee5722
Added new page to spit out a vendor's sales
brianaeng Oct 6, 2016
43f0e5b
Added create a sale button to vendor's sales page
brianaeng Oct 6, 2016
b1b5168
Search bar on markets and vendors index
alyssahursh Oct 6, 2016
8c6ac91
Added add product and add sale to specified vendor page
brianaeng Oct 6, 2016
4c75518
Added form to create vendor and button to delete vendor to the market…
brianaeng Oct 6, 2016
0839a7f
Got rid of add button that isn't needed anymore
brianaeng Oct 6, 2016
d3e59b6
Market login functions
alyssahursh Oct 6, 2016
6a27664
Added button to delete market from a specific market page, redirects …
brianaeng Oct 6, 2016
35dfb71
Vendor login functions
alyssahursh Oct 6, 2016
7d40797
Merge pull request #16 from alyssahursh/styles
alyssahursh Oct 6, 2016
97e50bc
Merge pull request #17 from alyssahursh/forms_testing
brianaeng Oct 6, 2016
da224d8
Trying to move all the things elsewhere
brianaeng Oct 6, 2016
5fe10ce
Products style and search complete
alyssahursh Oct 6, 2016
7811731
Handled non-numeric login
alyssahursh Oct 6, 2016
ccb7321
Changed paragraph styles
alyssahursh Oct 6, 2016
9840580
Merge pull request #18 from alyssahursh/styles
alyssahursh Oct 6, 2016
8331cda
Added new all page for market, small text fixes
brianaeng Oct 6, 2016
88c1377
Merge conflict fixed
brianaeng Oct 6, 2016
07d787d
Search is partially working, if no value is entered it returns all. S…
brianaeng Oct 7, 2016
cfa5186
Updated Gemfile for Heroku
alyssahursh Oct 7, 2016
67dc5e4
Added gemfile.lock for heroku
alyssahursh Oct 7, 2016
1311879
Added tables for vendor and market data
alyssahursh Oct 7, 2016
2c9696b
changed homepage image link
alyssahursh Oct 7, 2016
98f1dde
Changed config assets compile to true
alyssahursh Oct 7, 2016
934a72d
Fixed homepage image
alyssahursh Oct 7, 2016
fa59cc0
Removed ids from database seed
alyssahursh Oct 7, 2016
b74ef41
Search works better now
brianaeng Oct 7, 2016
e036573
Merge pull request #20 from alyssahursh/styles
alyssahursh Oct 7, 2016
e7860e7
Merge pull request #21 from alyssahursh/guest_views
brianaeng Oct 7, 2016
c516bea
Added guest view for market
brianaeng Oct 7, 2016
11b3383
Cleaned up products index
brianaeng Oct 7, 2016
d5747bf
Added guest views for vendor-related things (vendor show and vendors …
brianaeng Oct 7, 2016
b44d899
Updated/added routes for updated/new views
brianaeng Oct 7, 2016
ada5c2d
Added necessary elements to the admin page
brianaeng Oct 7, 2016
bfdf698
Added total sales amount
brianaeng Oct 7, 2016
fc7b5fc
Implemented super hacky way to get assigned vendor id, should revisit…
brianaeng Oct 7, 2016
8953201
Changing routing based on user type track (ex: guest only get view on…
brianaeng Oct 7, 2016
ecb2507
Committing to merge
alyssahursh Oct 7, 2016
14be43d
Merge pull request #22 from alyssahursh/styles
alyssahursh Oct 7, 2016
5d28e65
Merge pull request #23 from alyssahursh/guest_views
brianaeng Oct 7, 2016
cc02106
Added temp styling to see things and removed guest show for sales (si…
brianaeng Oct 7, 2016
8fa9c06
Fixing market and vendor login on admin page
brianaeng Oct 7, 2016
ec18230
Partial refactor of CSS
alyssahursh Oct 7, 2016
ccd1a14
Merge pull request #24 from alyssahursh/styles
alyssahursh Oct 7, 2016
69b2ec4
Fixing merge conflict
brianaeng Oct 7, 2016
17763c6
Fixed guest views
alyssahursh Oct 7, 2016
3861974
Show market and vendor table layout, sale page updates
alyssahursh Oct 8, 2016
cef06c8
Oof, this one hurt but finally figured it out. Got the render partial…
brianaeng Oct 8, 2016
a2133f4
Made a new partial view for the see all buttons at the bottom of the …
brianaeng Oct 8, 2016
66d5224
DRYing up code
brianaeng Oct 8, 2016
89f1a4a
DRYing up code
brianaeng Oct 8, 2016
73b3dd7
Merge pull request #26 from alyssahursh/final_touches
alyssahursh Oct 8, 2016
8cccabb
Moved new market form to admin page
alyssahursh Oct 8, 2016
675edba
styled market form on admin page
alyssahursh Oct 8, 2016
1f7ed61
Separate page edit forms for market and vendor
alyssahursh Oct 8, 2016
40030d3
Add sale form on view sale page
alyssahursh Oct 8, 2016
bbd8b5d
styled sale form and sale view page
alyssahursh Oct 8, 2016
ae3e092
Add files via upload
alyssahursh May 2, 2017
8498004
Update README.md
alyssahursh May 2, 2017
2ba11f5
Update README.md
alyssahursh May 2, 2017
0fe0608
Update README.md
alyssahursh May 2, 2017
f27fab4
Delete Farmar.png
alyssahursh May 2, 2017
772bdbc
Add files via upload
alyssahursh May 2, 2017
292b178
Delete Farmar.png
alyssahursh May 2, 2017
9df3431
Add files via upload
alyssahursh May 2, 2017
72713ca
Delete Farmar.png
alyssahursh May 2, 2017
e9febba
Add files via upload
alyssahursh May 2, 2017
55f14f9
Update README.md
alyssahursh May 2, 2017
32880fc
Update README.md
alyssahursh May 2, 2017
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
Rendered partial form for sales
brianaeng committed Oct 5, 2016
commit f02b4e4c901960133ec93f240cc58d66e4fad055
2 changes: 1 addition & 1 deletion app/views/sales/edit.html.erb
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<h1>Sales#edit</h1>
<p>Find me in app/views/sales/edit.html.erb</p>
<%= render partial: 'form', locals: {action_name: 'update'} %>
2 changes: 1 addition & 1 deletion app/views/sales/new.html.erb
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<h1>Sales#new</h1>
<p>Find me in app/views/sales/new.html.erb</p>
<%= render partial: 'form', locals: {action_name: 'create'} %>