Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
c8f6183
finish artstore-week1
ryanyangtw Jul 10, 2014
49c325e
Finish: finish hw1 without seeing solution
ryanyangtw Jul 17, 2014
63defd7
Bundle pry-rails & pry-plus
ryanyangtw Jul 17, 2014
e90cdaf
install simple form with bootstrap
ryanyangtw Jul 17, 2014
896051f
MODIFY: modify simple form with bootstrap
ryanyangtw Jul 17, 2014
a32eae5
MODIFY: cleaning code using helper and admin controller
ryanyangtw Jul 17, 2014
4ce8343
ADD: add settinglogic and add database.yml to .gitignore
ryanyangtw Jul 18, 2014
dd2b355
Finish: finish hw1 through combining the solution-week1
ryanyangtw Jul 18, 2014
c346df7
Fix: fix the problem about database configuration
ryanyangtw Jul 18, 2014
1ca376a
Finish: finish the content taught in class2 ppt
ryanyangtw Jul 18, 2014
8cd1cd5
Add: add feature - remove items in the cart and empty of the cart
ryanyangtw Jul 19, 2014
b8bd2f4
Add: add jquery_ui for spinner and using ajax to update cart_item's q…
ryanyangtw Jul 19, 2014
f53db5a
Add: finish quantity mechanism
ryanyangtw Jul 20, 2014
1e22373
Add: add namespace account let user see the order in the past
ryanyangtw Jul 20, 2014
5c89eba
Finish: add account/order admin/order and finish hw2 without seeing t…
ryanyangtw Jul 20, 2014
25760d8
Add: add mail mechanism, sending email to user after create order and…
ryanyangtw Jul 21, 2014
d730a39
move jquery_customization.js to js folder
ryanyangtw Jul 24, 2014
8b1d8a2
Finish: finish hw2 without seeing the solution
ryanyangtw Jul 24, 2014
1b031a0
ADD: refactor code using helper and add i18n to translate the state o…
ryanyangtw Jul 26, 2014
727f9f6
Finish: finish hw2 throw combining the solution-week2
ryanyangtw Jul 26, 2014
ee20eeb
ADD: Let user can change the order state including canceling the orde…
ryanyangtw Jul 26, 2014
b4136e6
Add: uding settingslogic to solve security issue
ryanyangtw Jul 26, 2014
045030b
Add: add service object to clean out the code
ryanyangtw Jul 26, 2014
83932e5
Add: finish search
ryanyangtw Jul 26, 2014
6463a48
Add: add dev.rake to create 10 fake user
ryanyangtw Jul 27, 2014
04cdd92
Add: add sidekiq to asynchronnously sending email to buyer
ryanyangtw Jul 27, 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
Expand Up @@ -14,3 +14,7 @@
# Ignore all logfiles and tempfiles.
/log/*.log
/tmp

config/settings.yml
config/database.yml
public/uploads
42 changes: 42 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,45 @@ gem 'spring', group: :development
# Use debugger
# gem 'debugger', group: [:development, :test]


#customize gem
#gem 'pry', '~> 0.10.0'
gem 'pry-rails'
gem 'pry-plus'
gem "simple_form", "3.1.0rc1"
gem 'bootstrap-sass', '~> 3.2.0.0'
#The bootstrap-sass-rails gem is deprecated starting with version 3.1.0.0.
#gem 'bootstrap-sass-rails', '~> 3.1.0.0'
gem 'will_paginate' , '~> 3.0'
gem 'will_paginate-bootstrap'
gem 'devise' , '~> 3.2'
gem 'carrierwave'
gem 'mini_magick', '~> 3.7.0'
gem 'cocoon', '~> 1.2.6'
gem 'settingslogic', '~> 2.0.9'
gem 'aasm', '~> 3.3.1'
gem 'stripe'
gem 'roadie'
gem 'ransack', github: 'activerecord-hackery/ransack', branch: 'rails-4.1'

# add for snipper
gem 'jquery-ui-rails', '~> 5.0.0'

# add for sidekiq
gem 'sidekiq', '~> 3.2.1'
gem 'sinatra', require: false
gem 'slim'


group :developmet, :test do
gem 'guard-livereload'
gem 'annotate', '~> 2.6.5'
gem 'mysql2'
gem 'letter_opener', '~> 1.2.0'
end






188 changes: 188 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
GIT
remote: git://github.com/activerecord-hackery/ransack.git
revision: 6e6457e511f9babd9a464d944e88b9e73f270bcf
branch: rails-4.1
specs:
ransack (1.2.4)
actionpack (>= 4.0)
activerecord (>= 4.0)
activesupport (>= 4.0)
i18n
polyamorous (~> 1.1.0)

GEM
remote: https://rubygems.org/
specs:
aasm (3.3.1)
actionmailer (4.1.0)
actionpack (= 4.1.0)
actionview (= 4.1.0)
Expand All @@ -27,34 +40,143 @@ GEM
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)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bond (0.5.1)
bootstrap-sass (3.2.0.0)
sass (~> 3.2)
builder (3.2.2)
carrierwave (0.10.0)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
json (>= 1.7)
mime-types (>= 1.16)
celluloid (0.15.2)
timers (~> 1.1.0)
cocoon (1.2.6)
coderay (1.1.0)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.7.0)
columnize (0.8.9)
connection_pool (2.0.0)
css_parser (1.3.5)
addressable
debug_inspector (0.0.2)
debugger (1.6.8)
columnize (>= 0.3.1)
debugger-linecache (~> 1.2.0)
debugger-ruby_core_source (~> 1.3.5)
debugger-linecache (1.2.0)
debugger-ruby_core_source (1.3.5)
devise (3.2.4)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
thread_safe (~> 0.1)
warden (~> 1.2.3)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (2.2.0)
ffi (1.9.3)
formatador (0.2.5)
guard (2.6.1)
formatador (>= 0.2.4)
listen (~> 2.7)
lumberjack (~> 1.0)
pry (>= 0.9.12)
thor (>= 0.18.1)
guard-livereload (2.3.0)
em-websocket (~> 0.5)
guard (~> 2.0)
multi_json (~> 1.8)
hike (1.2.3)
http_parser.rb (0.6.0)
i18n (0.6.9)
interception (0.5)
jbuilder (2.0.8)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
jist (1.5.1)
json
jquery-rails (3.1.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.0)
railties (>= 3.2.16)
json (1.8.1)
launchy (2.4.2)
addressable (~> 2.3)
letter_opener (1.2.0)
launchy (~> 2.2)
listen (2.7.9)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
lumberjack (1.0.9)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
method_source (0.8.2)
mime-types (1.25.1)
mini_magick (3.7.0)
subexec (~> 0.2.1)
mini_portile (0.6.0)
minitest (5.3.4)
multi_json (1.10.1)
mysql2 (0.3.16)
netrc (0.7.7)
nokogiri (1.6.3)
mini_portile (= 0.6.0)
orm_adapter (0.5.0)
polyamorous (1.1.0)
activerecord (>= 3.0)
polyglot (0.3.5)
pry (0.10.0)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-debugger (0.2.3)
debugger (~> 1.3)
pry (>= 0.9.10, < 0.11.0)
pry-doc (0.6.0)
pry (~> 0.9)
yard (~> 0.8)
pry-docmore (0.1.1)
pry
pry-doc
pry-plus (1.0.0)
bond
jist
pry-debugger
pry-doc
pry-docmore
pry-rescue
pry-stack_explorer
pry-rails (0.3.2)
pry (>= 0.9.10)
pry-rescue (1.4.1)
interception (>= 0.5)
pry
pry-stack_explorer (0.4.9.1)
binding_of_caller (>= 0.7)
pry (>= 0.9.11)
rack (1.5.2)
rack-protection (1.5.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (4.1.0)
Expand All @@ -73,8 +195,20 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.3.2)
rb-fsevent (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
rdoc (4.1.1)
json (~> 1.4)
redis (3.1.0)
redis-namespace (1.5.0)
redis (~> 3.0, >= 3.0.4)
rest-client (1.7.2)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
roadie (3.0.0)
css_parser (~> 1.3.4)
nokogiri (~> 1.6.0)
sass (3.2.19)
sass-rails (4.0.3)
railties (>= 4.0.0, < 5.0)
Expand All @@ -84,6 +218,24 @@ GEM
sdoc (0.4.0)
json (~> 1.8)
rdoc (~> 4.0, < 5.0)
settingslogic (2.0.9)
sidekiq (3.2.1)
celluloid (>= 0.15.2)
connection_pool (>= 2.0.0)
json
redis (>= 3.0.6)
redis-namespace (>= 1.3.1)
simple_form (3.1.0.rc1)
actionpack (~> 4.0)
activemodel (~> 4.0)
sinatra (1.4.5)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4)
slim (2.0.3)
temple (~> 0.6.6)
tilt (>= 1.3.3, < 2.1)
slop (3.5.0)
spring (1.1.3)
sprockets (2.11.0)
hike (~> 1.2)
Expand All @@ -95,9 +247,16 @@ GEM
activesupport (>= 3.0)
sprockets (~> 2.8)
sqlite3 (1.3.9)
stripe (1.14.0)
json (~> 1.8.1)
mime-types (~> 1.25)
rest-client (~> 1.4)
subexec (0.2.3)
temple (0.6.8)
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
timers (1.1.0)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
Expand All @@ -108,18 +267,47 @@ GEM
uglifier (2.5.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
warden (1.2.3)
rack (>= 1.0)
will_paginate (3.0.7)
will_paginate-bootstrap (1.0.1)
will_paginate (>= 3.0.3)
yard (0.8.7.4)

PLATFORMS
ruby

DEPENDENCIES
aasm (~> 3.3.1)
annotate (~> 2.6.5)
bootstrap-sass (~> 3.2.0.0)
carrierwave
cocoon (~> 1.2.6)
coffee-rails (~> 4.0.0)
devise (~> 3.2)
guard-livereload
jbuilder (~> 2.0)
jquery-rails
jquery-ui-rails (~> 5.0.0)
letter_opener (~> 1.2.0)
mini_magick (~> 3.7.0)
mysql2
pry-plus
pry-rails
rails (= 4.1.0)
ransack!
roadie
sass-rails (~> 4.0.3)
sdoc (~> 0.4.0)
settingslogic (~> 2.0.9)
sidekiq (~> 3.2.1)
simple_form (= 3.1.0rc1)
sinatra
slim
spring
sqlite3
stripe
turbolinks
uglifier (>= 1.3.0)
will_paginate (~> 3.0)
will_paginate-bootstrap
11 changes: 11 additions & 0 deletions Guardfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# A sample Guardfile
# More info at https://github.com/guard/guard#readme

guard 'livereload' do
watch(%r{app/views/.+\.(erb|haml|slim)$})
watch(%r{app/helpers/.+\.rb})
watch(%r{public/.+\.(css|js|html)})
watch(%r{config/locales/.+\.yml})
# Rails Assets Pipeline
watch(%r{(app|vendor)(/assets/\w+/(.+\.(css|js|html|png|jpg))).*}) { |m| "/assets/#{m[3]}" }
end
Empty file removed README.md
Empty file.
3 changes: 3 additions & 0 deletions app/assets/javascripts/account/orders.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/
3 changes: 3 additions & 0 deletions app/assets/javascripts/admin.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/
3 changes: 3 additions & 0 deletions app/assets/javascripts/admin/orders.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/
3 changes: 3 additions & 0 deletions app/assets/javascripts/admin/photos.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/
3 changes: 3 additions & 0 deletions app/assets/javascripts/admin/products.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/
7 changes: 6 additions & 1 deletion app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,9 @@
//= require jquery
//= require jquery_ujs
//= require turbolinks
//= require_tree .
//= require bootstrap-sprockets
//= require cocoon
//= require jquery-ui/spinner
//= require jquery_customization
//= require orders
// require_tree .
3 changes: 3 additions & 0 deletions app/assets/javascripts/card_charges.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/
3 changes: 3 additions & 0 deletions app/assets/javascripts/cart_items.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/
3 changes: 3 additions & 0 deletions app/assets/javascripts/carts.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