Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
a3af39b
add bootstrap to project
Falcon-7X Feb 13, 2017
e229497
add bootstrap html
Falcon-7X Feb 13, 2017
7830f4c
R01
Falcon-7X Feb 13, 2017
8e60f2e
R02
Falcon-7X Feb 13, 2017
ced6760
install devise
Falcon-7X Feb 13, 2017
b4b2f1b
user can login/logout/signup
Falcon-7X Feb 13, 2017
34d6cc1
R01
Falcon-7X Feb 13, 2017
e3bc7e6
R02
Falcon-7X Feb 13, 2017
cfa8151
R03
Falcon-7X Feb 13, 2017
fbc3874
add simple_form FUNC.
Falcon-7X Feb 13, 2017
9f843b3
add bootstrap flash FUNC.
Falcon-7X Feb 13, 2017
9fe73be
R01
Falcon-7X Feb 13, 2017
8f0eaec
font awesome and rails g controller admin::products
Falcon-7X Feb 14, 2017
ef44590
rails g model product
Falcon-7X Feb 14, 2017
5939e53
add backend CRUD partly
Falcon-7X Feb 14, 2017
9d6ca8d
add uploader image FUNC.
Falcon-7X Feb 14, 2017
d8feb45
before_action
Falcon-7X Feb 14, 2017
0955d97
implement is_admin?
Falcon-7X Feb 14, 2017
62d43ec
add product show
Falcon-7X Feb 15, 2017
b6d55c9
admin index revision
Falcon-7X Feb 15, 2017
8820fb9
revision product index
Falcon-7X Feb 15, 2017
e4b5ce1
add layout admin
Falcon-7X Feb 15, 2017
cf3db8d
add products show
Falcon-7X Feb 15, 2017
86972a4
optimize backend
Falcon-7X Feb 15, 2017
8dbcfcf
add navbar connnect to products
Falcon-7X Feb 15, 2017
8640a79
add delete button in admin/products
Falcon-7X Feb 15, 2017
636c402
add_product_to_cart FUNC.
Falcon-7X Feb 16, 2017
a141588
implement current_cart FUNC.
Falcon-7X Feb 16, 2017
1d42658
implement cart idex
Falcon-7X Feb 16, 2017
0b3ab8a
R01
Falcon-7X Feb 16, 2017
a5c7b85
implement total price FUNC.
Falcon-7X Feb 16, 2017
4b15072
implement delete one cart_item Function
Falcon-7X Feb 16, 2017
86dc013
can not add product to cart again
Falcon-7X Feb 16, 2017
04d1bb0
can select cart_item quantity
Falcon-7X Feb 16, 2017
8829169
can not add product with quantity 0
Falcon-7X Feb 17, 2017
caa280f
can not change product quantity exceed stock
Falcon-7X Feb 17, 2017
8ac65cb
add checkout routing
Falcon-7X Feb 17, 2017
daba659
add order model
Falcon-7X Feb 17, 2017
2409c57
pre-checkout
Falcon-7X Feb 17, 2017
ef9ce0a
add order contreller
Falcon-7X Feb 17, 2017
2bb78c4
add product_list model
Falcon-7X Feb 17, 2017
c538d97
add orders show
Falcon-7X Feb 17, 2017
13451c3
add token to order
Falcon-7X Feb 17, 2017
0a0d78a
order list on panel
Falcon-7X Feb 17, 2017
c60c621
add payment method
Falcon-7X Feb 17, 2017
585e37f
add OrderMailer FUNC.
Falcon-7X Feb 17, 2017
a556165
add aasm_state to order
Falcon-7X Feb 17, 2017
f0ba07a
add admin/order
Falcon-7X Feb 17, 2017
675a7d2
add order/show
Falcon-7X Feb 17, 2017
aacd112
add ship/shipped/cancel/return action and button
Falcon-7X Feb 17, 2017
6d73e47
add apply_cancel function
Falcon-7X Feb 17, 2017
b2b2557
add notify_cancel/ship function
Falcon-7X Feb 17, 2017
5137a75
figaro
Falcon-7X Feb 17, 2017
31dba1a
install gem fog and berfore heroku set
Falcon-7X Feb 17, 2017
6e690fd
Revisioin01
Falcon-7X Feb 17, 2017
f2a40a8
final
Falcon-7X Feb 17, 2017
759da32
final R01
Falcon-7X Feb 17, 2017
987b4a5
prep race and homepage css
Falcon-7X Feb 20, 2017
901b072
Delete carrierwave.rb
Falcon-7X Feb 21, 2017
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 @@ -20,3 +20,7 @@
# Ignore Byebug command history file.
.byebug_history
config/database.yml
public/uploads

