From 3b58cf6889c67757854a653fab9a1795633a29a5 Mon Sep 17 00:00:00 2001 From: uuurs Date: Sun, 26 Nov 2017 19:41:16 +0800 Subject: [PATCH 01/16] add bootstrap into project --- Gemfile | 4 +++- Gemfile.lock | 10 ++++++++-- .../stylesheets/{application.css => application.scss} | 3 +++ 3 files changed, 14 insertions(+), 3 deletions(-) rename app/assets/stylesheets/{application.css => application.scss} (93%) diff --git a/Gemfile b/Gemfile index 0447f70941..b79ea0ee29 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -source 'https://rubygems.org' +source 'http://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' @@ -29,6 +29,8 @@ gem 'jbuilder', '~> 2.5' # Use Capistrano for deployment # gem 'capistrano-rails', group: :development +gem 'bootstrap-sass' + 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..f6084d8747 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,5 @@ GEM - remote: https://rubygems.org/ + remote: http://rubygems.org/ specs: actioncable (5.0.0) actionpack (= 5.0.0) @@ -39,6 +39,11 @@ GEM minitest (~> 5.1) tzinfo (~> 1.1) arel (7.1.1) + autoprefixer-rails (6.6.0) + execjs + 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) @@ -155,6 +160,7 @@ PLATFORMS ruby DEPENDENCIES + bootstrap-sass byebug coffee-rails (~> 4.2) jbuilder (~> 2.5) @@ -172,4 +178,4 @@ DEPENDENCIES web-console BUNDLED WITH - 1.12.5 + 1.13.6 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..461e0e7763 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"; From 2a4e4de3b82779d66614b1afe1b459d0b7edf7ef Mon Sep 17 00:00:00 2001 From: uuurs Date: Sun, 26 Nov 2017 19:47:04 +0800 Subject: [PATCH 02/16] 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 | 19 +++++++++++++++++++ app/views/layouts/application.html.erb | 8 +++++++- app/views/welcome/index.html.erb | 1 + config/routes.rb | 1 + test/controllers/welcome_controller_test.rb | 7 +++++++ 10 files changed, 51 insertions(+), 1 deletion(-) 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..3e33190871 --- /dev/null +++ b/app/views/common/_footer.html.erb @@ -0,0 +1,6 @@ +
+

Copyright ©2016 Rails101 +
Design by yourname + +

+
diff --git a/app/views/common/_navbar.html.erb b/app/views/common/_navbar.html.erb new file mode 100644 index 0000000000..09fc42cfbc --- /dev/null +++ b/app/views/common/_navbar.html.erb @@ -0,0 +1,19 @@ + diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 9af1008a35..652385d659 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,6 +9,12 @@ - <%= yield %> +
+ <%= render "common/navbar" %> + <%= yield %> +
+ + <%= render "common/footer" %> + diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb new file mode 100644 index 0000000000..8257685eca --- /dev/null +++ b/app/views/welcome/index.html.erb @@ -0,0 +1 @@ +

Hello World

