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

Testing #14

Open
wants to merge 45 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
15311fd
Setup gems and pg
Bartlebyy Sep 22, 2014
a05c99b
Setup Invoice, Item & Cart. Get initial specs passing
andrewhouse Sep 22, 2014
e9371d1
Updates from Code Review
andrewhouse Sep 23, 2014
d2d7c7b
Updates from Code Review
andrewhouse Sep 23, 2014
e1d9e61
HotFix for invoice amount column
andrewhouse Sep 23, 2014
5aa5ef1
routes
andrewhouse Sep 23, 2014
c9c9f04
Complete Merge Request
Sep 23, 2014
5cd6418
Merge branch 'specs'
Sep 23, 2014
cbf7c7b
Update schema
Sep 23, 2014
859b50d
fix db schema issue
andrewhouse Sep 23, 2014
a2898eb
Merge branch 'master' of github.com:IY-Rails-Store/iron-shop
andrewhouse Sep 23, 2014
f0080b1
stripe working
andrewhouse Sep 23, 2014
2713a40
Add Basic Stripe Specs
andrewhouse Sep 23, 2014
bb78e0a
Add paid to Invoice
andrewhouse Sep 24, 2014
fba7826
Add sellers can post items
JTorr Sep 24, 2014
2cb51ec
Merge pull request #3 from IY-Rails-Store/invoice_paid_column
Sep 24, 2014
290e79d
Merge branch 'seller'
Sep 24, 2014
984d069
Update Schema
Sep 24, 2014
789b497
Setup CanCan authorization for Seller, Shoppers, and Admins
Sep 24, 2014
40b597c
Merge pull request #5 from IY-Rails-Store/auth
andrewhouse Sep 24, 2014
a62dec3
Add Rake Task and Seed Data
andrewhouse Sep 25, 2014
1848f30
Setup Pg Search Functionality
andrewhouse Sep 25, 2014
5143159
Merge pull request #6 from IY-Rails-Store/pgsql
Sep 25, 2014
6f37374
Passing Specs for Searching
andrewhouse Sep 25, 2014
8707386
Merge pull request #7 from IY-Rails-Store/pgsql
Sep 25, 2014
5e9d9a2
Mailer frame
Bartlebyy Sep 25, 2014
d2621bf
Update price_watch.html.haml
andrewhouse Sep 25, 2014
b6dc379
Add WatchedItem join table and associated views
JTorr Sep 26, 2014
79e3db6
Pull pg_search and update schema
Sep 26, 2014
cfd6cb4
Merge pull request #8 from IY-Rails-Store/watched_items
Sep 26, 2014
d4a0c54
Merge master into price watch mailer
Sep 26, 2014
2d6407c
Merge branch 'mailer'
Sep 26, 2014
1d05376
Merge branch 'master' of github.com:IY-Rails-Store/iron-shop
Sep 26, 2014
fea2f11
Add Cart
Sep 25, 2014
0ea73ba
Add Basic CSS & Stylings
andrewhouse Sep 27, 2014
c66e9ce
Merge pull request #11 from IY-Rails-Store/cart
Sep 27, 2014
a1bc241
Add price watch to mailer
JTorr Sep 27, 2014
8b9ab1e
Merge master into devise_mailer
Sep 27, 2014
084c641
Merge branch 'devise_mailer'
Sep 27, 2014
d241875
Add Fixes for No Signed in User
andrewhouse Sep 27, 2014
b72a968
Merge master into hotfix
Sep 27, 2014
611d747
Merge branch 'hotfix'
Sep 27, 2014
317b679
Add More Stylings and Seller Logic
andrewhouse Sep 28, 2014
7033ecf
Merge pull request #14 from IY-Rails-Store/jQuery
Sep 29, 2014
70dc832
Tests
andrewhouse Sep 30, 2014
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
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
dump.rdb
# 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
Expand All @@ -16,3 +17,6 @@
/tmp

coverage

