From f23f5f79a8d94c116638370fd0d94cb9c737f370 Mon Sep 17 00:00:00 2001 From: gzn Date: Fri, 24 Nov 2017 16:36:13 +0800 Subject: [PATCH 01/21] add bootsrap to project --- Gemfile | 1 + Gemfile.lock | 8 +++++++- .../stylesheets/{application.css => application.scss} | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) rename app/assets/stylesheets/{application.css => application.scss} (93%) diff --git a/Gemfile b/Gemfile index 0447f70941..d04d00a581 100644 --- a/Gemfile +++ b/Gemfile @@ -30,6 +30,7 @@ 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 gem 'byebug', platform: :mri diff --git a/Gemfile.lock b/Gemfile.lock index 96abec2521..eeeca71497 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,6 +39,11 @@ GEM minitest (~> 5.1) tzinfo (~> 1.1) arel (7.1.1) + autoprefixer-rails (6.7.7.2) + 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.14.5 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..de06911e86 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 f3c0c0ecddcfd66649dc47d01d1324fbd177e13a Mon Sep 17 00:00:00 2001 From: gzn Date: Fri, 24 Nov 2017 16:42:33 +0800 Subject: [PATCH 02/21] add bootsrap 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 | 4 ++++ app/views/welcome/index.html.erb | 1 + config/routes.rb | 2 +- test/controllers/welcome_controller_test.rb | 7 +++++++ 10 files changed, 48 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..0fdf9e91ae --- /dev/null +++ b/app/views/common/_footer.html.erb @@ -0,0 +1,6 @@ +
+

Copyright ©2016 Rails101 +
Design by Damon10L + +

+
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..8a5bac3eca 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,6 +9,10 @@ +
+ <%= render "common/navbar" %> <%= yield %> +
+ diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb new file mode 100644 index 0000000000..e6b0cbd24d --- /dev/null +++ b/app/views/welcome/index.html.erb @@ -0,0 +1 @@ +

Hey loser!

