From 9d7f9ca5e1a5a0338660d0e5af8963eb0551d924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=B1=E9=9B=AF?= <1612896130@qq.com> Date: Fri, 15 Mar 2019 06:44:34 +0800 Subject: [PATCH 01/39] add bootstrap to project --- Gemfile | 2 + Gemfile.lock | 22 +- .../{application.css => application.scss} | 3 + app/models/user.rb | 6 + config/initializers/devise.rb | 299 ++++++++++++++++++ config/locales/devise.en.yml | 65 ++++ config/routes.rb | 1 + .../20190314161420_devise_create_users.rb | 44 +++ db/schema.rb | 27 ++ test/fixtures/users.yml | 11 + test/models/user_test.rb | 7 + 11 files changed, 486 insertions(+), 1 deletion(-) rename app/assets/stylesheets/{application.css => application.scss} (93%) create mode 100644 app/models/user.rb create mode 100644 config/initializers/devise.rb create mode 100644 config/locales/devise.en.yml create mode 100644 db/migrate/20190314161420_devise_create_users.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/users.yml create mode 100644 test/models/user_test.rb diff --git a/Gemfile b/Gemfile index 0447f70941..33f9a90f8c 100644 --- a/Gemfile +++ b/Gemfile @@ -29,6 +29,8 @@ gem 'jbuilder', '~> 2.5' # Use Capistrano for deployment # gem 'capistrano-rails', group: :development +gem 'bootstrap-sass' +gem 'devise' group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console diff --git a/Gemfile.lock b/Gemfile.lock index 96abec2521..74d4c204c1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,6 +39,12 @@ GEM minitest (~> 5.1) tzinfo (~> 1.1) arel (7.1.1) + autoprefixer-rails (9.4.7) + execjs + bcrypt (3.1.12) + bootstrap-sass (3.3.7) + autoprefixer-rails (>= 5.2.1) + sass (>= 3.3.4) builder (3.2.2) byebug (9.0.5) coffee-rails (4.2.1) @@ -50,6 +56,12 @@ GEM coffee-script-source (1.10.0) concurrent-ruby (1.0.2) debug_inspector (0.0.2) + devise (4.6.1) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0, < 6.0) + responders + warden (~> 1.2.3) erubis (2.7.0) execjs (2.7.0) ffi (1.9.14) @@ -81,6 +93,7 @@ GEM nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) + orm_adapter (0.5.0) pkg-config (1.1.7) puma (3.6.0) rack (2.0.1) @@ -113,6 +126,9 @@ GEM rb-fsevent (0.9.7) rb-inotify (0.9.7) ffi (>= 0.5.0) + responders (2.4.1) + actionpack (>= 4.2.0, < 6.0) + railties (>= 4.2.0, < 6.0) sass (3.4.22) sass-rails (5.0.6) railties (>= 4.0.0, < 6) @@ -142,6 +158,8 @@ GEM thread_safe (~> 0.1) uglifier (3.0.1) execjs (>= 0.3.0, < 3) + warden (1.2.7) + rack (>= 1.0) web-console (3.3.1) actionview (>= 5.0) activemodel (>= 5.0) @@ -155,8 +173,10 @@ PLATFORMS ruby DEPENDENCIES + bootstrap-sass byebug coffee-rails (~> 4.2) + devise jbuilder (~> 2.5) jquery-rails listen (~> 3.0.5) @@ -172,4 +192,4 @@ DEPENDENCIES web-console BUNDLED WITH - 1.12.5 + 1.15.4 diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.scss similarity index 93% rename from app/assets/stylesheets/application.css rename to app/assets/stylesheets/application.scss index 0ebd7fe829..359d8c8432 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.scss @@ -13,3 +13,6 @@ *= require_tree . *= require_self */ + +@import "bootstrap-sprockets"; +@import "bootstrap"; \ No newline at end of file diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 0000000000..47567994e9 --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,6 @@ +class User < ApplicationRecord + # Include default devise modules. Others available are: + # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable + devise :database_authenticatable, :registerable, + :recoverable, :rememberable, :validatable +end diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb new file mode 100644 index 0000000000..a9a4a5179e --- /dev/null +++ b/config/initializers/devise.rb @@ -0,0 +1,299 @@ +# frozen_string_literal: true + +# 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. + # Devise will use the `secret_key_base` as its `secret_key` + # by default. You can change it below and use your own secret key. + # config.secret_key = 'da7303ec65ba556ff24bd22ba9eddee1956455274671491b09f18946974aeca3a1b673aed0e5a011fa9ba3395bd2262fa12faa8ac5606db24f12b5d15b2541ce' + + # ==> Controller configuration + # Configure the parent class to the devise controllers. + # config.parent_controller = 'DeviseController' + + # ==> 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' + + # Configure the parent class responsible to send e-mails. + # config.parent_mailer = 'ActionMailer::Base' + + # ==> 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 401 status code 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 + + # When false, Devise will not attempt to reload routes on eager load. + # This can reduce the time taken to boot the app but if your application + # requires the Devise mappings to be loaded during boot time the application + # won't boot properly. + # config.reload_routes = true + + # ==> Configuration for :database_authenticatable + # For bcrypt, this is the cost for hashing the password and defaults to 11. If + # using other algorithms, it sets how many times you want the password to be hashed. + # + # 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 + # algorithm), 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 : 11 + + # Set up a pepper to generate the hashed password. + # config.pepper = '1126f4c43375cb422d21e7a4999197fda81429265878e5d989049eafef96f752a8bc463464a485f308d26d96b6233afd04c3ce1901cb075dcd2f5477e6f553a7' + + # Send a notification to the original email when the user's email is changed. + # config.send_email_changed_notification = false + + # Send a notification email when the user's password is changed. + # config.send_password_change_notification = false + + # ==> 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. + # You can also set it to nil, which will allow the user to access the website + # without confirming their account. + # 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 + + # Invalidates all the remember me tokens when the user signs out. + config.expire_all_remember_me_on_sign_out = true + + # 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 = 6..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[^@\s]+@[^@\s]+\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 + + # ==> 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 = true + + # ==> 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 + + # When set to false, does not sign a user in automatically after their password is + # reset. Defaults to true, so a user is signed in automatically after a reset. + # config.sign_in_after_reset_password = true + + # ==> Configuration for :encryptable + # Allow you to use another hashing or encryption algorithm besides bcrypt (default). + # You can use :sha1, :sha512 or algorithms 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' + + # ==> Turbolinks configuration + # If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly: + # + # ActiveSupport.on_load(:devise_failure_app) do + # include Turbolinks::Controller + # end + + # ==> Configuration for :registerable + + # When set to false, does not sign a user in automatically after their password is + # changed. Defaults to true, so a user is signed in automatically after changing a password. + # config.sign_in_after_change_password = true +end diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml new file mode 100644 index 0000000000..55617bdf3c --- /dev/null +++ b/config/locales/devise.en.yml @@ -0,0 +1,65 @@ +# Additional translations at https://github.com/plataformatec/devise/wiki/I18n + +en: + devise: + confirmations: + confirmed: "Your email address has been successfully confirmed." + send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes." + send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes." + failure: + already_authenticated: "You are already signed in." + inactive: "Your account is not activated yet." + invalid: "Invalid %{authentication_keys} or password." + locked: "Your account is locked." + last_attempt: "You have one more attempt before your account is locked." + not_found_in_database: "Invalid %{authentication_keys} 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 email address before continuing." + mailer: + confirmation_instructions: + subject: "Confirmation instructions" + reset_password_instructions: + subject: "Reset password instructions" + unlock_instructions: + subject: "Unlock instructions" + email_changed: + subject: "Email Changed" + password_change: + subject: "Password Changed" + 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 has been changed successfully. You are now signed in." + updated_not_active: "Your password has been changed successfully." + registrations: + destroyed: "Bye! Your account has been 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 follow 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 follow the confirm link to confirm your new email address." + updated: "Your account has been updated successfully." + updated_but_not_signed_in: "Your account has been updated successfully, but since your password was changed, you need to sign in again" + sessions: + signed_in: "Signed in successfully." + signed_out: "Signed out successfully." + already_signed_out: "Signed out successfully." + unlocks: + send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes." + send_paranoid_instructions: "If your account exists, you will receive an email with instructions for 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/routes.rb b/config/routes.rb index 787824f888..2f790f8d50 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do + devise_for :users # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/db/migrate/20190314161420_devise_create_users.rb b/db/migrate/20190314161420_devise_create_users.rb new file mode 100644 index 0000000000..e3377c4e01 --- /dev/null +++ b/db/migrate/20190314161420_devise_create_users.rb @@ -0,0 +1,44 @@ +# frozen_string_literal: true + +class DeviseCreateUsers < ActiveRecord::Migration[5.0] + 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 null: false + 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/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..702dab1921 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,27 @@ +# 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: 20190314161420) do + + create_table "users", force: :cascade 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.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["email"], name: "index_users_on_email", unique: true + t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true + end + +end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 0000000000..80aed36e30 --- /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/models/user_test.rb b/test/models/user_test.rb new file mode 100644 index 0000000000..82f61e0109 --- /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 019fcec450740273f41b83d623c757a4a557d639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=B1=E9=9B=AF?= <1612896130@qq.com> Date: Fri, 15 Mar 2019 06:46:46 +0800 Subject: [PATCH 02/39] add bootstrap html --- app/assets/javascripts/welcome.coffee | 3 ++ app/assets/stylesheets/welcome.scss | 3 ++ app/controllers/welcome_controller.rb | 2 ++ app/helpers/welcome_helper.rb | 2 ++ app/views/common/_footer.html.erb | 6 ++++ app/views/common/_navbar.html.erb | 17 +++++++++++ app/views/layouts/application.html.erb | 31 +++++++++++++-------- app/views/welcome/index.html.erb | 1 + config/routes.rb | 3 +- test/controllers/welcome_controller_test.rb | 7 +++++ 10 files changed, 62 insertions(+), 13 deletions(-) create mode 100644 app/assets/javascripts/welcome.coffee create mode 100644 app/assets/stylesheets/welcome.scss create mode 100644 app/controllers/welcome_controller.rb create mode 100644 app/helpers/welcome_helper.rb create mode 100644 app/views/common/_footer.html.erb create mode 100644 app/views/common/_navbar.html.erb create mode 100644 app/views/welcome/index.html.erb create mode 100644 test/controllers/welcome_controller_test.rb diff --git a/app/assets/javascripts/welcome.coffee b/app/assets/javascripts/welcome.coffee new file mode 100644 index 0000000000..24f83d18bb --- /dev/null +++ b/app/assets/javascripts/welcome.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/welcome.scss b/app/assets/stylesheets/welcome.scss new file mode 100644 index 0000000000..77ce11a740 --- /dev/null +++ b/app/assets/stylesheets/welcome.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the welcome 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/welcome_controller.rb b/app/controllers/welcome_controller.rb new file mode 100644 index 0000000000..d8c85ab84b --- /dev/null +++ b/app/controllers/welcome_controller.rb @@ -0,0 +1,2 @@ +class WelcomeController < ApplicationController +end diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb new file mode 100644 index 0000000000..eeead45fc9 --- /dev/null +++ b/app/helpers/welcome_helper.rb @@ -0,0 +1,2 @@ +module WelcomeHelper +end diff --git a/app/views/common/_footer.html.erb b/app/views/common/_footer.html.erb new file mode 100644 index 0000000000..59b94b4fd4 --- /dev/null +++ b/app/views/common/_footer.html.erb @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/app/views/common/_navbar.html.erb b/app/views/common/_navbar.html.erb new file mode 100644 index 0000000000..890a41ef3e --- /dev/null +++ b/app/views/common/_navbar.html.erb @@ -0,0 +1,17 @@ + \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 9af1008a35..db8ffbc971 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,14 +1,21 @@ - - Jdstore - <%= csrf_meta_tags %> - - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> - - - - <%= yield %> - - + + JDStore + <%= csrf_meta_tags %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + + + +
+ <%= render "common/navbar" %> + <%= yield %> +
+ + <%= render "common/footer" %> + + + \ No newline at end of file diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb new file mode 100644 index 0000000000..40c7ce2c3d --- /dev/null +++ b/app/views/welcome/index.html.erb @@ -0,0 +1 @@ +

