From 7cc385f0a15fd55b98698a22861ae36f77569f71 Mon Sep 17 00:00:00 2001 From: BobLin Date: Wed, 9 Jul 2014 20:22:11 +0800 Subject: [PATCH 1/6] ADD:bootstrap,simple_form,product/new,product/show --- .idea/.generators | 8 + .idea/.name | 1 + .idea/.rakeTasks | 7 + .idea/artstore.iml | 238 ++++++++++++++++ .idea/dataSources.ids | 6 + .idea/dataSources.xml | 12 + .idea/encodings.xml | 5 + .idea/misc.xml | 5 + .idea/modules.xml | 9 + .../Development__artstore.xml | 32 +++ .../Production__artstore.xml | 28 ++ .idea/runConfigurations/spec__artstore.xml | 26 ++ .idea/runConfigurations/test__artstore.xml | 28 ++ .idea/scopes/scope_settings.xml | 5 + .idea/vcs.xml | 7 + Gemfile | 8 + Gemfile.lock | 34 ++- app/assets/javascripts/application.js | 1 + app/assets/stylesheets/application.css | 1 + app/assets/stylesheets/main.css.scss | 34 +++ app/controllers/admin/products_controller.rb | 33 +++ app/controllers/application_controller.rb | 6 + app/controllers/user/.keep | 0 app/helpers/admin/products_helper.rb | 2 + app/helpers/application_helper.rb | 8 + app/models/product.rb | 2 + app/models/user.rb | 10 + app/views/admin/products/index.html.erb | 15 + app/views/admin/products/new.html.erb | 16 ++ app/views/admin/products/show.html.erb | 11 + app/views/layouts/_header.html.erb | 28 ++ app/views/layouts/application.html.erb | 14 +- config/initializers/devise.rb | 256 ++++++++++++++++++ config/initializers/simple_form.rb | 145 ++++++++++ config/initializers/simple_form_bootstrap.rb | 45 +++ config/locales/devise.en.yml | 59 ++++ config/locales/simple_form.en.yml | 26 ++ config/routes.rb | 7 + db/migrate/20140707121534_create_products.rb | 11 + .../20140707124034_devise_create_users.rb | 42 +++ .../20140707125509_add_is_admin_to_user.rb | 5 + .../20140709094801_add_pirce_to_product.rb | 5 + db/schema.rb | 44 +++ lib/templates/erb/scaffold/_form.html.erb | 13 + .../admin/products_controller_test.rb | 7 + test/fixtures/products.yml | 11 + test/fixtures/users.yml | 11 + test/helpers/admin/products_helper_test.rb | 4 + test/models/product_test.rb | 7 + test/models/user_test.rb | 7 + 50 files changed, 1335 insertions(+), 10 deletions(-) create mode 100644 .idea/.generators create mode 100644 .idea/.name create mode 100644 .idea/.rakeTasks create mode 100644 .idea/artstore.iml create mode 100644 .idea/dataSources.ids create mode 100644 .idea/dataSources.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/runConfigurations/Development__artstore.xml create mode 100644 .idea/runConfigurations/Production__artstore.xml create mode 100644 .idea/runConfigurations/spec__artstore.xml create mode 100644 .idea/runConfigurations/test__artstore.xml create mode 100644 .idea/scopes/scope_settings.xml create mode 100644 .idea/vcs.xml create mode 100644 app/assets/stylesheets/main.css.scss create mode 100644 app/controllers/admin/products_controller.rb create mode 100644 app/controllers/user/.keep create mode 100644 app/helpers/admin/products_helper.rb create mode 100644 app/models/product.rb create mode 100644 app/models/user.rb create mode 100644 app/views/admin/products/index.html.erb create mode 100644 app/views/admin/products/new.html.erb create mode 100644 app/views/admin/products/show.html.erb create mode 100644 app/views/layouts/_header.html.erb create mode 100644 config/initializers/devise.rb create mode 100644 config/initializers/simple_form.rb create mode 100644 config/initializers/simple_form_bootstrap.rb create mode 100644 config/locales/devise.en.yml create mode 100644 config/locales/simple_form.en.yml create mode 100644 db/migrate/20140707121534_create_products.rb create mode 100644 db/migrate/20140707124034_devise_create_users.rb create mode 100644 db/migrate/20140707125509_add_is_admin_to_user.rb create mode 100644 db/migrate/20140709094801_add_pirce_to_product.rb create mode 100644 db/schema.rb create mode 100644 lib/templates/erb/scaffold/_form.html.erb create mode 100644 test/controllers/admin/products_controller_test.rb create mode 100644 test/fixtures/products.yml create mode 100644 test/fixtures/users.yml create mode 100644 test/helpers/admin/products_helper_test.rb create mode 100644 test/models/product_test.rb create mode 100644 test/models/user_test.rb diff --git a/.idea/.generators b/.idea/.generators new file mode 100644 index 0000000..7cedbd8 --- /dev/null +++ b/.idea/.generators @@ -0,0 +1,8 @@ + + diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ce06291 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +artstore \ No newline at end of file diff --git a/.idea/.rakeTasks b/.idea/.rakeTasks new file mode 100644 index 0000000..48967e7 --- /dev/null +++ b/.idea/.rakeTasks @@ -0,0 +1,7 @@ + + diff --git a/.idea/artstore.iml b/.idea/artstore.iml new file mode 100644 index 0000000..9241228 --- /dev/null +++ b/.idea/artstore.iml @@ -0,0 +1,238 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/dataSources.ids b/.idea/dataSources.ids new file mode 100644 index 0000000..c1a31fc --- /dev/null +++ b/.idea/dataSources.ids @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 0000000..c4246ad --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,12 @@ + + + + + sqlite.xerial + org.sqlite.JDBC + jdbc:sqlite:$PROJECT_DIR$/db/development.sqlite3 + + + + + diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..e206d70 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..60c08cc --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..5263cb6 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/runConfigurations/Development__artstore.xml b/.idea/runConfigurations/Development__artstore.xml new file mode 100644 index 0000000..a068392 --- /dev/null +++ b/.idea/runConfigurations/Development__artstore.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/Production__artstore.xml b/.idea/runConfigurations/Production__artstore.xml new file mode 100644 index 0000000..5b356d8 --- /dev/null +++ b/.idea/runConfigurations/Production__artstore.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/spec__artstore.xml b/.idea/runConfigurations/spec__artstore.xml new file mode 100644 index 0000000..cb1e609 --- /dev/null +++ b/.idea/runConfigurations/spec__artstore.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/test__artstore.xml b/.idea/runConfigurations/test__artstore.xml new file mode 100644 index 0000000..ff5c785 --- /dev/null +++ b/.idea/runConfigurations/test__artstore.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..c80f219 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/Gemfile b/Gemfile index fba3b4e..9f01a13 100644 --- a/Gemfile +++ b/Gemfile @@ -26,6 +26,14 @@ gem 'sdoc', '~> 0.4.0', group: :doc # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring', group: :development +gem 'devise' + +gem 'bootstrap-sass', '~> 3.2.0' + +gem 'simple_form' + +gem 'carrierwave' + # Use ActiveModel has_secure_password # gem 'bcrypt', '~> 3.1.7' diff --git a/Gemfile.lock b/Gemfile.lock index 53538d9..79d0280 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,7 +28,15 @@ GEM thread_safe (~> 0.1) tzinfo (~> 1.1) arel (5.0.1.20140414130214) + bcrypt (3.1.7) + 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) coffee-rails (4.0.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) @@ -36,14 +44,20 @@ GEM coffee-script-source execjs coffee-script-source (1.7.0) + devise (3.2.4) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 3.2.6, < 5) + thread_safe (~> 0.1) + warden (~> 1.2.3) erubis (2.7.0) - execjs (2.2.0) + execjs (2.2.1) hike (1.2.3) i18n (0.6.9) - jbuilder (2.0.8) + jbuilder (2.1.2) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) - jquery-rails (3.1.0) + jquery-rails (3.1.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) @@ -51,8 +65,9 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25.1) - minitest (5.3.4) + minitest (5.4.0) multi_json (1.10.1) + orm_adapter (0.5.0) polyglot (0.3.5) rack (1.5.2) rack-test (0.6.2) @@ -84,6 +99,9 @@ GEM sdoc (0.4.0) json (~> 1.8) rdoc (~> 4.0, < 5.0) + simple_form (3.0.2) + actionpack (~> 4.0) + activemodel (~> 4.0) spring (1.1.3) sprockets (2.11.0) hike (~> 1.2) @@ -105,20 +123,26 @@ GEM coffee-rails tzinfo (1.2.1) thread_safe (~> 0.1) - uglifier (2.5.0) + uglifier (2.5.1) execjs (>= 0.3.0) json (>= 1.8.0) + warden (1.2.3) + rack (>= 1.0) PLATFORMS ruby DEPENDENCIES + bootstrap-sass (~> 3.2.0) + carrierwave coffee-rails (~> 4.0.0) + devise jbuilder (~> 2.0) jquery-rails rails (= 4.1.0) sass-rails (~> 4.0.3) sdoc (~> 0.4.0) + simple_form spring sqlite3 turbolinks diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index d6925fa..cd5c291 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,4 +13,5 @@ //= require jquery //= require jquery_ujs //= require turbolinks +//= require bootstrap //= require_tree . diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index a443db3..bcdb41c 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -12,4 +12,5 @@ * *= require_tree . *= require_self + *= require bootstrap */ diff --git a/app/assets/stylesheets/main.css.scss b/app/assets/stylesheets/main.css.scss new file mode 100644 index 0000000..b97d678 --- /dev/null +++ b/app/assets/stylesheets/main.css.scss @@ -0,0 +1,34 @@ +body +{ + padding-top: 60px; +} + +.marketing +{ + .col-lg-4 + { + margin-bottom: 20px; + text-align: center; + p + { + margin-left: 10px; + } + } + h2 + { + font-weight: normal; + } +} + +.featurette-heading { + font-weight: 300; + line-height: 1; + letter-spacing: -1px; + @media (min-width: 768px) + { + font-size: 50px; + } + @media (min-width: 992px) { + margin-top: 120px; + } +} \ No newline at end of file diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb new file mode 100644 index 0000000..5c0d31a --- /dev/null +++ b/app/controllers/admin/products_controller.rb @@ -0,0 +1,33 @@ +class Admin::ProductsController < ApplicationController + before_action :authenticate_user! ,only: :new + before_action :admin_required,only: :new + before_action :backEndHeaders,only: :new + before_action :frontEndHeaders,only: [:index,:show] + + def new + @product = Product.new + end + + def show + @product = Product.find(params[:id]) + end + + def create + @product = Product.new(product_params) + + if @product.save + redirect_to admin_products_path + else + render :new + end + end + + def index + @products = Product.all + end + + private + def product_params + params.require(:product).permit(:title, :description,:quantity,:price) + end +end \ No newline at end of file diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d83690e..c25fbfa 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -2,4 +2,10 @@ class ApplicationController < ActionController::Base # Prevent CSRF attacks by raising an exception. # For APIs, you may want to use :null_session instead. protect_from_forgery with: :exception + include ApplicationHelper + + + def admin_required + redirect_to root_path unless current_user.admin? + end end diff --git a/app/controllers/user/.keep b/app/controllers/user/.keep new file mode 100644 index 0000000..e69de29 diff --git a/app/helpers/admin/products_helper.rb b/app/helpers/admin/products_helper.rb new file mode 100644 index 0000000..977a242 --- /dev/null +++ b/app/helpers/admin/products_helper.rb @@ -0,0 +1,2 @@ +module Admin::ProductsHelper +end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index de6be79..627c057 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,2 +1,10 @@ module ApplicationHelper + def frontEndHeaders + @enable_nav = true + @headers = [{:title=>"我的購物車",:link=>"/"},{:title=>"我的訂單",:link=>"/"}] + end + def backEndHeaders + @enable_nav = true + @headers = [{:title=>"商品上架",:link=>"/back_end"}] + end end diff --git a/app/models/product.rb b/app/models/product.rb new file mode 100644 index 0000000..077a819 --- /dev/null +++ b/app/models/product.rb @@ -0,0 +1,2 @@ +class Product < ActiveRecord::Base +end diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 0000000..2a15996 --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,10 @@ +class User < ActiveRecord::Base + # Include default devise modules. Others available are: + # :confirmable, :lockable, :timeoutable and :omniauthable + devise :database_authenticatable, :registerable, + :recoverable, :rememberable, :trackable, :validatable + + def admin? + is_admin + end +end diff --git a/app/views/admin/products/index.html.erb b/app/views/admin/products/index.html.erb new file mode 100644 index 0000000..1e97016 --- /dev/null +++ b/app/views/admin/products/index.html.erb @@ -0,0 +1,15 @@ +
+

商品總覽