diff --git a/config/routes.rb b/config/routes.rb index 787824f888..bc557ceacc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,3 @@ 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 7bb8b45cb3a7abaa43c8479dc8c1491852e1ad0e Mon Sep 17 00:00:00 2001 From: gzn Date: Fri, 24 Nov 2017 16:49:24 +0800 Subject: [PATCH 03/21] add bootstap flash function --- app/assets/javascripts/application.js | 1 + app/helpers/flashes_helper.rb | 11 +++++++++++ app/views/common/_flashes.html.erb | 8 ++++++++ 3 files changed, 20 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..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 %> From e156499d77909f7202272e8179b7517a276a8119 Mon Sep 17 00:00:00 2001 From: gzn Date: Fri, 24 Nov 2017 16:49:39 +0800 Subject: [PATCH 04/21] add bootstap flash function --- app/views/layouts/application.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 8a5bac3eca..92ca65249a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,8 +9,9 @@ -
+
<%= render "common/navbar" %> + <%= render "common/flashed" %> <%= yield %>
From 57b3016a949c7ab49cde066f22e7a8cf0860478a Mon Sep 17 00:00:00 2001 From: gzn Date: Fri, 24 Nov 2017 16:50:02 +0800 Subject: [PATCH 05/21] add bootstap flash function --- app/views/layouts/application.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 92ca65249a..86e636ca6c 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -11,7 +11,7 @@
<%= render "common/navbar" %> - <%= render "common/flashed" %> + <%= render "common/flashes" %> <%= yield %>
From b12e29325005ea7c13f5f76c9bed15d7fd9b03b2 Mon Sep 17 00:00:00 2001 From: gzn Date: Fri, 24 Nov 2017 17:19:47 +0800 Subject: [PATCH 06/21] user can login/logout/signup/ --- Gemfile | 1 + Gemfile.lock | 13 + 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 | 277 ++++++++++++++++++ config/locales/devise.en.yml | 64 ++++ config/routes.rb | 1 + .../20171124085346_devise_create_users.rb | 42 +++ db/schema.rb | 32 ++ test/fixtures/users.yml | 11 + test/models/user_test.rb | 7 + 13 files changed, 472 insertions(+), 1 deletion(-) 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/20171124085346_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 d04d00a581..c3834f4ff3 100644 --- a/Gemfile +++ b/Gemfile @@ -47,3 +47,4 @@ end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] +gem 'devise' diff --git a/Gemfile.lock b/Gemfile.lock index eeeca71497..e27d3ee4b5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -41,6 +41,7 @@ GEM arel (7.1.1) autoprefixer-rails (6.7.7.2) execjs + bcrypt (3.1.11) bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) @@ -55,6 +56,12 @@ GEM coffee-script-source (1.10.0) concurrent-ruby (1.0.2) debug_inspector (0.0.2) + devise (4.2.1) + 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) @@ -86,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) @@ -118,6 +126,8 @@ GEM rb-fsevent (0.9.7) rb-inotify (0.9.7) ffi (>= 0.5.0) + responders (2.3.0) + railties (>= 4.2.0, < 5.1) sass (3.4.22) sass-rails (5.0.6) railties (>= 4.0.0, < 6) @@ -147,6 +157,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) @@ -163,6 +175,7 @@ DEPENDENCIES bootstrap-sass byebug coffee-rails (~> 4.2) + devise jbuilder (~> 2.5) jquery-rails listen (~> 3.0.5) 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..3b6e7e7cfc 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -1,2 +1,5 @@ class WelcomeController < ApplicationController + def index + flash[:notice] = "Goodbye Loser" + 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..4f3dac21e8 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..77cfa366c5 --- /dev/null +++ b/config/initializers/devise.rb @@ -0,0 +1,277 @@ +# 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 = '30d8b8fb7772a0c9fade86ffdbd45d9256a9f8ba5424ff47ab2794e6c7f9e2e42cbf692fa398c13653be9ce60aaf7b9a60cd280778470c46bb8e3e405a6c7ca3' + + # ==> 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 = 'cd55d9241f387c3f10debe7cbdaa34e3688c4234cfe46176c3c85cd32efdb0cfa1da3fe471bc647de398bbc283c21099768479c2ffcd01d1ea6376155fac8b8a' + + # 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. 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..0b8f130278 --- /dev/null +++ b/config/locales/devise.en.yml @@ -0,0 +1,64 @@ +# 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." + 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 bc557ceacc..3640a2fe07 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do + devise_for :users root 'welcome#index' end diff --git a/db/migrate/20171124085346_devise_create_users.rb b/db/migrate/20171124085346_devise_create_users.rb new file mode 100644 index 0000000000..1fefeee7a6 --- /dev/null +++ b/db/migrate/20171124085346_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..22cc2e2c44 --- /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: 20171124085346) 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 651027d18cf5b9206e95bcf632f5866e924c51d4 Mon Sep 17 00:00:00 2001 From: gzn Date: Fri, 24 Nov 2017 17:21:55 +0800 Subject: [PATCH 07/21] install simpleform with bootstrap --- Gemfile | 1 + Gemfile.lock | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/Gemfile b/Gemfile index c3834f4ff3..fe0ef23702 100644 --- a/Gemfile +++ b/Gemfile @@ -48,3 +48,4 @@ end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem 'devise' +gem 'simple_form' diff --git a/Gemfile.lock b/Gemfile.lock index e27d3ee4b5..e2f5be7276 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -135,6 +135,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 (1.7.2) spring-watcher-listen (2.0.0) listen (>= 2.7, < 4.0) @@ -182,6 +185,7 @@ DEPENDENCIES puma (~> 3.0) rails (~> 5.0.0) sass-rails (~> 5.0) + simple_form spring spring-watcher-listen (~> 2.0.0) sqlite3 From 378f33b4474a340b22ce1288e70d4c42efa7132d Mon Sep 17 00:00:00 2001 From: gzn Date: Fri, 24 Nov 2017 19:57:53 +0800 Subject: [PATCH 08/21] install backend CRUD --- Gemfile | 1 + Gemfile.lock | 3 + app/assets/javascripts/admin/products.coffee | 3 + app/assets/stylesheets/admin/products.scss | 3 + app/assets/stylesheets/application.scss | 1 + app/controllers/admin/products_controller.rb | 41 +++++ app/helpers/admin/products_helper.rb | 2 + app/models/product.rb | 2 + app/views/admin/products/edit.html.erb | 23 +++ app/views/admin/products/index.html.erb | 5 + app/views/admin/products/new.html.erb | 23 +++ app/views/common/_footer.html.erb | 2 +- app/views/common/_navbar.html.erb | 32 ++-- app/views/layouts/application.html.erb | 1 + config/initializers/simple_form.rb | 169 ++++++++++++++++++ config/initializers/simple_form_bootstrap.rb | 154 ++++++++++++++++ config/locales/simple_form.en.yml | 31 ++++ config/routes.rb | 3 + db/migrate/20171124093638_create_products.rb | 12 ++ db/schema.rb | 11 +- lib/templates/erb/scaffold/_form.html.erb | 13 ++ .../admin/products_controller_test.rb | 7 + test/fixtures/products.yml | 13 ++ test/models/product_test.rb | 7 + 24 files changed, 543 insertions(+), 19 deletions(-) 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/edit.html.erb create mode 100644 app/views/admin/products/index.html.erb create mode 100644 app/views/admin/products/new.html.erb 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 db/migrate/20171124093638_create_products.rb create mode 100644 lib/templates/erb/scaffold/_form.html.erb create mode 100644 test/controllers/admin/products_controller_test.rb create mode 100644 test/fixtures/products.yml create mode 100644 test/models/product_test.rb diff --git a/Gemfile b/Gemfile index fe0ef23702..f3418ed7c6 100644 --- a/Gemfile +++ b/Gemfile @@ -49,3 +49,4 @@ end gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem 'devise' gem 'simple_form' +gem 'font-awesome-rails' diff --git a/Gemfile.lock b/Gemfile.lock index e2f5be7276..ba97a9a2d4 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.2) + railties (>= 3.2, < 5.2) globalid (0.3.7) activesupport (>= 4.1.0) i18n (0.7.0) @@ -179,6 +181,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/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/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index de06911e86..71c437ef79 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -16,3 +16,4 @@ @import "bootstrap-sprockets"; @import "bootstrap"; +@import "font-awesome"; diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb new file mode 100644 index 0000000000..07aaf75614 --- /dev/null +++ b/app/controllers/admin/products_controller.rb @@ -0,0 +1,41 @@ +class Admin::ProductsController < ApplicationController + before_action :authenticate_user! + + def index + @products = Product.all + end + + def new + @product = Product.new + end + + def edit + @product = Product.new + end + + def update + @product = Product.find(params[:id]) + if @product.update(product_params) + redirect_to admin_products_path + else + render :edit + end + end + + def create + @product = Product.new(product_params) + + if @product.save + redirect_to admin_products_path + else + render :new + end + end + + private + + def product_params + params.require(:product).permit(:title, :description, :quantity, :price) + 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/edit.html.erb b/app/views/admin/products/edit.html.erb new file mode 100644 index 0000000000..ece1a89839 --- /dev/null +++ b/app/views/admin/products/edit.html.erb @@ -0,0 +1,23 @@ +