Hello World!

\ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 2f790f8d50..cdb8bdd455 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,5 @@ Rails.application.routes.draw do devise_for :users + root 'welcome#index' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html -end +end \ No newline at end of file diff --git a/test/controllers/welcome_controller_test.rb b/test/controllers/welcome_controller_test.rb new file mode 100644 index 0000000000..59d2d0a0a9 --- /dev/null +++ b/test/controllers/welcome_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class WelcomeControllerTest < ActionDispatch::IntegrationTest + # test "the truth" do + # assert true + # end +end From 968ae3e1bdea93fe1ccae08e5ca5a3d92b012b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=B1=E9=9B=AF?= <1612896130@qq.com> Date: Fri, 15 Mar 2019 06:49:03 +0800 Subject: [PATCH 03/39] add bootstrap flash function --- app/assets/javascripts/application.js | 1 + app/helpers/flashes_helper.rb | 11 +++++++++++ app/views/common/_flashes.html.erb | 8 ++++++++ app/views/layouts/application.html.erb | 1 + 4 files changed, 21 insertions(+) create mode 100644 app/helpers/flashes_helper.rb create mode 100644 app/views/common/_flashes.html.erb diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b12018d099..48a8415f3f 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/alert //= require_tree . diff --git a/app/helpers/flashes_helper.rb b/app/helpers/flashes_helper.rb new file mode 100644 index 0000000000..1c2d1fcaba --- /dev/null +++ b/app/helpers/flashes_helper.rb @@ -0,0 +1,11 @@ +module FlashesHelper + FLASH_CLASSES = { alert: "danger", notice: "success", warning: "warning"}.freeze + + def flash_class(key) + FLASH_CLASSES.fetch key.to_sym, key + end + + def user_facing_flashes + flash.to_hash.slice "alert", "notice","warning" + end +end \ No newline at end of file diff --git a/app/views/common/_flashes.html.erb b/app/views/common/_flashes.html.erb new file mode 100644 index 0000000000..1a54023f38 --- /dev/null +++ b/app/views/common/_flashes.html.erb @@ -0,0 +1,8 @@ +<% if flash.any? %> + <% user_facing_flashes.each do |key, value| %> +
+ + <%= value %> +
+ <% end %> +<% end %> \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index db8ffbc971..1ee9b6d9ec 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -12,6 +12,7 @@
<%= render "common/navbar" %> + <%= render "common/flashes" %> <%= yield %>
From abc6f8b20235d2396b56dda386c18737a824cb80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=B1=E9=9B=AF?= <1612896130@qq.com> Date: Fri, 15 Mar 2019 06:52:40 +0800 Subject: [PATCH 04/39] user can login/logout/signup --- app/assets/javascripts/application.js | 1 + app/controllers/welcome_controller.rb | 5 ++++- app/views/common/_navbar.html.erb | 15 ++++++++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 48a8415f3f..ceee63822c 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -14,4 +14,5 @@ //= require jquery_ujs //= require turbolinks //= require bootstrap/alert +//= require bootstrap/dropdown //= require_tree . diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index d8c85ab84b..f9ca192588 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -1,2 +1,5 @@ class WelcomeController < ApplicationController -end + def index + flash[:notice] = "早安!你好!" + end +end \ No newline at end of file diff --git a/app/views/common/_navbar.html.erb b/app/views/common/_navbar.html.erb index 890a41ef3e..bf6dc11363 100644 --- a/app/views/common/_navbar.html.erb +++ b/app/views/common/_navbar.html.erb @@ -8,7 +8,20 @@ From 0bee2d802d685feb448a1e6d523a1dbcbae915e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=B1=E9=9B=AF?= <1612896130@qq.com> Date: Fri, 15 Mar 2019 06:54:11 +0800 Subject: [PATCH 05/39] install simpleform with bootstrap --- Gemfile | 1 + Gemfile.lock | 4 + config/initializers/simple_form.rb | 179 ++++++++ config/initializers/simple_form_bootstrap.rb | 439 +++++++++++++++++++ config/locales/simple_form.en.yml | 31 ++ lib/templates/erb/scaffold/_form.html.erb | 15 + 6 files changed, 669 insertions(+) create mode 100644 config/initializers/simple_form.rb create mode 100644 config/initializers/simple_form_bootstrap.rb create mode 100644 config/locales/simple_form.en.yml create mode 100644 lib/templates/erb/scaffold/_form.html.erb diff --git a/Gemfile b/Gemfile index 33f9a90f8c..77d79da72d 100644 --- a/Gemfile +++ b/Gemfile @@ -31,6 +31,7 @@ gem 'jbuilder', '~> 2.5' # gem 'capistrano-rails', group: :development gem 'bootstrap-sass' gem 'devise' +gem 'simple_form' group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console diff --git a/Gemfile.lock b/Gemfile.lock index 74d4c204c1..e916f19732 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -136,6 +136,9 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) + simple_form (4.1.0) + actionpack (>= 5.0) + activemodel (>= 5.0) spring (1.7.2) spring-watcher-listen (2.0.0) listen (>= 2.7, < 4.0) @@ -183,6 +186,7 @@ DEPENDENCIES puma (~> 3.0) rails (~> 5.0.0) sass-rails (~> 5.0) + simple_form spring spring-watcher-listen (~> 2.0.0) sqlite3 diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb new file mode 100644 index 0000000000..bb43c33645 --- /dev/null +++ b/config/initializers/simple_form.rb @@ -0,0 +1,179 @@ +# frozen_string_literal: true +# +# Uncomment this and change the path if necessary to include your own +# components. +# See https://github.com/plataformatec/simple_form#custom-components to know +# more about custom components. +# Dir[Rails.root.join('lib/components/**/*.rb')].each { |f| require f } +# +# 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, valid_class: :field_without_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 => true` + # to the input. If so, they will retrieve the values from the model + # if any exists. If you want to enable any of those + # extensions by default, you can change `b.optional` to `b.use`. + + # Calculates maxlength from length validations for string inputs + # and/or database column lengths + b.optional :maxlength + + # Calculate minlength from length validations for string inputs + b.optional :minlength + + # 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 :input, class: 'input', error_class: 'is-invalid', valid_class: 'is-valid' + b.use :label_input + b.use :hint, wrap_with: { tag: :span, class: :hint } + b.use :error, wrap_with: { tag: :span, class: :error } + + ## full_messages_for + # If you want to display the full error message for the attribute, you can + # use the component :full_error, like: + # + # b.use :full_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 = 'error_notification' + + # 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. + # 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, explicit_label| "#{required} #{label}" } + + # You can define the class to use on all labels. Default is nil. + # config.label_class = nil + + # You can define the default class to be used on forms. Can be overriden + # with `html: { :class }`. Defaulting to none. + # config.default_form_class = nil + + # 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, :attached? ] + + # 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 } + + # Namespaces where SimpleForm should look for custom input classes that + # override default inputs. + # config.custom_inputs_namespaces << "CustomInputs" + + # 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 + + # Define the default class of the input wrapper of the boolean input. + config.boolean_label_class = 'checkbox' + + # Defines if the default input wrapper class should be included in radio + # collection wrappers. + # config.include_default_input_wrapper_class = true + + # Defines which i18n scope will be used in Simple Form. + # config.i18n_scope = 'simple_form' + + # Defines validation classes to the input_field. By default it's nil. + # config.input_field_valid_class = 'is-valid' + # config.input_field_error_class = 'is-invalid' +end diff --git a/config/initializers/simple_form_bootstrap.rb b/config/initializers/simple_form_bootstrap.rb new file mode 100644 index 0000000000..0178fd53ca --- /dev/null +++ b/config/initializers/simple_form_bootstrap.rb @@ -0,0 +1,439 @@ +# frozen_string_literal: true + +# Please do not make direct changes to this file! +# This generator is maintained by the community around simple_form-bootstrap: +# https://github.com/rafaelfranca/simple_form-bootstrap +# All future development, tests, and organization should happen there. +# Background history: https://github.com/plataformatec/simple_form/issues/1561 + +# Uncomment this and change the path if necessary to include your own +# components. +# See https://github.com/plataformatec/simple_form#custom-components +# to know more about custom components. +# Dir[Rails.root.join('lib/components/**/*.rb')].each { |f| require f } + +# Use this setup block to configure all options available in SimpleForm. +SimpleForm.setup do |config| + # Default class for buttons + config.button_class = 'btn' + + # Define the default class of the input wrapper of the boolean input. + config.boolean_label_class = 'form-check-label' + + # How the label text should be generated altogether with the required text. + config.label_text = lambda { |label, required, explicit_label| "#{label} #{required}" } + + # Define the way to render check boxes / radio buttons with labels. + config.boolean_style = :inline + + # You can wrap each item in a collection of radio/check boxes with a tag + config.item_wrapper_tag = :div + + # Defines if the default input wrapper class should be included in radio + # collection wrappers. + config.include_default_input_wrapper_class = false + + # CSS class to add for error notification helper. + config.error_notification_class = 'alert alert-danger' + + # Method used to tidy up errors. Specify any Rails Array method. + # :first lists the first message for each field. + # :to_sentence to list all errors for each field. + config.error_method = :to_sentence + + # add validation classes to `input_field` + config.input_field_error_class = 'is-invalid' + config.input_field_valid_class = 'is-valid' + + + # vertical forms + # + # vertical default_wrapper + config.wrappers :vertical_form, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :minlength + b.optional :pattern + b.optional :min_max + b.optional :readonly + b.use :label, class: 'form-control-label' + b.use :input, class: 'form-control', error_class: 'is-invalid', valid_class: 'is-valid' + b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' } + b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + # vertical input for boolean + config.wrappers :vertical_boolean, tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.wrapper :form_check_wrapper, tag: 'div', class: 'form-check' do |bb| + bb.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid' + bb.use :label, class: 'form-check-label' + bb.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' } + bb.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + end + + # vertical input for radio buttons and check boxes + config.wrappers :vertical_collection, item_wrapper_class: 'form-check', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.wrapper :legend_tag, tag: 'legend', class: 'col-form-label pt-0' do |ba| + ba.use :label_text + end + b.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid' + b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + # vertical input for inline radio buttons and check boxes + config.wrappers :vertical_collection_inline, item_wrapper_class: 'form-check form-check-inline', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.wrapper :legend_tag, tag: 'legend', class: 'col-form-label pt-0' do |ba| + ba.use :label_text + end + b.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid' + b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + # vertical file input + config.wrappers :vertical_file, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :minlength + b.optional :readonly + b.use :label + b.use :input, class: 'form-control-file', error_class: 'is-invalid', valid_class: 'is-valid' + b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + # vertical multi select + config.wrappers :vertical_multi_select, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.use :label, class: 'form-control-label' + b.wrapper tag: 'div', class: 'd-flex flex-row justify-content-between align-items-center' do |ba| + ba.use :input, class: 'form-control mx-1', error_class: 'is-invalid', valid_class: 'is-valid' + end + b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + # vertical range input + config.wrappers :vertical_range, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.use :placeholder + b.optional :readonly + b.optional :step + b.use :label + b.use :input, class: 'form-control-range', error_class: 'is-invalid', valid_class: 'is-valid' + b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + + # horizontal forms + # + # horizontal default_wrapper + config.wrappers :horizontal_form, tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :minlength + b.optional :pattern + b.optional :min_max + b.optional :readonly + b.use :label, class: 'col-sm-3 col-form-label' + b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba| + ba.use :input, class: 'form-control', error_class: 'is-invalid', valid_class: 'is-valid' + ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' } + ba.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + end + + # horizontal input for boolean + config.wrappers :horizontal_boolean, tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.wrapper tag: 'label', class: 'col-sm-3' do |ba| + ba.use :label_text + end + b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |wr| + wr.wrapper :form_check_wrapper, tag: 'div', class: 'form-check' do |bb| + bb.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid' + bb.use :label, class: 'form-check-label' + bb.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + bb.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + end + end + + # horizontal input for radio buttons and check boxes + config.wrappers :horizontal_collection, item_wrapper_class: 'form-check', tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.use :label, class: 'col-sm-3 form-control-label' + b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba| + ba.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid' + ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + ba.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + end + + # horizontal input for inline radio buttons and check boxes + config.wrappers :horizontal_collection_inline, item_wrapper_class: 'form-check form-check-inline', tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.use :label, class: 'col-sm-3 form-control-label' + b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba| + ba.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid' + ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + ba.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + end + + # horizontal file input + config.wrappers :horizontal_file, tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :minlength + b.optional :readonly + b.use :label, class: 'col-sm-3 form-control-label' + b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba| + ba.use :input, error_class: 'is-invalid', valid_class: 'is-valid' + ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + ba.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + end + + # horizontal multi select + config.wrappers :horizontal_multi_select, tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.use :label, class: 'col-sm-3 control-label' + b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba| + ba.wrapper tag: 'div', class: 'd-flex flex-row justify-content-between align-items-center' do |bb| + bb.use :input, class: 'form-control mx-1', error_class: 'is-invalid', valid_class: 'is-valid' + end + ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + ba.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + end + + # horizontal range input + config.wrappers :horizontal_range, tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.use :placeholder + b.optional :readonly + b.optional :step + b.use :label, class: 'col-sm-3 form-control-label' + b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba| + ba.use :input, class: 'form-control-range', error_class: 'is-invalid', valid_class: 'is-valid' + ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + ba.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + end + + + # inline forms + # + # inline default_wrapper + config.wrappers :inline_form, tag: 'span', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :minlength + b.optional :pattern + b.optional :min_max + b.optional :readonly + b.use :label, class: 'sr-only' + + b.use :input, class: 'form-control', error_class: 'is-invalid', valid_class: 'is-valid' + b.use :error, wrap_with: { tag: 'div', class: 'invalid-feedback' } + b.optional :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + # inline input for boolean + config.wrappers :inline_boolean, tag: 'span', class: 'form-check flex-wrap justify-content-start mr-sm-2', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid' + b.use :label, class: 'form-check-label' + b.use :error, wrap_with: { tag: 'div', class: 'invalid-feedback' } + b.optional :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + + # bootstrap custom forms + # + # custom input for boolean + config.wrappers :custom_boolean, tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.wrapper :form_check_wrapper, tag: 'div', class: 'custom-control custom-checkbox' do |bb| + bb.use :input, class: 'custom-control-input', error_class: 'is-invalid', valid_class: 'is-valid' + bb.use :label, class: 'custom-control-label' + bb.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' } + bb.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + end + + config.wrappers :custom_boolean_switch, tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.wrapper :form_check_wrapper, tag: 'div', class: 'custom-control custom-checkbox-switch' do |bb| + bb.use :input, class: 'custom-control-input', error_class: 'is-invalid', valid_class: 'is-valid' + bb.use :label, class: 'custom-control-label' + bb.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' } + bb.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + end + + # custom input for radio buttons and check boxes + config.wrappers :custom_collection, item_wrapper_class: 'custom-control', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.wrapper :legend_tag, tag: 'legend', class: 'col-form-label pt-0' do |ba| + ba.use :label_text + end + b.use :input, class: 'custom-control-input', error_class: 'is-invalid', valid_class: 'is-valid' + b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + # custom input for inline radio buttons and check boxes + config.wrappers :custom_collection_inline, item_wrapper_class: 'custom-control custom-control-inline', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.wrapper :legend_tag, tag: 'legend', class: 'col-form-label pt-0' do |ba| + ba.use :label_text + end + b.use :input, class: 'custom-control-input', error_class: 'is-invalid', valid_class: 'is-valid' + b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + # custom file input + config.wrappers :custom_file, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :minlength + b.optional :readonly + b.use :label, class: 'form-control-label' + b.wrapper :custom_file_wrapper, tag: 'div', class: 'custom-file' do |ba| + ba.use :input, class: 'custom-file-input', error_class: 'is-invalid', valid_class: 'is-valid' + ba.use :label, class: 'custom-file-label' + ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' } + end + b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + # custom multi select + config.wrappers :custom_multi_select, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.use :label, class: 'form-control-label' + b.wrapper tag: 'div', class: 'd-flex flex-row justify-content-between align-items-center' do |ba| + ba.use :input, class: 'custom-select mx-1', error_class: 'is-invalid', valid_class: 'is-valid' + end + b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + # custom range input + config.wrappers :custom_range, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.use :placeholder + b.optional :readonly + b.optional :step + b.use :label, class: 'form-control-label' + b.use :input, class: 'custom-range', error_class: 'is-invalid', valid_class: 'is-valid' + b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + + # Input Group - custom component + # see example app and config at https://github.com/rafaelfranca/simple_form-bootstrap + # config.wrappers :input_group, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + # b.use :html5 + # b.use :placeholder + # b.optional :maxlength + # b.optional :minlength + # b.optional :pattern + # b.optional :min_max + # b.optional :readonly + # b.use :label, class: 'form-control-label' + # b.wrapper :input_group_tag, tag: 'div', class: 'input-group' do |ba| + # ba.optional :prepend + # ba.use :input, class: 'form-control', error_class: 'is-invalid', valid_class: 'is-valid' + # ba.optional :append + # end + # b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + # b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + # end + + + # Floating Labels form + # + # floating labels default_wrapper + config.wrappers :floating_labels_form, tag: 'div', class: 'form-label-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :minlength + b.optional :pattern + b.optional :min_max + b.optional :readonly + b.use :input, class: 'form-control', error_class: 'is-invalid', valid_class: 'is-valid' + b.use :label, class: 'form-control-label' + b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' } + b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + # custom multi select + config.wrappers :floating_labels_select, tag: 'div', class: 'form-label-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.use :input, class: 'custom-select custom-select-lg', error_class: 'is-invalid', valid_class: 'is-valid' + b.use :label, class: 'form-control-label' + b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' } + b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + + # The default wrapper to be used by the FormBuilder. + config.default_wrapper = :vertical_form + + # 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 = { + boolean: :vertical_boolean, + check_boxes: :vertical_collection, + date: :vertical_multi_select, + datetime: :vertical_multi_select, + file: :vertical_file, + radio_buttons: :vertical_collection, + range: :vertical_range, + time: :vertical_multi_select + } + + # enable custom form wrappers + # config.wrapper_mappings = { + # boolean: :custom_boolean, + # check_boxes: :custom_collection, + # date: :custom_multi_select, + # datetime: :custom_multi_select, + # file: :custom_file, + # radio_buttons: :custom_collection, + # range: :custom_range, + # time: :custom_multi_select + # } +end diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml new file mode 100644 index 0000000000..2374383342 --- /dev/null +++ b/config/locales/simple_form.en.yml @@ -0,0 +1,31 @@ +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:" + # 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.' + # include_blanks: + # defaults: + # age: 'Rather not say' + # prompts: + # defaults: + # age: 'Select your age' diff --git a/lib/templates/erb/scaffold/_form.html.erb b/lib/templates/erb/scaffold/_form.html.erb new file mode 100644 index 0000000000..106b71eefd --- /dev/null +++ b/lib/templates/erb/scaffold/_form.html.erb @@ -0,0 +1,15 @@ +<%# frozen_string_literal: true %> +<%%= simple_form_for(@<%= singular_table_name %>) do |f| %> + <%%= f.error_notification %> + <%%= f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? %> + +
+ <%- attributes.each do |attribute| -%> + <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> %> + <%- end -%> +
+ +
+ <%%= f.button :submit %> +
+<%% end %> From d9ddb5f85a2f184267de726804b56645b19557b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=B1=E9=9B=AF?= <1612896130@qq.com> Date: Fri, 15 Mar 2019 07:07:46 +0800 Subject: [PATCH 06/39] install font-awesome-rails --- Gemfile | 1 + Gemfile.lock | 3 +++ app/assets/stylesheets/application.scss | 3 ++- app/views/common/_navbar.html.erb | 4 ++-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 77d79da72d..4658dfc87b 100644 --- a/Gemfile +++ b/Gemfile @@ -32,6 +32,7 @@ gem 'jbuilder', '~> 2.5' gem 'bootstrap-sass' gem 'devise' gem 'simple_form' +gem 'font-awesome-rails' group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console diff --git a/Gemfile.lock b/Gemfile.lock index e916f19732..b431b500e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -65,6 +65,8 @@ GEM erubis (2.7.0) execjs (2.7.0) ffi (1.9.14) + font-awesome-rails (4.7.0.4) + railties (>= 3.2, < 6.0) globalid (0.3.7) activesupport (>= 4.1.0) i18n (0.7.0) @@ -180,6 +182,7 @@ DEPENDENCIES byebug coffee-rails (~> 4.2) devise + font-awesome-rails jbuilder (~> 2.5) jquery-rails listen (~> 3.0.5) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 359d8c8432..c04934a000 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -15,4 +15,5 @@ */ @import "bootstrap-sprockets"; -@import "bootstrap"; \ No newline at end of file +@import "bootstrap"; +@import "font-awesome"; \ No newline at end of file diff --git a/app/views/common/_navbar.html.erb b/app/views/common/_navbar.html.erb index bf6dc11363..1de711e989 100644 --- a/app/views/common/_navbar.html.erb +++ b/app/views/common/_navbar.html.erb @@ -10,7 +10,7 @@ <% end %> diff --git a/config/routes.rb b/config/routes.rb index e1718043e4..dd351e31d3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -20,5 +20,9 @@ resources :cart_items resources :orders + + namespace :account do + resources :orders + end # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end \ No newline at end of file diff --git a/test/controllers/account/orders_controller_test.rb b/test/controllers/account/orders_controller_test.rb new file mode 100644 index 0000000000..0addba5790 --- /dev/null +++ b/test/controllers/account/orders_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class Account::OrdersControllerTest < ActionDispatch::IntegrationTest + # test "the truth" do + # assert true + # end +end From 1172230acef2aff5ebdf12249c2bcbb25a984f13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=B1=E9=9B=AF?= <1612896130@qq.com> Date: Fri, 15 Mar 2019 14:11:57 +0800 Subject: [PATCH 31/39] add payment_method function --- app/controllers/orders_controller.rb | 16 ++++++++++++++++ app/models/order.rb | 10 ++++++++-- app/views/orders/show.html.erb | 9 +++++++++ config/routes.rb | 7 ++++++- .../20190315060253_add_is_paid_to_order.rb | 5 +++++ ...20190315060405_add_payment_method_to_order.rb | 5 +++++ db/schema.rb | 8 +++++--- 7 files changed, 54 insertions(+), 6 deletions(-) create mode 100644 db/migrate/20190315060253_add_is_paid_to_order.rb create mode 100644 db/migrate/20190315060405_add_payment_method_to_order.rb diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index 3bda247ea2..bd11381b84 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -27,6 +27,22 @@ def show @product_lists = @order.product_lists end + def pay_with_alipay + @order = Order.find_by_token(params[:id]) + @order.set_payment_with!("alipay") + @order.pay! + + redirect_to order_path(@order.token), notice: "使用支付宝成功完成付款" + end + + def pay_with_wechat + @order = Order.find_by_token(params[:id]) + @order.set_payment_with!("wechat") + @order.pay! + + redirect_to order_path(@order.token), notice: "使用微信成功完成付款" + end + private def order_params diff --git a/app/models/order.rb b/app/models/order.rb index 1f4464ca08..b70e60a77c 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -7,9 +7,15 @@ class Order < ApplicationRecord validates :shipping_name, presence: true validates :shipping_address, presence: true - - def generate_token self.token = SecureRandom.uuid end + + def set_payment_with!(method) + self.update_columns(payment_method: method ) + end + + def pay! + self.update_columns(is_paid: true ) + end end diff --git a/app/views/orders/show.html.erb b/app/views/orders/show.html.erb index feef071ec8..103e7f6b81 100644 --- a/app/views/orders/show.html.erb +++ b/app/views/orders/show.html.erb @@ -26,6 +26,15 @@ + <% if !@order.is_paid? %> +
+ <%= link_to("以支付宝支付", pay_with_alipay_order_path(@order.token), :method => :post, :class => "btn btn-danger") %> + <%= link_to("以微信支付", pay_with_wechat_order_path(@order.token), :method => :post, :class => "btn btn-danger") %> +
+ <% else %> +

