forked from AdaGold/FarMarRails
-
Notifications
You must be signed in to change notification settings - Fork 13
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
Yordanos & Jess' FarMar Rails #3
Open
jweeber
wants to merge
47
commits into
Ada-C5:master
Choose a base branch
from
jweeber:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 46 commits
Commits
Show all changes
47 commits
Select commit
Hold shift + click to select a range
373ea97
created rails app and erd
jweeber b08a7ab
added routes
yordanosd fab9c0d
seeded the Market file
yordanosd cb683e0
git stuff happening
yordanosd ec9aef5
vendor and market association created. some seeds done
jweeber e616d20
finished seeding but need to add validations
yordanosd a9e1b0f
added root path and home controller for index page
jweeber 398604c
adding some css pre-work stuff
jweeber 53fef58
edited controllers to be plural and started on market index to view a…
jweeber ba0fd77
started on show page for markets
jweeber f8a8104
created vendor update and create actions
yordanosd d3462c3
merge conflicts
yordanosd 03f070d
completed update, edit, create for markets
jweeber d3d3f34
git conflicts
jweeber 1ae41ac
Had to redo our seeding
yordanosd 1b0e9af
added validation to our models and ran seed
yordanosd d652a94
added shared view for vendor list
jweeber 9e3144f
added rails erd and pry gems
jweeber 3bd5cad
created edit and delete for vendors. working on default for dropdown …
jweeber 7f1a458
redirect to market show now working after creating a new vendor
jweeber 8a5617a
got vendor/vendor_id/sales working
yordanosd 118f20f
git stuff
yordanosd 71e542b
working on delete for products
jweeber cad6b1a
delete and edit buttonton showing up for products
jweeber 0df5656
got the create working for products
jweeber a725c3e
formatting changes
jweeber 7ba492b
finished sales stuff
yordanosd 1b6cee0
css stuff
yordanosd 4494578
added new sale path
yordanosd b741feb
css stuff
jweeber 46bb07d
css and merge stuff
jweeber c6a98b3
reseeded database for push to heroku and took our params printing
jweeber 2a0d292
final bundle with gems needed for heroku
jweeber f6a77f7
getting heroku to work
jweeber 2c71146
trying to get css to show up on heroku
jweeber f63b11a
more bundling. annoying bundling.
jweeber a6cc9eb
giving on this pg gem
jweeber b20700f
changed config
jweeber a703902
reseeded db because things were doubled
jweeber c2197eb
final changes
yordanosd 72667cc
FINAL COMMIT
yordanosd 283f1ae
had some git merge stuff in there I removed on the market index page
jweeber de84f54
working on some css padding for page headers
jweeber f30d2f0
trying to get css to show up again on heroku
jweeber a16aaca
got the css to show up so there is a picture on the index now
jweeber 43da665
now fixing some css stuff because heroku renders weird.
jweeber 2d93963
your store link works and goes to sellers orders. deirdre helped me f…
jweeber File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
--- | ||
BUNDLE_WITHOUT: production |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
source 'https://rubygems.org' | ||
|
||
gem 'rails', '4.2.6' | ||
gem 'sass-rails', '~> 5.0' | ||
gem 'uglifier', '>= 1.3.0' | ||
gem 'coffee-rails', '~> 4.1.0' | ||
gem 'jquery-rails' | ||
gem 'turbolinks' | ||
gem 'jbuilder', '~> 2.0' | ||
gem 'sdoc', '~> 0.4.0', group: :doc | ||
|
||
|
||
gem 'bootstrap-sass', '~> 3.2.0' | ||
gem 'autoprefixer-rails' | ||
|
||
group :development, :test do | ||
gem 'byebug' | ||
gem 'sqlite3' | ||
|
||
end | ||
|
||
group :development do | ||
gem 'web-console', '~> 2.0' | ||
gem "rails-erd" | ||
gem 'pry-rails' | ||
gem 'spring' | ||
end | ||
|
||
gem 'pg' | ||
gem 'rails_12factor' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,192 @@ | ||
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) | ||
autoprefixer-rails (6.3.6) | ||
execjs | ||
binding_of_caller (0.7.2) | ||
debug_inspector (>= 0.0.1) | ||
bootstrap-sass (3.2.0.2) | ||
sass (~> 3.2) | ||
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) | ||
method_source (0.8.2) | ||
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) | ||
pg (0.18.4) | ||
pry (0.10.3) | ||
coderay (~> 1.1.0) | ||
method_source (~> 0.8.1) | ||
slop (~> 3.4) | ||
pry-rails (0.3.4) | ||
pry (>= 0.9.10) | ||
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) | ||
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.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) | ||
slop (3.6.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 | ||
autoprefixer-rails | ||
bootstrap-sass (~> 3.2.0) | ||
byebug | ||
coffee-rails (~> 4.1.0) | ||
jbuilder (~> 2.0) | ||
jquery-rails | ||
pg | ||
pry-rails | ||
rails (= 4.2.6) | ||
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.11.2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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>. | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 . |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Best practice would be to delete all these files you're not using. They're automatically created when you do ``rails generate`. I heard this feedback in a code review from C3, and I never followed their advice, but I'm still passing it on so you can decide for yourselves :P |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/ |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Best practice would be to copy and paste the Readme from the class assignment into this one :)