Edit Product

+ +<%= simple_form_for [:admin, @product] do |f| %> + +
+ <%= f.input :title %> +
+ +
+ <%= f.input :description %> +
+ +
+ <%= f.input :quantity %> +
+ +
+ <%= f.input :price %> +
+ + <%= f.submit "Submit", data: { disable_with: "Submitting..." } %> + +<% 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..304c04270e --- /dev/null +++ b/app/views/admin/products/index.html.erb @@ -0,0 +1,5 @@ +
    + <% @products.each do |product| %> +
  • <%= link_to(product.title, admin_products_path(product)) %>
    • + <% end %> +
diff --git a/app/views/admin/products/new.html.erb b/app/views/admin/products/new.html.erb new file mode 100644 index 0000000000..5e459dd094 --- /dev/null +++ b/app/views/admin/products/new.html.erb @@ -0,0 +1,23 @@ +

New Product

+ +<%= simple_form_for [:admin, @product] do |f| %> + +
+ <%= f.input :title %> +
+ +
+ <%= f.input :description %> +
+ +
+ <%= f.input :quantity %> +
+ +
+ <%= f.input :price %> +
+ + <%= f.submit "Submit", data: { disable_with: "Submitting..." } %> + +<% end %> diff --git a/app/views/common/_footer.html.erb b/app/views/common/_footer.html.erb index 0fdf9e91ae..ac58f03d9f 100644 --- a/app/views/common/_footer.html.erb +++ b/app/views/common/_footer.html.erb @@ -1,5 +1,5 @@
-