+
+
+ <% @products.each{ |product| %> +
+ Generic placeholder image +

<%= product[:title] %>

+

<%= product[:description] %>

+

+ <%= link_to "商品細節 »", {:controller =>'products', :action =>'show',:id=>product[:id]},class:"btn btn-default"%> +

+
+ <%}%> +
\ No newline at end of file diff --git a/app/views/admin/products/new.html.erb b/app/views/admin/products/new.html.erb new file mode 100644 index 0000000..4cbd869 --- /dev/null +++ b/app/views/admin/products/new.html.erb @@ -0,0 +1,16 @@ +<%= simple_form_for([:admin, @product], html: {class: 'form-horizontal' },defaults: { input_html: { class: 'form-control' }}) do |f| %> +
+ <%= f.input :title,label: '名稱'%> +
+
+ <%= f.input :description, as: :text ,label: '描述'%> +
+
+ <%= f.input :quantity ,label: '數量'%> +
+
+ <%= f.input :price ,label: '價錢'%> +
+
+ <%= f.button :submit,class: 'btn-primary'%> +<% end %> \ No newline at end of file diff --git a/app/views/admin/products/show.html.erb b/app/views/admin/products/show.html.erb new file mode 100644 index 0000000..9eaf64f --- /dev/null +++ b/app/views/admin/products/show.html.erb @@ -0,0 +1,11 @@ +
+
+ 500x500 +
+
+

<%= @product[:title] %>

+

<%= @product[:description] %>

+

數量 : <%= @product[:quantity] %>

+

價錢 : <%= @product[:price] %>