此订单已完成付款

+ <% end %> +
总计 <%= @order.total %> CNY diff --git a/config/routes.rb b/config/routes.rb index dd351e31d3..e80975c22f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -19,7 +19,12 @@ end resources :cart_items - resources :orders + resources :orders do + member do + post :pay_with_alipay + post :pay_with_wechat + end + end namespace :account do resources :orders diff --git a/db/migrate/20190315060253_add_is_paid_to_order.rb b/db/migrate/20190315060253_add_is_paid_to_order.rb new file mode 100644 index 0000000000..512597fc2d --- /dev/null +++ b/db/migrate/20190315060253_add_is_paid_to_order.rb @@ -0,0 +1,5 @@ +class AddIsPaidToOrder < ActiveRecord::Migration[5.0] + def change + add_column :orders, :is_paid, :boolean, default: false + end +end diff --git a/db/migrate/20190315060405_add_payment_method_to_order.rb b/db/migrate/20190315060405_add_payment_method_to_order.rb new file mode 100644 index 0000000000..d1896b741e --- /dev/null +++ b/db/migrate/20190315060405_add_payment_method_to_order.rb @@ -0,0 +1,5 @@ +class AddPaymentMethodToOrder < ActiveRecord::Migration[5.0] + def change + add_column :orders, :payment_method, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index aa07515e2f..203df63e07 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20190315055119) do +ActiveRecord::Schema.define(version: 20190315060405) do create_table "cart_items", force: :cascade do |t| t.integer "cart_id" @@ -32,9 +32,11 @@ t.string "billing_address" t.string "shipping_name" t.string "shipping_address" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.string "token" + t.boolean "is_paid", default: false + t.string "payment_method" end create_table "product_lists", force: :cascade do |t| From 2d2050d1a1c762a57e3a556204135a868e40ed84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=B1=E9=9B=AF?= <1612896130@qq.com> Date: Fri, 15 Mar 2019 14:18:49 +0800 Subject: [PATCH 32/39] add OrderMailer function --- Gemfile | 1 + Gemfile.lock | 8 +++ app/controllers/orders_controller.rb | 3 + app/mailers/application_mailer.rb | 2 +- app/mailers/order_mailer.rb | 9 +++ .../order_mailer/notify_order_placed.html.erb | 71 +++++++++++++++++++ config/environments/development.rb | 2 + test/mailers/order_mailer_test.rb | 7 ++ test/mailers/previews/order_mailer_preview.rb | 4 ++ 9 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 app/mailers/order_mailer.rb create mode 100644 app/views/order_mailer/notify_order_placed.html.erb create mode 100644 test/mailers/order_mailer_test.rb create mode 100644 test/mailers/previews/order_mailer_preview.rb diff --git a/Gemfile b/Gemfile index 1dd89f4c34..fa1897b9c3 100644 --- a/Gemfile +++ b/Gemfile @@ -36,6 +36,7 @@ gem 'font-awesome-rails' gem 'carrierwave' gem 'mini_magick' +gem 'letter_opener', group: :development group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console diff --git a/Gemfile.lock b/Gemfile.lock index f219fc6879..39b9714ba7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,6 +38,8 @@ GEM i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) arel (7.1.1) autoprefixer-rails (9.4.7) execjs @@ -81,6 +83,10 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) + launchy (2.4.3) + addressable (~> 2.3) + letter_opener (1.7.0) + launchy (~> 2.2) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -102,6 +108,7 @@ GEM pkg-config (~> 1.1.7) orm_adapter (0.5.0) pkg-config (1.1.7) + public_suffix (3.0.3) puma (3.6.0) rack (2.0.1) rack-test (0.6.3) @@ -191,6 +198,7 @@ DEPENDENCIES font-awesome-rails jbuilder (~> 2.5) jquery-rails + letter_opener listen (~> 3.0.5) mini_magick puma (~> 3.0) diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index bd11381b84..6728d0cbdb 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -16,6 +16,9 @@ def create product_list.save end + current_cart.clean! + OrderMailer.notify_order_placed(@order).deliver! + redirect_to order_path(@order.token) else render 'carts/checkout' diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb index 286b2239d1..d55a88f448 100644 --- a/app/mailers/application_mailer.rb +++ b/app/mailers/application_mailer.rb @@ -1,4 +1,4 @@ class ApplicationMailer < ActionMailer::Base - default from: 'from@example.com' + default from: "service@jdstore.com" layout 'mailer' end diff --git a/app/mailers/order_mailer.rb b/app/mailers/order_mailer.rb new file mode 100644 index 0000000000..a0974f41af --- /dev/null +++ b/app/mailers/order_mailer.rb @@ -0,0 +1,9 @@ +class OrderMailer < ApplicationMailer + def notify_order_placed(order) + @order = order + @user = order.user + @product_lists = @order.product_lists + + mail(to: @user.email , subject: "[JDstore] 感谢您完成本次的下单,以下是您这次购物明细 #{order.token}") + end +end \ No newline at end of file diff --git a/app/views/order_mailer/notify_order_placed.html.erb b/app/views/order_mailer/notify_order_placed.html.erb new file mode 100644 index 0000000000..ef1133f06d --- /dev/null +++ b/app/views/order_mailer/notify_order_placed.html.erb @@ -0,0 +1,71 @@ +
+
+