Copyright ©2016 Rails101 +

Copyright ©2017 JDStore
Design by Damon10L

diff --git a/app/views/common/_navbar.html.erb b/app/views/common/_navbar.html.erb index 4f3dac21e8..1a79c56b26 100644 --- a/app/views/common/_navbar.html.erb +++ b/app/views/common/_navbar.html.erb @@ -2,28 +2,26 @@
- Job Listing + JDStore
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 86e636ca6c..dd7f358007 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -13,6 +13,7 @@ <%= render "common/navbar" %> <%= render "common/flashes" %> <%= yield %> + <%= render "common/footer" %>
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/config/routes.rb b/config/routes.rb index 3640a2fe07..394f7ce57c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,7 @@ Rails.application.routes.draw do + namespace :admin do + resources :products + end devise_for :users root 'welcome#index' end diff --git a/db/migrate/20171124093638_create_products.rb b/db/migrate/20171124093638_create_products.rb new file mode 100644 index 0000000000..471c156bb9 --- /dev/null +++ b/db/migrate/20171124093638_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 22cc2e2c44..3e90b422a2 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: 20171124085346) do +ActiveRecord::Schema.define(version: 20171124093638) 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/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 %> 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 263d143cdf778ef2dc25b6b807f27f757ae2c8b9 Mon Sep 17 00:00:00 2001 From: gzn Date: Mon, 27 Nov 2017 20:41:54 +0800 Subject: [PATCH 09/21] only admin can access backend panel --- app/controllers/admin/products_controller.rb | 2 ++ app/controllers/application_controller.rb | 7 ++++++ app/models/user.rb | 5 ++++ app/views/common/_navbar.html.erb | 2 +- app/views/layouts/admin.html.erb | 23 +++++++++++++++++++ .../20171124120431_add_is_admin_to_user.rb | 5 ++++ db/schema.rb | 13 ++++++----- 7 files changed, 50 insertions(+), 7 deletions(-) create mode 100644 app/views/layouts/admin.html.erb create mode 100644 db/migrate/20171124120431_add_is_admin_to_user.rb diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb index 07aaf75614..45834a2659 100644 --- a/app/controllers/admin/products_controller.rb +++ b/app/controllers/admin/products_controller.rb @@ -1,5 +1,7 @@ class Admin::ProductsController < ApplicationController before_action :authenticate_user! + before_action :admin_required + layout "admin" def index @products = Product.all diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1c07694e9d..716964c574 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 admin_required + if !current_user.admin? + redirect_to "/", alert:" You are not admin " + end + end + end diff --git a/app/models/user.rb b/app/models/user.rb index b2091f9a7a..bcc827cc1e 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 1a79c56b26..518e82947c 100644 --- a/app/views/common/_navbar.html.erb +++ b/app/views/common/_navbar.html.erb @@ -18,7 +18,7 @@
    -
  • <%= link_to(content_tag(:i,'登入',class:'fa fa-sign-in'), destroy_user_session_path, method: :delete) %>
    • +
  • <%= link_to(content_tag(:i,'登出',class:'fa fa-sign-in'), destroy_user_session_path, method: :delete) %>
