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

Rrsbmk/master #20

Open
wants to merge 192 commits into
base: rrsbmk/master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
192 commits
Select commit Hold shift + click to select a range
7a5aa60
Generating model for Product
brittanykohler Nov 18, 2015
918b662
Generated Markets controller
rileslovesyall Nov 18, 2015
dae3c81
Generating mode for Sale
brittanykohler Nov 18, 2015
cb1a67b
Generated market model
rileslovesyall Nov 18, 2015
7af5d64
Added vendors controller
rileslovesyall Nov 18, 2015
9d3ffd6
Generating product controller
brittanykohler Nov 18, 2015
98c67d8
Generating sales controller
brittanykohler Nov 18, 2015
bb9c30b
Generated vendor model
rileslovesyall Nov 18, 2015
496f458
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
brittanykohler Nov 18, 2015
db374db
Regenerated models for market and vendor
rileslovesyall Nov 18, 2015
9e21aed
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
rileslovesyall Nov 18, 2015
33c0da3
Adding initial seed data for Market
brittanykohler Nov 18, 2015
7721165
Created CRUD routes
rileslovesyall Nov 18, 2015
715d53e
Adding CRUD methods in market controller
brittanykohler Nov 18, 2015
b3535d4
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
brittanykohler Nov 18, 2015
4342574
ran the model migrations
rileslovesyall Nov 18, 2015
692cad4
Added gems to gemfile
rileslovesyall Nov 18, 2015
0cd32bd
Tried new csv file path
rileslovesyall Nov 18, 2015
bb6020e
Adding seed data scripts for vendor, product, and sale
brittanykohler Nov 18, 2015
deefb17
filled in basic vendor controller methods
rileslovesyall Nov 18, 2015
0e9790b
Adding CRUD methods to sales and products controllers
brittanykohler Nov 18, 2015
a079ebf
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
brittanykohler Nov 18, 2015
82116af
Fixing datetime in seeds for sale
brittanykohler Nov 18, 2015
3386be3
Created market and vendor view files
rileslovesyall Nov 18, 2015
72f8394
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
rileslovesyall Nov 18, 2015
08a0f3b
Adding view files for index, new, and show in products and sales
brittanykohler Nov 18, 2015
828292c
Adding view files for index, new, and show in products and sales
brittanykohler Nov 18, 2015
a6372c0
Adding belongs to and has many relationships for market, vendor, prod…
brittanykohler Nov 18, 2015
5ffee68
Added home route
rileslovesyall Nov 18, 2015
91a1d60
Adding special vendors all route to show all vendors without having t…
brittanykohler Nov 18, 2015
88991c6
Added market#show
rileslovesyall Nov 18, 2015
4d7a8ee
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
rileslovesyall Nov 18, 2015
fa68782
Added llist of markets to market#index
rileslovesyall Nov 18, 2015
7c771b0
Adding home page view
brittanykohler Nov 18, 2015
f392acb
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
brittanykohler Nov 18, 2015
7023630
Updated markjet#new action
rileslovesyall Nov 18, 2015
9149c72
Edit button and views created
rileslovesyall Nov 18, 2015
4947f09
Fixing edit and show methods in sales, products, vendors controllers,…
brittanykohler Nov 18, 2015
175e7a0
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
brittanykohler Nov 18, 2015
211be7f
Adding better errors and binding of callers gems
brittanykohler Nov 18, 2015
be88ad1
Dropped database, migrated, and seeded, and fixed vendor all and inde…
brittanykohler Nov 18, 2015
33f3bdd
Commiting Gemfile.lock so i can pull
rileslovesyall Nov 18, 2015
393b3cc
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
rileslovesyall Nov 18, 2015
95a149d
market#show view created, trying to troubleshoot
rileslovesyall Nov 18, 2015
283bb2f
Fixing show view for markets
brittanykohler Nov 18, 2015
88dbb9a
added return.referrer to market#show
rileslovesyall Nov 18, 2015
f9b78f6
Edit button partial created
rileslovesyall Nov 18, 2015
2327704
Figured out how to use url_helpers1
rileslovesyall Nov 18, 2015
5631b68
market#show delete and edit buttons working
rileslovesyall Nov 18, 2015
a24d8a7
vendor#destroy redirects back to market#show page
rileslovesyall Nov 18, 2015
22f31c0
Adding vendor show view including product and sale list
brittanykohler Nov 18, 2015
625374b
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
brittanykohler Nov 18, 2015
650308d
market#show actually working properly, instead of just test code
rileslovesyall Nov 18, 2015
8e108a4
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
rileslovesyall Nov 18, 2015
8cef172
market#show different code actually working, not just test code
rileslovesyall Nov 18, 2015
77f56cc
Adding edit and delete buttons to vendor show page
brittanykohler Nov 18, 2015
acfaf30
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
brittanykohler Nov 18, 2015
4c1b82e
Adding create button for products on vendor show page
brittanykohler Nov 18, 2015
21fdd77
Updating new methods in vendor and product controllers
brittanykohler Nov 18, 2015
c9f4d28
Updating new method for sale controller
brittanykohler Nov 18, 2015
c8df88c
Adding add sale button to vendor show page
brittanykohler Nov 18, 2015
d16cb46
Market form partial created, market#new working
rileslovesyall Nov 18, 2015
4d67ad8
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
rileslovesyall Nov 18, 2015
afe5f02
Add a Vendor button created market#show
rileslovesyall Nov 18, 2015
6523caf
Adding current month sales and sales total to vendor show page
brittanykohler Nov 18, 2015
0883961
Return to market button fixed
rileslovesyall Nov 18, 2015
3f1c124
Adding seed data for sales with purchase time = time.now so that we c…
brittanykohler Nov 18, 2015
f8d42d7
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
brittanykohler Nov 18, 2015
a707e5d
added create-a-vendor button to @button block
rileslovesyall Nov 18, 2015
d3bcac5
Added market#edit form, fixed button on index page
rileslovesyall Nov 19, 2015
2fbcc64
returned market#show vendor edit to button
rileslovesyall Nov 19, 2015
12c158e
Vendor create form sorta maybe working kinda
rileslovesyall Nov 19, 2015
987c7ac
More readble label names
rileslovesyall Nov 19, 2015
b39c1bd
Vendor create working
rileslovesyall Nov 19, 2015
4423216
Vendor edit form properly updating and redirecting
rileslovesyall Nov 19, 2015
9b1a336
starting updating sales create method and sales new form
rileslovesyall Nov 19, 2015
b63ca2c
Adding ability to add new product
brittanykohler Nov 19, 2015
194ce68
Broken edit functionality for product, Missing template products/upda…
brittanykohler Nov 19, 2015
9874ef9
Fixing edit method for products
brittanykohler Nov 19, 2015
6b4ec1d
Adding attribute information to market show page
brittanykohler Nov 19, 2015
68ed97b
Changing route nesting structure
brittanykohler Nov 19, 2015
efc03fd
Updating new nested resources url paths
rileslovesyall Nov 19, 2015
dc5a3f4
Updating product new, create, edit, update methods with new route nes…
brittanykohler Nov 19, 2015
849eac7
Breaking stuff, but routes are rerouted
rileslovesyall Nov 19, 2015
5003f3c
Added :edit to vendor/produt path
rileslovesyall Nov 19, 2015
3a0159f
Vendor id auto adds to new product
rileslovesyall Nov 19, 2015
34b64fa
product edit form fixed with new routes
rileslovesyall Nov 19, 2015
6823c17
DRYed up product#edit controller
rileslovesyall Nov 19, 2015
ba1eed0
Market update redirect added, yay for fixing bugs1
rileslovesyall Nov 19, 2015
88cf26b
Fixed new sale form bug
rileslovesyall Nov 19, 2015
3861b61
Removed last of unused methods from product and sales, left index jus…
rileslovesyall Nov 19, 2015
4324570
Adding basic CSS for homepage
brittanykohler Nov 19, 2015
41225e0
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
brittanykohler Nov 19, 2015
a7f5568
Added user_type to root page params hash
rileslovesyall Nov 19, 2015
18ae35f
Removing intentional breaking of market#index
rileslovesyall Nov 19, 2015
94295a2
Market#index only shows new/edit buttons if user_type is markets
rileslovesyall Nov 19, 2015
7584b53
market#show page buttons hidden unless user_type set
rileslovesyall Nov 19, 2015
60aa890
user_type set for vendor
rileslovesyall Nov 19, 2015
c8d4997
Adding more CSS styling
brittanykohler Nov 19, 2015
4fb1699
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
brittanykohler Nov 19, 2015
5ba9691
added guest button to front page
rileslovesyall Nov 19, 2015
ce9aca1
Fixed guest user_type path for vendor pages
rileslovesyall Nov 19, 2015
62acb32
Updated typos in market#show
rileslovesyall Nov 19, 2015
64e67bf
Removed market user_type acessibility to vendor#show page
rileslovesyall Nov 19, 2015
16ad65e
CSS to display buttons inline on home page
brittanykohler Nov 19, 2015
3522ed5
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
brittanykohler Nov 19, 2015
083fad5
made it so the market list can be toggled alphabetically
rileslovesyall Nov 19, 2015
38f65bb
Adding additional styling to market list on home page
brittanykohler Nov 19, 2015
cd2488c
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
brittanykohler Nov 19, 2015
9063adf
Fixed guest view error on market#show
rileslovesyall Nov 19, 2015
77542cf
Changed links so clicking a market from home page shows vendor name b…
rileslovesyall Nov 19, 2015
0571f7d
Fixed market#index to not reset session[:user_id]
rileslovesyall Nov 19, 2015
6865871
Updating sales form to take dollars and cents
brittanykohler Nov 19, 2015
9887c74
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
brittanykohler Nov 19, 2015
fbac5b7
Adding product name to new sale page
brittanykohler Nov 19, 2015
200a926
got nice css on market#index page
rileslovesyall Nov 19, 2015
ffe51c7
updated edit button css
rileslovesyall Nov 19, 2015
430fda9
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
rileslovesyall Nov 19, 2015
6ebfe12
market#show page ids working
rileslovesyall Nov 19, 2015
032a103
Fixed ascending and descending order for sales on vendor show page
brittanykohler Nov 20, 2015
0238baa
changed some CSS on front page
rileslovesyall Nov 20, 2015
b12a205
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
rileslovesyall Nov 20, 2015
7128fd6
fixed home page header class
rileslovesyall Nov 20, 2015
b180b4f
Adding back button on vendor show page
brittanykohler Nov 20, 2015
4052911
Changed front page buttons to links
rileslovesyall Nov 20, 2015
1f8da17
Front page links working properly
rileslovesyall Nov 20, 2015
fe252df
Adding return to links on new and edit views for vendors
brittanykohler Nov 20, 2015
c946933
Fixing link paths for return to on new and edit views in vendor
brittanykohler Nov 20, 2015
12af0b1
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
rileslovesyall Nov 20, 2015
c0602b8
cssed market#show
rileslovesyall Nov 20, 2015
4f7bf81
Adding return to buttons on edit products view and new sales view
brittanykohler Nov 20, 2015
2ea78b9
market css stil in progress
rileslovesyall Nov 20, 2015
ca06989
Tried to alphabetize vendors on vendors all and vendors index views
brittanykohler Nov 20, 2015
dc0ca54
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
brittanykohler Nov 20, 2015
fc265a7
some css still being added to market pages
rileslovesyall Nov 20, 2015
f5c74c1
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
rileslovesyall Nov 20, 2015
877ddcd
Fixed vendor#all sort function (made it order)
rileslovesyall Nov 20, 2015
c339aee
Have every name/address display titleized and looking pretty
rileslovesyall Nov 20, 2015
970d56f
Fixed native lowercase to be capitalized and pretty in market#show
rileslovesyall Nov 20, 2015
c388f75
added titleize
rileslovesyall Nov 20, 2015
f9803c6
more css
rileslovesyall Nov 20, 2015
c8d8426
home markets centered and titleized
rileslovesyall Nov 20, 2015
7132b5e
centered two_button_nav
rileslovesyall Nov 20, 2015
47a888a
vendors and two large button nav centered on page
rileslovesyall Nov 20, 2015
5b466eb
worked on css
rileslovesyall Nov 20, 2015
0b4616c
fixed css to keep vendor_all centered"
rileslovesyall Nov 20, 2015
daf1d48
tried to fix some css, mostly to no avail
rileslovesyall Nov 20, 2015
d6b62d7
Changing photo on home page and updating header
brittanykohler Nov 20, 2015
5a71768
Updating button styling for home page buttons
brittanykohler Nov 20, 2015
c72d126
Last styling changes on home page
brittanykohler Nov 20, 2015
806e931
Adding styling to market index page
brittanykohler Nov 20, 2015
1ee9a5e
Changing width of hr on market index page
brittanykohler Nov 20, 2015
9785ba8
changed home screen image
rileslovesyall Nov 20, 2015
267c8ff
adding delete button image
brittanykohler Nov 20, 2015
199d1f2
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
brittanykohler Nov 20, 2015
7ff57eb
Adding new versions of bin/rails and bin/rake
brittanykohler Nov 20, 2015
5e1763f
css for daaayyyyssss
rileslovesyall Nov 20, 2015
341164f
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
rileslovesyall Nov 20, 2015
a04d6ca
Added apostrophe to farmer's market
rileslovesyall Nov 20, 2015
e4cc01e
Adding css to vendor all page
brittanykohler Nov 20, 2015
3568b74
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
brittanykohler Nov 20, 2015
d6ef6a9
CSS on vendor show page
brittanykohler Nov 20, 2015
3ac49ab
removed sale and product views that we aren't using
rileslovesyall Nov 20, 2015
31af596
CSS for vendor index page
brittanykohler Nov 20, 2015
fc82e92
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
brittanykohler Nov 20, 2015
b902248
cssing
rileslovesyall Nov 20, 2015
c65799f
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
rileslovesyall Nov 20, 2015
1673d25
changing width of tables on vendor show page
brittanykohler Nov 20, 2015
fbbd69c
Updating nav links on market show page
brittanykohler Nov 20, 2015
a0ebc6b
cssed product form
rileslovesyall Nov 20, 2015
1390b58
css product form
rileslovesyall Nov 20, 2015
53f8935
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
brittanykohler Nov 20, 2015
678711b
got tables with buttons to look a little less poopy
rileslovesyall Nov 20, 2015
2a3d389
Adding the perfect image for the home page
brittanykohler Nov 20, 2015
390990e
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
brittanykohler Nov 20, 2015
1e354d2
Removing return to markets button on market show guest page
brittanykohler Nov 20, 2015
045fe47
Updating nav links on market new page
brittanykohler Nov 20, 2015
6891103
Moving nav buttons to top and downcasing titles
brittanykohler Nov 20, 2015
55401f8
market#show vendor column looking better
rileslovesyall Nov 20, 2015
174e4a5
Forms using proper font
rileslovesyall Nov 20, 2015
331161b
Moving nav and downcasing titles in vendor new and edit pages
brittanykohler Nov 20, 2015
3684a2c
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
rileslovesyall Nov 20, 2015
4619c9e
returned home-pg-sub-header to white because it magically wasnt'
rileslovesyall Nov 20, 2015
2882fbb
updating text on submit button for vendor new and edit pages
brittanykohler Nov 20, 2015
364b30d
changing nav and button for product new and edit pages, but ruined fo…
brittanykohler Nov 20, 2015
10ab6be
css
rileslovesyall Nov 20, 2015
230186b
Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails…
rileslovesyall Nov 20, 2015
9ca7245
adding images so they will show up on heroku
brittanykohler Nov 20, 2015
39ead40
fixing button images
brittanykohler Nov 20, 2015
ef7d387
Fixing sale, market, and product forms styling
brittanykohler Nov 22, 2015
dbdcd0b
Adding favicon
brittanykohler Nov 22, 2015
08367d8
Adding favicon (actually this time)
brittanykohler Nov 22, 2015
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
17 changes: 9 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source 'https://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.4'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'

# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
Expand All @@ -23,14 +23,12 @@ gem 'jbuilder', '~> 2.0'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc

# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'
gem 'csv'

# Use Unicorn as the app server
# gem 'unicorn'
group :production do
gem 'pg'
end

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
Expand All @@ -40,8 +38,11 @@ end
group :development do
# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console', '~> 2.0'
gem 'pry'
gem 'sqlite3'
gem 'binding_of_caller'
gem 'better_errors'

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
end

18 changes: 18 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,23 @@ GEM
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
arel (6.0.3)
better_errors (2.1.1)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.2)
byebug (8.2.0)
coderay (1.1.0)
coffee-rails (4.1.0)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
csv (2.7.3)
debug_inspector (0.0.2)
erubis (2.7.0)
execjs (2.6.0)
Expand All @@ -66,12 +72,18 @@ GEM
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (2.6.2)
mini_portile (0.6.2)
minitest (5.8.2)
multi_json (1.11.2)
nokogiri (1.6.6.3)
mini_portile (~> 0.6.0)
pg (0.18.4)
pry (0.10.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
Expand Down Expand Up @@ -111,6 +123,7 @@ GEM
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
slop (3.6.0)
spring (1.4.3)
sprockets (3.4.0)
rack (> 1, < 3)
Expand Down Expand Up @@ -139,10 +152,15 @@ PLATFORMS
ruby

DEPENDENCIES
better_errors
binding_of_caller
byebug
coffee-rails (~> 4.1.0)
csv
jbuilder (~> 2.0)
jquery-rails
pg
pry
rails (= 4.2.4)
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
Expand Down
Binary file added app/assets/images/delete-button.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/edit-button.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/assets/javascripts/markets.coffee
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/
3 changes: 3 additions & 0 deletions app/assets/javascripts/products.coffee
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/
3 changes: 3 additions & 0 deletions app/assets/javascripts/sales.coffee
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/
3 changes: 3 additions & 0 deletions app/assets/javascripts/vendors.coffee
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/
15 changes: 0 additions & 15 deletions app/assets/stylesheets/application.css

This file was deleted.

Loading