diff --git a/config/routes.rb b/config/routes.rb index 787824f888..905ecb36ec 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + root 'welcome#index' end 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 62edb00d22859484b9c60b63fdb278767869b5fe Mon Sep 17 00:00:00 2001 From: uuurs Date: Sun, 26 Nov 2017 19:52:22 +0800 Subject: [PATCH 03/16] add bootstrap flash function --- app/assets/javascripts/application.js | 1 + app/controllers/welcome_controller.rb | 3 +++ app/helpers/flashes_helper.rb | 11 +++++++++++ app/views/common/_flashes.html.erb | 8 ++++++++ app/views/layouts/application.html.erb | 3 ++- 5 files changed, 25 insertions(+), 1 deletion(-) 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/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index d8c85ab84b..416ed935b0 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -1,2 +1,5 @@ class WelcomeController < ApplicationController + def index + flash[:notice] = "Good Morning!" + end end diff --git a/app/helpers/flashes_helper.rb b/app/helpers/flashes_helper.rb new file mode 100644 index 0000000000..c451f21d8e --- /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 diff --git a/app/views/common/_flashes.html.erb b/app/views/common/_flashes.html.erb new file mode 100644 index 0000000000..04a0891ba3 --- /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 %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 652385d659..7b7979378f 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -11,10 +11,11 @@
<%= render "common/navbar" %> + <%= render "common/flashes" %> <%= yield %>
<%= render "common/footer" %> - + From 7d8b7ea578321851993ea437a9ee263df0419da2 Mon Sep 17 00:00:00 2001 From: uuurs Date: Sun, 26 Nov 2017 20:17:57 +0800 Subject: [PATCH 04/16] user can login/logout/signup --- Gemfile | 3 +- Gemfile.lock | 208 +++++++------ app/assets/javascripts/application.js | 1 + app/controllers/welcome_controller.rb | 3 - app/models/user.rb | 6 + app/views/common/_navbar.html.erb | 15 +- config/initializers/devise.rb | 274 ++++++++++++++++++ config/locales/devise.en.yml | 62 ++++ config/routes.rb | 1 + .../20171126121032_devise_create_users.rb | 42 +++ db/schema.rb | 32 ++ test/fixtures/users.yml | 11 + test/models/user_test.rb | 7 + 13 files changed, 565 insertions(+), 100 deletions(-) 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/20171126121032_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 b79ea0ee29..3a2f7c42d1 100644 --- a/Gemfile +++ b/Gemfile @@ -30,7 +30,8 @@ gem 'jbuilder', '~> 2.5' # Use Capistrano for deployment # gem 'capistrano-rails', group: :development gem 'bootstrap-sass' - +gem 'rake','~> 12.1.0' +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 f6084d8747..08e8c11cce 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,160 +1,176 @@ GEM remote: http://rubygems.org/ specs: - actioncable (5.0.0) - actionpack (= 5.0.0) - nio4r (~> 1.2) + actioncable (5.0.6) + actionpack (= 5.0.6) + nio4r (>= 1.2, < 3.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.0) - actionpack (= 5.0.0) - actionview (= 5.0.0) - activejob (= 5.0.0) + actionmailer (5.0.6) + actionpack (= 5.0.6) + actionview (= 5.0.6) + activejob (= 5.0.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.0) - actionview (= 5.0.0) - activesupport (= 5.0.0) + actionpack (5.0.6) + actionview (= 5.0.6) + activesupport (= 5.0.6) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.0) - activesupport (= 5.0.0) + actionview (5.0.6) + activesupport (= 5.0.6) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (5.0.0) - activesupport (= 5.0.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.0.6) + activesupport (= 5.0.6) globalid (>= 0.3.6) - activemodel (5.0.0) - activesupport (= 5.0.0) - activerecord (5.0.0) - activemodel (= 5.0.0) - activesupport (= 5.0.0) + activemodel (5.0.6) + activesupport (= 5.0.6) + activerecord (5.0.6) + activemodel (= 5.0.6) + activesupport (= 5.0.6) arel (~> 7.0) - activesupport (5.0.0) + activesupport (5.0.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) - arel (7.1.1) - autoprefixer-rails (6.6.0) + arel (7.1.4) + autoprefixer-rails (7.1.6) execjs + bcrypt (3.1.11) + bindex (0.5.0) 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) + builder (3.2.3) + byebug (9.1.0) + coffee-rails (4.2.2) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.2.x) + railties (>= 4.0.0) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.10.0) - concurrent-ruby (1.0.2) - debug_inspector (0.0.2) + coffee-script-source (1.12.2) + concurrent-ruby (1.0.5) + crass (1.0.3) + devise (4.2.0) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0, < 5.1) + responders + warden (~> 1.2.3) erubis (2.7.0) execjs (2.7.0) - ffi (1.9.14) - globalid (0.3.7) - activesupport (>= 4.1.0) - i18n (0.7.0) - jbuilder (2.6.0) - activesupport (>= 3.0.0, < 5.1) - multi_json (~> 1.2) - jquery-rails (4.1.1) + ffi (1.9.18) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (0.9.1) + concurrent-ruby (~> 1.0) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + jquery-rails (4.3.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - loofah (2.0.3) + loofah (2.1.1) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.4) - mime-types (>= 1.16, < 4) - method_source (0.8.2) - mime-types (3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_portile2 (2.1.0) - minitest (5.9.0) - multi_json (1.12.1) - nio4r (1.2.1) - nokogiri (1.6.8) - mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - pkg-config (1.1.7) - puma (3.6.0) - rack (2.0.1) + mail (2.7.0) + mini_mime (>= 0.1.1) + method_source (0.9.0) + mini_mime (1.0.0) + mini_portile2 (2.3.0) + minitest (5.10.3) + multi_json (1.12.2) + nio4r (2.1.0) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) + orm_adapter (0.5.0) + puma (3.11.0) + rack (2.0.3) rack-test (0.6.3) rack (>= 1.0) - rails (5.0.0) - actioncable (= 5.0.0) - actionmailer (= 5.0.0) - actionpack (= 5.0.0) - actionview (= 5.0.0) - activejob (= 5.0.0) - activemodel (= 5.0.0) - activerecord (= 5.0.0) - activesupport (= 5.0.0) - bundler (>= 1.3.0, < 2.0) - railties (= 5.0.0) + rails (5.0.6) + actioncable (= 5.0.6) + actionmailer (= 5.0.6) + actionpack (= 5.0.6) + actionview (= 5.0.6) + activejob (= 5.0.6) + activemodel (= 5.0.6) + activerecord (= 5.0.6) + activesupport (= 5.0.6) + bundler (>= 1.3.0) + railties (= 5.0.6) sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.1) - activesupport (>= 4.2.0, < 6.0) - nokogiri (~> 1.6.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (5.0.0) - actionpack (= 5.0.0) - activesupport (= 5.0.0) + railties (5.0.6) + actionpack (= 5.0.6) + activesupport (= 5.0.6) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (11.2.2) - rb-fsevent (0.9.7) - rb-inotify (0.9.7) - ffi (>= 0.5.0) - sass (3.4.22) - sass-rails (5.0.6) + rake (12.1.0) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + responders (2.3.0) + railties (>= 4.2.0, < 5.1) + sass (3.5.3) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.7) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - spring (1.7.2) - spring-watcher-listen (2.0.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) - spring (~> 1.2) - sprockets (3.7.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.1.1) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.11) - thor (0.19.1) - thread_safe (0.3.5) - tilt (2.0.5) - turbolinks (5.0.0) + sqlite3 (1.3.13) + thor (0.20.0) + thread_safe (0.3.6) + tilt (2.0.8) + turbolinks (5.0.1) turbolinks-source (~> 5) - turbolinks-source (5.0.0) - tzinfo (1.2.2) + turbolinks-source (5.0.3) + tzinfo (1.2.4) thread_safe (~> 0.1) - uglifier (3.0.1) + uglifier (3.2.0) execjs (>= 0.3.0, < 3) - web-console (3.3.1) + warden (1.2.7) + rack (>= 1.0) + web-console (3.5.1) actionview (>= 5.0) activemodel (>= 5.0) - debug_inspector + bindex (>= 0.4.0) railties (>= 5.0) - websocket-driver (0.6.4) + websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) + websocket-extensions (0.1.3) PLATFORMS ruby @@ -163,11 +179,13 @@ DEPENDENCIES bootstrap-sass byebug coffee-rails (~> 4.2) + devise jbuilder (~> 2.5) jquery-rails listen (~> 3.0.5) puma (~> 3.0) rails (~> 5.0.0) + rake (~> 12.1.0) sass-rails (~> 5.0) spring spring-watcher-listen (~> 2.0.0) 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 416ed935b0..d8c85ab84b 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -1,5 +1,2 @@ class WelcomeController < ApplicationController - def index - flash[:notice] = "Good Morning!" - end end diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 0000000000..b2091f9a7a --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,6 @@ +class User < ApplicationRecord + # Include default devise modules. Others available are: + # :confirmable, :lockable, :timeoutable and :omniauthable + devise :database_authenticatable, :registerable, + :recoverable, :rememberable, :trackable, :validatable +end diff --git a/app/views/common/_navbar.html.erb b/app/views/common/_navbar.html.erb index 09fc42cfbc..ed6caecd59 100644 --- a/app/views/common/_navbar.html.erb +++ b/app/views/common/_navbar.html.erb @@ -9,7 +9,20 @@ diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb new file mode 100644 index 0000000000..2b544b4992 --- /dev/null +++ b/config/initializers/devise.rb @@ -0,0 +1,274 @@ +# 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 = 'da4c89c11f4afe14d244bbd6c697bee306a605a7b3c7fc68b75f5febadf64c66a69886f484577a8a3fe52c845763e1af73f2fc4b985fd644fdaddc6abc46af7f' + + # ==> 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 = '6050439cd45f33eb157637170e20e5a5ad5623e176275b34d2c6932d1eba352b95bb2cb0f2febd0856aac006b5d67b6f11ba738651d4ab137797389158bb9827' + + # 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. 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' +end diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml new file mode 100644 index 0000000000..bd4c3ebc69 --- /dev/null +++ b/config/locales/devise.en.yml @@ -0,0 +1,62 @@ +# 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" + 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." + 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 905ecb36ec..d2e9fd90d5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,5 @@ Rails.application.routes.draw do + devise_for :users # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html root 'welcome#index' end diff --git a/db/migrate/20171126121032_devise_create_users.rb b/db/migrate/20171126121032_devise_create_users.rb new file mode 100644 index 0000000000..1fefeee7a6 --- /dev/null +++ b/db/migrate/20171126121032_devise_create_users.rb @@ -0,0 +1,42 @@ +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..0720a24233 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,32 @@ +# 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: 20171126121032) 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.integer "sign_in_count", default: 0, null: false + t.datetime "current_sign_in_at" + t.datetime "last_sign_in_at" + t.string "current_sign_in_ip" + t.string "last_sign_in_ip" + t.datetime "created_at", 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 12b38b2aa9456177a3985a09e0a7987c5a28df2e Mon Sep 17 00:00:00 2001 From: uuurs Date: Sun, 26 Nov 2017 20:19:17 +0800 Subject: [PATCH 05/16] install simpleform with bootstrap --- Gemfile | 1 + Gemfile.lock | 4 + config/initializers/simple_form.rb | 169 +++++++++++++++++++ config/initializers/simple_form_bootstrap.rb | 154 +++++++++++++++++ config/locales/simple_form.en.yml | 31 ++++ lib/templates/erb/scaffold/_form.html.erb | 13 ++ 6 files changed, 372 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 3a2f7c42d1..b71baa0b19 100644 --- a/Gemfile +++ b/Gemfile @@ -32,6 +32,7 @@ gem 'jbuilder', '~> 2.5' gem 'bootstrap-sass' gem 'rake','~> 12.1.0' 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 08e8c11cce..a729caba96 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -138,6 +138,9 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) + simple_form (3.4.0) + actionpack (> 4, < 5.1) + activemodel (> 4, < 5.1) spring (2.0.2) activesupport (>= 4.2) spring-watcher-listen (2.0.1) @@ -187,6 +190,7 @@ DEPENDENCIES rails (~> 5.0.0) rake (~> 12.1.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..f306c195ad --- /dev/null +++ b/config/initializers/simple_form.rb @@ -0,0 +1,169 @@ +# Use this setup block to configure all options available in SimpleForm. +SimpleForm.setup do |config| + # Wrappers are used by the form builder to generate a + # complete input. You can remove any component from the + # wrapper, change the order or even add your own to the + # stack. The options given below are used to wrap the + # whole input. + config.wrappers :default, class: :input, + hint_class: :field_with_hint, error_class: :field_with_errors do |b| + ## Extensions enabled by default + # Any of these extensions can be disabled for a + # given input by passing: `f.input EXTENSION_NAME => false`. + # You can make any of these extensions optional by + # renaming `b.use` to `b.optional`. + + # Determines whether to use HTML5 (:email, :url, ...) + # and required attributes + b.use :html5 + + # Calculates placeholders automatically from I18n + # You can also pass a string as f.input placeholder: "Placeholder" + b.use :placeholder + + ## Optional extensions + # They are disabled unless you pass `f.input EXTENSION_NAME => 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 :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' + + # ID to add for error notification helper. + # config.error_notification_id = nil + + # Series of attempts to detect a default label method for collection. + # config.collection_label_methods = [ :to_label, :name, :title, :to_s ] + + # Series of attempts to detect a default value method for collection. + # config.collection_value_methods = [ :id, :to_s ] + + # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none. + # config.collection_wrapper_tag = nil + + # You can define the class to use on all collection wrappers. Defaulting to none. + # config.collection_wrapper_class = nil + + # You can wrap each item in a collection of radio/check boxes with a tag, + # defaulting to :span. + # 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 ] + + # 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' +end diff --git a/config/initializers/simple_form_bootstrap.rb b/config/initializers/simple_form_bootstrap.rb new file mode 100644 index 0000000000..c7705e8e7b --- /dev/null +++ b/config/initializers/simple_form_bootstrap.rb @@ -0,0 +1,154 @@ +# Use this setup block to configure all options available in SimpleForm. +SimpleForm.setup do |config| + config.error_notification_class = 'alert alert-danger' + config.button_class = 'btn btn-default' + config.boolean_label_class = nil + + config.wrappers :vertical_form, tag: 'div', class: 'form-group', error_class: 'has-error' 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: 'control-label' + + b.use :input, class: 'form-control' + b.use :error, wrap_with: { tag: 'span', class: 'help-block' } + b.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + + config.wrappers :vertical_file_input, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :minlength + b.optional :readonly + b.use :label, class: 'control-label' + + b.use :input + b.use :error, wrap_with: { tag: 'span', class: 'help-block' } + b.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + + config.wrappers :vertical_boolean, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.optional :readonly + + b.wrapper tag: 'div', class: 'checkbox' do |ba| + ba.use :label_input + end + + b.use :error, wrap_with: { tag: 'span', class: 'help-block' } + b.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + + config.wrappers :vertical_radio_and_checkboxes, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.optional :readonly + b.use :label, class: 'control-label' + b.use :input + b.use :error, wrap_with: { tag: 'span', class: 'help-block' } + b.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + + config.wrappers :horizontal_form, tag: 'div', class: 'form-group', error_class: 'has-error' 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 control-label' + + b.wrapper tag: 'div', class: 'col-sm-9' do |ba| + ba.use :input, class: 'form-control' + ba.use :error, wrap_with: { tag: 'span', class: 'help-block' } + ba.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + end + + config.wrappers :horizontal_file_input, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :minlength + b.optional :readonly + b.use :label, class: 'col-sm-3 control-label' + + b.wrapper tag: 'div', class: 'col-sm-9' do |ba| + ba.use :input + ba.use :error, wrap_with: { tag: 'span', class: 'help-block' } + ba.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + end + + config.wrappers :horizontal_boolean, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.optional :readonly + + b.wrapper tag: 'div', class: 'col-sm-offset-3 col-sm-9' do |wr| + wr.wrapper tag: 'div', class: 'checkbox' do |ba| + ba.use :label_input + end + + wr.use :error, wrap_with: { tag: 'span', class: 'help-block' } + wr.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + end + + config.wrappers :horizontal_radio_and_checkboxes, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.optional :readonly + + b.use :label, class: 'col-sm-3 control-label' + + b.wrapper tag: 'div', class: 'col-sm-9' do |ba| + ba.use :input + ba.use :error, wrap_with: { tag: 'span', class: 'help-block' } + ba.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + end + + config.wrappers :inline_form, tag: 'div', class: 'form-group', error_class: 'has-error' 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' + b.use :error, wrap_with: { tag: 'span', class: 'help-block' } + b.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + + config.wrappers :multi_select, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.optional :readonly + b.use :label, class: 'control-label' + b.wrapper tag: 'div', class: 'form-inline' do |ba| + ba.use :input, class: 'form-control' + ba.use :error, wrap_with: { tag: 'span', class: 'help-block' } + ba.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + end + # Wrappers for forms and inputs using the Bootstrap toolkit. + # Check the Bootstrap docs (http://getbootstrap.com) + # to learn about the different styles for forms and inputs, + # buttons and other elements. + config.default_wrapper = :vertical_form + config.wrapper_mappings = { + check_boxes: :vertical_radio_and_checkboxes, + radio_buttons: :vertical_radio_and_checkboxes, + file: :vertical_file_input, + boolean: :vertical_boolean, + datetime: :multi_select, + date: :multi_select, + time: :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..201a069e2c --- /dev/null +++ b/lib/templates/erb/scaffold/_form.html.erb @@ -0,0 +1,13 @@ +<%%= simple_form_for(@<%= singular_table_name %>) do |f| %> + <%%= f.error_notification %> + +
+ <%- attributes.each do |attribute| -%> + <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> %> + <%- end -%> +
+ +
+ <%%= f.button :submit %> +
+<%% end %> From 2341b558cafea0cde347754ebbdfde6f88cafecb Mon Sep 17 00:00:00 2001 From: uuurs Date: Sun, 26 Nov 2017 20:49:59 +0800 Subject: [PATCH 06/16] implement admin/products with index --- app/assets/javascripts/admin/products.coffee | 3 +++ app/assets/stylesheets/admin/products.scss | 3 +++ app/controllers/admin/products_controller.rb | 5 ++++ app/helpers/admin/products_helper.rb | 2 ++ app/models/product.rb | 2 ++ app/views/admin/products/index.html.erb | 27 +++++++++++++++++++ config/routes.rb | 4 +++ db/migrate/20171126123942_create_products.rb | 12 +++++++++ db/schema.rb | 11 +++++++- .../admin/products_controller_test.rb | 7 +++++ test/fixtures/products.yml | 13 +++++++++ test/models/product_test.rb | 7 +++++ 12 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/admin/products.coffee create mode 100644 app/assets/stylesheets/admin/products.scss create mode 100644 app/controllers/admin/products_controller.rb create mode 100644 app/helpers/admin/products_helper.rb create mode 100644 app/models/product.rb create mode 100644 app/views/admin/products/index.html.erb create mode 100644 db/migrate/20171126123942_create_products.rb create mode 100644 test/controllers/admin/products_controller_test.rb create mode 100644 test/fixtures/products.yml create mode 100644 test/models/product_test.rb diff --git a/app/assets/javascripts/admin/products.coffee b/app/assets/javascripts/admin/products.coffee new file mode 100644 index 0000000000..24f83d18bb --- /dev/null +++ b/app/assets/javascripts/admin/products.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/products.scss b/app/assets/stylesheets/admin/products.scss new file mode 100644 index 0000000000..06dc60c289 --- /dev/null +++ b/app/assets/stylesheets/admin/products.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the admin/products 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/products_controller.rb b/app/controllers/admin/products_controller.rb new file mode 100644 index 0000000000..11415adb07 --- /dev/null +++ b/app/controllers/admin/products_controller.rb @@ -0,0 +1,5 @@ +class Admin::ProductsController < ApplicationController + def index + @products = Product.all + end +end diff --git a/app/helpers/admin/products_helper.rb b/app/helpers/admin/products_helper.rb new file mode 100644 index 0000000000..977a242f66 --- /dev/null +++ b/app/helpers/admin/products_helper.rb @@ -0,0 +1,2 @@ +module Admin::ProductsHelper +end diff --git a/app/models/product.rb b/app/models/product.rb new file mode 100644 index 0000000000..35a85acab3 --- /dev/null +++ b/app/models/product.rb @@ -0,0 +1,2 @@ +class Product < ApplicationRecord +end diff --git a/app/views/admin/products/index.html.erb b/app/views/admin/products/index.html.erb new file mode 100644 index 0000000000..4c2745ece4 --- /dev/null +++ b/app/views/admin/products/index.html.erb @@ -0,0 +1,27 @@ + + <% @products.each do |product| %> + + + + + + + + + + + + + + + + + + + + + + <% end %> +
商品名称描述价格<管理选项数量上架时间
<%= product.title %><%= product.description %><%= product.price %><%= link_to("Edit", edit_admin_product_path(product)) %>/ + <%= link_to("Delete", admin_product_path(product), method: :delete) %> + <%= product.quantity %><%= product.updated_at %>
diff --git a/config/routes.rb b/config/routes.rb index d2e9fd90d5..9c08e64293 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,4 +2,8 @@ devise_for :users # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html root 'welcome#index' + + namespace :admin do + resources :products + end end diff --git a/db/migrate/20171126123942_create_products.rb b/db/migrate/20171126123942_create_products.rb new file mode 100644 index 0000000000..471c156bb9 --- /dev/null +++ b/db/migrate/20171126123942_create_products.rb @@ -0,0 +1,12 @@ +class CreateProducts < ActiveRecord::Migration[5.0] + def change + create_table :products do |t| + t.string :title + t.text :description + t.integer :price + t.integer :quantity + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 0720a24233..244e4dc8f9 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,16 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20171126121032) do +ActiveRecord::Schema.define(version: 20171126123942) do + + create_table "products", force: :cascade do |t| + t.string "title" + t.text "description" + t.integer "price" + t.integer "quantity" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end create_table "users", force: :cascade do |t| t.string "email", default: "", null: false diff --git a/test/controllers/admin/products_controller_test.rb b/test/controllers/admin/products_controller_test.rb new file mode 100644 index 0000000000..250423dc51 --- /dev/null +++ b/test/controllers/admin/products_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class Admin::ProductsControllerTest < ActionDispatch::IntegrationTest + # test "the truth" do + # assert true + # end +end diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml new file mode 100644 index 0000000000..06cdd8d781 --- /dev/null +++ b/test/fixtures/products.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + description: MyText + price: 1 + quantity: 1 + +two: + title: MyString + description: MyText + price: 1 + quantity: 1 diff --git a/test/models/product_test.rb b/test/models/product_test.rb new file mode 100644 index 0000000000..211cdd0b4a --- /dev/null +++ b/test/models/product_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class ProductTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end From c1890bd5545ee1d305089d0e5eb50df9607a08a9 Mon Sep 17 00:00:00 2001 From: uuurs Date: Tue, 28 Nov 2017 22:30:06 +0800 Subject: [PATCH 07/16] implement CRUD for admin/product --- app/controllers/admin/products_controller.rb | 46 ++++++++++++++++++++ app/views/admin/products/edit.html.erb | 12 +++++ app/views/admin/products/index.html.erb | 10 +++-- app/views/admin/products/new.html.erb | 12 +++++ 4 files changed, 77 insertions(+), 3 deletions(-) create mode 100644 app/views/admin/products/edit.html.erb create mode 100644 app/views/admin/products/new.html.erb diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb index 11415adb07..37189e579a 100644 --- a/app/controllers/admin/products_controller.rb +++ b/app/controllers/admin/products_controller.rb @@ -1,5 +1,51 @@ class Admin::ProductsController < ApplicationController + before_action :find_product_before_action, only: [:edit, :update, :destroy] def index @products = Product.all end + + def new + @product = Product.new + end + + def create + @product = Product.new(product_params) + + if @product.save + redirect_to admin_products_path, notice: "add product success" + else + render :new + end + end + + def edit + end + + def update + + if @product.update(product_params) + redirect_to admin_products_path, notice: "edit product success" + else + render :edit + end + end + + def destroy + + @product.delete + redirect_to admin_products_path, alert: "delete product success" + end + + + + private + + def find_product_before_action + @product = Product.find(params[:id]) + end + + def product_params + params.require(:product).permit(:title, :description, :price, :quantity) + end + end diff --git a/app/views/admin/products/edit.html.erb b/app/views/admin/products/edit.html.erb new file mode 100644 index 0000000000..d35b24308c --- /dev/null +++ b/app/views/admin/products/edit.html.erb @@ -0,0 +1,12 @@ +