# Ignore application configuration
/config/application.yml
20 changes: 17 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source 'https://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.0.0'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'

# Use Puma as the app server
gem 'puma', '~> 3.0'
# Use SCSS for stylesheets
Expand All @@ -29,20 +29,34 @@ gem 'jbuilder', '~> 2.5'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development
gem 'bootstrap-sass'
gem 'devise'
gem 'simple_form'
gem 'font-awesome-rails'
gem 'carrierwave'
gem 'mini_magick'
gem 'letter_opener', group: :development
gem 'aasm'
gem 'figaro'
gem 'fog'

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platform: :mri
gem 'sqlite3'
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
gem 'web-console'
gem 'listen', '~> 3.0.5'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
# gem 'spring'
# gem 'spring-watcher-listen', '~> 2.0.0'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
group :production do
gem 'pg'
end
197 changes: 190 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (2.3.5)
aasm (4.11.1)
actioncable (5.0.0)
actionpack (= 5.0.0)
nio4r (~> 1.2)
Expand Down Expand Up @@ -38,9 +40,21 @@ GEM
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
arel (7.1.1)
autoprefixer-rails (6.6.1)
execjs
bcrypt (3.1.11)
bootstrap-sass (3.3.7)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
builder (3.2.2)
byebug (9.0.5)
carrierwave (1.0.0)
activemodel (>= 4.0.0)
activesupport (>= 4.0.0)
mime-types (>= 1.16)
coffee-rails (4.2.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.2.x)
Expand All @@ -50,19 +64,165 @@ GEM
coffee-script-source (1.10.0)
concurrent-ruby (1.0.2)
debug_inspector (0.0.2)
devise (4.2.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 5.1)
responders
warden (~> 1.2.3)
erubis (2.7.0)
excon (0.55.0)
execjs (2.7.0)
ffi (1.9.14)
figaro (1.1.1)
thor (~> 0.14)
fission (0.5.0)
CFPropertyList (~> 2.2)
fog (1.38.0)
fog-aliyun (>= 0.1.0)
fog-atmos
fog-aws (>= 0.6.0)
fog-brightbox (~> 0.4)
fog-cloudatcost (~> 0.1.0)
fog-core (~> 1.32)
fog-dynect (~> 0.0.2)
fog-ecloud (~> 0.1)
fog-google (<= 0.1.0)
fog-json
fog-local
fog-openstack
fog-powerdns (>= 0.1.1)
fog-profitbricks
fog-rackspace
fog-radosgw (>= 0.0.2)
fog-riakcs
fog-sakuracloud (>= 0.0.4)
fog-serverlove
fog-softlayer
fog-storm_on_demand
fog-terremark
fog-vmfusion
fog-voxel
fog-vsphere (>= 0.4.0)
fog-xenserver
fog-xml (~> 0.1.1)
ipaddress (~> 0.5)
fog-aliyun (0.1.0)
fog-core (~> 1.27)
fog-json (~> 1.0)
ipaddress (~> 0.8)
xml-simple (~> 1.1)
fog-atmos (0.1.0)
fog-core
fog-xml
fog-aws (1.2.0)
fog-core (~> 1.38)
fog-json (~> 1.0)
fog-xml (~> 0.1)
ipaddress (~> 0.8)
fog-brightbox (0.11.0)
fog-core (~> 1.22)
fog-json
inflecto (~> 0.0.2)
fog-cloudatcost (0.1.2)
fog-core (~> 1.36)
fog-json (~> 1.0)
fog-xml (~> 0.1)
ipaddress (~> 0.8)
fog-core (1.43.0)
builder
excon (~> 0.49)
formatador (~> 0.2)
fog-dynect (0.0.3)
fog-core
fog-json
fog-xml
fog-ecloud (0.3.0)
fog-core
fog-xml
fog-google (0.1.0)
fog-core
fog-json
fog-xml
fog-json (1.0.2)
fog-core (~> 1.0)
multi_json (~> 1.10)
fog-local (0.3.1)
fog-core (~> 1.27)
fog-openstack (0.1.19)
fog-core (>= 1.40)
fog-json (>= 1.0)
ipaddress (>= 0.8)
fog-powerdns (0.1.1)
fog-core (~> 1.27)
fog-json (~> 1.0)
fog-xml (~> 0.1)
fog-profitbricks (3.0.0)
fog-core (~> 1.42)
fog-json (~> 1.0)
fog-rackspace (0.1.4)
fog-core (>= 1.35)
fog-json (>= 1.0)
fog-xml (>= 0.1)
ipaddress (>= 0.8)
fog-radosgw (0.0.5)
fog-core (>= 1.21.0)
fog-json
fog-xml (>= 0.0.1)
fog-riakcs (0.1.0)
fog-core
fog-json
fog-xml
fog-sakuracloud (1.7.5)
fog-core
fog-json
fog-serverlove (0.1.2)
fog-core
fog-json
fog-softlayer (1.1.4)
fog-core
fog-json
fog-storm_on_demand (0.1.1)
fog-core
fog-json
fog-terremark (0.1.0)
fog-core
fog-xml
fog-vmfusion (0.1.0)
fission
fog-core
fog-voxel (0.1.0)
fog-core
fog-xml
fog-vsphere (1.7.0)
fog-core
rbvmomi (~> 1.9)
fog-xenserver (0.2.3)
fog-core
fog-xml
fog-xml (0.1.2)
fog-core
nokogiri (~> 1.5, >= 1.5.11)
font-awesome-rails (4.7.0.1)
railties (>= 3.2, < 5.1)
formatador (0.2.5)
globalid (0.3.7)
activesupport (>= 4.1.0)
i18n (0.7.0)
inflecto (0.0.2)
ipaddress (0.8.3)
jbuilder (2.6.0)
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 (2.0.3)
launchy (2.4.3)
addressable (~> 2.3)
letter_opener (1.4.1)
launchy (~> 2.2)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
Expand All @@ -74,14 +234,18 @@ GEM
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_magick (4.6.0)
mini_portile2 (2.1.0)
minitest (5.9.0)
multi_json (1.12.1)
nio4r (1.2.1)
nokogiri (1.6.8)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
orm_adapter (0.5.0)
pg (0.19.0)
pkg-config (1.1.7)
public_suffix (2.0.5)
puma (3.6.0)
rack (2.0.1)
rack-test (0.6.3)
Expand Down Expand Up @@ -113,17 +277,23 @@ GEM
rb-fsevent (0.9.7)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
rbvmomi (1.9.4)
builder (~> 3.2)
json (>= 1.8)
nokogiri (~> 1.5)
trollop (~> 2.1)
responders (2.3.0)
railties (>= 4.2.0, < 5.1)
sass (3.4.22)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
spring (1.7.2)
spring-watcher-listen (2.0.0)
listen (>= 2.7, < 4.0)
spring (~> 1.2)
simple_form (3.3.1)
actionpack (> 4, < 5.1)
activemodel (> 4, < 5.1)
sprockets (3.7.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
Expand All @@ -135,13 +305,16 @@ GEM
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.5)
trollop (2.1.2)
turbolinks (5.0.0)
turbolinks-source (~> 5)
turbolinks-source (5.0.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (3.0.1)
execjs (>= 0.3.0, < 3)
warden (1.2.6)
rack (>= 1.0)
web-console (3.3.1)
actionview (>= 5.0)
activemodel (>= 5.0)
Expand All @@ -150,26 +323,36 @@ GEM
websocket-driver (0.6.4)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
xml-simple (1.1.5)

PLATFORMS
ruby

DEPENDENCIES
aasm
bootstrap-sass
byebug
carrierwave
coffee-rails (~> 4.2)
devise
figaro
fog
font-awesome-rails
jbuilder (~> 2.5)
jquery-rails
letter_opener
listen (~> 3.0.5)
mini_magick
pg
puma (~> 3.0)
rails (~> 5.0.0)
sass-rails (~> 5.0)
spring
spring-watcher-listen (~> 2.0.0)
simple_form
sqlite3
turbolinks (~> 5)
tzinfo-data
uglifier (>= 1.3.0)
web-console

BUNDLED WITH
1.12.5
1.13.6
3 changes: 3 additions & 0 deletions app/assets/javascripts/account/orders.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.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.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/
2 changes: 2 additions & 0 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@
//= require jquery_ujs
//= require turbolinks
//= require_tree .
//= require bootstrap/dropdown
//= require bootstrap/alert
3 changes: 3 additions & 0 deletions app/assets/javascripts/cart_items.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.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/orders.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/welcome.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/stylesheets/account/orders.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Place all the styles related to the account/orders controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
Loading