From c5564968fd6eff2a83c3f24c72ee9358ae2b3c12 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Mon, 4 Apr 2016 22:57:37 -0500 Subject: [PATCH 01/20] Add devise --- Gemfile | 1 + Gemfile.lock | 13 + app/models/user.rb | 4 + app/views/devise/confirmations/new.html.erb | 16 ++ .../mailer/confirmation_instructions.html.erb | 5 + .../devise/mailer/password_change.html.erb | 3 + .../reset_password_instructions.html.erb | 8 + .../mailer/unlock_instructions.html.erb | 7 + app/views/devise/passwords/edit.html.erb | 25 ++ app/views/devise/passwords/new.html.erb | 16 ++ app/views/devise/registrations/edit.html.erb | 39 +++ app/views/devise/registrations/new.html.erb | 29 ++ app/views/devise/sessions/new.html.erb | 26 ++ app/views/devise/shared/_links.html.erb | 25 ++ app/views/devise/unlocks/new.html.erb | 16 ++ app/views/layouts/application.html.erb | 4 + config/environments/development.rb | 3 + config/environments/production.rb | 3 + config/initializers/devise.rb | 265 ++++++++++++++++++ config/locales/devise.en.yml | 62 ++++ config/routes.rb | 3 +- .../20160405035806_add_devise_to_users.rb | 49 ++++ 22 files changed, 621 insertions(+), 1 deletion(-) create mode 100644 app/views/devise/confirmations/new.html.erb create mode 100644 app/views/devise/mailer/confirmation_instructions.html.erb create mode 100644 app/views/devise/mailer/password_change.html.erb create mode 100644 app/views/devise/mailer/reset_password_instructions.html.erb create mode 100644 app/views/devise/mailer/unlock_instructions.html.erb create mode 100644 app/views/devise/passwords/edit.html.erb create mode 100644 app/views/devise/passwords/new.html.erb create mode 100644 app/views/devise/registrations/edit.html.erb create mode 100644 app/views/devise/registrations/new.html.erb create mode 100644 app/views/devise/sessions/new.html.erb create mode 100644 app/views/devise/shared/_links.html.erb create mode 100644 app/views/devise/unlocks/new.html.erb create mode 100644 config/initializers/devise.rb create mode 100644 config/locales/devise.en.yml create mode 100644 db/migrate/20160405035806_add_devise_to_users.rb diff --git a/Gemfile b/Gemfile index 6b1563f4..69d564a8 100644 --- a/Gemfile +++ b/Gemfile @@ -10,6 +10,7 @@ gem 'paperclip', '~> 4.2.0' gem 'rmagick', '2.13.4' gem 'aws-sdk', '~> 1.50' gem 'bcrypt', '~> 3.1.10', platforms: [:ruby, :mingw, :x64_mingw] +gem 'devise' group :production do gem 'less-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 904c0215..c97a0b8b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -83,6 +83,13 @@ GEM thor (~> 0.19.1) tins (~> 1.6.0) debug_inspector (0.0.2) + devise (3.5.6) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 3.2.6, < 5) + responders + thread_safe (~> 0.1) + warden (~> 1.2.3) docile (1.1.5) erubis (2.7.0) execjs (2.6.0) @@ -145,6 +152,7 @@ GEM notiffany (0.0.8) nenv (~> 0.1) shellany (~> 0.0) + orm_adapter (0.5.0) paperclip (4.2.4) activemodel (>= 3.2.0) activesupport (>= 3.2.0) @@ -192,6 +200,8 @@ GEM rb-inotify (0.9.7) ffi (>= 0.5.0) ref (2.0.0) + responders (2.1.1) + railties (>= 4.2.0, < 5.1) rmagick (2.13.4) rubocop (0.39.0) parser (>= 2.3.0.7, < 3.0) @@ -245,6 +255,8 @@ GEM uglifier (3.0.0) execjs (>= 0.3.0, < 3) unicode-display_width (1.0.3) + warden (1.2.6) + rack (>= 1.0) websocket (1.2.2) xpath (2.0.0) nokogiri (~> 1.3) @@ -262,6 +274,7 @@ DEPENDENCIES capybara coffee-rails (~> 4.0.0) coveralls + devise guard guard-minitest guard-rubocop diff --git a/app/models/user.rb b/app/models/user.rb index 21fd5851..45418309 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,6 +1,10 @@ ## # a person using the Indent web application. Owns all other content. class User < ActiveRecord::Base + # Include default devise modules. Others available are: + # :confirmable, :lockable, :timeoutable and :omniauthable + devise :database_authenticatable, :registerable, + :recoverable, :rememberable, :trackable, :validatable validates :name, presence: true validates :email, presence: true diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb new file mode 100644 index 00000000..826672f7 --- /dev/null +++ b/app/views/devise/confirmations/new.html.erb @@ -0,0 +1,16 @@ +

Resend confirmation instructions

+ +<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %> + <%= devise_error_messages! %> + +
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true, value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %> +
+ +
+ <%= f.submit "Resend confirmation instructions" %> +
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb new file mode 100644 index 00000000..dc55f64f --- /dev/null +++ b/app/views/devise/mailer/confirmation_instructions.html.erb @@ -0,0 +1,5 @@ +

Welcome <%= @email %>!

+ +

You can confirm your account email through the link below:

+ +

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