Edit product

+ +<%= simple_form_for [:admin, @product] do |f| %> + + <%= f.input :title %> + <%= f.input :description %> + <%= f.input :price %> + <%= f.input :quantity %> + + <%= f.submit "Submit" %> + +<% end %> diff --git a/app/views/admin/products/index.html.erb b/app/views/admin/products/index.html.erb index 4c2745ece4..c4cda22fb7 100644 --- a/app/views/admin/products/index.html.erb +++ b/app/views/admin/products/index.html.erb @@ -1,16 +1,20 @@ - - <% @products.each do |product| %> +
+ <%= link_to("Add a product", new_admin_product_path, :class => "btn btn-default") %> +
+ +
- + + <% @products.each do |product| %> diff --git a/app/views/admin/products/new.html.erb b/app/views/admin/products/new.html.erb new file mode 100644 index 0000000000..18260b07dd --- /dev/null +++ b/app/views/admin/products/new.html.erb @@ -0,0 +1,12 @@ +

Add a new product

+ +<%= simple_form_for [:admin, @product] do |f| %> + + <%= f.input :title %> + <%= f.input :description %> + <%= f.input :price %> + <%= f.input :quantity %> + + <%= f.submit "create product" %> + +<% end %> From 9762e1e8d23a12fbaaaece36cbf82cdcb19aa41c Mon Sep 17 00:00:00 2001 From: uuurs Date: Tue, 28 Nov 2017 22:31:31 +0800 Subject: [PATCH 08/16] create name to jdstore --- app/views/admin/products/index.html.erb | 2 +- app/views/common/_navbar.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/admin/products/index.html.erb b/app/views/admin/products/index.html.erb index c4cda22fb7..4ba4e0e670 100644 --- a/app/views/admin/products/index.html.erb +++ b/app/views/admin/products/index.html.erb @@ -1,5 +1,5 @@
- <%= link_to("Add a product", new_admin_product_path, :class => "btn btn-default") %> + <%= link_to("Add new product", new_admin_product_path, :class => "btn btn-default") %>
商品名称 描述 价格<管理选项管理选项 数量 上架时间
<%= product.title %>
diff --git a/app/views/common/_navbar.html.erb b/app/views/common/_navbar.html.erb index ed6caecd59..02a38b3ace 100644 --- a/app/views/common/_navbar.html.erb +++ b/app/views/common/_navbar.html.erb @@ -2,7 +2,7 @@
- Job Listing + JDstroe
From c6aaea790110a85b810812b01af4b1edd594b7f8 Mon Sep 17 00:00:00 2001 From: uuurs Date: Tue, 28 Nov 2017 22:36:54 +0800 Subject: [PATCH 09/16] add is_hiddent to products --- app/controllers/admin/products_controller.rb | 2 +- app/views/admin/products/edit.html.erb | 1 + app/views/admin/products/new.html.erb | 1 + db/migrate/20171128143341_add_hidden_to_product.rb | 5 +++++ db/schema.rb | 3 ++- 5 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20171128143341_add_hidden_to_product.rb diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb index 37189e579a..ef33fb93fd 100644 --- a/app/controllers/admin/products_controller.rb +++ b/app/controllers/admin/products_controller.rb @@ -45,7 +45,7 @@ def find_product_before_action end def product_params - params.require(:product).permit(:title, :description, :price, :quantity) + params.require(:product).permit(:title, :description, :price, :quantity, :is_hidden) end end diff --git a/app/views/admin/products/edit.html.erb b/app/views/admin/products/edit.html.erb index d35b24308c..7b3626baae 100644 --- a/app/views/admin/products/edit.html.erb +++ b/app/views/admin/products/edit.html.erb @@ -6,6 +6,7 @@ <%= f.input :description %> <%= f.input :price %> <%= f.input :quantity %> + <%= f.input :is_hidden %> <%= f.submit "Submit" %> diff --git a/app/views/admin/products/new.html.erb b/app/views/admin/products/new.html.erb index 18260b07dd..f513bcfe59 100644 --- a/app/views/admin/products/new.html.erb +++ b/app/views/admin/products/new.html.erb @@ -6,6 +6,7 @@ <%= f.input :description %> <%= f.input :price %> <%= f.input :quantity %> + <%= f.input :is_hidden %> <%= f.submit "create product" %> diff --git a/db/migrate/20171128143341_add_hidden_to_product.rb b/db/migrate/20171128143341_add_hidden_to_product.rb new file mode 100644 index 0000000000..c53bfd453e --- /dev/null +++ b/db/migrate/20171128143341_add_hidden_to_product.rb @@ -0,0 +1,5 @@ +class AddHiddenToProduct < ActiveRecord::Migration[5.0] + def change + add_column :products, :is_hidden, :boolean, defualt: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 244e4dc8f9..05d661c992 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: 20171126123942) do +ActiveRecord::Schema.define(version: 20171128143341) do create_table "products", force: :cascade do |t| t.string "title" @@ -19,6 +19,7 @@ t.integer "quantity" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.boolean "is_hidden" end create_table "users", force: :cascade do |t| From 23a1b32902b35135fed7879d3fddcc2f02582d67 Mon Sep 17 00:00:00 2001 From: uuurs Date: Tue, 28 Nov 2017 22:39:10 +0800 Subject: [PATCH 10/16] add validates for title, price, quantity --- app/models/product.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/models/product.rb b/app/models/product.rb index 35a85acab3..83d768030b 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -1,2 +1,5 @@ class Product < ApplicationRecord + validates :title, presence: true + validates :price, presence: true + validates :quantity, presence: true end From a1406ef1401c4c230447d6d46cdcd7dbf269ec51 Mon Sep 17 00:00:00 2001 From: uuurs Date: Tue, 28 Nov 2017 22:56:21 +0800 Subject: [PATCH 11/16] implement CRUD for products, include index and show --- app/assets/javascripts/products.coffee | 3 +++ app/assets/stylesheets/products.scss | 3 +++ app/controllers/admin/products_controller.rb | 1 + app/controllers/products_controller.rb | 9 ++++++++ app/helpers/products_helper.rb | 2 ++ app/views/products/index.html.erb | 23 ++++++++++++++++++++ app/views/products/show.html.erb | 13 +++++++++++ config/routes.rb | 5 +++-- test/controllers/products_controller_test.rb | 7 ++++++ 9 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 app/assets/javascripts/products.coffee create mode 100644 app/assets/stylesheets/products.scss create mode 100644 app/controllers/products_controller.rb create mode 100644 app/helpers/products_helper.rb create mode 100644 app/views/products/index.html.erb create mode 100644 app/views/products/show.html.erb create mode 100644 test/controllers/products_controller_test.rb diff --git a/app/assets/javascripts/products.coffee b/app/assets/javascripts/products.coffee new file mode 100644 index 0000000000..24f83d18bb --- /dev/null +++ b/app/assets/javascripts/products.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/products.scss b/app/assets/stylesheets/products.scss new file mode 100644 index 0000000000..89e2e8db07 --- /dev/null +++ b/app/assets/stylesheets/products.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the products 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/products_controller.rb b/app/controllers/admin/products_controller.rb index ef33fb93fd..c503a7f062 100644 --- a/app/controllers/admin/products_controller.rb +++ b/app/controllers/admin/products_controller.rb @@ -1,4 +1,5 @@ class Admin::ProductsController < ApplicationController + before_action :authantication_user! before_action :find_product_before_action, only: [:edit, :update, :destroy] def index @products = Product.all diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb new file mode 100644 index 0000000000..0e295c2588 --- /dev/null +++ b/app/controllers/products_controller.rb @@ -0,0 +1,9 @@ +class ProductsController < ApplicationController + def index + @products = Product.all + end + + def show + @product = Product.find(params[:id]) + end +end diff --git a/app/helpers/products_helper.rb b/app/helpers/products_helper.rb new file mode 100644 index 0000000000..ab5c42b325 --- /dev/null +++ b/app/helpers/products_helper.rb @@ -0,0 +1,2 @@ +module ProductsHelper +end diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb new file mode 100644 index 0000000000..5e6e1727dc --- /dev/null +++ b/app/views/products/index.html.erb @@ -0,0 +1,23 @@ +
+ + + + + + + + + + + <% @products.each do |product| %> + + + + + + + + + + <% end %> +
商品名称描述价格数量上架时间
<%= link_to(product.title, product_path(product)) %><%= product.description %><%= product.price %><%= product.quantity %><%= product.updated_at %>
diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb new file mode 100644 index 0000000000..fbb28d953f --- /dev/null +++ b/app/views/products/show.html.erb @@ -0,0 +1,13 @@ +

