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

Jillian & Cristal's FarMarRails - First Pull Request #8

Open
wants to merge 66 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
088b261
First commit. Testing that we understand branching correctly.
JBoshart Apr 26, 2016
bad5254
Test continuation this time, ON A BRANCH oooh aaaaah.
JBoshart Apr 26, 2016
1573135
cristal making changes on the same file. we gonna try to merge our br…
Apr 26, 2016
3aee36a
conflict commit
Apr 26, 2016
b733aa5
Test number two. Are we doing this right? Whooooo knows! Not me.
JBoshart Apr 26, 2016
4c5b52b
CT adding another branch
Apr 26, 2016
cdfe8b3
So, according to the internet all we have to do is remove the conflic…
JBoshart Apr 26, 2016
7ccf7b8
Removed the test file. Now we make trello and ERD.
JBoshart Apr 26, 2016
f9ff0db
Set up new Rails app, added controllers and models. Have not yet seed…
JBoshart Apr 26, 2016
7b32691
Set up seed file and schema. Have not yet seeded.
JBoshart Apr 26, 2016
be4dd36
SEEDED. USING GIT RELENTLESSLY.
JBoshart Apr 26, 2016
b45915e
All classes are now facebook official, and have defined relationships.
JBoshart Apr 26, 2016
849e49d
branch to create home routes and new homes controller.
Apr 27, 2016
d2f19d1
Started work on Vendors controller methods.
JBoshart Apr 27, 2016
6fdd11b
Merge branch 'master' of github.com:JBoshart/FarMarRails
Apr 27, 2016
53faa98
More git playing.
JBoshart Apr 27, 2016
0cbfb03
Making a view for Cristal, git is weird.
JBoshart Apr 27, 2016
95e5604
added homes
Apr 27, 2016
905be5d
Added more views for Cristal.
JBoshart Apr 27, 2016
5e5b32c
Merging stuff, still trying to understand git.
JBoshart Apr 27, 2016
9eeeab2
Finished (maybe? hahaha) vendor controller methods.
JBoshart Apr 27, 2016
7f57f66
added some css to the home page. can view all markets with links
Apr 27, 2016
136c2ac
Merge branch 'master' of github.com:JBoshart/FarMarRails
Apr 27, 2016
374a012
Added vendors routes.
JBoshart Apr 27, 2016
8bff91d
Small vendors controller change.
JBoshart Apr 27, 2016
d2d169f
Small vendors controller change.
JBoshart Apr 27, 2016
82430b3
Fixes to vendor controller, views for vendor index and single view of…
JBoshart Apr 27, 2016
37ea284
I guess I didn't catch all the changes I made in the last commit.
JBoshart Apr 27, 2016
489daa4
finished linking for user views
Apr 27, 2016
adefb76
finished linking for user views
Apr 27, 2016
9dae98e
Added link_to all products for each vendor in the single vendor view.…
JBoshart Apr 27, 2016
eddd5b2
deleted the home controller and changed our root path to go to Market…
Apr 27, 2016
0f90967
Worked on products view. Currently it contains a table that lists all…
JBoshart Apr 27, 2016
31513ab
Merge branch 'master' of github.com:JBoshart/FarMarRails
JBoshart Apr 27, 2016
5d74405
Removed homes view since we removed the homes controller.
JBoshart Apr 27, 2016
38a002f
there's ability to add a new market. edit seems to be broken.. shall …
Apr 27, 2016
544683e
Edited route for products#new to carry the vendor's ID through params…
JBoshart Apr 28, 2016
e6b8eb4
Wow. I need to stop trying to commit things when I'm in the wrong dir…
JBoshart Apr 28, 2016
4456fd1
Moved form from product 'new' view to _form partial. This partial is …
JBoshart Apr 28, 2016
2eac1a8
Added rails-erd gem.
JBoshart Apr 28, 2016
8a2e4a6
Added better_errors gem
JBoshart Apr 28, 2016
ab42394
Commiting erd generated by rails-erd gem.
JBoshart Apr 28, 2016
ae9bbbd
make changes to fix edit and show
Apr 28, 2016
e9038cd
Merge branch 'master' of github.com:JBoshart/FarMarRails
Apr 28, 2016
c0e354f
Started work on 'As a vendor, I can create a sale for one of my produ…
JBoshart Apr 28, 2016
7f5ccdd
Merge branch 'master' of github.com:JBoshart/FarMarRails
JBoshart Apr 28, 2016
55655c9
added a edit and new vendor page
Apr 28, 2016
ae8a769
holy crap I added a delete button and figured out how to redirect the…
Apr 28, 2016
4dc4286
After much consternation, the create sale method works.
JBoshart Apr 28, 2016
76d16de
Merge branch 'master' of github.com:JBoshart/FarMarRails
JBoshart Apr 28, 2016
b75c818
done edit and delete for markets. all good
Apr 28, 2016
1376d46
Merge branch 'master' of github.com:JBoshart/FarMarRails
Apr 28, 2016
ea2dcc7
Small change to single view.
JBoshart Apr 28, 2016
b95eacd
Minor fix added.
JBoshart Apr 28, 2016
40536d0
Added links to See All Sales and See All Sales For the Current Month
JBoshart Apr 28, 2016
97d18e6
Hahahahaha, don't look at show.html.erb yet. It's a mess! TOTAL MESS.
JBoshart Apr 28, 2016
ad9c8eb
View all sales is working, total is listed on that main page.
JBoshart Apr 28, 2016
0a7678f
figured out how to group by month
Apr 29, 2016
8ced96f
figured out how to group by month
Apr 29, 2016
388d217
cleaned up sales show pages all and monthly
Apr 29, 2016
6d8eae0
found a way to group the markets to be searched for by the first lett…
Apr 29, 2016
b4b41af
added current month
Apr 29, 2016
33449e2
code isn't working on Jillians computer
Apr 29, 2016
fd633dc
Fixed the new method for add a sale.
JBoshart Apr 29, 2016
b116b16
fixed the little bugs
Apr 29, 2016
d46dd74
doneskis with errthang. time to css
Apr 29, 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
18 changes: 17 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,17 @@
.DS_Store
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore bundler config.
/.bundle

