Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
b1f66d6
initial project wave 0.0
rpavilanis Oct 4, 2016
364216a
added models for vendors, markets, sales, products
rpavilanis Oct 4, 2016
0f0cfc0
added controllers for markets, vendors, products, and sales.
rpavilanis Oct 4, 2016
4e6e071
added relationships for vendor, market, sale, and product
rpavilanis Oct 4, 2016
9543cb5
corrected purchase_time in sales - changed from datetime to string
rpavilanis Oct 4, 2016
c3a956f
seeded with all CSV files
miriam-cortes Oct 4, 2016
e73edf8
added user controller
miriam-cortes Oct 4, 2016
e214344
all routes
miriam-cortes Oct 4, 2016
df7536e
Working User pages and Market Index page
rpavilanis Oct 4, 2016
02ec42f
added index.html.erb and controller for vendors.
rpavilanis Oct 4, 2016
47fb9b2
added new and create controllers and forms for markets and vendors
rpavilanis Oct 5, 2016
0a7b4ba
added validations for market and vendor models
rpavilanis Oct 5, 2016
c0836d4
corrected and added that zip in market.rb can only be an integer
rpavilanis Oct 5, 2016
a8ab519
created an unordered list for the vendor and market forms
rpavilanis Oct 5, 2016
b1cc21e
Merge pull request #1 from rpavilanis/add_new_market
rpavilanis Oct 5, 2016
89e9bca
added vendor show page and updated gitignore file
miriam-cortes Oct 5, 2016
0cdd258
Merge branch 'add_vendor_show'
miriam-cortes Oct 5, 2016
46fbdf5
not sure what I am commiting
rpavilanis Oct 5, 2016
335527c
added edit/update controllers for market and vendor.
rpavilanis Oct 5, 2016
8c6d5c3
finished adjusting views for market and vendor edit features
rpavilanis Oct 5, 2016
1c7a2ab
added destroy methods to vendor and market controllers
rpavilanis Oct 5, 2016
3f3bd44
Merge pull request #3 from rpavilanis/add_edit_vendorandmarket
rpavilanis Oct 5, 2016
f3a3983
market views its own vendors
miriam-cortes Oct 5, 2016
d6b9da6
correct edit method for MArket
miriam-cortes Oct 5, 2016
bcbddd7
Merge pull request #4 from rpavilanis/market_viewing_its_vendors
miriam-cortes Oct 5, 2016
73e8c93
added _saleform and _productform for partials, added part of edit fea…
rpavilanis Oct 5, 2016
ee9883f
Merge pull request #5 from rpavilanis/edit_products_and_sales
rpavilanis Oct 5, 2016
686f21b
fixed name of _saleform, finished edit and update in controller and v…
rpavilanis Oct 5, 2016
621de5c
not sure what changed here....
rpavilanis Oct 5, 2016
67ce242
Merge pull request #6 from rpavilanis/add_editsalefeature
rpavilanis Oct 5, 2016
1fa282f
new product method, i think
miriam-cortes Oct 5, 2016
156eb7b
weird stuffs happening
miriam-cortes Oct 5, 2016
1354a58
no more db
miriam-cortes Oct 5, 2016
51e9e2a
added delete feature for sales and products, and added products show …
rpavilanis Oct 5, 2016
c76024c
Merge pull request #8 from rpavilanis/add_delete_feature
rpavilanis Oct 5, 2016
282257f
validations for product and sale
miriam-cortes Oct 5, 2016
e1dff92
Merge pull request #9 from rpavilanis/validations
miriam-cortes Oct 5, 2016
999bf5e
images
miriam-cortes Oct 5, 2016
e6a1ea3
list of sales in Vendor show page added
miriam-cortes Oct 6, 2016
b8e4742
Merge pull request #10 from rpavilanis/user_markets_dropdown_box
miriam-cortes Oct 6, 2016
07b302f
added a header/nav bar for users, markets, and vendors
rpavilanis Oct 6, 2016
1bdfe69
total sales in vendor show view
miriam-cortes Oct 6, 2016
9d0e597
Merge pull request #11 from rpavilanis/vendor_show_total_sales
miriam-cortes Oct 6, 2016
2775459
Merge pull request #12 from rpavilanis/add_nav_bar
rpavilanis Oct 6, 2016
216b44f
reseeded and correct db
miriam-cortes Oct 6, 2016
2342280
corrected links - they broke and were not working. made into link_to …
rpavilanis Oct 6, 2016
ec4a543
added images to homepage with links
rpavilanis Oct 6, 2016
59fe153
delete method now working, add a sale working
miriam-cortes Oct 6, 2016
da58846
Merge pull request #13 from rpavilanis/add_new_sale
miriam-cortes Oct 6, 2016
3ad2b98
images on homepage are linking, not styled yet.
rpavilanis Oct 6, 2016
fb5dafd
Merge pull request #14 from rpavilanis/add_homepage_images
rpavilanis Oct 6, 2016
f610767
fixed user button
rpavilanis Oct 6, 2016
1ec8142
changed fonts on main page, uploaded logo, and did some additional cs…
rpavilanis Oct 6, 2016
8730461
Merge pull request #15 from rpavilanis/add_style_user_index
rpavilanis Oct 6, 2016
866bd5b
market can add vendors and product index and show pages viewable
miriam-cortes Oct 6, 2016
de78286
Merge pull request #16 from rpavilanis/market_can_add_new_vendor
miriam-cortes Oct 6, 2016
d8650a7
centered home page, changed fonts
rpavilanis Oct 6, 2016
ae6cb0a
user show page dropdowns for vendors and markets
miriam-cortes Oct 6, 2016
4fda53d
Merge pull request #17 from rpavilanis/user_show_dropdowns
miriam-cortes Oct 6, 2016
c23a2a7
centered some headers and not others
rpavilanis Oct 6, 2016
5da78ed
Merge pull request #18 from rpavilanis/finish_home_page
rpavilanis Oct 6, 2016
c5a45f6
Added link to products on User show page.
rpavilanis Oct 6, 2016
bbf2c4d
fixed links color when link is visited
rpavilanis Oct 6, 2016
43225da
fixed headers - now left-aligned except for specific h3 headers
rpavilanis Oct 6, 2016
d7f6c81
working buttons are now styled
rpavilanis Oct 6, 2016
7d71045
Merge pull request #19 from rpavilanis/change_links_and_buttons
rpavilanis Oct 6, 2016
2119d9f
im traumatized because of git branches
miriam-cortes Oct 7, 2016
bfd4a17
Merge pull request #20 from rpavilanis/monthly_sales
miriam-cortes Oct 7, 2016
b023812
added rails erd
rpavilanis Oct 7, 2016
7a387f3
added erd.pdf
rpavilanis Oct 7, 2016
12c348d
removed bullets from forms
rpavilanis Oct 7, 2016
970e1be
corrected issues with lists on vendor and market pages.
rpavilanis Oct 7, 2016
028fcaf
changed form buttons to correct button format
rpavilanis Oct 7, 2016
cb6ebda
Merge pull request #21 from rpavilanis/clean_forms
rpavilanis Oct 7, 2016
e189564
postgres for production gem
miriam-cortes Oct 7, 2016
1d9e6d3
gemfile
miriam-cortes Oct 7, 2016
106bc4a
decided not to add footer - didn't like impact it had on design and d…
rpavilanis Oct 7, 2016
fe68f3c
added this feature
rpavilanis Oct 7, 2016
43ed349
Merge pull request #22 from rpavilanis/add_products_edit_delete
rpavilanis Oct 7, 2016
a455c22
Merge pull request #23 from rpavilanis/add_footer
rpavilanis Oct 7, 2016
e24714d
added dropdowns to saleform and productform
rpavilanis Oct 7, 2016
332020e
Merge pull request #24 from rpavilanis/add_vendor_dropdown
rpavilanis Oct 7, 2016
8c677c8
added current products to markets
rpavilanis Oct 7, 2016
9495c48
Merge pull request #25 from rpavilanis/add_product_to_market_show
rpavilanis Oct 7, 2016
014c1d2
added this month's sales to market
rpavilanis Oct 7, 2016
5d3a309
Merge pull request #26 from rpavilanis/add_monthly_market_sales
rpavilanis Oct 7, 2016
41ef620
new vendor form dropdown
miriam-cortes Oct 7, 2016
4d659b0
Merge pull request #27 from rpavilanis/vendorform
miriam-cortes Oct 7, 2016
0e83472
gemfile
rpavilanis Oct 7, 2016
98dea63
added gemfile pg
rpavilanis Oct 7, 2016
1fa9ad8
removed id?
rpavilanis Oct 7, 2016
bb6dd8f
added info so we can add stuff on heroku
rpavilanis Oct 7, 2016
edb64f4
filtering by state working
miriam-cortes Oct 8, 2016
b8c9de7
Merge pull request #28 from rpavilanis/filter_by_state
miriam-cortes Oct 8, 2016
825c3f2
case: no markets in a state
miriam-cortes Oct 8, 2016
9308b9a
warnings by dropdowns
miriam-cortes Oct 8, 2016
6771a85
changes to stylepage and nav bar
miriam-cortes Oct 8, 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
38 changes: 37 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,37 @@
.DS_Store
*.gem
*.rbc
*.log
/.config
/coverage/
/InstalledFiles
/pkg/
/spec/reports/
/test/tmp/
/test/version_tmp/
/tmp/
/db