+ 订单明细
+ + <%= link_to("订单连结", order_url(@order.token)) %> + +

+ + + + + + + + + + + + <% @product_lists.each do |product_list| %> + + + + + + + <% end %> + + +
商品明细单价数量小记
+ <%= product_list.product_name %> + + <%= product_list.product_price %> + + <%= product_list.quantity %> + + <%= product_list.quantity * product_list.product_price %> +
+ +
+

+ 总计 <%= @order.total %> CNY +

+
+ +
+ +

寄送资讯

+ + + + + + + + + + + + + + + + +
订购人
+ <%= @order.billing_name %> - <%= @order.billing_address %> +
收件者
+ <%= @order.shipping_name %> - <%= @order.shipping_address %> +
+
+
\ No newline at end of file diff --git a/config/environments/development.rb b/config/environments/development.rb index 6f7197045a..83369ff74d 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -51,4 +51,6 @@ # Use an evented file watcher to asynchronously detect changes in source code, # routes, locales, etc. This feature depends on the listen gem. config.file_watcher = ActiveSupport::EventedFileUpdateChecker + config.action_mailer.default_url_options = { host: 'localhost:3000' } + config.action_mailer.delivery_method = :letter_opener end diff --git a/test/mailers/order_mailer_test.rb b/test/mailers/order_mailer_test.rb new file mode 100644 index 0000000000..6e2129de09 --- /dev/null +++ b/test/mailers/order_mailer_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class OrderMailerTest < ActionMailer::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/mailers/previews/order_mailer_preview.rb b/test/mailers/previews/order_mailer_preview.rb new file mode 100644 index 0000000000..7be457e2d6 --- /dev/null +++ b/test/mailers/previews/order_mailer_preview.rb @@ -0,0 +1,4 @@ +# Preview all emails at http://localhost:3000/rails/mailers/order_mailer +class OrderMailerPreview < ActionMailer::Preview + +end From c87baea44f0248e29999d96df18307f424a32164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=B1=E9=9B=AF?= <1612896130@qq.com> Date: Fri, 15 Mar 2019 14:27:34 +0800 Subject: [PATCH 33/39] add admin/orders --- Gemfile | 1 + Gemfile.lock | 3 ++ app/assets/javascripts/admin/orders.coffee | 3 ++ app/assets/stylesheets/admin/orders.scss | 3 ++ app/controllers/admin/orders_controller.rb | 10 ++++++ app/controllers/orders_controller.rb | 4 +-- app/helpers/admin/orders_helper.rb | 2 ++ app/models/order.rb | 32 +++++++++++++++++++ app/views/admin/orders/index.html.erb | 23 +++++++++++++ app/views/layouts/admin.html.erb | 1 + config/routes.rb | 1 + .../20190315062041_add_aasm_state_to_order.rb | 6 ++++ db/schema.rb | 8 +++-- .../admin/orders_controller_test.rb | 7 ++++ 14 files changed, 99 insertions(+), 5 deletions(-) create mode 100644 app/assets/javascripts/admin/orders.coffee create mode 100644 app/assets/stylesheets/admin/orders.scss create mode 100644 app/controllers/admin/orders_controller.rb create mode 100644 app/helpers/admin/orders_helper.rb create mode 100644 app/views/admin/orders/index.html.erb create mode 100644 db/migrate/20190315062041_add_aasm_state_to_order.rb create mode 100644 test/controllers/admin/orders_controller_test.rb diff --git a/Gemfile b/Gemfile index fa1897b9c3..15aa8cd928 100644 --- a/Gemfile +++ b/Gemfile @@ -37,6 +37,7 @@ gem 'carrierwave' gem 'mini_magick' gem 'letter_opener', group: :development +gem 'aasm' group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console diff --git a/Gemfile.lock b/Gemfile.lock index 39b9714ba7..c7463169e9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,8 @@ GEM remote: https://rubygems.org/ specs: + aasm (5.0.2) + concurrent-ruby (~> 1.0) actioncable (5.0.0) actionpack (= 5.0.0) nio4r (~> 1.2) @@ -190,6 +192,7 @@ PLATFORMS ruby DEPENDENCIES + aasm bootstrap-sass byebug carrierwave diff --git a/app/assets/javascripts/admin/orders.coffee b/app/assets/javascripts/admin/orders.coffee new file mode 100644 index 0000000000..24f83d18bb --- /dev/null +++ b/app/assets/javascripts/admin/orders.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/admin/orders.scss b/app/assets/stylesheets/admin/orders.scss new file mode 100644 index 0000000000..7ed90c7eac --- /dev/null +++ b/app/assets/stylesheets/admin/orders.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/controllers/admin/orders_controller.rb b/app/controllers/admin/orders_controller.rb new file mode 100644 index 0000000000..d279f6f8bc --- /dev/null +++ b/app/controllers/admin/orders_controller.rb @@ -0,0 +1,10 @@ +class Admin::OrdersController < ApplicationController + layout "admin" + + before_action :authenticate_user! + before_action :admin_required + + def index + @orders = Order.order("id DESC") + end +end \ No newline at end of file diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index 6728d0cbdb..92d1383dfb 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -33,7 +33,7 @@ def show def pay_with_alipay @order = Order.find_by_token(params[:id]) @order.set_payment_with!("alipay") - @order.pay! + @order.make_payment! redirect_to order_path(@order.token), notice: "使用支付宝成功完成付款" end @@ -41,7 +41,7 @@ def pay_with_alipay def pay_with_wechat @order = Order.find_by_token(params[:id]) @order.set_payment_with!("wechat") - @order.pay! + @order.make_payment! redirect_to order_path(@order.token), notice: "使用微信成功完成付款" end diff --git a/app/helpers/admin/orders_helper.rb b/app/helpers/admin/orders_helper.rb new file mode 100644 index 0000000000..863374ff66 --- /dev/null +++ b/app/helpers/admin/orders_helper.rb @@ -0,0 +1,2 @@ +module Admin::OrdersHelper +end diff --git a/app/models/order.rb b/app/models/order.rb index b70e60a77c..0924d0bd12 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -7,6 +7,38 @@ class Order < ApplicationRecord validates :shipping_name, presence: true validates :shipping_address, presence: true + include AASM + + aasm do + state :order_placed, initial: true + state :paid + state :shipping + state :shipped + state :order_cancelled + state :good_returned + + + event :make_payment, after_commit: :pay! do + transitions from: :order_placed, to: :paid + end + + event :ship do + transitions from: :paid, to: :shipping + end + + event :deliver do + transitions from: :shipping, to: :shipped + end + + event :return_good do + transitions from: :shipped, to: :good_returned + end + + event :cancel_order do + transitions from: [:order_placed, :paid], to: :order_cancelled + end + end + def generate_token self.token = SecureRandom.uuid end diff --git a/app/views/admin/orders/index.html.erb b/app/views/admin/orders/index.html.erb new file mode 100644 index 0000000000..0823861006 --- /dev/null +++ b/app/views/admin/orders/index.html.erb @@ -0,0 +1,23 @@ +