# Ignore the default SQLite database.
/db/*.sqlite3
/db/*.sqlite3-journal

# Ignore all logfiles and tempfiles.
/log/*
!/log/.keep
/tmp
52 changes: 52 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
source 'https://rubygems.org'



# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.6'
# 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
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

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'

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

gem 'rails-erd'

gem "better_errors"
gem "binding_of_caller"
end
175 changes: 175 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.6)
actionpack (= 4.2.6)
actionview (= 4.2.6)
activejob (= 4.2.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.6)
actionview (= 4.2.6)
activesupport (= 4.2.6)
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.6)
activesupport (= 4.2.6)
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.6)
activesupport (= 4.2.6)
globalid (>= 0.3.0)
activemodel (4.2.6)
activesupport (= 4.2.6)
builder (~> 3.1)
activerecord (4.2.6)
activemodel (= 4.2.6)
activesupport (= 4.2.6)
arel (~> 6.0)
activesupport (4.2.6)
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)
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.4)
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.1)
debug_inspector (0.0.2)
erubis (2.7.0)
execjs (2.6.0)
globalid (0.3.6)
activesupport (>= 4.1.0)
i18n (0.7.0)
jbuilder (2.4.1)
activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2)
jquery-rails (4.1.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.0)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0221)
mini_portile2 (2.0.0)
minitest (5.8.4)
multi_json (1.11.3)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.6)
actionmailer (= 4.2.6)
actionpack (= 4.2.6)
actionview (= 4.2.6)
activejob (= 4.2.6)
activemodel (= 4.2.6)
activerecord (= 4.2.6)
activesupport (= 4.2.6)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.6)
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.4.7)
activerecord (>= 3.2)
activesupport (>= 3.2)
choice (~> 0.2.0)
ruby-graphviz (~> 1.2)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (4.2.6)
actionpack (= 4.2.6)
activesupport (= 4.2.6)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (11.1.2)
rdoc (4.2.2)
json (~> 1.4)
ruby-graphviz (1.2.2)
sass (3.4.22)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
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 (1.7.1)
sprockets (3.6.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.0.4)
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.2)
turbolinks (2.5.3)
coffee-rails
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (3.0.0)
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
better_errors
binding_of_caller
byebug
coffee-rails (~> 4.1.0)
jbuilder (~> 2.0)
jquery-rails
rails (= 4.2.6)
rails-erd
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
spring
sqlite3
turbolinks
uglifier (>= 1.3.0)
web-console (~> 2.0)

BUNDLED WITH
1.11.2
28 changes: 28 additions & 0 deletions README.rdoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
== README

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The README is a good place to include instructions for how to run your project or view it on the web. I generally delete this generated one and create one in markdown - README.md

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good note, thank you. I'll endeavor to remember that in the future.

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.
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/homes.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/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/
Loading