diff --git a/app/views/devise/mailer/password_change.html.erb b/app/views/devise/mailer/password_change.html.erb new file mode 100644 index 00000000..b41daf47 --- /dev/null +++ b/app/views/devise/mailer/password_change.html.erb @@ -0,0 +1,3 @@ +

Hello <%= @resource.email %>!

+ +

We're contacting you to notify you that your password has been changed.

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

Hello <%= @resource.email %>!

+ +

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

+ +

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

+ +

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

+

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

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

Hello <%= @resource.email %>!

+ +

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

+ +

Click the link below to unlock your account:

+ +

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

diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb new file mode 100644 index 00000000..6a796b05 --- /dev/null +++ b/app/views/devise/passwords/edit.html.erb @@ -0,0 +1,25 @@ +

Change your password

+ +<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %> + <%= devise_error_messages! %> + <%= f.hidden_field :reset_password_token %> + +
+ <%= f.label :password, "New password" %>
+ <% if @minimum_password_length %> + (<%= @minimum_password_length %> characters minimum)
+ <% end %> + <%= f.password_field :password, autofocus: true, autocomplete: "off" %> +
+ +
+ <%= f.label :password_confirmation, "Confirm new password" %>
+ <%= f.password_field :password_confirmation, autocomplete: "off" %> +
+ +
+ <%= f.submit "Change my password" %> +
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb new file mode 100644 index 00000000..3d6d11aa --- /dev/null +++ b/app/views/devise/passwords/new.html.erb @@ -0,0 +1,16 @@ +

Forgot your password?

+ +<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> + <%= devise_error_messages! %> + +
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true %> +
+ +
+ <%= f.submit "Send me reset password instructions" %> +
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb new file mode 100644 index 00000000..3ea40f01 --- /dev/null +++ b/app/views/devise/registrations/edit.html.erb @@ -0,0 +1,39 @@ +

Edit <%= resource_name.to_s.humanize %>

+ +<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %> + <%= devise_error_messages! %> + +
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true %> +
+ + <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %> +
Currently waiting confirmation for: <%= resource.unconfirmed_email %>
+ <% end %> + +
+ <%= f.label :password %> (leave blank if you don't want to change it)
+ <%= f.password_field :password, autocomplete: "off" %> +
+ +
+ <%= f.label :password_confirmation %>
+ <%= f.password_field :password_confirmation, autocomplete: "off" %> +
+ +
+ <%= f.label :current_password %> (we need your current password to confirm your changes)
+ <%= f.password_field :current_password, autocomplete: "off" %> +
+ +
+ <%= f.submit "Update" %> +
+<% end %> + +

Cancel my account

+ +

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

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

Sign up

+ +<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> + <%= devise_error_messages! %> + +
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true %> +
+ +
+ <%= f.label :password %> + <% if @minimum_password_length %> + (<%= @minimum_password_length %> characters minimum) + <% end %>
+ <%= f.password_field :password, autocomplete: "off" %> +
+ +
+ <%= f.label :password_confirmation %>
+ <%= f.password_field :password_confirmation, autocomplete: "off" %> +
+ +
+ <%= f.submit "Sign up" %> +
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb new file mode 100644 index 00000000..b261cfd1 --- /dev/null +++ b/app/views/devise/sessions/new.html.erb @@ -0,0 +1,26 @@ +

Log in

+ +<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> +
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true %> +
+ +
+ <%= f.label :password %>
+ <%= f.password_field :password, autocomplete: "off" %> +
+ + <% if devise_mapping.rememberable? -%> +
+ <%= f.check_box :remember_me %> + <%= f.label :remember_me %> +
+ <% end -%> + +
+ <%= f.submit "Log in" %> +
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/shared/_links.html.erb b/app/views/devise/shared/_links.html.erb new file mode 100644 index 00000000..e6a3e419 --- /dev/null +++ b/app/views/devise/shared/_links.html.erb @@ -0,0 +1,25 @@ +<%- if controller_name != 'sessions' %> + <%= link_to "Log in", new_session_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.registerable? && controller_name != 'registrations' %> + <%= link_to "Sign up", new_registration_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> + <%= link_to "Forgot your password?", new_password_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> + <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> + <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.omniauthable? %> + <%- resource_class.omniauth_providers.each do |provider| %> + <%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider) %>
+ <% end -%> +<% end -%> diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb new file mode 100644 index 00000000..16586bc7 --- /dev/null +++ b/app/views/devise/unlocks/new.html.erb @@ -0,0 +1,16 @@ +

Resend unlock instructions

+ +<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %> + <%= devise_error_messages! %> + +
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true %> +
+ +
+ <%= f.submit "Resend unlock instructions" %> +
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 56481aee..cffdf0fb 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -12,6 +12,10 @@ <%= render 'layouts/navbar' %> <%= render 'layouts/noscript_notice' %> + +

<%= notice %>

+

<%= alert %>