<%= @product.title %>

+ +

+ <%= simple_format(@product.description) %> +

+ +

+ price: + <%= @product.price %> +
+ left: + <%= @product.quantity %> +

diff --git a/config/routes.rb b/config/routes.rb index 9c08e64293..86ed7a5c19 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,8 @@ Rails.application.routes.draw do devise_for :users - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - root 'welcome#index' + + resources :products + root 'products#index' namespace :admin do resources :products diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb new file mode 100644 index 0000000000..bccd91d86a --- /dev/null +++ b/test/controllers/products_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class ProductsControllerTest < ActionDispatch::IntegrationTest + # test "the truth" do + # assert true + # end +end From 7a10f491ba34412d3824ce9c9479f39c6475e98c Mon Sep 17 00:00:00 2001 From: uuurs Date: Tue, 28 Nov 2017 22:57:23 +0800 Subject: [PATCH 12/16] adjust designed by me --- app/views/common/_footer.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/common/_footer.html.erb b/app/views/common/_footer.html.erb index 3e33190871..5ae98f3d6f 100644 --- a/app/views/common/_footer.html.erb +++ b/app/views/common/_footer.html.erb @@ -1,6 +1,6 @@

Copyright ©2016 Rails101 -
Design by yourname +
Design by 枫寒

From b692a7ebc0c332603e9dde90a44d17b0bb9c48eb Mon Sep 17 00:00:00 2001 From: uuurs Date: Wed, 29 Nov 2017 07:10:46 +0800 Subject: [PATCH 13/16] add admin-pannel in dropdown menu --- app/controllers/admin/products_controller.rb | 5 ++--- app/controllers/application_controller.rb | 7 +++++++ app/models/user.rb | 5 +++++ app/views/common/_navbar.html.erb | 3 +++ db/migrate/20171128145835_add_is_admin_to_users.rb | 5 +++++ db/schema.rb | 13 +++++++------ 6 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 db/migrate/20171128145835_add_is_admin_to_users.rb diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb index c503a7f062..a43d635dce 100644 --- a/app/controllers/admin/products_controller.rb +++ b/app/controllers/admin/products_controller.rb @@ -1,5 +1,6 @@ class Admin::ProductsController < ApplicationController - before_action :authantication_user! + before_action :authanticate_user!, only: [:new, :create, :edit, :update, :destroy] + before_action :require_is_admin before_action :find_product_before_action, only: [:edit, :update, :destroy] def index @products = Product.all @@ -37,8 +38,6 @@ def destroy redirect_to admin_products_path, alert: "delete product success" end - - private def find_product_before_action diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1c07694e9d..b1d7f16f8d 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,3 +1,10 @@ class ApplicationController < ActionController::Base protect_from_forgery with: :exception + + def require_is_admin + if !current_user.admin? + flash[:alsert] = 'You are not admin!' + redirect_to root_path + end + end end diff --git a/app/models/user.rb b/app/models/user.rb index b2091f9a7a..6a232cdd57 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -3,4 +3,9 @@ class User < ApplicationRecord # :confirmable, :lockable, :timeoutable and :omniauthable devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable + + + def admin? + is_admin + end end diff --git a/app/views/common/_navbar.html.erb b/app/views/common/_navbar.html.erb index 02a38b3ace..cd1714ca7f 100644 --- a/app/views/common/_navbar.html.erb +++ b/app/views/common/_navbar.html.erb @@ -19,6 +19,9 @@
    + <% if current_user.admin? %> +
  • <%= link_to("Admin_panel", admin_products_path ) %>
    • + <% end %>
  • <%= link_to("登出", destroy_user_session_path, method: :delete) %>