+
+
\ No newline at end of file diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb new file mode 100644 index 0000000..46da0b4 --- /dev/null +++ b/app/views/layouts/_header.html.erb @@ -0,0 +1,28 @@ + \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index da9769d..1d5530c 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -2,13 +2,17 @@ Artstore - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> - <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> + + + <%= csrf_meta_tags %> + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> - -<%= yield %> - +<%= render 'layouts/header' if @enable_nav%> +
+ <%= yield %> +
+<%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb new file mode 100644 index 0000000..36ba13d --- /dev/null +++ b/config/initializers/devise.rb @@ -0,0 +1,256 @@ +# Use this hook to configure devise mailer, warden hooks and so forth. +# Many of these configuration options can be set straight in your model. +Devise.setup do |config| + # The secret key used by Devise. Devise uses this key to generate + # random tokens. Changing this key will render invalid all existing + # confirmation, reset password and unlock tokens in the database. + # config.secret_key = '719058740864b8ed9ed3d666827d191c25dd7002ddcde81b3b900327f82c672fcb14aeef5c05419474788080e2d6a6a901508d6815548e5555f7af02dd535b47' + + # ==> Mailer Configuration + # Configure the e-mail address which will be shown in Devise::Mailer, + # note that it will be overwritten if you use your own mailer class + # with default "from" parameter. + config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' + + # Configure the class responsible to send e-mails. + # config.mailer = 'Devise::Mailer' + + # ==> ORM configuration + # Load and configure the ORM. Supports :active_record (default) and + # :mongoid (bson_ext recommended) by default. Other ORMs may be + # available as additional gems. + require 'devise/orm/active_record' + + # ==> Configuration for any authentication mechanism + # Configure which keys are used when authenticating a user. The default is + # just :email. You can configure it to use [:username, :subdomain], so for + # authenticating a user, both parameters are required. Remember that those + # parameters are used only when authenticating and not when retrieving from + # session. If you need permissions, you should implement that in a before filter. + # You can also supply a hash where the value is a boolean determining whether + # or not authentication should be aborted when the value is not present. + # config.authentication_keys = [ :email ] + + # Configure parameters from the request object used for authentication. Each entry + # given should be a request method and it will automatically be passed to the + # find_for_authentication method and considered in your model lookup. For instance, + # if you set :request_keys to [:subdomain], :subdomain will be used on authentication. + # The same considerations mentioned for authentication_keys also apply to request_keys. + # config.request_keys = [] + + # Configure which authentication keys should be case-insensitive. + # These keys will be downcased upon creating or modifying a user and when used + # to authenticate or find a user. Default is :email. + config.case_insensitive_keys = [ :email ] + + # Configure which authentication keys should have whitespace stripped. + # These keys will have whitespace before and after removed upon creating or + # modifying a user and when used to authenticate or find a user. Default is :email. + config.strip_whitespace_keys = [ :email ] + + # Tell if authentication through request.params is enabled. True by default. + # It can be set to an array that will enable params authentication only for the + # given strategies, for example, `config.params_authenticatable = [:database]` will + # enable it only for database (email + password) authentication. + # config.params_authenticatable = true + + # Tell if authentication through HTTP Auth is enabled. False by default. + # It can be set to an array that will enable http authentication only for the + # given strategies, for example, `config.http_authenticatable = [:database]` will + # enable it only for database authentication. The supported strategies are: + # :database = Support basic authentication with authentication key + password + # config.http_authenticatable = false + + # If http headers should be returned for AJAX requests. True by default. + # config.http_authenticatable_on_xhr = true + + # The realm used in Http Basic Authentication. 'Application' by default. + # config.http_authentication_realm = 'Application' + + # It will change confirmation, password recovery and other workflows + # to behave the same regardless if the e-mail provided was right or wrong. + # Does not affect registerable. + # config.paranoid = true + + # By default Devise will store the user in session. You can skip storage for + # particular strategies by setting this option. + # Notice that if you are skipping storage for all authentication paths, you + # may want to disable generating routes to Devise's sessions controller by + # passing skip: :sessions to `devise_for` in your config/routes.rb + config.skip_session_storage = [:http_auth] + + # By default, Devise cleans up the CSRF token on authentication to + # avoid CSRF token fixation attacks. This means that, when using AJAX + # requests for sign in and sign up, you need to get a new CSRF token + # from the server. You can disable this option at your own risk. + # config.clean_up_csrf_token_on_authentication = true + + # ==> Configuration for :database_authenticatable + # For bcrypt, this is the cost for hashing the password and defaults to 10. If + # using other encryptors, it sets how many times you want the password re-encrypted. + # + # Limiting the stretches to just one in testing will increase the performance of + # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use + # a value less than 10 in other environments. Note that, for bcrypt (the default + # encryptor), the cost increases exponentially with the number of stretches (e.g. + # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation). + config.stretches = Rails.env.test? ? 1 : 10 + + # Setup a pepper to generate the encrypted password. + # config.pepper = '4ca517370d4b3b6ec297c1e08596a8f19c9e2e02300f781e4a9c0c29d54b936991e6602ee83e9bd03d23f189b68dc769447ee350af2ba33fc8a8e03f1f5c978d' + + # ==> Configuration for :confirmable + # A period that the user is allowed to access the website even without + # confirming their account. For instance, if set to 2.days, the user will be + # able to access the website for two days without confirming their account, + # access will be blocked just in the third day. Default is 0.days, meaning + # the user cannot access the website without confirming their account. + # config.allow_unconfirmed_access_for = 2.days + + # A period that the user is allowed to confirm their account before their + # token becomes invalid. For example, if set to 3.days, the user can confirm + # their account within 3 days after the mail was sent, but on the fourth day + # their account can't be confirmed with the token any more. + # Default is nil, meaning there is no restriction on how long a user can take + # before confirming their account. + # config.confirm_within = 3.days + + # If true, requires any email changes to be confirmed (exactly the same way as + # initial account confirmation) to be applied. Requires additional unconfirmed_email + # db field (see migrations). Until confirmed, new email is stored in + # unconfirmed_email column, and copied to email column on successful confirmation. + config.reconfirmable = true + + # Defines which key will be used when confirming an account + # config.confirmation_keys = [ :email ] + + # ==> Configuration for :rememberable + # The time the user will be remembered without asking for credentials again. + # config.remember_for = 2.weeks + + # If true, extends the user's remember period when remembered via cookie. + # config.extend_remember_period = false + + # Options to be passed to the created cookie. For instance, you can set + # secure: true in order to force SSL only cookies. + # config.rememberable_options = {} + + # ==> Configuration for :validatable + # Range for password length. + config.password_length = 8..128 + + # Email regex used to validate email formats. It simply asserts that + # one (and only one) @ exists in the given string. This is mainly + # to give user feedback and not to assert the e-mail validity. + # config.email_regexp = /\A[^@]+@[^@]+\z/ + + # ==> Configuration for :timeoutable + # The time you want to timeout the user session without activity. After this + # time the user will be asked for credentials again. Default is 30 minutes. + # config.timeout_in = 30.minutes + + # If true, expires auth token on session timeout. + # config.expire_auth_token_on_timeout = false + + # ==> Configuration for :lockable + # Defines which strategy will be used to lock an account. + # :failed_attempts = Locks an account after a number of failed attempts to sign in. + # :none = No lock strategy. You should handle locking by yourself. + # config.lock_strategy = :failed_attempts + + # Defines which key will be used when locking and unlocking an account + # config.unlock_keys = [ :email ] + + # Defines which strategy will be used to unlock an account. + # :email = Sends an unlock link to the user email + # :time = Re-enables login after a certain amount of time (see :unlock_in below) + # :both = Enables both strategies + # :none = No unlock strategy. You should handle unlocking by yourself. + # config.unlock_strategy = :both + + # Number of authentication tries before locking an account if lock_strategy + # is failed attempts. + # config.maximum_attempts = 20 + + # Time interval to unlock the account if :time is enabled as unlock_strategy. + # config.unlock_in = 1.hour + + # Warn on the last attempt before the account is locked. + # config.last_attempt_warning = false + + # ==> Configuration for :recoverable + # + # Defines which key will be used when recovering the password for an account + # config.reset_password_keys = [ :email ] + + # Time interval you can reset your password with a reset password key. + # Don't put a too small interval or your users won't have the time to + # change their passwords. + config.reset_password_within = 6.hours + + # ==> Configuration for :encryptable + # Allow you to use another encryption algorithm besides bcrypt (default). You can use + # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1, + # :authlogic_sha512 (then you should set stretches above to 20 for default behavior) + # and :restful_authentication_sha1 (then you should set stretches to 10, and copy + # REST_AUTH_SITE_KEY to pepper). + # + # Require the `devise-encryptable` gem when using anything other than bcrypt + # config.encryptor = :sha512 + + # ==> Scopes configuration + # Turn scoped views on. Before rendering "sessions/new", it will first check for + # "users/sessions/new". It's turned off by default because it's slower if you + # are using only default views. + # config.scoped_views = false + + # Configure the default scope given to Warden. By default it's the first + # devise role declared in your routes (usually :user). + # config.default_scope = :user + + # Set this configuration to false if you want /users/sign_out to sign out + # only the current scope. By default, Devise signs out all scopes. + # config.sign_out_all_scopes = true + + # ==> Navigation configuration + # Lists the formats that should be treated as navigational. Formats like + # :html, should redirect to the sign in page when the user does not have + # access, but formats like :xml or :json, should return 401. + # + # If you have any extra navigational formats, like :iphone or :mobile, you + # should add them to the navigational formats lists. + # + # The "*/*" below is required to match Internet Explorer requests. + # config.navigational_formats = ['*/*', :html] + + # The default HTTP method used to sign out a resource. Default is :delete. + config.sign_out_via = :delete + + # ==> OmniAuth + # Add a new OmniAuth provider. Check the wiki for more information on setting + # up on your models and hooks. + # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo' + + # ==> Warden configuration + # If you want to use other strategies, that are not supported by Devise, or + # change the failure app, you can configure them inside the config.warden block. + # + # config.warden do |manager| + # manager.intercept_401 = false + # manager.default_strategies(scope: :user).unshift :some_external_strategy + # end + + # ==> Mountable engine configurations + # When using Devise inside an engine, let's call it `MyEngine`, and this engine + # is mountable, there are some extra configurations to be taken into account. + # The following options are available, assuming the engine is mounted as: + # + # mount MyEngine, at: '/my_engine' + # + # The router that invoked `devise_for`, in the example above, would be: + # config.router_name = :my_engine + # + # When using omniauth, Devise cannot automatically set Omniauth path, + # so you need to do it manually. For the users scope, it would be: + # config.omniauth_path_prefix = '/my_engine/users/auth' +end diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb new file mode 100644 index 0000000..6986de9 --- /dev/null +++ b/config/initializers/simple_form.rb @@ -0,0 +1,145 @@ +# Use this setup block to configure all options available in SimpleForm. +SimpleForm.setup do |config| + # Wrappers are used by the form builder to generate a + # complete input. You can remove any component from the + # wrapper, change the order or even add your own to the + # stack. The options given below are used to wrap the + # whole input. + config.wrappers :default, class: :input, + hint_class: :field_with_hint, error_class: :field_with_errors do |b| + ## Extensions enabled by default + # Any of these extensions can be disabled for a + # given input by passing: `f.input EXTENSION_NAME => false`. + # You can make any of these extensions optional by + # renaming `b.use` to `b.optional`. + + # Determines whether to use HTML5 (:email, :url, ...) + # and required attributes + b.use :html5 + + # Calculates placeholders automatically from I18n + # You can also pass a string as f.input placeholder: "Placeholder" + b.use :placeholder + + ## Optional extensions + # They are disabled unless you pass `f.input EXTENSION_NAME => :lookup` + # to the input. If so, they will retrieve the values from the model + # if any exists. If you want to enable the lookup for any of those + # extensions by default, you can change `b.optional` to `b.use`. + + # Calculates maxlength from length validations for string inputs + b.optional :maxlength + + # Calculates pattern from format validations for string inputs + b.optional :pattern + + # Calculates min and max from length validations for numeric inputs + b.optional :min_max + + # Calculates readonly automatically from readonly attributes + b.optional :readonly + + ## Inputs + b.use :label_input + b.use :hint, wrap_with: { tag: :span, class: :hint } + b.use :error, wrap_with: { tag: :span, class: :error } + end + + # The default wrapper to be used by the FormBuilder. + config.default_wrapper = :default + + # Define the way to render check boxes / radio buttons with labels. + # Defaults to :nested for bootstrap config. + # inline: input + label + # nested: label > input + config.boolean_style = :nested + + # Default class for buttons + config.button_class = 'btn' + + # Method used to tidy up errors. Specify any Rails Array method. + # :first lists the first message for each field. + # Use :to_sentence to list all errors for each field. + # config.error_method = :first + + # Default tag used for error notification helper. + config.error_notification_tag = :div + + # CSS class to add for error notification helper. + config.error_notification_class = 'alert alert-error' + + # ID to add for error notification helper. + # config.error_notification_id = nil + + # Series of attempts to detect a default label method for collection. + # config.collection_label_methods = [ :to_label, :name, :title, :to_s ] + + # Series of attempts to detect a default value method for collection. + # config.collection_value_methods = [ :id, :to_s ] + + # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none. + # config.collection_wrapper_tag = nil + + # You can define the class to use on all collection wrappers. Defaulting to none. + # config.collection_wrapper_class = nil + + # You can wrap each item in a collection of radio/check boxes with a tag, + # defaulting to :span. Please note that when using :boolean_style = :nested, + # SimpleForm will force this option to be a label. + # config.item_wrapper_tag = :span + + # You can define a class to use in all item wrappers. Defaulting to none. + # config.item_wrapper_class = nil + + # How the label text should be generated altogether with the required text. + # config.label_text = lambda { |label, required| "#{required} #{label}" } + + # You can define the class to use on all labels. Default is nil. + config.label_class = 'control-label' + + # You can define the class to use on all forms. Default is simple_form. + # config.form_class = :simple_form + + # You can define which elements should obtain additional classes + # config.generate_additional_classes_for = [:wrapper, :label, :input] + + # Whether attributes are required by default (or not). Default is true. + # config.required_by_default = true + + # Tell browsers whether to use the native HTML5 validations (novalidate form option). + # These validations are enabled in SimpleForm's internal config but disabled by default + # in this configuration, which is recommended due to some quirks from different browsers. + # To stop SimpleForm from generating the novalidate option, enabling the HTML5 validations, + # change this configuration to true. + config.browser_validations = false + + # Collection of methods to detect if a file type was given. + # config.file_methods = [ :mounted_as, :file?, :public_filename ] + + # Custom mappings for input types. This should be a hash containing a regexp + # to match as key, and the input type that will be used when the field name + # matches the regexp as value. + # config.input_mappings = { /count/ => :integer } + + # Custom wrappers for input types. This should be a hash containing an input + # type as key and the wrapper that will be used for all inputs with specified type. + # config.wrapper_mappings = { string: :prepend } + + # Default priority for time_zone inputs. + # config.time_zone_priority = nil + + # Default priority for country inputs. + # config.country_priority = nil + + # When false, do not use translations for labels. + # config.translate_labels = true + + # Automatically discover new inputs in Rails' autoload path. + # config.inputs_discovery = true + + # Cache SimpleForm inputs discovery + # config.cache_discovery = !Rails.env.development? + + # Default class for inputs + # config.input_class = nil +end diff --git a/config/initializers/simple_form_bootstrap.rb b/config/initializers/simple_form_bootstrap.rb new file mode 100644 index 0000000..ad4ca74 --- /dev/null +++ b/config/initializers/simple_form_bootstrap.rb @@ -0,0 +1,45 @@ +# Use this setup block to configure all options available in SimpleForm. +SimpleForm.setup do |config| + config.wrappers :bootstrap, tag: 'div', class: 'control-group', error_class: 'error' do |b| + b.use :html5 + b.use :placeholder + b.use :label + b.wrapper tag: 'div', class: 'controls' do |ba| + ba.use :input + ba.use :error, wrap_with: { tag: 'span', class: 'help-inline' } + ba.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + end + + config.wrappers :prepend, tag: 'div', class: "control-group", error_class: 'error' do |b| + b.use :html5 + b.use :placeholder + b.use :label + b.wrapper tag: 'div', class: 'controls' do |input| + input.wrapper tag: 'div', class: 'input-prepend' do |prepend| + prepend.use :input + end + input.use :hint, wrap_with: { tag: 'span', class: 'help-block' } + input.use :error, wrap_with: { tag: 'span', class: 'help-inline' } + end + end + + config.wrappers :append, tag: 'div', class: "control-group", error_class: 'error' do |b| + b.use :html5 + b.use :placeholder + b.use :label + b.wrapper tag: 'div', class: 'controls' do |input| + input.wrapper tag: 'div', class: 'input-append' do |append| + append.use :input + end + input.use :hint, wrap_with: { tag: 'span', class: 'help-block' } + input.use :error, wrap_with: { tag: 'span', class: 'help-inline' } + end + end + + # Wrappers for forms and inputs using the Twitter Bootstrap toolkit. + # Check the Bootstrap docs (http://twitter.github.com/bootstrap) + # to learn about the different styles for forms and inputs, + # buttons and other elements. + config.default_wrapper = :bootstrap +end diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml new file mode 100644 index 0000000..abccdb0 --- /dev/null +++ b/config/locales/devise.en.yml @@ -0,0 +1,59 @@ +# Additional translations at https://github.com/plataformatec/devise/wiki/I18n + +en: + devise: + confirmations: + confirmed: "Your account was successfully confirmed." + send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes." + send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes." + failure: + already_authenticated: "You are already signed in." + inactive: "Your account is not activated yet." + invalid: "Invalid email or password." + locked: "Your account is locked." + last_attempt: "You have one more attempt before your account will be locked." + not_found_in_database: "Invalid email or password." + timeout: "Your session expired. Please sign in again to continue." + unauthenticated: "You need to sign in or sign up before continuing." + unconfirmed: "You have to confirm your account before continuing." + mailer: + confirmation_instructions: + subject: "Confirmation instructions" + reset_password_instructions: + subject: "Reset password instructions" + unlock_instructions: + subject: "Unlock Instructions" + omniauth_callbacks: + failure: "Could not authenticate you from %{kind} because \"%{reason}\"." + success: "Successfully authenticated from %{kind} account." + passwords: + no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided." + send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes." + send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes." + updated: "Your password was changed successfully. You are now signed in." + updated_not_active: "Your password was changed successfully." + registrations: + destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon." + signed_up: "Welcome! You have signed up successfully." + signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated." + signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked." + signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please open the link to activate your account." + update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address." + updated: "You updated your account successfully." + sessions: + signed_in: "Signed in successfully." + signed_out: "Signed out successfully." + unlocks: + send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes." + send_paranoid_instructions: "If your account exists, you will receive an email with instructions about how to unlock it in a few minutes." + unlocked: "Your account has been unlocked successfully. Please sign in to continue." + errors: + messages: + already_confirmed: "was already confirmed, please try signing in" + confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one" + expired: "has expired, please request a new one" + not_found: "not found" + not_locked: "was not locked" + not_saved: + one: "1 error prohibited this %{resource} from being saved:" + other: "%{count} errors prohibited this %{resource} from being saved:" diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml new file mode 100644 index 0000000..0df11fe --- /dev/null +++ b/config/locales/simple_form.en.yml @@ -0,0 +1,26 @@ +en: + simple_form: + "yes": 'Yes' + "no": 'No' + required: + text: 'required' + mark: '*' + # You can uncomment the line below if you need to overwrite the whole required html. + # When using html, text and mark won't be used. + # html: '*' + error_notification: + default_message: "Please review the problems below:" + # Labels and hints examples + # labels: + # defaults: + # password: 'Password' + # user: + # new: + # email: 'E-mail to sign in.' + # edit: + # email: 'E-mail.' + # hints: + # defaults: + # username: 'User name to sign in.' + # password: 'No special characters, please.' + diff --git a/config/routes.rb b/config/routes.rb index 3f66539..bec1adf 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,11 @@ Rails.application.routes.draw do + devise_for :users + namespace :admin do + resources :products + end + get 'admin/products/' => 'products#index' + get 'back_end/' => 'admin/products#new' + root 'admin/products#index' # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". diff --git a/db/migrate/20140707121534_create_products.rb b/db/migrate/20140707121534_create_products.rb new file mode 100644 index 0000000..805c976 --- /dev/null +++ b/db/migrate/20140707121534_create_products.rb @@ -0,0 +1,11 @@ +class CreateProducts < ActiveRecord::Migration + def change + create_table :products do |t| + t.string :title + t.text :description + t.integer :quantity + + t.timestamps + end + end +end diff --git a/db/migrate/20140707124034_devise_create_users.rb b/db/migrate/20140707124034_devise_create_users.rb new file mode 100644 index 0000000..cf497c2 --- /dev/null +++ b/db/migrate/20140707124034_devise_create_users.rb @@ -0,0 +1,42 @@ +class DeviseCreateUsers < ActiveRecord::Migration + def change + create_table(:users) do |t| + ## Database authenticatable + t.string :email, null: false, default: "" + t.string :encrypted_password, null: false, default: "" + + ## Recoverable + t.string :reset_password_token + t.datetime :reset_password_sent_at + + ## Rememberable + t.datetime :remember_created_at + + ## Trackable + t.integer :sign_in_count, default: 0, null: false + t.datetime :current_sign_in_at + t.datetime :last_sign_in_at + t.string :current_sign_in_ip + t.string :last_sign_in_ip + + ## Confirmable + # t.string :confirmation_token + # t.datetime :confirmed_at + # t.datetime :confirmation_sent_at + # t.string :unconfirmed_email # Only if using reconfirmable + + ## Lockable + # t.integer :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts + # t.string :unlock_token # Only if unlock strategy is :email or :both + # t.datetime :locked_at + + + t.timestamps + end + + add_index :users, :email, unique: true + add_index :users, :reset_password_token, unique: true + # add_index :users, :confirmation_token, unique: true + # add_index :users, :unlock_token, unique: true + end +end diff --git a/db/migrate/20140707125509_add_is_admin_to_user.rb b/db/migrate/20140707125509_add_is_admin_to_user.rb new file mode 100644 index 0000000..1ef84cf --- /dev/null +++ b/db/migrate/20140707125509_add_is_admin_to_user.rb @@ -0,0 +1,5 @@ +class AddIsAdminToUser < ActiveRecord::Migration + def change + add_column :users, :is_admin, :boolean, :default => false + end +end diff --git a/db/migrate/20140709094801_add_pirce_to_product.rb b/db/migrate/20140709094801_add_pirce_to_product.rb new file mode 100644 index 0000000..01cb0d4 --- /dev/null +++ b/db/migrate/20140709094801_add_pirce_to_product.rb @@ -0,0 +1,5 @@ +class AddPirceToProduct < ActiveRecord::Migration + def change + add_column :products, :price, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000..a3d68d4 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,44 @@ +# encoding: UTF-8 +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 20140709094801) do + + create_table "products", force: true do |t| + t.string "title" + t.text "description" + t.integer "quantity" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "price" + end + + create_table "users", force: true do |t| + t.string "email", default: "", null: false + t.string "encrypted_password", default: "", null: false + t.string "reset_password_token" + t.datetime "reset_password_sent_at" + t.datetime "remember_created_at" + t.integer "sign_in_count", default: 0, null: false + t.datetime "current_sign_in_at" + t.datetime "last_sign_in_at" + t.string "current_sign_in_ip" + t.string "last_sign_in_ip" + t.datetime "created_at" + t.datetime "updated_at" + t.boolean "is_admin", default: false + end + + add_index "users", ["email"], name: "index_users_on_email", unique: true + add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true + +end diff --git a/lib/templates/erb/scaffold/_form.html.erb b/lib/templates/erb/scaffold/_form.html.erb new file mode 100644 index 0000000..201a069 --- /dev/null +++ b/lib/templates/erb/scaffold/_form.html.erb @@ -0,0 +1,13 @@ +<%%= simple_form_for(@<%= singular_table_name %>) do |f| %> + <%%= f.error_notification %> + +
+ <%- attributes.each do |attribute| -%> + <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> %> + <%- end -%> +
+ +
+ <%%= f.button :submit %> +
+<%% end %> diff --git a/test/controllers/admin/products_controller_test.rb b/test/controllers/admin/products_controller_test.rb new file mode 100644 index 0000000..508fe6b --- /dev/null +++ b/test/controllers/admin/products_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class Admin::ProductsControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml new file mode 100644 index 0000000..c3b9bc1 --- /dev/null +++ b/test/fixtures/products.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + description: MyText + quantity: 1 + +two: + title: MyString + description: MyText + quantity: 1 diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 0000000..937a0c0 --- /dev/null +++ b/test/fixtures/users.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/helpers/admin/products_helper_test.rb b/test/helpers/admin/products_helper_test.rb new file mode 100644 index 0000000..0b696b1 --- /dev/null +++ b/test/helpers/admin/products_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class Admin::ProductsHelperTest < ActionView::TestCase +end diff --git a/test/models/product_test.rb b/test/models/product_test.rb new file mode 100644 index 0000000..211cdd0 --- /dev/null +++ b/test/models/product_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class ProductTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/user_test.rb b/test/models/user_test.rb new file mode 100644 index 0000000..82f61e0 --- /dev/null +++ b/test/models/user_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class UserTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end From ee0c4cf0e22173f354f96fbbeb384af260b07af9 Mon Sep 17 00:00:00 2001 From: BobLin Date: Wed, 9 Jul 2014 20:47:06 +0800 Subject: [PATCH 2/6] =?UTF-8?q?ADD:=E5=8A=A0=E5=85=A5=E8=B3=BC=E7=89=A9?= =?UTF-8?q?=E8=BB=8A=E6=8C=89=E9=88=95,=E5=BE=8C=E5=8F=B0=E9=80=A3?= =?UTF-8?q?=E7=B5=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 5 +++++ app/views/admin/products/show.html.erb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 627c057..4c3e773 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2,9 +2,14 @@ module ApplicationHelper def frontEndHeaders @enable_nav = true @headers = [{:title=>"我的購物車",:link=>"/"},{:title=>"我的訂單",:link=>"/"}] + addBackendLink if user_signed_in? end def backEndHeaders @enable_nav = true @headers = [{:title=>"商品上架",:link=>"/back_end"}] end + + def addBackendLink + @headers.push({:title=>"後台",:link=>"/back_end"}) if current_user.admin? + end end diff --git a/app/views/admin/products/show.html.erb b/app/views/admin/products/show.html.erb index 9eaf64f..872822b 100644 --- a/app/views/admin/products/show.html.erb +++ b/app/views/admin/products/show.html.erb @@ -6,6 +6,7 @@