+
diff --git a/config/environments/development.rb b/config/environments/development.rb index cb6a141c..362f7c58 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -26,6 +26,9 @@ PlanCharacters::Application.configure do # Do not compress assets config.assets.compress = false + # Devise default url options + config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } + # DEVELOPMENT S3 settings for Paperclip uploads ON DEVELOPMENT config.paperclip_defaults = { storage: :s3, diff --git a/config/environments/production.rb b/config/environments/production.rb index c6316329..1f990458 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -62,6 +62,9 @@ Rails.application.configure do # the I18n.default_locale when a translation can not be found) config.i18n.fallbacks = true + # Devise default url options + config.action_mailer.default_url_options = { host: 'notebook.indentlabs.com', port: 80 } + # Send deprecation notices to registered listeners config.active_support.deprecation = :notify diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb new file mode 100644 index 00000000..ad72210a --- /dev/null +++ b/config/initializers/devise.rb @@ -0,0 +1,265 @@ +# 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` on Rails 4+ applications as its `secret_key` + # by default. You can change it below and use your own secret key. + # config.secret_key = '997e765e0d71e4f2400867bc60f5710459e40f101837a8b3b6d6b98cded073b9dcb5831bd0171355db85fad1e34f90d2e3bd3e8259bc4e7d7e0dde6a711ac6b5' + + # ==> Mailer Configuration + # Configure the e-mail address which will be shown in Devise::Mailer, + # note that it will be overwritten if you use your own mailer class + # with default "from" parameter. + config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' + + # Configure the class responsible to send e-mails. + # config.mailer = 'Devise::Mailer' + + # ==> ORM configuration + # Load and configure the ORM. Supports :active_record (default) and + # :mongoid (bson_ext recommended) by default. Other ORMs may be + # available as additional gems. + require 'devise/orm/active_record' + + # ==> Configuration for any authentication mechanism + # Configure which keys are used when authenticating a user. The default is + # just :email. You can configure it to use [:username, :subdomain], so for + # authenticating a user, both parameters are required. Remember that those + # parameters are used only when authenticating and not when retrieving from + # session. If you need permissions, you should implement that in a before filter. + # You can also supply a hash where the value is a boolean determining whether + # or not authentication should be aborted when the value is not present. + # config.authentication_keys = [:email] + + # Configure parameters from the request object used for authentication. Each entry + # given should be a request method and it will automatically be passed to the + # find_for_authentication method and considered in your model lookup. For instance, + # if you set :request_keys to [:subdomain], :subdomain will be used on authentication. + # The same considerations mentioned for authentication_keys also apply to request_keys. + # config.request_keys = [] + + # Configure which authentication keys should be case-insensitive. + # These keys will be downcased upon creating or modifying a user and when used + # to authenticate or find a user. Default is :email. + config.case_insensitive_keys = [:email] + + # Configure which authentication keys should have whitespace stripped. + # These keys will have whitespace before and after removed upon creating or + # modifying a user and when used to authenticate or find a user. Default is :email. + config.strip_whitespace_keys = [:email] + + # Tell if authentication through request.params is enabled. True by default. + # It can be set to an array that will enable params authentication only for the + # given strategies, for example, `config.params_authenticatable = [:database]` will + # enable it only for database (email + password) authentication. + # config.params_authenticatable = true + + # Tell if authentication through HTTP Auth is enabled. False by default. + # It can be set to an array that will enable http authentication only for the + # given strategies, for example, `config.http_authenticatable = [:database]` will + # enable it only for database authentication. The supported strategies are: + # :database = Support basic authentication with authentication key + password + # config.http_authenticatable = false + + # If 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 + + # ==> Configuration for :database_authenticatable + # For bcrypt, this is the cost for hashing the password and defaults to 10. If + # using other encryptors, it sets how many times you want the password re-encrypted. + # + # Limiting the stretches to just one in testing will increase the performance of + # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use + # a value less than 10 in other environments. Note that, for bcrypt (the default + # encryptor), the cost increases exponentially with the number of stretches (e.g. + # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation). + config.stretches = Rails.env.test? ? 1 : 10 + + # Setup a pepper to generate the encrypted password. + # config.pepper = '663d2a93a1c348ef0c540729701ce6767ea5b3f6f68543ddd16549d8dd2f63022af9c7f54c429e5b247566b1b099c1c0d05ac64fdc1c6898dd7495c52b10862d' + + # 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 = 8..72 + + # Email regex used to validate email formats. It simply asserts that + # one (and only one) @ exists in the given string. This is mainly + # to give user feedback and not to assert the e-mail validity. + # config.email_regexp = /\A[^@]+@[^@]+\z/ + + # ==> Configuration for :timeoutable + # The time you want to timeout the user session without activity. After this + # time the user will be asked for credentials again. Default is 30 minutes. + # config.timeout_in = 30.minutes + + # ==> 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 encryption algorithm besides bcrypt (default). You can use + # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1, + # :authlogic_sha512 (then you should set stretches above to 20 for default behavior) + # and :restful_authentication_sha1 (then you should set stretches to 10, and copy + # REST_AUTH_SITE_KEY to pepper). + # + # Require the `devise-encryptable` gem when using anything other than bcrypt + # config.encryptor = :sha512 + + # ==> Scopes configuration + # Turn scoped views on. Before rendering "sessions/new", it will first check for + # "users/sessions/new". It's turned off by default because it's slower if you + # are using only default views. + # config.scoped_views = false + + # Configure the default scope given to Warden. By default it's the first + # devise role declared in your routes (usually :user). + # config.default_scope = :user + + # Set this configuration to false if you want /users/sign_out to sign out + # only the current scope. By default, Devise signs out all scopes. + # config.sign_out_all_scopes = true + + # ==> Navigation configuration + # Lists the formats that should be treated as navigational. Formats like + # :html, should redirect to the sign in page when the user does not have + # access, but formats like :xml or :json, should return 401. + # + # If you have any extra navigational formats, like :iphone or :mobile, you + # should add them to the navigational formats lists. + # + # The "*/*" below is required to match Internet Explorer requests. + # config.navigational_formats = ['*/*', :html] + + # The default HTTP method used to sign out a resource. Default is :delete. + config.sign_out_via = :delete + + # ==> OmniAuth + # Add a new OmniAuth provider. Check the wiki for more information on setting + # up on your models and hooks. + # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo' + + # ==> Warden configuration + # If you want to use other strategies, that are not supported by Devise, or + # change the failure app, you can configure them inside the config.warden block. + # + # config.warden do |manager| + # manager.intercept_401 = false + # manager.default_strategies(scope: :user).unshift :some_external_strategy + # end + + # ==> Mountable engine configurations + # When using Devise inside an engine, let's call it `MyEngine`, and this engine + # is mountable, there are some extra configurations to be taken into account. + # The following options are available, assuming the engine is mounted as: + # + # mount MyEngine, at: '/my_engine' + # + # The router that invoked `devise_for`, in the example above, would be: + # config.router_name = :my_engine + # + # When using OmniAuth, Devise cannot automatically set OmniAuth path, + # so you need to do it manually. For the users scope, it would be: + # config.omniauth_path_prefix = '/my_engine/users/auth' +end diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml new file mode 100644 index 00000000..bd4c3ebc --- /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 01cc6c08..19b5d60a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,8 +1,9 @@ PlanCharacters::Application.routes.draw do + devise_for :users # rubocop:disable LineLength # Main pages - root to: 'main#index', as: :homepage + root to: 'main#index' # Info pages scope '/about' do diff --git a/db/migrate/20160405035806_add_devise_to_users.rb b/db/migrate/20160405035806_add_devise_to_users.rb new file mode 100644 index 00000000..e382389c --- /dev/null +++ b/db/migrate/20160405035806_add_devise_to_users.rb @@ -0,0 +1,49 @@ +class AddDeviseToUsers < ActiveRecord::Migration + def self.up + change_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 + + + # Uncomment below if timestamps were not included in your original model. + # 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 + + def self.down + # By default, we don't want to make any assumption about how to roll back a migration when your + # model already existed. Please edit below which fields you would like to remove in this migration. + raise ActiveRecord::IrreversibleMigration + end +end From d1295ef24316b6befa0c0225e7aa1d5973c8ef39 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Tue, 5 Apr 2016 18:07:13 -0500 Subject: [PATCH 02/20] ponr: replace custom login with devise login --- app/controllers/application_controller.rb | 50 +----------- app/controllers/characters_controller.rb | 2 + app/controllers/content_controller.rb | 8 +- app/controllers/main_controller.rb | 5 +- app/controllers/sessions_controller.rb | 76 ------------------- app/controllers/users_controller.rb | 28 ++----- app/models/user.rb | 15 +--- app/views/layouts/_login_box.html.erb | 10 +-- app/views/layouts/_noscript_notice.html.erb | 7 -- .../layouts/_session_protection.html.erb | 13 ---- app/views/layouts/application.html.erb | 2 - app/views/sessions/_form.html.erb | 2 +- app/views/users/_form.html.erb | 2 +- db/migrate/20140713043535_create_models.rb | 2 +- .../20160405035806_add_devise_to_users.rb | 1 - db/schema.rb | 34 ++++++--- test/controllers/users_controller_test.rb | 4 +- test/test_helper.rb | 6 +- 18 files changed, 52 insertions(+), 215 deletions(-) delete mode 100644 app/controllers/sessions_controller.rb delete mode 100644 app/views/layouts/_noscript_notice.html.erb delete mode 100644 app/views/layouts/_session_protection.html.erb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 57240319..a10df3f3 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -8,14 +8,6 @@ class ApplicationController < ActionController::Base helper_method :nl2br helper_method :universe_filter - # Rails changed cookie format in rails 4, so log out all old users so that - # they get the new version - rescue_from JSON::ParserError, with: :force_user_logout - def force_user_logout - reset_session - redirect_to login_path - end - # View Helpers def nl2br(string) # simple_format string @@ -23,50 +15,10 @@ class ApplicationController < ActionController::Base end def universe_filter - return if User.find_by(id: session[:user]).universes.empty? + return if User.find_by(id: current_user.id).universes.empty? @selected_universe_filter ||= t(:all_universes) end - # Authentication - # replace with devise - def log_in(user) - session[:user] = user.id - end - - def logged_in? - session && session[:user] - end - - def redirect_if_not_logged_in - return if logged_in? - redirect_to signup_path, notice: t(:must_be_logged_in) - end - - def create_anonymous_account_if_not_logged_in - return if logged_in? - - # layman's collision detection - 10.times do - @user = create_anonymous_user - break if @user.save - end - - return if @user.nil? - - session[:user] = @user.id - session[:anon_user] = true - end - - def create_anonymous_user - # TODO: guarantee anonymous id is random (or just let db assign it?) - id = rand(10_000_000).to_s + rand(10_000_000).to_s # lol - - User.new( - name: 'Anonymous-' + id.to_s, - email: id.to_s + '@localhost', - password: id.to_s) - end - def content_type_from_controller(content_controller_name) content_controller_name.to_s.chomp('Controller').singularize.constantize end diff --git a/app/controllers/characters_controller.rb b/app/controllers/characters_controller.rb index a5354c21..fea3dc70 100644 --- a/app/controllers/characters_controller.rb +++ b/app/controllers/characters_controller.rb @@ -1,5 +1,7 @@ # Controller for the Character model class CharactersController < ContentController + before_action :authenticate_user! + private def content_params diff --git a/app/controllers/content_controller.rb b/app/controllers/content_controller.rb index f0511c5e..8d66f7c5 100644 --- a/app/controllers/content_controller.rb +++ b/app/controllers/content_controller.rb @@ -1,11 +1,9 @@ class ContentController < ApplicationController include HasOwnership - before_action :create_anonymous_account_if_not_logged_in, only: [:edit, :create, :update] - def index @content = content_type_from_controller(self.class) - .where(user_id: session[:user]) + .where(user_id: current_user.id) .order(:name) .presence || [] @@ -77,7 +75,7 @@ class ContentController < ApplicationController @content = content_type .new(content_params) .tap do |c| - c.user_id = session[:user] + c.user_id = current_user.id c.universe = universe_from_params if c.respond_to? :universe #todo this doesn't actually work? end end @@ -89,7 +87,7 @@ class ContentController < ApplicationController def universe_from_params return unless params[content_symbol].include? :universe - Universe.where(user_id: session[:user], name: params[content_symbol][:universe].strip).first + Universe.where(user_id: current_user.id, name: params[content_symbol][:universe].strip).first end def content_symbol diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index ab6bf557..8384fb30 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -4,7 +4,7 @@ class MainController < ApplicationController before_action :redirect_if_not_logged_in, only: [:dashboard] def index - redirect_to :dashboard if session && session[:user] + redirect_to :dashboard if user_signed_in? end def comingsoon @@ -17,7 +17,8 @@ class MainController < ApplicationController end def dashboard - user = User.where(id: session[:user]).first + #todo just use @user in the view + user = User.where(id: current_user.id).first @characters = user.characters @equipment = user.equipment diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb deleted file mode 100644 index 4d3a651c..00000000 --- a/app/controllers/sessions_controller.rb +++ /dev/null @@ -1,76 +0,0 @@ -# Controller for user Sessions -class SessionsController < ApplicationController - # GET /sessions/new - # GET /sessions/new.json - def new - @session = Session.new - - respond_to do |format| - format.html # new.html.erb - format.json { render json: @session } - end - end - - # POST /sessions - # POST /sessions.json - def create - user = user_from_params - - if user.nil? - redirect_to login_path, notice: t(:username_password_incorrect) - return - end - - build_session_for user - - respond_to do |format| - format.html { redirect_to dashboard_path, notice: t(:login_successful) } - format.json { render json: true, status: :created } - end - end - - # GET /logout - def destroy - session.delete(:user) - session.delete(:anon_user) - - respond_to do |format| - format.html { redirect_to homepage_path, notice: t(:logged_out) } - format.json { head :no_content } - end - end - - def self.create_password_digest(username, password) - require 'digest' - Digest::MD5.hexdigest( - username + "'s password IS... " + password + ' (lol!)') - end - - private - - def user_from_params - login = Session.new(session_params) - user = User.find_by(name: login.username) - migrate_to_bcrypt(user, login.password) if user.old_password.present? - user.try(:authenticate, login.password) - end - - def migrate_to_bcrypt(user, password) - hash = SessionsController.create_password_digest user.name, password - - return unless user.old_password == hash - - user.old_password = nil - user.password = password - user.save - end - - def build_session_for(user) - session[:user] = user.id - session.delete(:anon_user) - end - - def session_params - params.require(:session).permit(:username, :password) - end -end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index a0cea86e..f1c72c3c 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -15,7 +15,7 @@ class UsersController < ApplicationController # GET /users/1/edit def edit - @user = User.find(session[:user]) + @user = current_user #todo just use current_user in view end # POST /users @@ -27,23 +27,7 @@ class UsersController < ApplicationController if @user.save log_in @user notice = t(:create_success, model_name: User.model_name.human) - format.html { redirect_to homepage_path, notice: notice } - format.json { render json: @user, status: :created } - else - format.html { render action: 'new' } - format.json { render json: @user.errors, status: :unprocessable_entity } - end - end - end - - def anonymous_login - @user = create_anonymous_user - - respond_to do |format| - if @user.save - session[:user] = @user.id - session[:anon_user] = true - format.html { redirect_to dashboard_path } + format.html { redirect_to root_url, notice: notice } format.json { render json: @user, status: :created } else format.html { render action: 'new' } @@ -55,12 +39,11 @@ class UsersController < ApplicationController # PUT /users/1 # PUT /users/1.json def update - @user = User.find(session[:user]) + @user = current_user respond_to do |format| if @user.update_attributes(user_params) - session[:anon_user] = false - format.html { redirect_to homepage_path, notice: 'Successfully updated.' } + format.html { redirect_to root_url, notice: 'Successfully updated.' } format.json { head :no_content } else format.html { render action: 'edit' } @@ -75,7 +58,6 @@ class UsersController < ApplicationController private def user_params - params.require(:user).permit(:name, :email, - :password, :password_confirmation) + params.require(:user).permit(:name, :email, :password, :password_confirmation) end end diff --git a/app/models/user.rb b/app/models/user.rb index 45418309..d8ae3717 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -5,11 +5,9 @@ class User < ActiveRecord::Base # :confirmable, :lockable, :timeoutable and :omniauthable devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable - validates :name, presence: true - validates :email, presence: true - has_secure_password - before_save :hash_old_password + #validates :name, presence: true + validates :email, presence: true has_many :characters has_many :equipment @@ -18,15 +16,6 @@ class User < ActiveRecord::Base has_many :magics has_many :universes - def hash_old_password - require 'digest' - - return if old_password.blank? - - self.old_password = Digest::MD5.hexdigest( - name + "'s password IS... " + old_password + ' (lol!)') - end - def content { characters: characters, diff --git a/app/views/layouts/_login_box.html.erb b/app/views/layouts/_login_box.html.erb index 46cefeb0..52af76ae 100644 --- a/app/views/layouts/_login_box.html.erb +++ b/app/views/layouts/_login_box.html.erb @@ -1,12 +1,12 @@ diff --git a/app/views/layouts/_noscript_notice.html.erb b/app/views/layouts/_noscript_notice.html.erb deleted file mode 100644 index 0a1afc39..00000000 --- a/app/views/layouts/_noscript_notice.html.erb +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/app/views/layouts/_session_protection.html.erb b/app/views/layouts/_session_protection.html.erb deleted file mode 100644 index c06a1175..00000000 --- a/app/views/layouts/_session_protection.html.erb +++ /dev/null @@ -1,13 +0,0 @@ -<% - # Destroy old sessions if a user has been deleted - begin - User.find(session[:user]) if session[:user] - rescue ActiveRecord::RecordNotFound - session = {} - %> - - <% - end -%> \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index cffdf0fb..c8a24f1f 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -6,12 +6,10 @@ <%= javascript_include_tag "application" %> <%= csrf_meta_tags %> - <%= render 'layouts/session_protection' %> <%= render 'layouts/bootstrap_includes' %> <%= render 'layouts/navbar' %> -<%= render 'layouts/noscript_notice' %>