diff --git a/db/migrate/20171128145835_add_is_admin_to_users.rb b/db/migrate/20171128145835_add_is_admin_to_users.rb new file mode 100644 index 0000000000..8debef16ec --- /dev/null +++ b/db/migrate/20171128145835_add_is_admin_to_users.rb @@ -0,0 +1,5 @@ +class AddIsAdminToUsers < ActiveRecord::Migration[5.0] + def change + add_column :users, :is_admin, :boolean, default: false + end +end diff --git a/db/schema.rb b/db/schema.rb index 05d661c992..6ed412d0a2 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: 20171128143341) do +ActiveRecord::Schema.define(version: 20171128145835) do create_table "products", force: :cascade do |t| t.string "title" @@ -23,18 +23,19 @@ end create_table "users", force: :cascade do |t| - t.string "email", default: "", null: false - t.string "encrypted_password", default: "", null: false + t.string "email", default: "", null: false + t.string "encrypted_password", default: "", null: false t.string "reset_password_token" t.datetime "reset_password_sent_at" t.datetime "remember_created_at" - t.integer "sign_in_count", default: 0, null: false + t.integer "sign_in_count", default: 0, null: false t.datetime "current_sign_in_at" t.datetime "last_sign_in_at" t.string "current_sign_in_ip" t.string "last_sign_in_ip" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.boolean "is_admin", default: 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 From b5b3b01d6acc55d6e1a3d5511d1aba8ffddfcba2 Mon Sep 17 00:00:00 2001 From: uuurs Date: Wed, 29 Nov 2017 21:11:29 +0800 Subject: [PATCH 14/16] implement hidden product at products_path --- app/controllers/products_controller.rb | 2 +- app/views/products/index.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 0e295c2588..a95893c2c7 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -1,6 +1,6 @@ class ProductsController < ApplicationController def index - @products = Product.all + @products = Product.where(:is_hidden => false) end def show diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index 5e6e1727dc..86d5b792fa 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -1,4 +1,4 @@ - +
From 11dd82d3e2ccd5469beefed54522a1b020623947 Mon Sep 17 00:00:00 2001 From: uuurs Date: Wed, 29 Nov 2017 22:52:16 +0800 Subject: [PATCH 15/16] add uploader with image --- .gitignore | 2 + Gemfile | 2 + Gemfile.lock | 10 +++ app/controllers/admin/products_controller.rb | 4 +- app/models/product.rb | 2 + app/uploaders/image_uploader.rb | 61 +++++++++++++++++++ app/views/admin/products/edit.html.erb | 2 + app/views/admin/products/new.html.erb | 1 + .../20171129131434_add_image_to_product.rb | 5 ++ db/schema.rb | 3 +- 10 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 app/uploaders/image_uploader.rb create mode 100644 db/migrate/20171129131434_add_image_to_product.rb diff --git a/.gitignore b/.gitignore index 9f14c9f5b6..18d83384d5 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ # Ignore Byebug command history file. .byebug_history config/database.yml + +public/uploads diff --git a/Gemfile b/Gemfile index b71baa0b19..f267a5aa50 100644 --- a/Gemfile +++ b/Gemfile @@ -33,6 +33,8 @@ gem 'bootstrap-sass' gem 'rake','~> 12.1.0' gem 'devise' gem 'simple_form' +gem 'carrierwave' +gem 'mini_magick' 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 a729caba96..eeb4a7a5c2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,6 +48,10 @@ GEM sass (>= 3.3.4) builder (3.2.3) byebug (9.1.0) + carrierwave (1.2.1) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) + mime-types (>= 1.16) coffee-rails (4.2.2) coffee-script (>= 2.2.0) railties (>= 4.0.0) @@ -86,6 +90,10 @@ GEM mail (2.7.0) mini_mime (>= 0.1.1) method_source (0.9.0) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_magick (4.8.0) mini_mime (1.0.0) mini_portile2 (2.3.0) minitest (5.10.3) @@ -181,11 +189,13 @@ PLATFORMS DEPENDENCIES bootstrap-sass byebug + carrierwave coffee-rails (~> 4.2) devise jbuilder (~> 2.5) jquery-rails listen (~> 3.0.5) + mini_magick puma (~> 3.0) rails (~> 5.0.0) rake (~> 12.1.0) diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb index a43d635dce..085d0e8cae 100644 --- a/app/controllers/admin/products_controller.rb +++ b/app/controllers/admin/products_controller.rb @@ -1,5 +1,5 @@ class Admin::ProductsController < ApplicationController - before_action :authanticate_user!, only: [:new, :create, :edit, :update, :destroy] + before_action :authenticate_user!, only: [:new, :create, :edit, :update, :destroy] before_action :require_is_admin before_action :find_product_before_action, only: [:edit, :update, :destroy] def index @@ -45,7 +45,7 @@ def find_product_before_action end def product_params - params.require(:product).permit(:title, :description, :price, :quantity, :is_hidden) + params.require(:product).permit(:title, :description, :price, :quantity, :is_hidden, :image) end end diff --git a/app/models/product.rb b/app/models/product.rb index 83d768030b..8e67094f1e 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -2,4 +2,6 @@ class Product < ApplicationRecord validates :title, presence: true validates :price, presence: true validates :quantity, presence: true + + mount_uploader :image, ImageUploader end diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb new file mode 100644 index 0000000000..0e2a7ff87c --- /dev/null +++ b/app/uploaders/image_uploader.rb @@ -0,0 +1,61 @@ +class ImageUploader < CarrierWave::Uploader::Base + + # Include RMagick or MiniMagick support: + # include CarrierWave::RMagick + include CarrierWave::MiniMagick + + # Choose what kind of storage to use for this uploader: + storage :file + # storage :fog + + # Override the directory where uploaded files will be stored. + # This is a sensible default for uploaders that are meant to be mounted: + def store_dir + "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}" + end + + process resize_to_fit: [800, 800] + + version :thumb do + process resize_to_fit: [200,200] + end + + version :medium do + process resize_to_fit: [400,400] + end + + + + # Provide a default URL as a default if there hasn't been a file uploaded: + # def default_url(*args) + # # For Rails 3.1+ asset pipeline compatibility: + # # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_')) + # + # "/images/fallback/" + [version_name, "default.png"].compact.join('_') + # end + + # Process files as they are uploaded: + # process scale: [200, 300] + # + # def scale(width, height) + # # do something + # end + + # Create different versions of your uploaded files: + # version :thumb do + # process resize_to_fit: [50, 50] + # end + + # Add a white list of extensions which are allowed to be uploaded. + # For images you might use something like this: + # def extension_whitelist + # %w(jpg jpeg gif png) + # end + + # Override the filename of the uploaded files: + # Avoid using model.id or version_name here, see uploader/store.rb for details. + # def filename + # "something.jpg" if original_filename + # end + +end diff --git a/app/views/admin/products/edit.html.erb b/app/views/admin/products/edit.html.erb index 7b3626baae..b2f6a4bba8 100644 --- a/app/views/admin/products/edit.html.erb +++ b/app/views/admin/products/edit.html.erb @@ -7,6 +7,8 @@ <%= f.input :price %> <%= f.input :quantity %> <%= f.input :is_hidden %> + <%= f.input :image %> + <%= f.submit "Submit" %> diff --git a/app/views/admin/products/new.html.erb b/app/views/admin/products/new.html.erb index f513bcfe59..808ede06b6 100644 --- a/app/views/admin/products/new.html.erb +++ b/app/views/admin/products/new.html.erb @@ -7,6 +7,7 @@ <%= f.input :price %> <%= f.input :quantity %> <%= f.input :is_hidden %> + <%= f.input :image %> <%= f.submit "create product" %> diff --git a/db/migrate/20171129131434_add_image_to_product.rb b/db/migrate/20171129131434_add_image_to_product.rb new file mode 100644 index 0000000000..5aa363e06d --- /dev/null +++ b/db/migrate/20171129131434_add_image_to_product.rb @@ -0,0 +1,5 @@ +class AddImageToProduct < ActiveRecord::Migration[5.0] + def change + add_column :products, :image, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 6ed412d0a2..f4abf2ce33 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: 20171128145835) do +ActiveRecord::Schema.define(version: 20171129131434) do create_table "products", force: :cascade do |t| t.string "title" @@ -20,6 +20,7 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.boolean "is_hidden" + t.string "image" end create_table "users", force: :cascade do |t| From 6e2f760fa5ab630fc0d357652d41ff608840395d Mon Sep 17 00:00:00 2001 From: uuurs Date: Wed, 29 Nov 2017 23:03:25 +0800 Subject: [PATCH 16/16] first week --- README.md | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/README.md b/README.md index 7db80e4ca1..4c0fbc22de 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,3 @@ # README -This README would normally document whatever steps are necessary to get the -application up and running. - -Things you may want to cover: - -* Ruby version - -* System dependencies - -* Configuration - -* Database creation - -* Database initialization - -* How to run the test suite - -* Services (job queues, cache servers, search engines, etc.) - -* Deployment instructions - -* ... +第一周作业
商品名称