<%= @product[:title] %>

<%= @product[:description] %>

數量 : <%= @product[:quantity] %>

-

價錢 : <%= @product[:price] %>

+

價錢 : $<%= @product[:price] %>

+ 加入購物車 \ No newline at end of file From 49b3a42a718eefb4b7e45c667e5c93de5024c83d Mon Sep 17 00:00:00 2001 From: BobLin Date: Wed, 9 Jul 2014 22:30:36 +0800 Subject: [PATCH 3/6] =?UTF-8?q?MODIFY:=E5=B0=87Product=E5=88=86=E5=89=8D?= =?UTF-8?q?=E5=BE=8C=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/artstore.iml | 1 + Gemfile | 1 + Gemfile.lock | 2 + app/assets/javascripts/main.js | 3 ++ app/controllers/admin/products_controller.rb | 15 ++---- app/controllers/products_controller.rb | 9 ++++ app/helpers/application_helper.rb | 9 +--- app/uploaders/image_uploader.rb | 51 +++++++++++++++++++ app/views/admin/products/new.html.erb | 4 +- app/views/layouts/_header.html.erb | 19 ++++--- app/views/{admin => }/products/index.html.erb | 0 app/views/{admin => }/products/show.html.erb | 0 config/routes.rb | 6 +-- 13 files changed, 91 insertions(+), 29 deletions(-) create mode 100644 app/assets/javascripts/main.js create mode 100644 app/controllers/products_controller.rb create mode 100644 app/uploaders/image_uploader.rb rename app/views/{admin => }/products/index.html.erb (100%) rename app/views/{admin => }/products/show.html.erb (100%) diff --git a/.idea/artstore.iml b/.idea/artstore.iml index 9241228..2c651a3 100644 --- a/.idea/artstore.iml +++ b/.idea/artstore.iml @@ -213,6 +213,7 @@ + diff --git a/Gemfile b/Gemfile index 9f01a13..a61b8d5 100644 --- a/Gemfile +++ b/Gemfile @@ -33,6 +33,7 @@ gem 'bootstrap-sass', '~> 3.2.0' gem 'simple_form' gem 'carrierwave' +gem 'rmagick' # Use ActiveModel has_secure_password # gem 'bcrypt', '~> 3.1.7' diff --git a/Gemfile.lock b/Gemfile.lock index 79d0280..d4379f0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -90,6 +90,7 @@ GEM rake (10.3.2) rdoc (4.1.1) json (~> 1.4) + rmagick (2.13.2) sass (3.2.19) sass-rails (4.0.3) railties (>= 4.0.0, < 5.0) @@ -140,6 +141,7 @@ DEPENDENCIES jbuilder (~> 2.0) jquery-rails rails (= 4.1.0) + rmagick sass-rails (~> 4.0.3) sdoc (~> 0.4.0) simple_form diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js new file mode 100644 index 0000000..1435aaa --- /dev/null +++ b/app/assets/javascripts/main.js @@ -0,0 +1,3 @@ +$(document).ready(function() { + $('.dropdown-toggle').dropdown(); +}); \ No newline at end of file diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb index 5c0d31a..1de3a95 100644 --- a/app/controllers/admin/products_controller.rb +++ b/app/controllers/admin/products_controller.rb @@ -1,17 +1,12 @@ class Admin::ProductsController < ApplicationController - before_action :authenticate_user! ,only: :new - before_action :admin_required,only: :new - before_action :backEndHeaders,only: :new - before_action :frontEndHeaders,only: [:index,:show] + before_action :authenticate_user! + before_action :admin_required + before_action :backEndHeaders def new @product = Product.new end - def show - @product = Product.find(params[:id]) - end - def create @product = Product.new(product_params) @@ -22,10 +17,6 @@ def create end end - def index - @products = Product.all - end - private def product_params params.require(:product).permit(:title, :description,:quantity,:price) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb new file mode 100644 index 0000000..71a114c --- /dev/null +++ b/app/controllers/products_controller.rb @@ -0,0 +1,9 @@ +class ProductsController < ApplicationController + before_action :frontEndHeaders + def index + @products = Product.all + end + def show + @product = Product.find(params[:id]) + end +end \ No newline at end of file diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 4c3e773..7370bae 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,15 +1,10 @@ module ApplicationHelper def frontEndHeaders @enable_nav = true - @headers = [{:title=>"我的購物車",:link=>"/"},{:title=>"我的訂單",:link=>"/"}] - addBackendLink if user_signed_in? + @headers = [{:title=>"我的購物車",:link=>"#"},{:title=>"我的訂單",:link=>"#"}] end def backEndHeaders @enable_nav = true - @headers = [{:title=>"商品上架",:link=>"/back_end"}] - end - - def addBackendLink - @headers.push({:title=>"後台",:link=>"/back_end"}) if current_user.admin? + @headers = [{:title=>"商品上架",:link=>"/admin/products/new"}] end end diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb new file mode 100644 index 0000000..2fc27d0 --- /dev/null +++ b/app/uploaders/image_uploader.rb @@ -0,0 +1,51 @@ +# encoding: utf-8 + +class ImageUploader < CarrierWave::Uploader::Base + + # Include RMagick or MiniMagick support: + # include CarrierWave::RMagick + # include CarrierWave::MiniMagick + + # Choose what kind of storage to use for this uploader: + storage :file + # storage :fog + + # Override the directory where uploaded files will be stored. + # This is a sensible default for uploaders that are meant to be mounted: + def store_dir + "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}" + end + + # Provide a default URL as a default if there hasn't been a file uploaded: + # def default_url + # # For Rails 3.1+ asset pipeline compatibility: + # # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_')) + # + # "/images/fallback/" + [version_name, "default.png"].compact.join('_') + # end + + # Process files as they are uploaded: + # process :scale => [200, 300] + # + # def scale(width, height) + # # do something + # end + + # Create different versions of your uploaded files: + # version :thumb do + # process :resize_to_fit => [50, 50] + # end + + # Add a white list of extensions which are allowed to be uploaded. + # For images you might use something like this: + # def extension_white_list + # %w(jpg jpeg gif png) + # end + + # Override the filename of the uploaded files: + # Avoid using model.id or version_name here, see uploader/store.rb for details. + # def filename + # "something.jpg" if original_filename + # end + +end diff --git a/app/views/admin/products/new.html.erb b/app/views/admin/products/new.html.erb index 4cbd869..33c8e6d 100644 --- a/app/views/admin/products/new.html.erb +++ b/app/views/admin/products/new.html.erb @@ -1,4 +1,6 @@ -<%= simple_form_for([:admin, @product], html: {class: 'form-horizontal' },defaults: { input_html: { class: 'form-control' }}) do |f| %> +

新增商品

+ +<%= simple_form_for([:admin, @product], html: {class: 'form form-horizontal' },defaults: { input_html: { class: 'form-control' }}) do |f| %>
<%= f.input :title,label: '名稱'%>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 46da0b4..f577b15 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -12,16 +12,23 @@
    -
  • <% if !current_user %> + <% if !current_user %> +
  • <%= link_to("登入", new_user_session_path) %> - <% else %> - <%= link_to("登出", destroy_user_session_path, :method => :delete ) %> - <% end %> -
    • + + <% else %> +
  • + 其他 + +
    • + <% end %>
diff --git a/app/views/admin/products/index.html.erb b/app/views/products/index.html.erb similarity index 100% rename from app/views/admin/products/index.html.erb rename to app/views/products/index.html.erb diff --git a/app/views/admin/products/show.html.erb b/app/views/products/show.html.erb similarity index 100% rename from app/views/admin/products/show.html.erb rename to app/views/products/show.html.erb diff --git a/config/routes.rb b/config/routes.rb index bec1adf..3f636e6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,9 +3,9 @@ namespace :admin do resources :products end - get 'admin/products/' => 'products#index' - get 'back_end/' => 'admin/products#new' - root 'admin/products#index' + match 'admin/products/:action' => 'products#:action', via: [:get, :post] + match 'products/:action/:id' => 'products#:action/:id', via: [:get] + root 'products#index' # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". From a35927962a6a07910974c3e3b9be26beb805a45b Mon Sep 17 00:00:00 2001 From: BobLin Date: Thu, 10 Jul 2014 13:39:47 +0800 Subject: [PATCH 4/6] MODIFY:photo upload --- .idea/artstore.iml | 1 + Gemfile | 2 +- app/controllers/admin/products_controller.rb | 6 +++--- app/models/photo.rb | 4 ++++ app/models/product.rb | 10 ++++++++++ app/uploaders/image_uploader.rb | 12 ++++++++---- app/views/admin/products/new.html.erb | 5 +++++ app/views/layouts/_header.html.erb | 2 +- app/views/products/index.html.erb | 2 +- app/views/products/show.html.erb | 2 +- db/migrate/20140710023825_create_photos.rb | 10 ++++++++++ db/schema.rb | 9 ++++++++- test/fixtures/photos.yml | 9 +++++++++ test/models/photos_test.rb | 7 +++++++ 14 files changed, 69 insertions(+), 12 deletions(-) create mode 100644 app/models/photo.rb create mode 100644 db/migrate/20140710023825_create_photos.rb create mode 100644 test/fixtures/photos.yml create mode 100644 test/models/photos_test.rb diff --git a/.idea/artstore.iml b/.idea/artstore.iml index 2c651a3..1312314 100644 --- a/.idea/artstore.iml +++ b/.idea/artstore.iml @@ -128,6 +128,7 @@ + diff --git a/Gemfile b/Gemfile index a61b8d5..fcc9e4c 100644 --- a/Gemfile +++ b/Gemfile @@ -33,7 +33,7 @@ gem 'bootstrap-sass', '~> 3.2.0' gem 'simple_form' gem 'carrierwave' -gem 'rmagick' +gem 'rmagick', :require => 'RMagick' # Use ActiveModel has_secure_password # gem 'bcrypt', '~> 3.1.7' diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb index 1de3a95..0b2cf95 100644 --- a/app/controllers/admin/products_controller.rb +++ b/app/controllers/admin/products_controller.rb @@ -5,13 +5,13 @@ class Admin::ProductsController < ApplicationController def new @product = Product.new + @photo = @product.photos.new end def create @product = Product.new(product_params) - if @product.save - redirect_to admin_products_path + redirect_to root_path else render :new end @@ -19,6 +19,6 @@ def create private def product_params - params.require(:product).permit(:title, :description,:quantity,:price) + params.require(:product).permit(:title, :description,:quantity,:price,:photos_attributes => [:image]) end end \ No newline at end of file diff --git a/app/models/photo.rb b/app/models/photo.rb new file mode 100644 index 0000000..9acf5bf --- /dev/null +++ b/app/models/photo.rb @@ -0,0 +1,4 @@ +class Photo < ActiveRecord::Base + belongs_to :product + mount_uploader :image, ImageUploader +end diff --git a/app/models/product.rb b/app/models/product.rb index 077a819..d40cafa 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -1,2 +1,12 @@ class Product < ActiveRecord::Base + has_many :photos + accepts_nested_attributes_for :photos + + def getPhoto + self.photos.first.image_url(:original).to_s + end + + def getThumb + self.photos.first.image_url(:thumb).to_s + end end diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb index 2fc27d0..c79829a 100644 --- a/app/uploaders/image_uploader.rb +++ b/app/uploaders/image_uploader.rb @@ -3,7 +3,7 @@ class ImageUploader < CarrierWave::Uploader::Base # Include RMagick or MiniMagick support: - # include CarrierWave::RMagick + include CarrierWave::RMagick # include CarrierWave::MiniMagick # Choose what kind of storage to use for this uploader: @@ -32,9 +32,13 @@ def store_dir # end # Create different versions of your uploaded files: - # version :thumb do - # process :resize_to_fit => [50, 50] - # end + version :thumb do + process :resize_to_fill => [140, 140] + end + + version :original do + process :resize_to_fill => [500, 500] + end # Add a white list of extensions which are allowed to be uploaded. # For images you might use something like this: diff --git a/app/views/admin/products/new.html.erb b/app/views/admin/products/new.html.erb index 33c8e6d..b4bfa89 100644 --- a/app/views/admin/products/new.html.erb +++ b/app/views/admin/products/new.html.erb @@ -13,6 +13,11 @@
<%= f.input :price ,label: '價錢'%>
+
+ <%= f.simple_fields_for :photos do |c| %> + <%= c.input :image , :as => :file %> + <% end %> +