<%= notice %>

<%= alert %>

diff --git a/app/views/sessions/_form.html.erb b/app/views/sessions/_form.html.erb index e2027006..a573afe5 100644 --- a/app/views/sessions/_form.html.erb +++ b/app/views/sessions/_form.html.erb @@ -17,7 +17,7 @@
<%= f.submit 'Log in', :class => 'btn btn-primary' %> - <%= link_to t('.cancel', :default => t("helpers.links.cancel")), homepage_path, :class => 'btn' %> + <%= link_to t('.cancel', :default => t("helpers.links.cancel")), root_url, :class => 'btn' %>
<% end %> diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb index 239ba3a0..975b64a7 100644 --- a/app/views/users/_form.html.erb +++ b/app/views/users/_form.html.erb @@ -43,7 +43,7 @@
<%= f.submit nil, :class => 'btn btn-primary' %> - <%= link_to t('.cancel', :default => t("helpers.links.cancel")), homepage_path, :class => 'btn' %> + <%= link_to t('.cancel', :default => t("helpers.links.cancel")), root_url, :class => 'btn' %>
<% end %> diff --git a/db/migrate/20140713043535_create_models.rb b/db/migrate/20140713043535_create_models.rb index dcb26156..50d09499 100644 --- a/db/migrate/20140713043535_create_models.rb +++ b/db/migrate/20140713043535_create_models.rb @@ -225,7 +225,7 @@ class CreateModels < ActiveRecord::Migration end create_table :users do |t| - t.string :name, unique: true, null: false + t.string :name, null: true t.string :email, unique: true, null: false t.string :password, null: false diff --git a/db/migrate/20160405035806_add_devise_to_users.rb b/db/migrate/20160405035806_add_devise_to_users.rb index e382389c..8c1cba49 100644 --- a/db/migrate/20160405035806_add_devise_to_users.rb +++ b/db/migrate/20160405035806_add_devise_to_users.rb @@ -2,7 +2,6 @@ class AddDeviseToUsers < ActiveRecord::Migration def self.up change_table(:users) do |t| ## Database authenticatable - t.string :email, null: false, default: "" t.string :encrypted_password, null: false, default: "" ## Recoverable diff --git a/db/schema.rb b/db/schema.rb index dd669321..d7683ca6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,9 +11,9 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20150419134141) do +ActiveRecord::Schema.define(version: 20160405035806) do - create_table "characters", force: true do |t| + create_table "characters", force: :cascade do |t| t.string "name", null: false t.string "role" t.string "gender" @@ -57,7 +57,7 @@ ActiveRecord::Schema.define(version: 20150419134141) do t.datetime "updated_at" end - create_table "equipment", force: true do |t| + create_table "equipment", force: :cascade do |t| t.string "name", null: false t.string "equip_type" t.text "description" @@ -76,7 +76,7 @@ ActiveRecord::Schema.define(version: 20150419134141) do t.datetime "updated_at" end - create_table "languages", force: true do |t| + create_table "languages", force: :cascade do |t| t.string "name", null: false t.text "words" t.string "established_year" @@ -90,7 +90,7 @@ ActiveRecord::Schema.define(version: 20150419134141) do t.datetime "updated_at" end - create_table "locations", force: true do |t| + create_table "locations", force: :cascade do |t| t.string "name", null: false t.string "type_of" t.text "description" @@ -118,7 +118,7 @@ ActiveRecord::Schema.define(version: 20150419134141) do t.datetime "updated_at" end - create_table "magics", force: true do |t| + create_table "magics", force: :cascade do |t| t.string "name", null: false t.string "type_of" t.text "manifestation" @@ -139,14 +139,14 @@ ActiveRecord::Schema.define(version: 20150419134141) do t.datetime "updated_at" end - create_table "sessions", force: true do |t| + create_table "sessions", force: :cascade do |t| t.string "username", null: false t.string "password", null: false t.datetime "created_at" t.datetime "updated_at" end - create_table "universes", force: true do |t| + create_table "universes", force: :cascade do |t| t.string "name", null: false t.text "description" t.text "history" @@ -158,13 +158,25 @@ ActiveRecord::Schema.define(version: 20150419134141) do t.datetime "updated_at" end - create_table "users", force: true do |t| - t.string "name", null: false - t.string "email", null: false + create_table "users", force: :cascade do |t| + t.string "name" + t.string "email", null: false t.string "old_password" t.datetime "created_at" t.datetime "updated_at" t.string "password_digest" + 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" end + add_index "users", ["email"], name: "index_users_on_email", unique: true + add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true + end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index d2995625..b5f056de 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -27,7 +27,7 @@ class UsersControllerTest < ActionController::TestCase email: 'tolkienjr@example.com' } end - assert_redirected_to homepage_path + assert_redirected_to root_url end test 'can create an anonymous account' do @@ -42,7 +42,7 @@ class UsersControllerTest < ActionController::TestCase password: 'Mellon', email: 'jrr@localhost' } - assert_redirected_to homepage_path + assert_redirected_to root_url assert_not_nil assigns(:user) assert_equal assigns(:user).email, 'jrr@localhost' end diff --git a/test/test_helper.rb b/test/test_helper.rb index d3b9b276..0a00b361 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -39,7 +39,7 @@ module ActionDispatch include Capybara::DSL def register_as(name, email, password) - visit homepage_path + visit root_url click_on 'Register' fill_in 'user_name', with: name fill_in 'user_email', with: email @@ -48,7 +48,7 @@ module ActionDispatch end def log_in_as(user, password) - visit homepage_path + visit root_url click_on 'Login' within('#new_session') do fill_in 'session[username]', with: user @@ -64,7 +64,7 @@ module ActionDispatch end def log_in_as_anon - visit homepage_path + visit root_url click_on 'Login' click_on 'Be Anonymous' click_on 'I understand, create an account for me' From 0a44ce1a67afeb7b382baa748d9020cea6cf8ad0 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Wed, 6 Apr 2016 16:51:52 -0500 Subject: [PATCH 03/20] new navbar --- Gemfile | 1 + Gemfile.lock | 3 + app/assets/stylesheets/application.css | 1 + app/assets/stylesheets/cards.css.scss | 53 ------------------ app/assets/stylesheets/content.css | 4 -- app/assets/stylesheets/forms.css.scss | 21 ------- app/assets/stylesheets/landing.css.scss | 12 ---- app/assets/stylesheets/languages.css.scss | 3 - app/assets/stylesheets/navbar.css.scss | 21 ------- app/assets/stylesheets/structure.css.scss | 7 --- app/assets/stylesheets/tabs.css.scss | 5 -- app/assets/stylesheets/theme.css.scss | 8 --- .../layouts/_bootstrap_includes.html.erb | 2 - app/views/layouts/_navbar.html.erb | 56 ++++++++++++++++++- app/views/layouts/application.html.erb | 19 ++++--- 15 files changed, 69 insertions(+), 147 deletions(-) delete mode 100644 app/assets/stylesheets/cards.css.scss delete mode 100644 app/assets/stylesheets/content.css delete mode 100644 app/assets/stylesheets/forms.css.scss delete mode 100644 app/assets/stylesheets/landing.css.scss delete mode 100644 app/assets/stylesheets/languages.css.scss delete mode 100644 app/assets/stylesheets/navbar.css.scss delete mode 100644 app/assets/stylesheets/structure.css.scss delete mode 100644 app/assets/stylesheets/tabs.css.scss delete mode 100644 app/assets/stylesheets/theme.css.scss delete mode 100644 app/views/layouts/_bootstrap_includes.html.erb diff --git a/Gemfile b/Gemfile index 69d564a8..1235f5ef 100644 --- a/Gemfile +++ b/Gemfile @@ -11,6 +11,7 @@ gem 'rmagick', '2.13.4' gem 'aws-sdk', '~> 1.50' gem 'bcrypt', '~> 3.1.10', platforms: [:ruby, :mingw, :x64_mingw] gem 'devise' +gem 'material_icons' group :production do gem 'less-rails' diff --git a/Gemfile.lock b/Gemfile.lock index c97a0b8b..2e94e1c5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -137,6 +137,8 @@ GEM lumberjack (1.0.10) mail (2.6.4) mime-types (>= 1.16, < 4) + material_icons (2.2.0) + railties (>= 3.2) method_source (0.8.2) mime-types (3.0) mime-types-data (~> 3.2015) @@ -281,6 +283,7 @@ DEPENDENCIES jquery-rails less-rails less-rails-fontawesome + material_icons paperclip (~> 4.2.0) pg pry diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 3b5cc664..625943f9 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -9,5 +9,6 @@ * compiled file, but it's generally better to create a new file per style scope. * *= require_self + *= require material_icons *= require_tree . */ diff --git a/app/assets/stylesheets/cards.css.scss b/app/assets/stylesheets/cards.css.scss deleted file mode 100644 index fcdf8f4b..00000000 --- a/app/assets/stylesheets/cards.css.scss +++ /dev/null @@ -1,53 +0,0 @@ -.card { - margin: 10px 0; - padding-top: 15px; - border: 1px solid #d8d8d8; - border-bottom-width: 2px; - border-top-width: 0; - background-color: #ffffff; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -box-sizing: border-box; - - .card-heading { - text-transform: capitalize; - border-bottom: 1px solid #e5e5e5; - color: #777; - font-size: 20px; - font-weight: 300; - margin: 0 -15px; - padding: 0px 35px 10px 35px; - } - - .card-image { - - } - - .card-body { - padding: 10px 20px; - font-family: Roboto, arial, sans-serif; - font-size: 13px; - line-height: 20px; - color: #444444; - - h2 { - font-size: 29px; - small { - font-size: 16px; - } - } - } - - .card-comments { - padding: 20px; - margin: 0; - background-color: #f8f8f8; - } - -} diff --git a/app/assets/stylesheets/content.css b/app/assets/stylesheets/content.css deleted file mode 100644 index afad32db..00000000 --- a/app/assets/stylesheets/content.css +++ /dev/null @@ -1,4 +0,0 @@ -/* - Place all the styles related to the matching controller here. - They will automatically be included in application.css. -*/ diff --git a/app/assets/stylesheets/forms.css.scss b/app/assets/stylesheets/forms.css.scss deleted file mode 100644 index af6fb1e6..00000000 --- a/app/assets/stylesheets/forms.css.scss +++ /dev/null @@ -1,21 +0,0 @@ -form { - .text_field { - padding: 0 8px; - border-top: 1px solid #c0c0c0; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - min-height: 29px; - background-color: #ffffff; - border: 1px solid #d9d9d9; - -webkit-transition: border linear .2s, box-shadow linear .2s; - -moz-transition: border linear .2s, box-shadow linear .2s; - -o-transition: border linear .2s, box-shadow linear .2s; - transition: border linear .2s, box-shadow linear .2s; - } -} - -#placeholder_map_input { - width: 100%; - display: block; -} \ No newline at end of file diff --git a/app/assets/stylesheets/landing.css.scss b/app/assets/stylesheets/landing.css.scss deleted file mode 100644 index 850cadf7..00000000 --- a/app/assets/stylesheets/landing.css.scss +++ /dev/null @@ -1,12 +0,0 @@ -#landing-page-1 { - - #content-types { - .card { - img { - height: 200px; - width: 100%; - } - min-height: 400px; - } - } -} diff --git a/app/assets/stylesheets/languages.css.scss b/app/assets/stylesheets/languages.css.scss deleted file mode 100644 index 32d25fab..00000000 --- a/app/assets/stylesheets/languages.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the languages 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/navbar.css.scss b/app/assets/stylesheets/navbar.css.scss deleted file mode 100644 index d7740ac4..00000000 --- a/app/assets/stylesheets/navbar.css.scss +++ /dev/null @@ -1,21 +0,0 @@ -.navbar-fixed-top { - border-bottom: 1px solid #d8d8d8 !important; - background-color: #ffffff; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -box-sizing: border-box; - - & a { - color: #777777; - &:hover { - color: #000000; - } - } -} - diff --git a/app/assets/stylesheets/structure.css.scss b/app/assets/stylesheets/structure.css.scss deleted file mode 100644 index 5bf25761..00000000 --- a/app/assets/stylesheets/structure.css.scss +++ /dev/null @@ -1,7 +0,0 @@ -.footer { - margin-top: 120px; - - & p { - text-align: center; - } -} diff --git a/app/assets/stylesheets/tabs.css.scss b/app/assets/stylesheets/tabs.css.scss deleted file mode 100644 index b7ff677b..00000000 --- a/app/assets/stylesheets/tabs.css.scss +++ /dev/null @@ -1,5 +0,0 @@ -.nav-stacked { - .active { - border-left: 3px solid #777; - } -} \ No newline at end of file diff --git a/app/assets/stylesheets/theme.css.scss b/app/assets/stylesheets/theme.css.scss deleted file mode 100644 index a67b2074..00000000 --- a/app/assets/stylesheets/theme.css.scss +++ /dev/null @@ -1,8 +0,0 @@ -body { - margin-top: 60px !important; - background: #e5e5e5 !important; -} - -.section { - margin: 30px 0; -} \ No newline at end of file diff --git a/app/views/layouts/_bootstrap_includes.html.erb b/app/views/layouts/_bootstrap_includes.html.erb deleted file mode 100644 index eb60ee1d..00000000 --- a/app/views/layouts/_bootstrap_includes.html.erb +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb index 31aaf30e..815e25f4 100644 --- a/app/views/layouts/_navbar.html.erb +++ b/app/views/layouts/_navbar.html.erb @@ -1,4 +1,4 @@ -