订单列表

+ + + + + + + + + + + + <% @orders.each do |order| %> + + + + + + + <% end %> + + +
#生成时间订购者订单状态
<%= link_to(order.id, admin_order_path(order) ) %> <%= order.created_at.to_s(:long) %> <%= order.user.email %> <%= order.aasm_state %>
\ No newline at end of file diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index 7f8ca78984..c5b5d847f2 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb @@ -13,6 +13,7 @@
diff --git a/config/routes.rb b/config/routes.rb index e80975c22f..77a75b198b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,6 +3,7 @@ devise_for :users namespace :admin do resources :products + resources :orders end resources :products do diff --git a/db/migrate/20190315062041_add_aasm_state_to_order.rb b/db/migrate/20190315062041_add_aasm_state_to_order.rb new file mode 100644 index 0000000000..4028b8c968 --- /dev/null +++ b/db/migrate/20190315062041_add_aasm_state_to_order.rb @@ -0,0 +1,6 @@ +class AddAasmStateToOrder < ActiveRecord::Migration[5.0] + def change + add_column :orders, :aasm_state, :string, default: "order_placed" + add_index :orders, :aasm_state + end +end diff --git a/db/schema.rb b/db/schema.rb index 203df63e07..096b1db6a6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20190315060405) do +ActiveRecord::Schema.define(version: 20190315062041) do create_table "cart_items", force: :cascade do |t| t.integer "cart_id" @@ -32,11 +32,13 @@ t.string "billing_address" t.string "shipping_name" t.string "shipping_address" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.string "token" t.boolean "is_paid", default: false t.string "payment_method" + t.string "aasm_state", default: "order_placed" + t.index ["aasm_state"], name: "index_orders_on_aasm_state" end create_table "product_lists", force: :cascade do |t| diff --git a/test/controllers/admin/orders_controller_test.rb b/test/controllers/admin/orders_controller_test.rb new file mode 100644 index 0000000000..f43ce7d407 --- /dev/null +++ b/test/controllers/admin/orders_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class Admin::OrdersControllerTest < ActionDispatch::IntegrationTest + # test "the truth" do + # assert true + # end +end From f66f610c65ea766c47fe11a53f8a929461529667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=B1=E9=9B=AF?= <1612896130@qq.com> Date: Fri, 15 Mar 2019 14:29:28 +0800 Subject: [PATCH 34/39] implement admin/orders show function --- app/controllers/admin/orders_controller.rb | 5 ++ app/helpers/orders_helper.rb | 9 ++- app/views/admin/orders/show.html.erb | 69 ++++++++++++++++++++++ 3 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 app/views/admin/orders/show.html.erb diff --git a/app/controllers/admin/orders_controller.rb b/app/controllers/admin/orders_controller.rb index d279f6f8bc..8810497a08 100644 --- a/app/controllers/admin/orders_controller.rb +++ b/app/controllers/admin/orders_controller.rb @@ -7,4 +7,9 @@ class Admin::OrdersController < ApplicationController def index @orders = Order.order("id DESC") end + + def show + @order = Order.find(params[:id]) + @product_lists = @order.product_lists + end end \ No newline at end of file diff --git a/app/helpers/orders_helper.rb b/app/helpers/orders_helper.rb index 443227fd48..81e238d586 100644 --- a/app/helpers/orders_helper.rb +++ b/app/helpers/orders_helper.rb @@ -1,2 +1,9 @@ module OrdersHelper -end + def render_order_paid_state(order) + if order.is_paid? + "已付款" + else + "未付款" + end + end +end \ No newline at end of file diff --git a/app/views/admin/orders/show.html.erb b/app/views/admin/orders/show.html.erb new file mode 100644 index 0000000000..5963e341c8 --- /dev/null +++ b/app/views/admin/orders/show.html.erb @@ -0,0 +1,69 @@ +
+
+ +