<%= f.button :submit,class: 'btn-primary'%> <% end %> \ No newline at end of file diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index f577b15..5571ce2 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -25,7 +25,7 @@ 其他 <% end %> diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index 1e97016..b1c2660 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -4,7 +4,7 @@
<% @products.each{ |product| %>
- Generic placeholder image + Generic placeholder image

<%= product[:title] %>

<%= product[:description] %>

diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 872822b..41e260a 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -1,6 +1,6 @@

- 500x500 + Generic placeholder image

<%= @product[:title] %>

diff --git a/db/migrate/20140710023825_create_photos.rb b/db/migrate/20140710023825_create_photos.rb new file mode 100644 index 0000000..de592bf --- /dev/null +++ b/db/migrate/20140710023825_create_photos.rb @@ -0,0 +1,10 @@ +class CreatePhotos < ActiveRecord::Migration + def change + create_table :photos do |t| + t.integer :product_id + t.string :image + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index a3d68d4..7c7b024 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,14 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140709094801) do +ActiveRecord::Schema.define(version: 20140710023825) do + + create_table "photos", force: true do |t| + t.integer "product_id" + t.string "image" + t.datetime "created_at" + t.datetime "updated_at" + end create_table "products", force: true do |t| t.string "title" diff --git a/test/fixtures/photos.yml b/test/fixtures/photos.yml new file mode 100644 index 0000000..5cc49b7 --- /dev/null +++ b/test/fixtures/photos.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + product_id: 1 + image: MyString + +two: + product_id: 1 + image: MyString diff --git a/test/models/photos_test.rb b/test/models/photos_test.rb new file mode 100644 index 0000000..b923979 --- /dev/null +++ b/test/models/photos_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class PhotosTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end From 5ad3f00cf18f8719dbfdcfc7fe04404ff08efe46 Mon Sep 17 00:00:00 2001 From: BobLin Date: Thu, 10 Jul 2014 16:09:18 +0800 Subject: [PATCH 5/6] MODIFY:form style --- .idea/artstore.iml | 54 ------------------- app/assets/stylesheets/main.css.scss | 14 +++++ app/views/admin/products/new.html.erb | 31 ++++------- app/views/devise/confirmations/new.html.erb | 16 ++++++ .../mailer/confirmation_instructions.html.erb | 5 ++ .../reset_password_instructions.html.erb | 8 +++ .../mailer/unlock_instructions.html.erb | 7 +++ app/views/devise/passwords/edit.html.erb | 19 +++++++ app/views/devise/passwords/new.html.erb | 15 ++++++ app/views/devise/registrations/edit.html.erb | 27 ++++++++++ app/views/devise/registrations/new.html.erb | 17 ++++++ app/views/devise/sessions/new.html.erb | 14 +++++ app/views/devise/shared/_links.erb | 25 +++++++++ app/views/devise/unlocks/new.html.erb | 16 ++++++ 14 files changed, 194 insertions(+), 74 deletions(-) create mode 100644 app/views/devise/confirmations/new.html.erb create mode 100644 app/views/devise/mailer/confirmation_instructions.html.erb create mode 100644 app/views/devise/mailer/reset_password_instructions.html.erb create mode 100644 app/views/devise/mailer/unlock_instructions.html.erb create mode 100644 app/views/devise/passwords/edit.html.erb create mode 100644 app/views/devise/passwords/new.html.erb create mode 100644 app/views/devise/registrations/edit.html.erb create mode 100644 app/views/devise/registrations/new.html.erb create mode 100644 app/views/devise/sessions/new.html.erb create mode 100644 app/views/devise/shared/_links.erb create mode 100644 app/views/devise/unlocks/new.html.erb diff --git a/.idea/artstore.iml b/.idea/artstore.iml index 1312314..7fe0f82 100644 --- a/.idea/artstore.iml +++ b/.idea/artstore.iml @@ -119,60 +119,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/assets/stylesheets/main.css.scss b/app/assets/stylesheets/main.css.scss index b97d678..6aba5e6 100644 --- a/app/assets/stylesheets/main.css.scss +++ b/app/assets/stylesheets/main.css.scss @@ -31,4 +31,18 @@ body @media (min-width: 992px) { margin-top: 120px; } +} + +.form { + max-width: 330px; + padding: 15px; + margin: 0 auto; + .checkbox{ + margin-left: 20px; + } + .labelText{ + float: right; + margin-top: -20px; + padding-right: 180px; + } } \ No newline at end of file diff --git a/app/views/admin/products/new.html.erb b/app/views/admin/products/new.html.erb index b4bfa89..5326345 100644 --- a/app/views/admin/products/new.html.erb +++ b/app/views/admin/products/new.html.erb @@ -1,23 +1,14 @@ -

新增商品

- -<%= simple_form_for([:admin, @product], html: {class: 'form form-horizontal' },defaults: { input_html: { class: 'form-control' }}) do |f| %> -
- <%= f.input :title,label: '名稱'%> -
-
- <%= f.input :description, as: :text ,label: '描述'%> -
-
- <%= f.input :quantity ,label: '數量'%> -
-
- <%= f.input :price ,label: '價錢'%> -
-
- <%= f.simple_fields_for :photos do |c| %> - <%= c.input :image , :as => :file %> - <% end %> -
+<%= simple_form_for([:admin, @product], + html: {class: 'form form-horizontal' }, + defaults: { input_html: { class: 'form-control' }}) do |f| %> +

新增商品

+ <%= f.input :title,label: '名稱'%> + <%= f.input :description, as: :text ,label: '描述'%> + <%= f.input :quantity ,label: '數量'%> + <%= f.input :price ,label: '價錢'%> + <%= f.simple_fields_for :photos do |c| %> + <%= c.input :image , :as => :file %> + <% end %>
<%= f.button :submit,class: 'btn-primary'%> <% end %> \ No newline at end of file diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb new file mode 100644 index 0000000..949b172 --- /dev/null +++ b/app/views/devise/confirmations/new.html.erb @@ -0,0 +1,16 @@ +

Resend confirmation instructions

+ +<%= simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %> + <%= f.error_notification %> + <%= f.full_error :confirmation_token %> + +
+ <%= f.input :email, required: true, autofocus: true %> +
+ +
+ <%= f.button :submit, "Resend confirmation instructions" %> +
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb new file mode 100644 index 0000000..dc55f64 --- /dev/null +++ b/app/views/devise/mailer/confirmation_instructions.html.erb @@ -0,0 +1,5 @@ +

Welcome <%= @email %>!

+ +

You can confirm your account email through the link below:

+ +

<%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %>

diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb new file mode 100644 index 0000000..f667dc1 --- /dev/null +++ b/app/views/devise/mailer/reset_password_instructions.html.erb @@ -0,0 +1,8 @@ +

Hello <%= @resource.email %>!

+ +

Someone has requested a link to change your password. You can do this through the link below.

+ +

<%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %>

+ +

If you didn't request this, please ignore this email.

+

Your password won't change until you access the link above and create a new one.

diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb new file mode 100644 index 0000000..41e148b --- /dev/null +++ b/app/views/devise/mailer/unlock_instructions.html.erb @@ -0,0 +1,7 @@ +

Hello <%= @resource.email %>!

+ +

Your account has been locked due to an excessive number of unsuccessful sign in attempts.

+ +

Click the link below to unlock your account:

+ +

<%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %>

diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb new file mode 100644 index 0000000..8f995ed --- /dev/null +++ b/app/views/devise/passwords/edit.html.erb @@ -0,0 +1,19 @@ +

Change your password

+ +<%= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %> + <%= f.error_notification %> + + <%= f.input :reset_password_token, as: :hidden %> + <%= f.full_error :reset_password_token %> + +
+ <%= f.input :password, label: "New password", required: true, autofocus: true %> + <%= f.input :password_confirmation, label: "Confirm your new password", required: true %> +
+ +
+ <%= f.button :submit, "Change my password" %> +
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb new file mode 100644 index 0000000..d1503e7 --- /dev/null +++ b/app/views/devise/passwords/new.html.erb @@ -0,0 +1,15 @@ +

Forgot your password?

+ +<%= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> + <%= f.error_notification %> + +
+ <%= f.input :email, required: true, autofocus: true %> +
+ +
+ <%= f.button :submit, "Send me reset password instructions" %> +
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb new file mode 100644 index 0000000..5db350b --- /dev/null +++ b/app/views/devise/registrations/edit.html.erb @@ -0,0 +1,27 @@ +

Edit <%= resource_name.to_s.humanize %>

+ +<%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %> + <%= f.error_notification %> + +
+ <%= f.input :email, required: true, autofocus: true %> + + <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %> +

Currently waiting confirmation for: <%= resource.unconfirmed_email %>

+ <% end %> + + <%= f.input :password, autocomplete: "off", hint: "leave it blank if you don't want to change it", required: false %> + <%= f.input :password_confirmation, required: false %> + <%= f.input :current_password, hint: "we need your current password to confirm your changes", required: true %> +
+ +
+ <%= f.button :submit, "Update" %> +
+<% end %> + +

Cancel my account

+ +

Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %>

+ +<%= link_to "Back", :back %> diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb new file mode 100644 index 0000000..090fb29 --- /dev/null +++ b/app/views/devise/registrations/new.html.erb @@ -0,0 +1,17 @@ +

Sign up

+ +<%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> + <%= f.error_notification %> + +
+ <%= f.input :email, required: true, autofocus: true %> + <%= f.input :password, required: true %> + <%= f.input :password_confirmation, required: true %> +
+ +
+ <%= f.button :submit, "Sign up" %> +
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb new file mode 100644 index 0000000..1bea562 --- /dev/null +++ b/app/views/devise/sessions/new.html.erb @@ -0,0 +1,14 @@ +<%= simple_form_for(resource, as: resource_name, + url: session_path(resource_name), + html: {class: 'form form-horizontal' }) do |f| %> +

登入

+ <%= f.input :email, required: false, autofocus: true, input_html: { class: 'form-control' } %> + <%= f.input :password, required: false, input_html: { class: 'form-control' } %> + <%= f.input_field :remember_me, input_html: { class: 'form-control' }, as: :boolean if devise_mapping.rememberable? %> + + +
+ <%= f.button :submit, "登入" ,class: 'btn-primary'%> +
+ <%= render "devise/shared/links" %> +<% end %> diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb new file mode 100644 index 0000000..d84bdde --- /dev/null +++ b/app/views/devise/shared/_links.erb @@ -0,0 +1,25 @@ +<%- if controller_name != 'sessions' %> + <%= link_to "Sign in", new_session_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.registerable? && controller_name != 'registrations' %> + <%= link_to "Sign up", new_registration_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> + <%= link_to "Forgot your password?", new_password_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> + <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> + <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.omniauthable? %> + <%- resource_class.omniauth_providers.each do |provider| %> + <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
+ <% end -%> +<% end -%> diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb new file mode 100644 index 0000000..788f62e --- /dev/null +++ b/app/views/devise/unlocks/new.html.erb @@ -0,0 +1,16 @@ +