## Specific to RubyMotion:
.dat*
.repl_history
build/

## Documentation cache and generated files:
/.yardoc/
/_yardoc/
/doc/
/rdoc/

## Environment normalisation:
/.bundle/
/vendor/bundle
/lib/bundler/man/

# for a library or gem, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# Gemfile.lock
# .ruby-version
# .ruby-gemset

# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
.rvmrc
50 changes: 50 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
source 'https://rubygems.org'

# awesome print
gem 'awesome_print'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.7'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.1.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

# Use jquery as the JavaScript library
gem 'jquery-rails'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
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'

# Use Unicorn as the app server
# gem 'unicorn'

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

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug'
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console', '~> 2.0'
gem "rails-erd"
# Use sqlite3 as the database for Active Record
gem 'sqlite3'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem "better_errors"
end
186 changes: 186 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,186 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.7)
actionpack (= 4.2.7)
actionview (= 4.2.7)
activejob (= 4.2.7)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.7)
actionview (= 4.2.7)
activesupport (= 4.2.7)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.7)
activesupport (= 4.2.7)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.7)
activesupport (= 4.2.7)
globalid (>= 0.3.0)
activemodel (4.2.7)
activesupport (= 4.2.7)
builder (~> 3.1)
activerecord (4.2.7)
activemodel (= 4.2.7)
activesupport (= 4.2.7)
arel (~> 6.0)
activesupport (4.2.7)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
arel (6.0.3)
awesome_print (1.7.0)
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 (9.0.6)
choice (0.2.0)
coderay (1.1.1)
coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
concurrent-ruby (1.0.2)
debug_inspector (0.0.2)
erubis (2.7.0)
execjs (2.7.0)
globalid (0.3.7)
activesupport (>= 4.1.0)
i18n (0.7.0)
jbuilder (2.6.0)
activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2)
jquery-rails (4.2.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.4)
mime-types (>= 1.16, < 4)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.9.1)
multi_json (1.12.1)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
pg (0.19.0)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.7)
actionmailer (= 4.2.7)
actionpack (= 4.2.7)
actionview (= 4.2.7)
activejob (= 4.2.7)
activemodel (= 4.2.7)
activerecord (= 4.2.7)
activesupport (= 4.2.7)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.7)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-erd (1.5.0)
activerecord (>= 3.2)
activesupport (>= 3.2)
choice (~> 0.2.0)
ruby-graphviz (~> 1.2)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (4.2.7)
actionpack (= 4.2.7)
activesupport (= 4.2.7)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (11.3.0)
rdoc (4.2.2)
json (~> 1.4)
ruby-graphviz (1.2.2)
sass (3.4.22)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
spring (2.0.0)
activesupport (>= 4.2)
sprockets (3.7.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.11)
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.5)
turbolinks (5.0.1)
turbolinks-source (~> 5)
turbolinks-source (5.0.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (3.0.2)
execjs (>= 0.3.0, < 3)
web-console (2.3.0)
activemodel (>= 4.0)
binding_of_caller (>= 0.7.2)
railties (>= 4.0)
sprockets-rails (>= 2.0, < 4.0)

PLATFORMS
ruby

DEPENDENCIES
awesome_print
better_errors
byebug
coffee-rails (~> 4.1.0)
jbuilder (~> 2.0)
jquery-rails
pg
rails (= 4.2.7)
rails-erd
rails_12factor
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
spring
sqlite3
turbolinks
uglifier (>= 1.3.0)
web-console (~> 2.0)

BUNDLED WITH
1.13.1
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# links to Trello and ERD:
https://trello.com/b/6JRDemNP/farmar-board

https://www.lucidchart.com/invitations/accept/7e76aa32-fd18-47fc-9a31-084ec081b6e9

# FarMar Rails
Build a database backend application to view, create, and manage farmers markets as well as their vendors, products, and sales.
In this implementation we'll be seeding with static data, and also building a tool to allow markets and/or vendors to sign up and add their own data.
Expand Down
28 changes: 28 additions & 0 deletions README.rdoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
== README

This README would normally document whatever steps are necessary to get the
application up and running.

Things you may want to cover:

* Ruby version

* System dependencies

* Configuration

* Database creation

* Database initialization

* How to run the test suite

* Services (job queues, cache servers, search engines, etc.)

* Deployment instructions

* ...


Please feel free to use a different markup language if you do not plan to run
<tt>rake doc:app</tt>.
6 changes: 6 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.

require File.expand_path('../config/application', __FILE__)

Rails.application.load_tasks
Empty file added app/assets/images/.keep
Empty file.
Binary file added app/assets/images/fiercegreens.jpg
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/heavychicken.jpg
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/heroku-toolbelt.pkg
Binary file not shown.
Binary file added app/assets/images/logo1option.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/market-stall.jpg
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/shrutefarms.jpg
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/users.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/vendoroption.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// This is a manifest file that'll be compiled into application.js, which will include all the files
// listed below.
//
// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
//
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
// compiled file.
//
// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
// about supported directives.
//
//= require jquery
//= require jquery_ujs
//= require turbolinks
//= require_tree .
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/users.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: 15 additions & 0 deletions app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/*
* This is a manifest file that'll be compiled into application.css, which will include all the files
* listed below.
*
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
* or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
*
* You're free to add application-wide styles to this file and they'll appear at the bottom of the
* compiled file so the styles you add here take precedence over styles defined in any styles
* defined in the other CSS/SCSS files in this directory. It is generally better to create a new
* file per style scope.
*
*= require_tree .
*= require_self
*/
3 changes: 3 additions & 0 deletions app/assets/stylesheets/markets.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Place all the styles related to the markets controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
Loading