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

Jessica & Lauren's FarMarRails Site #43

Open
wants to merge 93 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
588527c
created new rails app
jchung722 Oct 4, 2016
c2c4029
re-added seed CSVs
laurenfb Oct 4, 2016
8f2a3f6
created all controllers
jchung722 Oct 4, 2016
d86797e
added models
jchung722 Oct 4, 2016
3ea0161
added homes controller
jchung722 Oct 4, 2016
ace4111
seed database
laurenfb Oct 4, 2016
5497a8c
Update and rename README.rdoc to README.md
jchung722 Oct 4, 2016
951cc86
added photo of data structure
laurenfb Oct 4, 2016
f6e323e
rename photo
laurenfb Oct 4, 2016
677a1e3
Update README.md
jchung722 Oct 4, 2016
5a25fb4
added home page & index links for Market & Vendor. woo hoo
laurenfb Oct 4, 2016
78615c8
Merge branch 'master' of https://github.com/jchung722/FarMarRails
laurenfb Oct 4, 2016
692010f
index method for viewing all Markets
laurenfb Oct 4, 2016
d04fdff
show method in markets controller
laurenfb Oct 4, 2016
59a9575
added link to each market in the html index page
laurenfb Oct 4, 2016
8355781
show view for individual markets
laurenfb Oct 4, 2016
e64a070
add new route aliases & fix typo in vendors/index route
laurenfb Oct 4, 2016
d4de686
Merge pull request #1 from jchung722/view-all-markets
jchung722 Oct 4, 2016
2d6ef4c
added new and update option to market
jchung722 Oct 5, 2016
d26363d
Merge pull request #2 from jchung722/forms
laurenfb Oct 5, 2016
9f6d309
links to edit and add market
jchung722 Oct 5, 2016
06022fe
added overall user views
jchung722 Oct 5, 2016
7a84e0b
added index view for vendors with links to show
laurenfb Oct 5, 2016
a08a4fd
added ability for vendors to add new product
laurenfb Oct 5, 2016
1cdfec5
ability for vendors to edit and update products
laurenfb Oct 5, 2016
7f48dc3
add vendor option
jchung722 Oct 5, 2016
3f2f774
added rendered button to update products from the vendors/index page
laurenfb Oct 5, 2016
521cb13
abilty to delete products as a vendor
laurenfb Oct 5, 2016
7f8df10
added delete button to rendered product buttons
laurenfb Oct 5, 2016
7255e8a
added redirect after destroy, thanks jessica
laurenfb Oct 5, 2016
ed6db72
show product when link is clicked
laurenfb Oct 5, 2016
aca9c78
add buttons for edit and delete to show product page
laurenfb Oct 5, 2016
94020df
comments
laurenfb Oct 5, 2016
ab00430
delete and edit vendor options added
jchung722 Oct 5, 2016
6d3bd3c
Merge pull request #3 from jchung722/market_editing_vendor_list
laurenfb Oct 5, 2016
0199d4d
added sale button file
laurenfb Oct 5, 2016
ee06b31
resolved merge conflict in vendors controller
laurenfb Oct 5, 2016
67d028a
typo fix & routes for new & create in sale
laurenfb Oct 5, 2016
ba460ff
form and button for adding a new sale from a product
laurenfb Oct 5, 2016
975d2b3
vendor can see list of sales
jchung722 Oct 5, 2016
1c64c19
added ability to create a new sale from a product
laurenfb Oct 5, 2016
edc98ab
Merge pull request #5 from jchung722/add-sales
laurenfb Oct 5, 2016
632adda
total sale
jchung722 Oct 6, 2016
667bfff
changing h1s to h2s in market
laurenfb Oct 6, 2016
5cc5064
change h1s to h2s in product views
laurenfb Oct 6, 2016
b7fe186
changing h1s to h2s in sale views
laurenfb Oct 6, 2016
a460165
changing h1s to h2s in vendor views
laurenfb Oct 6, 2016
aa0fdfc
changing h1s to h2s in homes views
laurenfb Oct 6, 2016
9720ac7
added monthly sale list and total
jchung722 Oct 6, 2016
496ce2a
Merge pull request #6 from jchung722/monthly_sale
laurenfb Oct 6, 2016
24cd619
CSS styling, a teeny bit
laurenfb Oct 6, 2016
3e54812
Merge pull request #7 from jchung722/styling-and-layout
jchung722 Oct 6, 2016
65e7c05
move sales logic to controller
laurenfb Oct 6, 2016
43b22aa
aligned vendors with buttons
jchung722 Oct 6, 2016
711e1c9
add method to convert sale input to storing in cents
laurenfb Oct 6, 2016
ecae763
more css and added redirects
jchung722 Oct 6, 2016
69c02fd
added ability to see products of each market on the guest page
laurenfb Oct 6, 2016
89d17e6
added functional top nav links in application.html.erb layout
laurenfb Oct 6, 2016
9d803e4
created market shut down option
jchung722 Oct 6, 2016
275c410
more application.html.erb styling and layout
laurenfb Oct 6, 2016
6e60f1d
made add vendor button
jchung722 Oct 6, 2016
fc3fa36
Merge pull request #8 from jchung722/styling-and-layout
jchung722 Oct 6, 2016
6d8938f
Merge pull request #9 from jchung722/market_spruce
laurenfb Oct 6, 2016
2d62766
added image
jchung722 Oct 6, 2016
366e0e1
added background image
jchung722 Oct 6, 2016
b456c2d
style & layout for front page
laurenfb Oct 7, 2016
cd3ca0d
market lists on index and home render with a new partial
laurenfb Oct 7, 2016
e4318c2
Merge pull request #10 from jchung722/front-page-buttons
jchung722 Oct 7, 2016
1a921df
Merge pull request #11 from jchung722/new-partials
jchung722 Oct 7, 2016
2c2680d
rolled back broken partials
laurenfb Oct 7, 2016
41cf060
Merge pull request #12 from jchung722/new-partials
laurenfb Oct 7, 2016
13f2dcf
updated Gemfile for production yay
laurenfb Oct 7, 2016
e136aa8
changed order of seed files
laurenfb Oct 7, 2016
c608542
commented out sales
laurenfb Oct 7, 2016
e44e1a8
serve static assets + uncomment sales
laurenfb Oct 7, 2016
9882c9e
dumb end
laurenfb Oct 7, 2016
7dea818
please work, database
laurenfb Oct 7, 2016
029c74a
comment out Markets comment
laurenfb Oct 7, 2016
e033fe5
styling the top header on all pages except home
laurenfb Oct 7, 2016
8e783ab
spaced li lines
jchung722 Oct 7, 2016
eda3e6c
Merge pull request #13 from jchung722/final-touches-on-vendor
jchung722 Oct 7, 2016
e3758ae
Merge pull request #14 from jchung722/more-market-styles
laurenfb Oct 7, 2016
4d3ea66
styled vendors/show view
laurenfb Oct 7, 2016
bf2ed8f
fixed add market button
jchung722 Oct 7, 2016
289d5dc
styling new product page and form
laurenfb Oct 7, 2016
454d695
added footer
jchung722 Oct 7, 2016
8e3579f
style create product page
laurenfb Oct 7, 2016
56aaede
style sales index page
laurenfb Oct 7, 2016
96b8c9b
final touches everywhere
laurenfb Oct 7, 2016
247af7c
link formatting
jchung722 Oct 7, 2016
d6c8c0e
Merge pull request #15 from jchung722/final-touches-on-vendor
jchung722 Oct 7, 2016
00cb88d
Merge pull request #16 from jchung722/market-styles-continued
laurenfb Oct 7, 2016
b8b0fb8
a few more links
laurenfb Oct 7, 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
Prev Previous commit
Next Next commit
updated Gemfile for production yay
  • Loading branch information
laurenfb committed Oct 7, 2016
commit 13f2dcf6ac522748f1666b0b855a5dad8e73f9a8
11 changes: 8 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -4,8 +4,6 @@ source 'https://rubygems.org'
gem 'awesome_print'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.7'
# 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
@@ -33,15 +31,22 @@ gem 'sdoc', '~> 0.4.0', group: :doc
# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

# added these directly from Textbook Curriculum
# use postgres on production
gem 'pg', group: :production
# use rails 12 on production, this is required by Heroku
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
# Use sqlite3 as the database for Active Record
gem 'sqlite3'
# 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'
end
8 changes: 8 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -76,6 +76,7 @@ GEM
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)
@@ -98,6 +99,11 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
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)
@@ -151,7 +157,9 @@ DEPENDENCIES
coffee-rails (~> 4.1.0)
jbuilder (~> 2.0)
jquery-rails
pg
rails (= 4.2.7)
rails_12factor
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
spring