Resend unlock instructions

+ +<%= simple_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %> + <%= f.error_notification %> + <%= f.full_error :unlock_token %> + +
+ <%= f.input :email, required: true, autofocus: true %> +
+ +
+ <%= f.button :submit, "Resend unlock instructions" %> +
+<% end %> + +<%= render "devise/shared/links" %> From debf5facd3e440cc563ba725bd931ccf24d2962e Mon Sep 17 00:00:00 2001 From: BobLin Date: Mon, 21 Jul 2014 10:35:34 +0800 Subject: [PATCH 6/6] ADD:homework_week2 --- Gemfile | 2 + Gemfile.lock | 2 + .../javascripts/account/order.js.coffee | 3 + app/assets/javascripts/admin/orders.js.coffee | 3 + app/assets/javascripts/application.js | 2 +- app/assets/javascripts/cart_items.js.coffee | 3 + app/assets/javascripts/orders.js.coffee | 3 + app/assets/stylesheets/account/order.css.scss | 3 + app/assets/stylesheets/admin/orders.css.scss | 3 + app/assets/stylesheets/cart_items.css.scss | 3 + app/assets/stylesheets/orders.css.scss | 3 + app/controllers/account/orders_controller.rb | 14 +++ app/controllers/admin/orders_controller.rb | 20 +++++ app/controllers/application_controller.rb | 18 ++++ app/controllers/cart_items_controller.rb | 29 +++++++ app/controllers/carts_controller.rb | 11 +++ app/controllers/orders_controller.rb | 38 +++++++++ app/controllers/products_controller.rb | 18 ++++ app/helpers/account/orders_helper.rb | 2 + app/helpers/admin/orders_helper.rb | 5 ++ app/helpers/application_helper.rb | 4 +- app/helpers/cart_items_helper.rb | 2 + app/helpers/carts_helper.rb | 9 ++ app/helpers/orders_helper.rb | 23 +++++ app/helpers/products_helper.rb | 38 +++++++++ app/models/cart.rb | 15 ++++ app/models/cart_item.rb | 4 + app/models/order.rb | 67 +++++++++++++++ app/models/order_info.rb | 8 ++ app/models/order_item.rb | 2 + app/models/product.rb | 5 ++ app/models/user.rb | 1 + app/views/account/orders/index.html.erb | 25 ++++++ app/views/admin/orders/index.html.erb | 24 ++++++ app/views/admin/orders/show.html.erb | 84 ++++++++++++++++++ app/views/carts/checkout.html.erb | 72 ++++++++++++++++ app/views/carts/index.html.erb | 56 ++++++++++++ app/views/layouts/_header.html.erb | 5 ++ app/views/orders/show.html.erb | 85 +++++++++++++++++++ app/views/products/index.html.erb | 2 +- app/views/products/show.html.erb | 2 +- config/routes.rb | 24 +++++- db/migrate/20140714113730_create_carts.rb | 8 ++ .../20140714113842_create_cart_items.rb | 10 +++ db/migrate/20140714124828_create_orders.rb | 10 +++ .../20140714124907_create_order_infos.rb | 13 +++ .../20140714124934_create_order_items.rb | 11 +++ .../20140714131749_add_token_to_order.rb | 6 ++ ...40714132524_add_payment_method_to_order.rb | 5 ++ ...20140714133958_add_aasm_state_to_orders.rb | 6 ++ ...15070934_add_cart_quantity_to_cart_item.rb | 5 ++ db/schema.rb | 48 ++++++++++- .../account/order_controller_test.rb | 7 ++ .../admin/orders_controller_test.rb | 7 ++ .../controllers/cart_items_controller_test.rb | 7 ++ test/controllers/orders_controller_test.rb | 7 ++ test/fixtures/cart_items.yml | 9 ++ test/fixtures/carts.yml | 11 +++ test/fixtures/order_infos.yml | 11 +++ test/fixtures/order_items.yml | 11 +++ test/fixtures/orders.yml | 11 +++ test/helpers/account/order_helper_test.rb | 4 + test/helpers/admin/orders_helper_test.rb | 4 + test/helpers/cart_items_helper_test.rb | 4 + test/helpers/orders_helper_test.rb | 4 + test/models/cart_item_test.rb | 7 ++ test/models/cart_test.rb | 7 ++ test/models/order_info_test.rb | 7 ++ test/models/order_item_test.rb | 7 ++ test/models/order_test.rb | 7 ++ 70 files changed, 988 insertions(+), 8 deletions(-) create mode 100644 app/assets/javascripts/account/order.js.coffee create mode 100644 app/assets/javascripts/admin/orders.js.coffee create mode 100644 app/assets/javascripts/cart_items.js.coffee create mode 100644 app/assets/javascripts/orders.js.coffee create mode 100644 app/assets/stylesheets/account/order.css.scss create mode 100644 app/assets/stylesheets/admin/orders.css.scss create mode 100644 app/assets/stylesheets/cart_items.css.scss create mode 100644 app/assets/stylesheets/orders.css.scss create mode 100644 app/controllers/account/orders_controller.rb create mode 100644 app/controllers/admin/orders_controller.rb create mode 100644 app/controllers/cart_items_controller.rb create mode 100644 app/controllers/carts_controller.rb create mode 100644 app/controllers/orders_controller.rb create mode 100644 app/helpers/account/orders_helper.rb create mode 100644 app/helpers/admin/orders_helper.rb create mode 100644 app/helpers/cart_items_helper.rb create mode 100644 app/helpers/carts_helper.rb create mode 100644 app/helpers/orders_helper.rb create mode 100644 app/helpers/products_helper.rb create mode 100644 app/models/cart.rb create mode 100644 app/models/cart_item.rb create mode 100644 app/models/order.rb create mode 100644 app/models/order_info.rb create mode 100644 app/models/order_item.rb create mode 100644 app/views/account/orders/index.html.erb create mode 100644 app/views/admin/orders/index.html.erb create mode 100644 app/views/admin/orders/show.html.erb create mode 100644 app/views/carts/checkout.html.erb create mode 100644 app/views/carts/index.html.erb create mode 100644 app/views/orders/show.html.erb create mode 100644 db/migrate/20140714113730_create_carts.rb create mode 100644 db/migrate/20140714113842_create_cart_items.rb create mode 100644 db/migrate/20140714124828_create_orders.rb create mode 100644 db/migrate/20140714124907_create_order_infos.rb create mode 100644 db/migrate/20140714124934_create_order_items.rb create mode 100644 db/migrate/20140714131749_add_token_to_order.rb create mode 100644 db/migrate/20140714132524_add_payment_method_to_order.rb create mode 100644 db/migrate/20140714133958_add_aasm_state_to_orders.rb create mode 100644 db/migrate/20140715070934_add_cart_quantity_to_cart_item.rb create mode 100644 test/controllers/account/order_controller_test.rb create mode 100644 test/controllers/admin/orders_controller_test.rb create mode 100644 test/controllers/cart_items_controller_test.rb create mode 100644 test/controllers/orders_controller_test.rb create mode 100644 test/fixtures/cart_items.yml create mode 100644 test/fixtures/carts.yml create mode 100644 test/fixtures/order_infos.yml create mode 100644 test/fixtures/order_items.yml create mode 100644 test/fixtures/orders.yml create mode 100644 test/helpers/account/order_helper_test.rb create mode 100644 test/helpers/admin/orders_helper_test.rb create mode 100644 test/helpers/cart_items_helper_test.rb create mode 100644 test/helpers/orders_helper_test.rb create mode 100644 test/models/cart_item_test.rb create mode 100644 test/models/cart_test.rb create mode 100644 test/models/order_info_test.rb create mode 100644 test/models/order_item_test.rb create mode 100644 test/models/order_test.rb diff --git a/Gemfile b/Gemfile index fcc9e4c..937460d 100644 --- a/Gemfile +++ b/Gemfile @@ -35,6 +35,8 @@ gem 'simple_form' gem 'carrierwave' gem 'rmagick', :require => 'RMagick' +gem 'aasm' + # Use ActiveModel has_secure_password # gem 'bcrypt', '~> 3.1.7' diff --git a/Gemfile.lock b/Gemfile.lock index d4379f0..b199b4c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,7 @@ GEM remote: https://rubygems.org/ specs: + aasm (3.2.0) actionmailer (4.1.0) actionpack (= 4.1.0) actionview (= 4.1.0) @@ -134,6 +135,7 @@ PLATFORMS ruby DEPENDENCIES + aasm bootstrap-sass (~> 3.2.0) carrierwave coffee-rails (~> 4.0.0) diff --git a/app/assets/javascripts/account/order.js.coffee b/app/assets/javascripts/account/order.js.coffee new file mode 100644 index 0000000..24f83d1 --- /dev/null +++ b/app/assets/javascripts/account/order.js.coffee @@ -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/ diff --git a/app/assets/javascripts/admin/orders.js.coffee b/app/assets/javascripts/admin/orders.js.coffee new file mode 100644 index 0000000..24f83d1 --- /dev/null +++ b/app/assets/javascripts/admin/orders.js.coffee @@ -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/ diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index cd5c291..e3a9f2d 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,6 +12,6 @@ // //= require jquery //= require jquery_ujs -//= require turbolinks //= require bootstrap +//= require turbolinks //= require_tree . diff --git a/app/assets/javascripts/cart_items.js.coffee b/app/assets/javascripts/cart_items.js.coffee new file mode 100644 index 0000000..24f83d1 --- /dev/null +++ b/app/assets/javascripts/cart_items.js.coffee @@ -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/ diff --git a/app/assets/javascripts/orders.js.coffee b/app/assets/javascripts/orders.js.coffee new file mode 100644 index 0000000..24f83d1 --- /dev/null +++ b/app/assets/javascripts/orders.js.coffee @@ -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/ diff --git a/app/assets/stylesheets/account/order.css.scss b/app/assets/stylesheets/account/order.css.scss new file mode 100644 index 0000000..23a340e --- /dev/null +++ b/app/assets/stylesheets/account/order.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the account/order controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/admin/orders.css.scss b/app/assets/stylesheets/admin/orders.css.scss new file mode 100644 index 0000000..449abf6 --- /dev/null +++ b/app/assets/stylesheets/admin/orders.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the admin/orders controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/cart_items.css.scss b/app/assets/stylesheets/cart_items.css.scss new file mode 100644 index 0000000..c8ba380 --- /dev/null +++ b/app/assets/stylesheets/cart_items.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the cart_items controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/orders.css.scss b/app/assets/stylesheets/orders.css.scss new file mode 100644 index 0000000..3b0428a --- /dev/null +++ b/app/assets/stylesheets/orders.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the orders controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/account/orders_controller.rb b/app/controllers/account/orders_controller.rb new file mode 100644 index 0000000..3be4a1a --- /dev/null +++ b/app/controllers/account/orders_controller.rb @@ -0,0 +1,14 @@ +class Account::OrdersController < ApplicationController + before_action :authenticate_user! + before_action :frontEndHeaders + + def index + @orders = current_user.orders.recent + end + + def destroy + @order = current_user.orders.find(params[:id]) + + @order.destroy + end +end diff --git a/app/controllers/admin/orders_controller.rb b/app/controllers/admin/orders_controller.rb new file mode 100644 index 0000000..1abc1de --- /dev/null +++ b/app/controllers/admin/orders_controller.rb @@ -0,0 +1,20 @@ +class Admin::OrdersController < ApplicationController + before_action :backEndHeaders + before_filter :find_order, :except => [:index] + + def index + @orders = Order.recent + end + + def show + @order_info = @order.info + @order_items = @order.items + end + + protected + + + def find_order + @order = Order.find_by_token(params[:id]) + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index c25fbfa..eb56e20 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -3,9 +3,27 @@ class ApplicationController < ActionController::Base # For APIs, you may want to use :null_session instead. protect_from_forgery with: :exception include ApplicationHelper + helper_method :current_cart #view 才可以使用到 def admin_required redirect_to root_path unless current_user.admin? end + + def current_cart + @current_cart ||= find_cart + end + + def find_cart + + cart = Cart.find_by(id: session[:cart_id]) + + unless cart.present? + cart = Cart.create + end + + session[:cart_id] = cart.id + cart + end + end diff --git a/app/controllers/cart_items_controller.rb b/app/controllers/cart_items_controller.rb new file mode 100644 index 0000000..53d8ee9 --- /dev/null +++ b/app/controllers/cart_items_controller.rb @@ -0,0 +1,29 @@ +class CartItemsController < ApplicationController + before_action :authenticate_user! + + + def update + @cart = current_cart + @item = @cart.cart_items.find(params[:id]) + + @item.update(item_params) + + redirect_to carts_path + end + + def destroy + @cart = current_cart + @item = @cart.cart_items.find(params[:id]) + + @item.destroy + + flash[:warning] = "刪除成功" + redirect_to :back + end + + private + + def item_params + params.require(:cart_item).permit(:quantity) + end +end diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb new file mode 100644 index 0000000..ecb5317 --- /dev/null +++ b/app/controllers/carts_controller.rb @@ -0,0 +1,11 @@ +class CartsController < ApplicationController + before_action :frontEndHeaders + before_action :authenticate_user!, :only => [:checkout] + def index + @cart_items = current_cart.cart_items.all + end + def checkout + @order = current_user.orders.build + @info = @order.build_info + end +end \ No newline at end of file diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb new file mode 100644 index 0000000..2c8ce80 --- /dev/null +++ b/app/controllers/orders_controller.rb @@ -0,0 +1,38 @@ +class OrdersController < ApplicationController + before_action :frontEndHeaders + before_action :authenticate_user! + + def create + @order = current_user.orders.build(order_params) + + if @order.save + @order.build_item_cache_from_cart(current_cart) + @order.calculate_total!(current_cart) + redirect_to order_path(@order.token) + else + render "carts/checkout" + end + end + + def show + @order = current_user.orders.find_by_token(params[:id]) + @order_info = @order.info + @order_items = @order.items + end + + def pay_with_credit_card + @order = current_user.orders.find_by_token(params[:id]) + @order.set_payment_with!("credit_card") + + @order.make_payment! # TODO: should move to stripe callbacks + + redirect_to root_path, :notice => "成功完成付款" + end + + + private + + def order_params + params.require(:orders).permit(:info_attributes => [:billing_name, :billing_address,:shipping_name, :shipping_address] ) + end +end diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 71a114c..31802b9 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -6,4 +6,22 @@ def index def show @product = Product.find(params[:id]) end + + def add_to_cart + @product = Product.find(params[:id]) + if !current_cart.items.include?(@product) + + if @product.quantity > 0 + current_cart.add_product_to_cart(@product, 1) + flash[:notice] = "你已成功將 #{@product.title} 加入購物車" + else + flash[:warning] = "此物品已停止銷售，你無法將它加入購物車" + end + + else + flash[:warning] = "你的購物車內已有此物品" + end + + redirect_to :back + end end \ No newline at end of file diff --git a/app/helpers/account/orders_helper.rb b/app/helpers/account/orders_helper.rb new file mode 100644 index 0000000..6f690c4 --- /dev/null +++ b/app/helpers/account/orders_helper.rb @@ -0,0 +1,2 @@ +module Account::OrdersHelper +end diff --git a/app/helpers/admin/orders_helper.rb b/app/helpers/admin/orders_helper.rb new file mode 100644 index 0000000..d2449ad --- /dev/null +++ b/app/helpers/admin/orders_helper.rb @@ -0,0 +1,5 @@ +module Admin::OrdersHelper + def render_order_options_for_admin(order) + #render :partial => "admin/orders/state_option", :locals => { :order => order} + end +end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 7370bae..4017c87 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,10 +1,10 @@ module ApplicationHelper def frontEndHeaders @enable_nav = true - @headers = [{:title=>"我的購物車",:link=>"#"},{:title=>"我的訂單",:link=>"#"}] + @headers = [{:title=>"我的訂單",:link=>"/account/orders"}] end def backEndHeaders @enable_nav = true - @headers = [{:title=>"商品上架",:link=>"/admin/products/new"}] + @headers = [{:title=>"商品上架",:link=>"/admin/products/new"},{:title=>"訂單列表",:link=>"/admin/orders/"}] end end diff --git a/app/helpers/cart_items_helper.rb b/app/helpers/cart_items_helper.rb new file mode 100644 index 0000000..f30f683 --- /dev/null +++ b/app/helpers/cart_items_helper.rb @@ -0,0 +1,2 @@ +module CartItemsHelper +end diff --git a/app/helpers/carts_helper.rb b/app/helpers/carts_helper.rb new file mode 100644 index 0000000..33fb0a0 --- /dev/null +++ b/app/helpers/carts_helper.rb @@ -0,0 +1,9 @@ +module CartsHelper + def cart_items_count(cart) + cart.cart_items.count + end + + def render_cart_total_price(current_cart) + current_cart.total_price + end +end \ No newline at end of file diff --git a/app/helpers/orders_helper.rb b/app/helpers/orders_helper.rb new file mode 100644 index 0000000..4cc58f1 --- /dev/null +++ b/app/helpers/orders_helper.rb @@ -0,0 +1,23 @@ +module OrdersHelper + + def render_order_link(order) + link_to(order.token, order_path(order.token)) + end + + def render_admin_order_link(order) + link_to(order.token, admin_order_path(order.token)) + end + + def render_order_created_time(order) + order.created_at.to_s(:short) + end + + def render_order_user_name(user) + user.email + end + + def render_order_state(order) + t("orders.order_state.#{order.aasm_state}") + end + +end \ No newline at end of file diff --git a/app/helpers/products_helper.rb b/app/helpers/products_helper.rb new file mode 100644 index 0000000..aca459e --- /dev/null +++ b/app/helpers/products_helper.rb @@ -0,0 +1,38 @@ +module ProductsHelper + + def render_product_photo(photo, size = "thumb") + + if photo.present? + image_url = photo.image.send(size).url + else + + case size + when :medium + volume = "300x300" + else + volume = "200x200" + end + + image_url = "http://placehold.it/#{volume}&text=No Pic" + end + + image_tag(image_url, :class => "thumbnail") + + end + + def render_product_name(product) + product.title + end + + def render_product_desc(product) + simple_format(product.description) + end + + def render_product_quantity(product) + product.quantity + end + + def render_product_price(product) + product.price + end +end \ No newline at end of file diff --git a/app/models/cart.rb b/app/models/cart.rb new file mode 100644 index 0000000..ac2729c --- /dev/null +++ b/app/models/cart.rb @@ -0,0 +1,15 @@ +class Cart < ActiveRecord::Base + has_many :cart_items + has_many :items, :through => :cart_items, :source => :product + + def add_product_to_cart(product, amount) + cart_item = cart_items.build + cart_item.product = product + cart_item.quantity = amount + cart_item.save + end + + def total_price + cart_items.inject(0) {|sum, item| sum + (item.product.price * item.quantity) } + end +end diff --git a/app/models/cart_item.rb b/app/models/cart_item.rb new file mode 100644 index 0000000..ddf0322 --- /dev/null +++ b/app/models/cart_item.rb @@ -0,0 +1,4 @@ +class CartItem < ActiveRecord::Base + belongs_to :cart + belongs_to :product +end diff --git a/app/models/order.rb b/app/models/order.rb new file mode 100644 index 0000000..a7eed3e --- /dev/null +++ b/app/models/order.rb @@ -0,0 +1,67 @@ +class Order < ActiveRecord::Base + belongs_to :user + has_many :items, :class_name => "OrderItem", :dependent => :destroy + has_one :info, :class_name => "OrderInfo", :dependent => :destroy + + accepts_nested_attributes_for :info + + scope :recent, -> { order("id DESC")} + + def build_item_cache_from_cart(cart) + cart.items.each do |cart_item| + item = items.build + item.product_name = cart_item.title + item.quantity = 1 + item.price = cart_item.price + item.save + end + end + + def calculate_total!(current_cart) + self.total = current_cart.total_price + self.save + end + + before_create :generate_token + + def generate_token + self.token = SecureRandom.uuid + end + + def set_payment_with!(method) + self.update_column(:payment_method, method) + end + + include AASM + + aasm do + state :order_placed, :initial => true + state :paid, :after_commit => :pay! + event :make_payment do + transitions :from => :order_placed, :to => :paid + end + + state :shipping + event :ship do + transitions :from => :paid, :to => :shipping + end + + state :shipped + event :deliver do + transitions :from => :shipping, :to => :shipped + end + + state :order_cancelled + event :cancell_order do + transitions :from => [:order_placed, :paid ], :to => :order_cancelled + end + + state :good_returned + event :return_good do + transitions :from => [:shipped ], :to => :good_returned + end + + end + + +end diff --git a/app/models/order_info.rb b/app/models/order_info.rb new file mode 100644 index 0000000..5c3b195 --- /dev/null +++ b/app/models/order_info.rb @@ -0,0 +1,8 @@ +class OrderInfo < ActiveRecord::Base + belongs_to :order + + validates :billing_name , :presence => true + validates :billing_address , :presence => true + validates :shipping_name , :presence => true + validates :shipping_address , :presence => true +end diff --git a/app/models/order_item.rb b/app/models/order_item.rb new file mode 100644 index 0000000..7d3194a --- /dev/null +++ b/app/models/order_item.rb @@ -0,0 +1,2 @@ +class OrderItem < ActiveRecord::Base +end diff --git a/app/models/product.rb b/app/models/product.rb index d40cafa..a18b845 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -9,4 +9,9 @@ def getPhoto def getThumb self.photos.first.image_url(:thumb).to_s end + + def default_photo + photos.first + end + end diff --git a/app/models/user.rb b/app/models/user.rb index 2a15996..6d19022 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -3,6 +3,7 @@ class User < ActiveRecord::Base # :confirmable, :lockable, :timeoutable and :omniauthable devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable + has_many :orders def admin? is_admin diff --git a/app/views/account/orders/index.html.erb b/app/views/account/orders/index.html.erb new file mode 100644 index 0000000..6f7d48a --- /dev/null +++ b/app/views/account/orders/index.html.erb @@ -0,0 +1,25 @@ + +