订单明细 (<%= render_order_paid_state(@order) %>)

+ + + + + + + + + + + + <% @product_lists.each do |product_list| %> + + + + + + <% end %> + + +
商品明细单价数量
+ <%= product_list.product_name %> + + <%= product_list.product_price %> + + <%= product_list.quantity %> +
+ +
+ + 总计 <%= @order.total %> CNY + +
+ +
+ +

寄送资讯

+ + + + + + + + + + + + + + + + +
+ 订购人 +
+ <%= @order.billing_name %> - <%= @order.billing_address %> +
+ 收件人 +
+ <%= @order.shipping_name %> - <%= @order.shipping_address %> +
+ +
+
\ No newline at end of file From a06e0614d94cb5fddd10de1473ed33f520286324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=B1=E9=9B=AF?= <1612896130@qq.com> Date: Fri, 15 Mar 2019 14:44:25 +0800 Subject: [PATCH 35/39] add ship/shipped/cancel/return action to admin/orders_controller --- app/controllers/admin/orders_controller.rb | 24 ++++++++++++++++++++++ config/routes.rb | 9 +++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/orders_controller.rb b/app/controllers/admin/orders_controller.rb index 8810497a08..5942b3edd7 100644 --- a/app/controllers/admin/orders_controller.rb +++ b/app/controllers/admin/orders_controller.rb @@ -12,4 +12,28 @@ def show @order = Order.find(params[:id]) @product_lists = @order.product_lists end + + def ship + @order = Order.find(params[:id]) + @order.ship! + redirect_to :back + end + + def shipped + @order = Order.find(params[:id]) + @order.deliver! + redirect_to :back + end + + def cancel + @order = Order.find(params[:id]) + @order.cancel_order! + redirect_to :back + end + + def return + @order = Order.find(params[:id]) + @order.return_good! + redirect_to :back + end end \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 77a75b198b..6660d0a4bc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,7 +3,14 @@ devise_for :users namespace :admin do resources :products - resources :orders + resources :orders do + member do + post :cancel + post :ship + post :shipped + post :return + end + end end resources :products do From 0a4d9180a83fc73e1f47fc0ca6b71d6874360dd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=B1=E9=9B=AF?= <1612896130@qq.com> Date: Fri, 15 Mar 2019 14:45:39 +0800 Subject: [PATCH 36/39] add admin/orders/state_option button --- app/views/admin/orders/_state_option.html.erb | 35 +++++++++++++++++++ app/views/admin/orders/show.html.erb | 1 + 2 files changed, 36 insertions(+) create mode 100644 app/views/admin/orders/_state_option.html.erb diff --git a/app/views/admin/orders/_state_option.html.erb b/app/views/admin/orders/_state_option.html.erb new file mode 100644 index 0000000000..b4a4e9be93 --- /dev/null +++ b/app/views/admin/orders/_state_option.html.erb @@ -0,0 +1,35 @@ +
+ + <% case order.aasm_state %> + <% when "order_placed" %> + <%= link_to("取消订单", + cancel_admin_order_path(order), + class: "btn btn-default btn-sm", method: :post) %> + + <% when "paid" %> + <%= link_to("取消订单", + cancel_admin_order_path(order), + class: "btn btn-default btn-sm", method: :post) %> + <%= link_to("出货", + ship_admin_order_path(order), + class: "btn btn-default btn-sm", method: :post) %> + + <% when "shipping" %> + <%= link_to("设为已出货", + shipped_admin_order_path(order), + class: "btn btn-default btn-sm", method: :post) %> + + <% when "shipped" %> + <%= link_to("退货", + return_admin_order_path(order), + class: "btn btn-default btn-sm", method: :post) %> + + <% when "order_cancelled" %> + 订单已取消 + + <% when "good_returned" %> + 已退货 + + <% end %> + +
\ No newline at end of file diff --git a/app/views/admin/orders/show.html.erb b/app/views/admin/orders/show.html.erb index 5963e341c8..64608eabde 100644 --- a/app/views/admin/orders/show.html.erb +++ b/app/views/admin/orders/show.html.erb @@ -2,6 +2,7 @@