# Ignore application configuration
/config/application.yml
15 changes: 14 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,22 @@ gem 'sdoc', '~> 0.4.0', group: :doc

gem 'devise'
gem 'cancancan'
gem 'figaro'
gem 'omniauth'
gem 'omniauth-google-oauth2'
gem 'pg'
gem 'stripe'
gem 'letter_opener'
gem 'pg_search'
gem 'sucker_punch', '~> 1.0'


group :production do
gem 'rails_12factor'
end

group :development do
gem 'annotate'
gem 'better_errors'
gem 'binding_of_caller'
gem 'pry-rails'
Expand All @@ -25,7 +39,6 @@ group :development do
end

group :development, :test do
gem 'sqlite3'
gem 'factory_girl_rails', require: false
gem 'faker'
gem 'rspec-rails'
Expand Down
179 changes: 118 additions & 61 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,105 +1,142 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.1.4)
actionpack (= 4.1.4)
actionview (= 4.1.4)
mail (~> 2.5.4)
actionpack (4.1.4)
actionview (= 4.1.4)
activesupport (= 4.1.4)
actionmailer (4.1.6)
actionpack (= 4.1.6)
actionview (= 4.1.6)
mail (~> 2.5, >= 2.5.4)
actionpack (4.1.6)
actionview (= 4.1.6)
activesupport (= 4.1.6)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionview (4.1.4)
activesupport (= 4.1.4)
actionview (4.1.6)
activesupport (= 4.1.6)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.4)
activesupport (= 4.1.4)
activemodel (4.1.6)
activesupport (= 4.1.6)
builder (~> 3.1)
activerecord (4.1.4)
activemodel (= 4.1.4)
activesupport (= 4.1.4)
activerecord (4.1.6)
activemodel (= 4.1.6)
activesupport (= 4.1.6)
arel (~> 5.0.0)
activesupport (4.1.4)
activesupport (4.1.6)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
addressable (2.3.6)
annotate (2.6.5)
activerecord (>= 2.3.0)
rake (>= 0.8.7)
arel (5.0.1.20140414130214)
bcrypt (3.1.7)
better_errors (1.1.0)
better_errors (2.0.0)
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)
cancancan (1.9.2)
capybara (2.4.1)
capybara (2.4.3)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
celluloid (0.15.2)
timers (~> 1.1.0)
coderay (1.1.0)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.3.0)
coffee-script-source
execjs
coffee-script-source (1.7.1)
coffee-script-source (1.8.0)
debug_inspector (0.0.2)
devise (3.2.4)
devise (3.3.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
thread_safe (~> 0.1)
warden (~> 1.2.3)
diff-lcs (1.2.5)
docile (1.1.3)
docile (1.1.5)
erubis (2.7.0)
execjs (2.2.1)
factory_girl (4.4.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.4.1)
factory_girl (~> 4.4.0)
railties (>= 3.0.0)
faker (1.3.0)
faker (1.4.3)
i18n (~> 0.5)
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
figaro (1.0.0)
thor (~> 0.14)
haml (4.0.5)
tilt
haml-rails (0.5.3)
actionpack (>= 4.0.1)
activesupport (>= 4.0.1)
haml (>= 3.1, < 5.0)
railties (>= 4.0.1)
hashie (3.3.1)
hike (1.2.3)
i18n (0.6.11)
jbuilder (2.1.3)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
jquery-rails (3.1.1)
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
jwt (1.0.0)
launchy (2.4.2)
addressable (~> 2.3)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
letter_opener (1.2.0)
launchy (~> 2.2)
mail (2.6.1)
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (1.25.1)
mime-types (2.3)
mini_portile (0.6.0)
minitest (5.4.0)
minitest (5.4.2)
multi_json (1.10.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
netrc (0.7.7)
nokogiri (1.6.3.1)
mini_portile (= 0.6.0)
oauth2 (1.0.0)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (~> 1.2)
omniauth (1.2.2)
hashie (>= 1.2, < 4)
rack (~> 1.0)
omniauth-google-oauth2 (0.2.5)
omniauth (> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-oauth2 (1.2.0)
faraday (>= 0.8, < 0.10)
multi_json (~> 1.3)
oauth2 (~> 1.0)
omniauth (~> 1.2)
orm_adapter (0.5.0)
polyglot (0.3.5)
pry (0.10.0)
pg (0.17.1)
pg_search (0.7.8)
activerecord (>= 3.1)
activesupport (>= 3.1)
arel
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
Expand All @@ -110,40 +147,48 @@ GEM
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.1.4)
actionmailer (= 4.1.4)
actionpack (= 4.1.4)
actionview (= 4.1.4)
activemodel (= 4.1.4)
activerecord (= 4.1.4)
activesupport (= 4.1.4)
rails (4.1.6)
actionmailer (= 4.1.6)
actionpack (= 4.1.6)
actionview (= 4.1.6)
activemodel (= 4.1.6)
activerecord (= 4.1.6)
activesupport (= 4.1.6)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.4)
railties (= 4.1.6)
sprockets-rails (~> 2.0)
railties (4.1.4)
actionpack (= 4.1.4)
activesupport (= 4.1.4)
rails_12factor (0.0.2)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.2)
rails_stdout_logging (0.0.3)
railties (4.1.6)
actionpack (= 4.1.6)
activesupport (= 4.1.6)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.3.2)
rdoc (4.1.1)
rdoc (4.1.2)
json (~> 1.4)
rspec-core (3.0.2)
rspec-support (~> 3.0.0)
rspec-expectations (3.0.2)
rest-client (1.7.2)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rspec-core (3.1.4)
rspec-support (~> 3.1.0)
rspec-expectations (3.1.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.0.0)
rspec-mocks (3.0.2)
rspec-support (~> 3.0.0)
rspec-rails (3.0.1)
rspec-support (~> 3.1.0)
rspec-mocks (3.1.2)
rspec-support (~> 3.1.0)
rspec-rails (3.1.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.0.0)
rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0)
rspec-support (~> 3.0.0)
rspec-support (3.0.2)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-support (~> 3.1.0)
rspec-support (3.1.1)
sass (3.2.19)
sass-rails (4.0.3)
railties (>= 4.0.0, < 5.0)
Expand All @@ -153,9 +198,9 @@ GEM
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
simplecov (0.8.2)
simplecov (0.9.1)
docile (~> 1.1.0)
multi_json
multi_json (~> 1.0)
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
slop (3.6.0)
Expand All @@ -167,17 +212,20 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.1.3)
sprockets-rails (2.1.4)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
sqlite3 (1.3.9)
stripe (1.15.0)
json (~> 1.8.1)
mime-types (>= 1.25, < 3.0)
rest-client (~> 1.4)
sucker_punch (1.2.1)
celluloid (~> 0.15.2)
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
timers (1.1.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.5.3)
Expand All @@ -192,6 +240,7 @@ PLATFORMS
ruby

DEPENDENCIES
annotate
better_errors
binding_of_caller
cancancan
Expand All @@ -200,18 +249,26 @@ DEPENDENCIES
devise
factory_girl_rails
faker
figaro
haml-rails
jbuilder (~> 2.0)
jquery-rails
launchy
letter_opener
omniauth
omniauth-google-oauth2
pg
pg_search
pry-rails
quiet_assets
rails
rails_12factor
rspec-rails
sass-rails (~> 4.0.3)
sdoc (~> 0.4.0)
simplecov
spring
spring-commands-rspec
sqlite3
stripe
sucker_punch (~> 1.0)
uglifier (>= 1.3.0)
5 changes: 5 additions & 0 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,8 @@
//= require jquery
//= require jquery_ujs
//= require_tree .
//
// Tooltip for Bootstrap not working.
// $(function(){
// $('.tooltp').tooltip();
// });
3 changes: 3 additions & 0 deletions app/assets/javascripts/watched_item.js.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