訂單列表

+ + + + + + + + + + + + <% @orders.each do |order| %> + + + + + + <% end %> + + +
#生成時間總金額
<%= render_order_link(order) %> <%= render_order_created_time(order) %> <%= order.total %>
+ + diff --git a/app/views/admin/orders/index.html.erb b/app/views/admin/orders/index.html.erb new file mode 100644 index 0000000..d3c32c4 --- /dev/null +++ b/app/views/admin/orders/index.html.erb @@ -0,0 +1,24 @@ +

訂單列表

+ + + + + + + + + + + + + <% @orders.each do |order| %> + + + + + + + <% end %> + + +
#生成時間訂購者訂單狀態
<%= render_admin_order_link(order) %> <%= render_order_created_time(order) %> <%= render_order_user_name(order.user) %> <%= render_order_state(order) %>
diff --git a/app/views/admin/orders/show.html.erb b/app/views/admin/orders/show.html.erb new file mode 100644 index 0000000..e8d7b89 --- /dev/null +++ b/app/views/admin/orders/show.html.erb @@ -0,0 +1,84 @@ +
+
+ +

訂單明細

+ + <%= render_order_options_for_admin(@order) %> + + + + + + + + + + + + + <% @order_items.each do |order_item| %> + + + + + + <% end %> + + +
商品明細單價數量
+ <%= order_item.product_name %> + <%= order_item.price %> <%= order_item.quantity %>
+ +
+ + 總計 <%= @order.total %> NTD + +
+ +
+ +

寄送資訊

+ + + + + + + + + + + + + + + + + + + + + +
訂購人
+ <%= @order_info.billing_name %> - <%= @order_info.billing_address %> +
訂購人
+ <%= @order_info.billing_name %> - <%= @order_info.billing_address %> +
+ + + <% if !@order.paid? %> + +
+ <%= link_to("以信用卡付款", pay_with_credit_card_order_path(@order.token), :class => "btn btn-primary btn-lg btn-danger ") %> + + <%= link_to("以 ATM 付款", "#", :class => "btn btn-primary btn-lg btn-danger ") %> +
+ + <% else %> + + 此訂單已完成付款 + + <% end %> + +
+
diff --git a/app/views/carts/checkout.html.erb b/app/views/carts/checkout.html.erb new file mode 100644 index 0000000..aa90c15 --- /dev/null +++ b/app/views/carts/checkout.html.erb @@ -0,0 +1,72 @@ +
+
+ +

購物明細

+ + + + + + + + + + + + <% current_cart.cart_items.each do |item| %> + + + + + + + <% end %> + + +
商品明細單價數量小記
+ + <%= link_to(item.product.title, admin_product_path(item.product)) %> + <%= item.product.price %> <%= item.quantity %> <%= item.quantity * item.product.price %>
+ +
+ + 總計 <%= render_cart_total_price(current_cart) %> NTD + +
+ +
+ +

訂單資訊

+ + +
+ + <%= simple_form_for @order do |f| %> + + <%= f.simple_fields_for :info do |c| %> + + 訂購人 + +
<%= c.input :billing_name %>
+
<%= c.input :billing_address %>
+ + 收貨人 + +
<%= c.input :shipping_name %>
+
<%= c.input :shipping_address %>
+ <% end %> + +
+ <%= f.submit "生成訂單", :class => "btn btn-primary btn-lg btn-danger pull-right", + :disable_with => 'Submiting...' %> +
+ + <% end %> +
+ + + +
+ + +
\ No newline at end of file diff --git a/app/views/carts/index.html.erb b/app/views/carts/index.html.erb new file mode 100644 index 0000000..c951cc8 --- /dev/null +++ b/app/views/carts/index.html.erb @@ -0,0 +1,56 @@ +
+
+ +