订单明细 (<%= render_order_paid_state(@order) %>)

+ <%= render "admin/orders/state_option", order: @order %> From f7ae1f8edcea4c5179a23cea7e4755067140b08c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=B1=E9=9B=AF?= <1612896130@qq.com> Date: Fri, 15 Mar 2019 14:48:09 +0800 Subject: [PATCH 37/39] add apply_cancel function --- app/controllers/orders_controller.rb | 7 ++ app/mailers/order_mailer.rb | 8 +++ app/views/order_mailer/apply_cancel.html.erb | 71 ++++++++++++++++++++ app/views/orders/show.html.erb | 6 ++ config/routes.rb | 1 + 5 files changed, 93 insertions(+) create mode 100644 app/views/order_mailer/apply_cancel.html.erb diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index 92d1383dfb..5324f2ac0a 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -51,4 +51,11 @@ def pay_with_wechat def order_params params.require(:order).permit(:billing_name, :billing_address, :shipping_name, :shipping_address) end + + def apply_to_cancel + @order = Order.find_by_token(params[:id]) + OrderMailer.apply_cancel(@order).deliver! + flash[:notice] = "已提交申请" + redirect_to :back + end end diff --git a/app/mailers/order_mailer.rb b/app/mailers/order_mailer.rb index a0974f41af..61fe40515c 100644 --- a/app/mailers/order_mailer.rb +++ b/app/mailers/order_mailer.rb @@ -6,4 +6,12 @@ def notify_order_placed(order) mail(to: @user.email , subject: "[JDstore] 感谢您完成本次的下单,以下是您这次购物明细 #{order.token}") end + + def apply_cancel(order) + @order = order + @user = order.user + @product_lists = @order.product_lists + + mail(to: "admin@test.com" , subject: "[JDStore] 用户#{order.user.email}申请取消订单 #{order.token}") + end end \ No newline at end of file diff --git a/app/views/order_mailer/apply_cancel.html.erb b/app/views/order_mailer/apply_cancel.html.erb new file mode 100644 index 0000000000..f706a80b7c --- /dev/null +++ b/app/views/order_mailer/apply_cancel.html.erb @@ -0,0 +1,71 @@ +
+
+