<% end %> diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb new file mode 100644 index 0000000000..4e351e14f1 --- /dev/null +++ b/app/views/layouts/admin.html.erb @@ -0,0 +1,23 @@ + + + + JDstore 后台 + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> + <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> + <%= csrf_meta_tags %> + + +
+ <%= render "common/navbar" %> +
+
+
    +
  • <%= link_to("Products", admin_products_path) %>
    • +
+
+
+ <%= yield %> +
+
+
+ diff --git a/db/migrate/20171124120431_add_is_admin_to_user.rb b/db/migrate/20171124120431_add_is_admin_to_user.rb new file mode 100644 index 0000000000..4b47cc61e0 --- /dev/null +++ b/db/migrate/20171124120431_add_is_admin_to_user.rb @@ -0,0 +1,5 @@ +class AddIsAdminToUser < 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 3e90b422a2..e82b41f8d3 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: 20171124093638) do +ActiveRecord::Schema.define(version: 20171124120431) do create_table "products", force: :cascade do |t| t.string "title" @@ -22,18 +22,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 c1511ff09fd3bc16e2d1f53d3224f80940c4bfb0 Mon Sep 17 00:00:00 2001 From: gzn Date: Mon, 27 Nov 2017 21:40:15 +0800 Subject: [PATCH 10/21] implement image upload --- .gitignore | 1 + Gemfile | 2 + Gemfile.lock | 7 +++ app/controllers/admin/products_controller.rb | 2 +- app/models/product.rb | 1 + app/uploaders/image_uploader.rb | 59 +++++++++++++++++++ app/views/admin/products/edit.html.erb | 9 +++ app/views/admin/products/new.html.erb | 4 ++ .../20171127131223_add_image_to_product.rb | 5 ++ 9 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 app/uploaders/image_uploader.rb create mode 100644 db/migrate/20171127131223_add_image_to_product.rb diff --git a/.gitignore b/.gitignore index 9f14c9f5b6..095fa64412 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ # Ignore Byebug command history file. .byebug_history config/database.yml +public/uploads diff --git a/Gemfile b/Gemfile index f3418ed7c6..63a8557ddf 100644 --- a/Gemfile +++ b/Gemfile @@ -50,3 +50,5 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem 'devise' gem 'simple_form' gem 'font-awesome-rails' +gem 'carrierwave' +gem 'mini_magick' diff --git a/Gemfile.lock b/Gemfile.lock index ba97a9a2d4..571799c0c1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -47,6 +47,10 @@ GEM sass (>= 3.3.4) builder (3.2.2) byebug (9.0.5) + carrierwave (1.2.1) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) + mime-types (>= 1.16) coffee-rails (4.2.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.2.x) @@ -88,6 +92,7 @@ GEM mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) + mini_magick (4.8.0) mini_portile2 (2.1.0) minitest (5.9.0) multi_json (1.12.1) @@ -179,12 +184,14 @@ PLATFORMS DEPENDENCIES bootstrap-sass byebug + carrierwave coffee-rails (~> 4.2) devise font-awesome-rails jbuilder (~> 2.5) jquery-rails listen (~> 3.0.5) + mini_magick puma (~> 3.0) rails (~> 5.0.0) sass-rails (~> 5.0) diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb index 45834a2659..ce725a7b6f 100644 --- a/app/controllers/admin/products_controller.rb +++ b/app/controllers/admin/products_controller.rb @@ -37,7 +37,7 @@ def create private def product_params - params.require(:product).permit(:title, :description, :quantity, :price) + params.require(:product).permit(:title, :description, :quantity, :price, :image) end end diff --git a/app/models/product.rb b/app/models/product.rb index 35a85acab3..266f69c35d 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -1,2 +1,3 @@ class Product < ApplicationRecord + 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..6b5b807776 --- /dev/null +++ b/app/uploaders/image_uploader.rb @@ -0,0 +1,59 @@ +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_fill: [200,200] + end + + version :medium do + process resize_to_fill: [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 ece1a89839..42d13c5211 100644 --- a/app/views/admin/products/edit.html.erb +++ b/app/views/admin/products/edit.html.erb @@ -18,6 +18,15 @@ <%= f.input :price %>
+ <% if @product.image.present? %> + 目前商品图
+ <%= image_tag(@product.image.thumb.url) %> + <% end %> + +
+ <%= f.input :image, as: :file %> +
+ <%= f.submit "Submit", data: { disable_with: "Submitting..." } %> <% end %> diff --git a/app/views/admin/products/new.html.erb b/app/views/admin/products/new.html.erb index 5e459dd094..230db17616 100644 --- a/app/views/admin/products/new.html.erb +++ b/app/views/admin/products/new.html.erb @@ -18,6 +18,10 @@ <%= f.input :price %> +
+ <%= f.input: image, as: :file %> +
+ <%= f.submit "Submit", data: { disable_with: "Submitting..." } %> <% end %> diff --git a/db/migrate/20171127131223_add_image_to_product.rb b/db/migrate/20171127131223_add_image_to_product.rb new file mode 100644 index 0000000000..89c3f5c0d4 --- /dev/null +++ b/db/migrate/20171127131223_add_image_to_product.rb @@ -0,0 +1,5 @@ +class AddImageToProduct < ActiveRecord::Migration[5.0] + def change + add_column :produts, :image, :string + end +end From f1f90e836bcad5f7acc5346a93e65a147a5b051c Mon Sep 17 00:00:00 2001 From: gzn Date: Mon, 27 Nov 2017 22:14:40 +0800 Subject: [PATCH 11/21] implement product show --- app/assets/javascripts/products.coffee | 3 +++ app/assets/stylesheets/products.scss | 3 +++ app/controllers/products_controller.rb | 10 +++++++++ app/helpers/products_helper.rb | 2 ++ app/views/common/_navbar.html.erb | 7 ++++++ app/views/products/index.html.erb | 14 ++++++++++++ app/views/products/show.html.erb | 23 ++++++++++++++++++++ config/routes.rb | 6 ++++- test/controllers/products_controller_test.rb | 7 ++++++ 9 files changed, 74 insertions(+), 1 deletion(-) 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/products_controller.rb b/app/controllers/products_controller.rb new file mode 100644 index 0000000000..a59ac673e7 --- /dev/null +++ b/app/controllers/products_controller.rb @@ -0,0 +1,10 @@ +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/common/_navbar.html.erb b/app/views/common/_navbar.html.erb index 518e82947c..3852ef2ee7 100644 --- a/app/views/common/_navbar.html.erb +++ b/app/views/common/_navbar.html.erb @@ -6,6 +6,13 @@ + diff --git a/config/routes.rb b/config/routes.rb index 394f7ce57c..cd9b8e5d8e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,11 @@ Rails.application.routes.draw do + + root 'products#index' namespace :admin do resources :products end devise_for :users - root 'welcome#index' + + resources :products + end 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 af2930e172669f7fa5c0d0c7fc0622fa37ad117c Mon Sep 17 00:00:00 2001 From: gzn Date: Mon, 27 Nov 2017 22:46:21 +0800 Subject: [PATCH 12/21] change admin/product backend panel --- app/views/admin/products/index.html.erb | 48 +++++++++++++++++-- app/views/common/_navbar.html.erb | 10 ++-- .../20171127131223_add_image_to_product.rb | 2 +- db/schema.rb | 3 +- 4 files changed, 53 insertions(+), 10 deletions(-) diff --git a/app/views/admin/products/index.html.erb b/app/views/admin/products/index.html.erb index 304c04270e..366e601891 100644 --- a/app/views/admin/products/index.html.erb +++ b/app/views/admin/products/index.html.erb @@ -1,5 +1,43 @@ -
    - <% @products.each do |product| %> -
  • <%= link_to(product.title, admin_products_path(product)) %>
    • - <% end %> -