購物車

+ + + + + + + + + + + + <% current_cart.cart_items.each do |item| %> + + + + + + + <% end %> + + +
商品資訊單價數量
<%= render_product_photo(item.product.default_photo) %> + <%= link_to(item.product.title, admin_product_path(item.product)) %> + <%= item.product.price %> <%= form_for item, :url => item_path(item) do |f| %> + <%= f.select :quantity, [1,2,3,4,5] %> + <%= button_tag(type: 'submit', class: "btn btn-default btn-xs") do %> + + <% end %> + <%= link_to item_path(item), :method => :delete do %> + + <% end %> + <% end %> +
+ +
+ + 總計 <%= render_cart_total_price(current_cart) %> NTD + +
+ +
+
+ <%= link_to("確認結賬", checkout_carts_path , :method => :post , :class => "btn btn-primary btn-lg btn-danger pull-right") %> +
+ + +
+ + +
\ No newline at end of file diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 5571ce2..5a1c17c 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -16,6 +16,11 @@ <%}%>
    +
  • + <%= link_to carts_path do %> + 購物車 (<%= cart_items_count(current_cart) %>) + <% end %> +
    • <% if !current_user %>
  • <%= link_to("登入", new_user_session_path) %> diff --git a/app/views/orders/show.html.erb b/app/views/orders/show.html.erb new file mode 100644 index 0000000..0e1304c --- /dev/null +++ b/app/views/orders/show.html.erb @@ -0,0 +1,85 @@ +
    +
    + +

    訂單明細

    + + + + + + + + + + <% @order_items.each do |order_item| %> + + + + + <% end %> + + +
    商品明細單價
    + <%= order_item.product_name %> + <%= order_item.price %>
    + +
    + + 總計 <%= @order.total %> NTD + +
    + +
    + +

    寄送資訊

    + + + + + + + + + + + + + + + + + + + + + + + +
    訂購人
    + <%= @order_info.billing_name %> - <%= @order_info.billing_address %> +
    訂購人
    + <%= @order_info.billing_name %> - <%= @order_info.billing_address %> +
    + + + <% if !@order.paid? %> + +
    + <%= link_to("以信用卡付款", pay_with_credit_card_order_path(@order.token), :class => "btn btn-primary btn-lg btn-danger ") %> + + <%= link_to("以 ATM 付款", "#", :class => "btn btn-primary btn-lg btn-danger ") %> +
    + + <% else %> + + 此訂單已完成付款 + + <% end %> + + + + +
    + + +
    \ No newline at end of file diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index b1c2660..caaa26a 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -1,7 +1,7 @@

    商品總覽

    -
    +
    <% @products.each{ |product| %>
    Generic placeholder image diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 41e260a..66c58a3 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -7,6 +7,6 @@

    <%= @product[:description] %>

    數量 : <%= @product[:quantity] %>

    價錢 : $<%= @product[:price] %>

    - 加入購物車 + <%= link_to("加入購物車", add_to_cart_product_path(@product) , :method => :post , :class => "btn btn-primary btn-lg btn-danger") %>
    \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 3f636e6..4160a62 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,9 +2,29 @@ devise_for :users namespace :admin do resources :products + resources :orders end - match 'admin/products/:action' => 'products#:action', via: [:get, :post] - match 'products/:action/:id' => 'products#:action/:id', via: [:get] + resources :products do + member do + post :add_to_cart + end + end + resources :carts do + collection do + post :checkout + end + end + resources :orders do + member do + get :pay_with_credit_card + end + end + resources :items, :controller => "cart_items" + + namespace :account do + resources :orders + end + root 'products#index' # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". diff --git a/db/migrate/20140714113730_create_carts.rb b/db/migrate/20140714113730_create_carts.rb new file mode 100644 index 0000000..8e66adb --- /dev/null +++ b/db/migrate/20140714113730_create_carts.rb @@ -0,0 +1,8 @@ +class CreateCarts < ActiveRecord::Migration + def change + create_table :carts do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140714113842_create_cart_items.rb b/db/migrate/20140714113842_create_cart_items.rb new file mode 100644 index 0000000..0fb13b1 --- /dev/null +++ b/db/migrate/20140714113842_create_cart_items.rb @@ -0,0 +1,10 @@ +class CreateCartItems < ActiveRecord::Migration + def change + create_table :cart_items do |t| + t.integer :cart_id + t.integer :product_id + + t.timestamps + end + end +end diff --git a/db/migrate/20140714124828_create_orders.rb b/db/migrate/20140714124828_create_orders.rb new file mode 100644 index 0000000..12bf480 --- /dev/null +++ b/db/migrate/20140714124828_create_orders.rb @@ -0,0 +1,10 @@ +class CreateOrders < ActiveRecord::Migration + def change + create_table :orders do |t| + t.integer :user_id + t.integer :total + t.boolean :paid, :default => false + t.timestamps + end + end +end diff --git a/db/migrate/20140714124907_create_order_infos.rb b/db/migrate/20140714124907_create_order_infos.rb new file mode 100644 index 0000000..09d6331 --- /dev/null +++ b/db/migrate/20140714124907_create_order_infos.rb @@ -0,0 +1,13 @@ +class CreateOrderInfos < ActiveRecord::Migration + def change + create_table :order_infos do |t| + t.integer :order_id + t.string :billing_name + t.string :billing_address + + t.string :shipping_name + t.string :shipping_address + t.timestamps + end + end +end diff --git a/db/migrate/20140714124934_create_order_items.rb b/db/migrate/20140714124934_create_order_items.rb new file mode 100644 index 0000000..cebcd4f --- /dev/null +++ b/db/migrate/20140714124934_create_order_items.rb @@ -0,0 +1,11 @@ +class CreateOrderItems < ActiveRecord::Migration + def change + create_table :order_items do |t| + t.string :product_name + t.float :price + t.integer :quantity + t.integer :order_id + t.timestamps + end + end +end diff --git a/db/migrate/20140714131749_add_token_to_order.rb b/db/migrate/20140714131749_add_token_to_order.rb new file mode 100644 index 0000000..cb455b4 --- /dev/null +++ b/db/migrate/20140714131749_add_token_to_order.rb @@ -0,0 +1,6 @@ +class AddTokenToOrder < ActiveRecord::Migration + def change + add_column :orders, :token, :string + add_index :orders, :token + end +end diff --git a/db/migrate/20140714132524_add_payment_method_to_order.rb b/db/migrate/20140714132524_add_payment_method_to_order.rb new file mode 100644 index 0000000..e7eb536 --- /dev/null +++ b/db/migrate/20140714132524_add_payment_method_to_order.rb @@ -0,0 +1,5 @@ +class AddPaymentMethodToOrder < ActiveRecord::Migration + def change + add_column :orders, :payment_method, :string + end +end diff --git a/db/migrate/20140714133958_add_aasm_state_to_orders.rb b/db/migrate/20140714133958_add_aasm_state_to_orders.rb new file mode 100644 index 0000000..37097ca --- /dev/null +++ b/db/migrate/20140714133958_add_aasm_state_to_orders.rb @@ -0,0 +1,6 @@ +class AddAasmStateToOrders < ActiveRecord::Migration + def change + add_column :orders, :aasm_state, :string, :default => "order_placed" + add_index :orders, :aasm_state + end +end diff --git a/db/migrate/20140715070934_add_cart_quantity_to_cart_item.rb b/db/migrate/20140715070934_add_cart_quantity_to_cart_item.rb new file mode 100644 index 0000000..bf06f64 --- /dev/null +++ b/db/migrate/20140715070934_add_cart_quantity_to_cart_item.rb @@ -0,0 +1,5 @@ +class AddCartQuantityToCartItem < ActiveRecord::Migration + def change + add_column :cart_items, :quantity, :integer ,:default =>1 + end +end diff --git a/db/schema.rb b/db/schema.rb index 7c7b024..5757968 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,53 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140710023825) do +ActiveRecord::Schema.define(version: 20140715070934) do + + create_table "cart_items", force: true do |t| + t.integer "cart_id" + t.integer "product_id" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "quantity", default: 1 + end + + create_table "carts", force: true do |t| + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "order_infos", force: true do |t| + t.integer "order_id" + t.string "billing_name" + t.string "billing_address" + t.string "shipping_name" + t.string "shipping_address" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "order_items", force: true do |t| + t.string "product_name" + t.float "price" + t.integer "quantity" + t.integer "order_id" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "orders", force: true do |t| + t.integer "user_id" + t.integer "total" + t.boolean "paid", default: false + t.datetime "created_at" + t.datetime "updated_at" + t.string "token" + t.string "payment_method" + t.string "aasm_state", default: "order_placed" + end + + add_index "orders", ["aasm_state"], name: "index_orders_on_aasm_state" + add_index "orders", ["token"], name: "index_orders_on_token" create_table "photos", force: true do |t| t.integer "product_id" diff --git a/test/controllers/account/order_controller_test.rb b/test/controllers/account/order_controller_test.rb new file mode 100644 index 0000000..0cf805e --- /dev/null +++ b/test/controllers/account/order_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class Account::OrderControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/controllers/admin/orders_controller_test.rb b/test/controllers/admin/orders_controller_test.rb new file mode 100644 index 0000000..8af7f0c --- /dev/null +++ b/test/controllers/admin/orders_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class Admin::OrdersControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/controllers/cart_items_controller_test.rb b/test/controllers/cart_items_controller_test.rb new file mode 100644 index 0000000..76b2b02 --- /dev/null +++ b/test/controllers/cart_items_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class CartItemsControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/controllers/orders_controller_test.rb b/test/controllers/orders_controller_test.rb new file mode 100644 index 0000000..0afece1 --- /dev/null +++ b/test/controllers/orders_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class OrdersControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/fixtures/cart_items.yml b/test/fixtures/cart_items.yml new file mode 100644 index 0000000..d2a24f3 --- /dev/null +++ b/test/fixtures/cart_items.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + cart_id: 1 + product_id: + +two: + cart_id: 1 + product_id: diff --git a/test/fixtures/carts.yml b/test/fixtures/carts.yml new file mode 100644 index 0000000..937a0c0 --- /dev/null +++ b/test/fixtures/carts.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/order_infos.yml b/test/fixtures/order_infos.yml new file mode 100644 index 0000000..937a0c0 --- /dev/null +++ b/test/fixtures/order_infos.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/order_items.yml b/test/fixtures/order_items.yml new file mode 100644 index 0000000..937a0c0 --- /dev/null +++ b/test/fixtures/order_items.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/orders.yml b/test/fixtures/orders.yml new file mode 100644 index 0000000..937a0c0 --- /dev/null +++ b/test/fixtures/orders.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/helpers/account/order_helper_test.rb b/test/helpers/account/order_helper_test.rb new file mode 100644 index 0000000..7e25480 --- /dev/null +++ b/test/helpers/account/order_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class Account::OrderHelperTest < ActionView::TestCase +end diff --git a/test/helpers/admin/orders_helper_test.rb b/test/helpers/admin/orders_helper_test.rb new file mode 100644 index 0000000..8511d6d --- /dev/null +++ b/test/helpers/admin/orders_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class Admin::OrdersHelperTest < ActionView::TestCase +end diff --git a/test/helpers/cart_items_helper_test.rb b/test/helpers/cart_items_helper_test.rb new file mode 100644 index 0000000..4cfc7e9 --- /dev/null +++ b/test/helpers/cart_items_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class CartItemsHelperTest < ActionView::TestCase +end diff --git a/test/helpers/orders_helper_test.rb b/test/helpers/orders_helper_test.rb new file mode 100644 index 0000000..52dacae --- /dev/null +++ b/test/helpers/orders_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class OrdersHelperTest < ActionView::TestCase +end diff --git a/test/models/cart_item_test.rb b/test/models/cart_item_test.rb new file mode 100644 index 0000000..881afe1 --- /dev/null +++ b/test/models/cart_item_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class CartItemTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/cart_test.rb b/test/models/cart_test.rb new file mode 100644 index 0000000..9fad43a --- /dev/null +++ b/test/models/cart_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class CartTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/order_info_test.rb b/test/models/order_info_test.rb new file mode 100644 index 0000000..e268911 --- /dev/null +++ b/test/models/order_info_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class OrderInfoTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/order_item_test.rb b/test/models/order_item_test.rb new file mode 100644 index 0000000..e473b9e --- /dev/null +++ b/test/models/order_item_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class OrderItemTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/order_test.rb b/test/models/order_test.rb new file mode 100644 index 0000000..15b8ed1 --- /dev/null +++ b/test/models/order_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class OrderTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end