+ 订单明细
+ + <%= link_to("订单连结", order_url(@order.token)) %> + +

+
+ + + + + + + + + + + <% @product_lists.each do |product_list| %> + + + + + + + <% end %> + + +
商品明细单价数量小记
+ <%= product_list.product_name %> + + <%= product_list.product_price %> + + <%= product_list.quantity %> + + <%= product_list.quantity * product_list.product_price %> +
+ +
+

+ 总计 <%= @order.total %> CNY +

+
+ +
+ +

寄送资讯

+ + + + + + + + + + + + + + + + +
订购人
+ <%= @order.billing_name %> - <%= @order.billing_address %> +
收件者
+ <%= @order.shipping_name %> - <%= @order.shipping_address %> +
+
+
diff --git a/app/views/orders/show.html.erb b/app/views/orders/show.html.erb index 103e7f6b81..b63bb999f0 100644 --- a/app/views/orders/show.html.erb +++ b/app/views/orders/show.html.erb @@ -26,6 +26,12 @@ +
+ <% if @order.order_placed? || @order.paid? %> + <%= link_to("申请取消订单", apply_to_cancel_order_path(@order.token), method: :post, class: "btn btn-info") %> + <% end %> +
+ <% if !@order.is_paid? %>
<%= link_to("以支付宝支付", pay_with_alipay_order_path(@order.token), :method => :post, :class => "btn btn-danger") %> diff --git a/config/routes.rb b/config/routes.rb index 6660d0a4bc..88431257bd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -31,6 +31,7 @@ member do post :pay_with_alipay post :pay_with_wechat + post :apply_to_cancel end end From 768ba08787ff1978da0f86b0d40c80a1ffb5f228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=B1=E9=9B=AF?= <1612896130@qq.com> Date: Fri, 15 Mar 2019 14:50:23 +0800 Subject: [PATCH 38/39] add notify_cancel/ship function --- app/controllers/admin/orders_controller.rb | 2 + app/mailers/order_mailer.rb | 16 +++++ app/views/order_mailer/notify_cancel.html.erb | 71 +++++++++++++++++++ app/views/order_mailer/notify_ship.html.erb | 71 +++++++++++++++++++ 4 files changed, 160 insertions(+) create mode 100644 app/views/order_mailer/notify_cancel.html.erb create mode 100644 app/views/order_mailer/notify_ship.html.erb diff --git a/app/controllers/admin/orders_controller.rb b/app/controllers/admin/orders_controller.rb index 5942b3edd7..5fb92a9d5a 100644 --- a/app/controllers/admin/orders_controller.rb +++ b/app/controllers/admin/orders_controller.rb @@ -16,6 +16,7 @@ def show def ship @order = Order.find(params[:id]) @order.ship! + OrderMailer.notify_ship(@order).deliver! redirect_to :back end @@ -28,6 +29,7 @@ def shipped def cancel @order = Order.find(params[:id]) @order.cancel_order! + OrderMailer.notify_cancel(@order).deliver! redirect_to :back end diff --git a/app/mailers/order_mailer.rb b/app/mailers/order_mailer.rb index 61fe40515c..21b7ed6cb2 100644 --- a/app/mailers/order_mailer.rb +++ b/app/mailers/order_mailer.rb @@ -14,4 +14,20 @@ def apply_cancel(order) mail(to: "admin@test.com" , subject: "[JDStore] 用户#{order.user.email}申请取消订单 #{order.token}") end + + def notify_ship(order) + @order = order + @user = order.user + @product_lists = @order.product_lists + + mail(to: @user.email, subject: "[JDStore] 您的订单 #{order.token}已发货") + end + + def notify_cancel(order) + @order = order + @user = order.user + @product_lists = @order.product_lists + + mail(to: @user.email, subject: "[JDStore] 您的订单 #{order.token}已取消") + end end \ No newline at end of file diff --git a/app/views/order_mailer/notify_cancel.html.erb b/app/views/order_mailer/notify_cancel.html.erb new file mode 100644 index 0000000000..ef1133f06d --- /dev/null +++ b/app/views/order_mailer/notify_cancel.html.erb @@ -0,0 +1,71 @@ +
+
+

+ 订单明细
+ + <%= link_to("订单连结", order_url(@order.token)) %> + +

+ + + + + + + + + + + + <% @product_lists.each do |product_list| %> + + + + + + + <% end %> + + +
商品明细单价数量小记
+ <%= product_list.product_name %> + + <%= product_list.product_price %> + + <%= product_list.quantity %> + + <%= product_list.quantity * product_list.product_price %> +
+ +
+

+ 总计 <%= @order.total %> CNY +

+
+ +
+ +

寄送资讯

+ + + + + + + + + + + + + + + + +
订购人
+ <%= @order.billing_name %> - <%= @order.billing_address %> +
收件者
+ <%= @order.shipping_name %> - <%= @order.shipping_address %> +
+
+
\ No newline at end of file diff --git a/app/views/order_mailer/notify_ship.html.erb b/app/views/order_mailer/notify_ship.html.erb new file mode 100644 index 0000000000..ef1133f06d --- /dev/null +++ b/app/views/order_mailer/notify_ship.html.erb @@ -0,0 +1,71 @@ +
+
+

+ 订单明细
+ + <%= link_to("订单连结", order_url(@order.token)) %> + +

+ + + + + + + + + + + + <% @product_lists.each do |product_list| %> + + + + + + + <% end %> + + +
商品明细单价数量小记
+ <%= product_list.product_name %> + + <%= product_list.product_price %> + + <%= product_list.quantity %> + + <%= product_list.quantity * product_list.product_price %> +
+ +
+

+ 总计 <%= @order.total %> CNY +

+
+ +
+ +

寄送资讯

+ + + + + + + + + + + + + + + + +
订购人
+ <%= @order.billing_name %> - <%= @order.billing_address %> +
收件者
+ <%= @order.shipping_name %> - <%= @order.shipping_address %> +
+
+
\ No newline at end of file From 38747b2e3f8c4ca4c3644a0e018d39b120e24750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=B1=E9=9B=AF?= <1612896130@qq.com> Date: Wed, 20 Mar 2019 12:10:07 +0800 Subject: [PATCH 39/39] stroy5 --- config/application.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 config/application.yml diff --git a/config/application.yml b/config/application.yml new file mode 100644 index 0000000000..b61bc7150e --- /dev/null +++ b/config/application.yml @@ -0,0 +1,23 @@ +# Add configuration values here, as shown below. +# +# pusher_app_id: "2954" +# pusher_key: 7381a978f7dd7f9a1117 +# pusher_secret: abdc3b896a0ffb85d373 +# stripe_api_key: sk_test_2J0l093xOyW72XUYJHE4Dv2r +# stripe_publishable_key: pk_test_ro9jV5SNwGb1yYlQfzG17LHK +# +# production: +# stripe_api_key: sk_live_EeHnL644i6zo4Iyq4v1KdV9H +# stripe_publishable_key: pk_live_9lcthxpSIHbGwmdO941O1XVU + +production: + qiniu_access_key: H3VniOOGL5PQs-U2JPfLljJFvLisne78pINQow5v # 你的 qiniu AccessKey + qiniu_secret_key: nG-sZWSOv4mkayOVESb8vTAJMrQ4Q99S_4LgyKr0 # 你的 qiniu SecretKey + qiniu_bucket: jdstore-demo # 你的 qiniu bucket + qiniu_bucket_domain: poejqvpn7.bkt.clouddn.com # 你的 qiniu bucket domain + +development: + qiniu_access_key: H3VniOOGL5PQs-U2JPfLljJFvLisne78pINQow5v # 你的 qiniu AccessKey + qiniu_secret_key: nG-sZWSOv4mkayOVESb8vTAJMrQ4Q99S_4LgyKr0 # 你的 qiniu SecretKey + qiniu_bucket: jdstore-demo # 你的 qiniu bucket + qiniu_bucket_domain: poejqvpn7.bkt.clouddn.com # 你的 qiniu bucket domain