+

Product List

+
+ <%= link_to("新增产品", new_admin_product_path, class:"btn btn-primary btn-sm")%> +
+ + + + + + + + + + + + + <% @products.each do |product| %> + + + + + + + + <% end %> + +
# Product Pic Name Price Options
+ <%= product.id %> + + <%= link_to product_path(product) do %> + <% if product.image.present? %> + <%= image_tag(product.image.thumb.url, class: "thumbnail") %> + <% else %> + <%= image_tag("http://placehold.it/200x200&text=No Pic", class: "thumbnail") %> + <% end %> + <% end %> + + <%= product.title %> + + <%= product.price %> + + <%= link_to("Edit", edit_admin_product_path(product)) %> +
diff --git a/app/views/common/_navbar.html.erb b/app/views/common/_navbar.html.erb index 3852ef2ee7..f5686186b4 100644 --- a/app/views/common/_navbar.html.erb +++ b/app/views/common/_navbar.html.erb @@ -9,10 +9,9 @@ + -
数量 : <%= @products.quantity %>
+
数量 : <%= @product.quantity %>
¥ <%= @product.price %>
From 4b319975fceb5dde874144eec4a0f57bc16d1516 Mon Sep 17 00:00:00 2001 From: gzn Date: Wed, 29 Nov 2017 19:18:28 +0800 Subject: [PATCH 14/21] add add_to_cart button --- app/controllers/products_controller.rb | 6 +++++- app/views/products/show.html.erb | 2 +- config/routes.rb | 6 +++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index a59ac673e7..9df0f25a4f 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -6,5 +6,9 @@ def index def show @product = Product.find(params[:id]) end - + + def add_to_cart + @product = Product.find(params[:id]) + redirect_to :back + flash[:notice] = "测试加入购物车" end diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index f778e4cfee..3dfd7884b9 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -17,7 +17,7 @@
¥ <%= @product.price %>
- <%= link_to("加入购物车","#", :class => "btn btn-danger btn-lg") %> + <%= link_to("加入购物车",add_to_cart_product_path(@product),:method => :post, :class => "btn btn-primary btn-lg btn-danger") %>
diff --git a/config/routes.rb b/config/routes.rb index cd9b8e5d8e..21c3236244 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,6 +6,10 @@ end devise_for :users - resources :products + resources :products do + member do + post :add_to_cart + end + end end From 53b5f21e438844fb5c7ad50523cddebe231f832f Mon Sep 17 00:00:00 2001 From: gzn Date: Wed, 29 Nov 2017 19:36:59 +0800 Subject: [PATCH 15/21] implement add_ptoduct_to_cart function --- app/controllers/products_controller.rb | 1 + app/models/cart.rb | 11 +++++++++++ app/models/cart_item.rb | 4 ++++ app/views/products/show.html.erb | 2 +- db/migrate/20171129112631_create_carts.rb | 8 ++++++++ db/migrate/20171129112645_create_cart_items.rb | 10 ++++++++++ db/schema.rb | 15 ++++++++++++++- test/fixtures/cart_items.yml | 11 +++++++++++ test/fixtures/carts.yml | 11 +++++++++++ test/models/cart_item_test.rb | 7 +++++++ test/models/cart_test.rb | 7 +++++++ 11 files changed, 85 insertions(+), 2 deletions(-) create mode 100644 app/models/cart.rb create mode 100644 app/models/cart_item.rb create mode 100644 db/migrate/20171129112631_create_carts.rb create mode 100644 db/migrate/20171129112645_create_cart_items.rb create mode 100644 test/fixtures/cart_items.yml create mode 100644 test/fixtures/carts.yml create mode 100644 test/models/cart_item_test.rb create mode 100644 test/models/cart_test.rb diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 9df0f25a4f..e51d626fa9 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -11,4 +11,5 @@ def add_to_cart @product = Product.find(params[:id]) redirect_to :back flash[:notice] = "测试加入购物车" + end end diff --git a/app/models/cart.rb b/app/models/cart.rb new file mode 100644 index 0000000000..fe6e9559db --- /dev/null +++ b/app/models/cart.rb @@ -0,0 +1,11 @@ +class Cart < ApplicationRecord + has_many :cart_items + has_many :products, through: :cart_items, source: :product + + def add_product_to_cart(product) + ci = cart_items.build + ci.product = product + ci.quantity = 1 + ci.save + end +end diff --git a/app/models/cart_item.rb b/app/models/cart_item.rb new file mode 100644 index 0000000000..23b07149b0 --- /dev/null +++ b/app/models/cart_item.rb @@ -0,0 +1,4 @@ +class CartItem < ApplicationRecord + belongs_to :cart + belongs_to :product +end diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 3dfd7884b9..96f2d886d4 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -17,7 +17,7 @@
¥ <%= @product.price %>
- <%= link_to("加入购物车",add_to_cart_product_path(@product),:method => :post, :class => "btn btn-primary btn-lg btn-danger") %> + <%= link_to("加入购物车",add_to_cart_product_path(@product),:method => :post, :class => "btn btn-primary btn-danger") %>
diff --git a/db/migrate/20171129112631_create_carts.rb b/db/migrate/20171129112631_create_carts.rb new file mode 100644 index 0000000000..e029bfec87 --- /dev/null +++ b/db/migrate/20171129112631_create_carts.rb @@ -0,0 +1,8 @@ +class CreateCarts < ActiveRecord::Migration[5.0] + def change + create_table :carts do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20171129112645_create_cart_items.rb b/db/migrate/20171129112645_create_cart_items.rb new file mode 100644 index 0000000000..cfd692995b --- /dev/null +++ b/db/migrate/20171129112645_create_cart_items.rb @@ -0,0 +1,10 @@ +class CreateCartItems < ActiveRecord::Migration[5.0] + def change + create_table :cart_items do |t| + t.integer :cart_id + t.integer :product_id + t.integer :quantity, default: 1 + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 00f71f4abf..6f6d118ee8 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,20 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20171127131223) do +ActiveRecord::Schema.define(version: 20171129112645) do + + create_table "cart_items", force: :cascade do |t| + t.integer "cart_id" + t.integer "product_id" + t.integer "quantity", default: 1 + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "carts", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end create_table "products", force: :cascade do |t| t.string "title" diff --git a/test/fixtures/cart_items.yml b/test/fixtures/cart_items.yml new file mode 100644 index 0000000000..80aed36e30 --- /dev/null +++ b/test/fixtures/cart_items.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/carts.yml b/test/fixtures/carts.yml new file mode 100644 index 0000000000..80aed36e30 --- /dev/null +++ b/test/fixtures/carts.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/models/cart_item_test.rb b/test/models/cart_item_test.rb new file mode 100644 index 0000000000..881afe1fcf --- /dev/null +++ b/test/models/cart_item_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class CartItemTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/cart_test.rb b/test/models/cart_test.rb new file mode 100644 index 0000000000..9fad43a1c6 --- /dev/null +++ b/test/models/cart_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class CartTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end From c133780227535fa9901f623e4ddd80cfa06cc4d1 Mon Sep 17 00:00:00 2001 From: gzn Date: Wed, 29 Nov 2017 20:31:42 +0800 Subject: [PATCH 16/21] implement current_cart function --- app/controllers/application_controller.rb | 16 ++++++++++++++++ app/controllers/products_controller.rb | 3 ++- app/views/common/_navbar.html.erb | 5 +++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 716964c574..28a21bc232 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -7,4 +7,20 @@ def admin_required end end + helper_method :current_cart + + def current_cart + @current_cart ||= find_cart + end + + private + + def find_cart + cart = Cart.find_by(id: session[:cart_id]) + if cart.blank? + cart = Cart.create + end + session[ :cart_id] = cart.id + return cart + end end diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index e51d626fa9..9b6433face 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -9,7 +9,8 @@ def show def add_to_cart @product = Product.find(params[:id]) - redirect_to :back + current_cart.add_product_to_cart(@product) flash[:notice] = "测试加入购物车" + redirect_to :back end end diff --git a/app/views/common/_navbar.html.erb b/app/views/common/_navbar.html.erb index f5686186b4..86d0db82dd 100644 --- a/app/views/common/_navbar.html.erb +++ b/app/views/common/_navbar.html.erb @@ -14,6 +14,11 @@