devise-bootstrap-views 0.0.11 → 1.0.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7238302407593874b87b73079c276c3683d4612f
-  data.tar.gz: 0d420756ebdfa5518bd0104ee9c11e86e9eb87bf
+  metadata.gz: b577437581b06dffb063c28424e4bcff8683e947
+  data.tar.gz: f7037c4921d87f2502bea9ad8e54380d89091441
 SHA512:
-  metadata.gz: eb5418aa2b9233320f607e76dbeef2ff851d12b96b0469cf2a56410de534619ae745317cf90c34a052385cbd6330455665b54f889d2343a37c731ebc04d9a39d
-  data.tar.gz: e43e2e577869656893a3d7d56094d31324bca039288f9ba733d99cebaec2ab461c4b95585b09df51569bb899bdced591854d712c1249b9d16032af05524e53ef
+  metadata.gz: 4c4d649dabff58148a6002b4945308b7f55b8f7c07c36d24788c21699c05c29e6078613d9b3767a67f7eded549159237439c672e88af4a754936ed013a433783
+  data.tar.gz: d98418a9f010ff1058afb6ae655bbefed520b7273e8e8e4720d83495ee2ec0dc9da40e3e79eafc759107c0b6ec24f6cd0618ffd67f80263f6f2114f7ac00390f

data/.gitignore

@@ -1,22 +1,11 @@
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+
 *.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log

data/README.md

@@ -2,9 +2,9 @@
 
 Here are some of the highlights:
 
-* Devise views with Bootstrap 3.
-* Used Bootstrap responsive columns.
-* I18n Support.
+* Devise views with Bootstrap 4
+* Used Bootstrap responsive columns
+* I18n Support
 
 WARNING:
 This gem copies lots of its code from [devise-i18n-views](https://github.com/mcasimir/devise-i18n-views) gem.
@@ -22,18 +22,10 @@ And then execute:
 
     $ bundle
 
-Add some minor css fix to your rails asset pipeline manifest
-
-    # SASS
-    *= require devise_bootstrap_views
-
-    # LESS
-    *= require devise_bootstrap_views_less
-
-Then you need to install the required translations in your `config/locales`. The  [devise-i18n-views](https://github.com/mcasimir/devise-i18n-views) project is no longer maintained after being merged into [devise-i18n](https://github.com/tigrish/devise-i18n), which is currently the best source for updated Devise translations. You can manually download locale dictionaries from [devise-i18n/rails/locales](https://github.com/tigrish/devise-i18n/tree/master/rails/locales) or generate them by running `devise:views:locale <chosen_locale>`:
+Then you can install the required translations in your `config/locales`. Use [devise-i18n](https://github.com/tigrish/devise-i18n) — the best source for updated Devise translations. You can manually generate locale files by executing `rails generate devise:views:locale <chosen_locale>`:
 
 ``` sh
-rails g devise:views:locale it
+rails generate devise:views:locale it
 ```
 
 will generate `config/locales/devise.views.it.yml`.
@@ -43,17 +35,9 @@ will generate `config/locales/devise.views.it.yml`.
 The `devise:views:bootstrap_templates` generator will copy all views to your application, so you can modify the files as you wish:
 
 ``` sh
-rails g devise:views:bootstrap_templates
-```
-Alternatively, you can also generate Haml or Slim templates instead of traditional ERB. Both can be generated with their respective commands below.
-
-``` sh
-rails g devise:views:bootstrap_haml_templates
+rails generate devise:views:bootstrap_templates
 ```
 
-``` sh
-rails g devise:views:bootstrap_slim_templates
-```
 ## Example
 
 Sample Application can be found at this link - [Devise Boostrap Views Application](https://github.com/ethiraj-srinivasan/devise-boostrap-views)

data/Rakefile

@@ -1,2 +1 @@
-require "bundler/gem_tasks"
-
+require 'bundler/gem_tasks'

data/app/assets/stylesheets/devise_bootstrap_views.scss

@@ -1,10 +0,0 @@
-.float-none {
-  float: none;
-}
-
-.panel-heading {
-  padding: 15px;
-  h4 {
-    margin: 0px;
-  }
-}

data/app/assets/stylesheets/devise_bootstrap_views_less.less

@@ -1,10 +0,0 @@
-.float-none {
-  float: none;
-}
-
-.panel-heading {
-  padding: 15px;
-  h4 {
-    margin: 0px;
-  }
-}

data/app/views/devise/confirmations/new.html.erb

@@ -0,0 +1,16 @@
+<%= bootstrap_devise_error_messages! %>
+
+<h1><%= t('.resend_confirmation_instructions', default: 'Resend confirmation instructions') %></h1>
+
+<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post, role: 'form' }) do |f| %>
+  <div class="form-group">
+    <%= f.label :email %>
+    <%= f.email_field :email, autofocus: true, class: "form-control"  %>
+  </div>
+
+  <div class="form-group">
+    <%= f.submit t('.resend_confirmation_instructions', default: 'Resend confirmation instructions'), class: 'btn btn-primary' %>
+  </div>
+<% end %>
+
+<%= render 'devise/shared/links' %>

data/app/views/{erb → devise}/mailer/confirmation_instructions.html.erb

@@ -2,5 +2,7 @@
 
 <p><%= t('.instruction', default: 'You can confirm your account email through the link below:') %></p>
 
-<p><%= link_to t('.action', default: 'Confirm my account'),
-         confirmation_url(@resource, confirmation_token: @token, locale: I18n.locale) %></p>
+<p>
+  <%= link_to t('.action', default: 'Confirm my account'),
+              confirmation_url(@resource, confirmation_token: @token, locale: I18n.locale) %>
+</p>

data/app/views/{erb → devise}/mailer/reset_password_instructions.html.erb

@@ -5,4 +5,5 @@
 <p><%= link_to t('.action', default: 'Change my password'), edit_password_url(@resource, reset_password_token: @token, locale: I18n.locale) %></p>
 
 <p><%= t('.instruction_2', default: "If you didn't request this, please ignore this email.") %></p>
+
 <p><%= t('.instruction_3', default: "Your password won't change until you access the link above and create a new one.") %></p>

data/app/views/devise/passwords/edit.html.erb

@@ -0,0 +1,23 @@
+<%= bootstrap_devise_error_messages! %>
+
+<h1><%= t('.change_your_password', default: 'Change your password') %></h1>
+
+<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put, role: 'form' }) do |f| %>
+  <%= f.hidden_field :reset_password_token %>
+
+  <div class="form-group">
+    <%= f.label :password, t('.new_password', default: 'New password') %>
+    <%= f.password_field :password, autofocus: true, class: 'form-control'  %>
+  </div>
+
+  <div class="form-group">
+    <%= f.label :password_confirmation, t('.confirm_new_password', default: 'Confirm new password') %>
+    <%= f.password_field :password_confirmation, class: 'form-control'  %>
+  </div>
+
+  <div class="form-group">
+    <%= f.submit t('.change_my_password', default: 'Change my password'), class: 'btn btn-primary' %>
+  </div>
+<% end %>
+
+<%= render 'devise/shared/links' %>

data/app/views/devise/passwords/new.html.erb

@@ -0,0 +1,16 @@
+<%= bootstrap_devise_error_messages! %>
+
+<h1><%= t('.forgot_your_password', default: 'Forgot your password?') %></h1>
+
+<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post, role: 'form' }) do |f| %>
+  <div class="form-group">
+    <%= f.label :email %>
+    <%= f.email_field :email, autofocus: true, class: 'form-control' %>
+  </div>
+
+  <div class="form-group">
+    <%= f.submit t('.send_me_reset_password_instructions', default: 'Send me reset password instructions'), class: 'btn btn-primary' %>
+  </div>
+<% end %>
+
+<%= render 'devise/shared/links' %>

data/app/views/devise/registrations/edit.html.erb

@@ -0,0 +1,30 @@
+<%= bootstrap_devise_error_messages! %>
+
+<h1><%= t('.title', resource: resource_class.model_name.human , default: "Edit #{resource_name.to_s.humanize}") %></h1>
+
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
+  <div class="form-group">
+    <%= f.label :email %>
+    <%= f.email_field :email, autofocus: true, class: 'form-control' %>
+  </div>
+  <div class="form-group">
+    <%= f.label :password %> <i>(<%= t('.leave_blank_if_you_don_t_want_to_change_it', default: "leave blank if you don't want to change it") %>)</i>
+    <%= f.password_field :password, autocomplete: "off", class: 'form-control' %>
+  </div>
+  <div class="form-group">
+    <%= f.label :password_confirmation %>
+    <%= f.password_field :password_confirmation, class: 'form-control'  %>
+  </div>
+  <div class="form-group">
+    <%= f.label :current_password %> <i>(<%= t('.we_need_your_current_password_to_confirm_your_changes', default: 'we need your current password to confirm your changes') %>)</i>
+    <%= f.password_field :current_password, class: 'form-control' %>
+  </div>
+
+  <div class="form-group">
+    <%= f.submit t('.update', default: 'Update'), class: 'btn btn-primary' %>
+  </div>
+<% end %>
+
+<p><%= t('.unhappy', default: 'Unhappy') %>? <%= link_to t('.cancel_my_account', default: 'Cancel my account'), registration_path(resource_name), data: { confirm: t('.are_you_sure', default: "Are you sure?") }, method: :delete %>.</p>
+
+<%= link_to t('.back', default: 'Back'), :back %>

data/app/views/devise/registrations/new.html.erb

@@ -0,0 +1,24 @@
+<%= bootstrap_devise_error_messages! %>
+
+<h1><%= t('.sign_up', default: 'Sign up') %></h1>
+
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { role: 'form' }) do |f| %>
+  <div class="form-group">
+    <%= f.label :email %>
+    <%= f.email_field :email, autofocus: true, class: 'form-control' %>
+  </div>
+  <div class="form-group">
+    <%= f.label :password %>
+    <%= f.password_field :password, class: 'form-control' %>
+  </div>
+  <div class="form-group">
+    <%= f.label :password_confirmation %>
+    <%= f.password_field :password_confirmation, class: 'form-control' %>
+  </div>
+
+  <div class="form-group">
+    <%= f.submit t('.sign_up', default: 'Sign up'), class: 'btn btn-primary' %>
+  </div>
+<% end %>
+
+<%= render 'devise/shared/links' %>

data/app/views/devise/sessions/new.html.erb

@@ -0,0 +1,28 @@
+<h1><%= t('.sign_in', default: 'Sign in') %></h1>
+
+
+<%= form_for(resource, as: resource_name, url: session_path(resource_name), html: { role: 'form' }) do |f| %>
+  <div class="form-group">
+    <%= f.label :email %>
+    <%= f.email_field :email, autofocus: true, class: 'form-control' %>
+  </div>
+  <div class="form-group">
+    <%= f.label :password %>
+    <%= f.password_field :password, autocomplete: 'off', class: 'form-control' %>
+  </div>
+
+  <% if devise_mapping.rememberable? %>
+    <div class="form-check">
+      <%= f.label :remember_me, class: 'form-check-label' do %>
+        <%= f.check_box :remember_me, class: 'form-check-input' %>
+        <%= t('.remember_me', default: 'Remember me') %>
+      <% end %>
+    </div>
+  <% end %>
+
+  <div class="form-group">
+    <%= f.submit  t('.sign_in', default: 'Sign in'), class: 'btn btn-primary' %>
+  </div>
+<% end %>
+
+<%= render 'devise/shared/links' %>

data/app/views/devise/shared/_links.html.erb

@@ -0,0 +1,27 @@
+<div class="form-group">
+  <% if controller_name != 'sessions' %>
+    <%= link_to t('.sign_in', default: 'Sign in'), new_session_path(resource_name) %><br />
+  <% end %>
+
+  <% if devise_mapping.registerable? && controller_name != 'registrations' %>
+    <%= link_to t('.sign_up', default: 'Sign up'), new_registration_path(resource_name) %><br />
+  <% end %>
+
+  <% if devise_mapping.recoverable? && controller_name != 'passwords' %>
+    <%= link_to t('.forgot_your_password', default: 'Forgot your password?'), new_password_path(resource_name) %><br />
+  <% end %>
+
+  <% if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+    <%= link_to t('.didn_t_receive_confirmation_instructions', default: "Didn't receive confirmation instructions?"), new_confirmation_path(resource_name) %><br />
+  <% end %>
+
+  <% if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+    <%= link_to t('.didn_t_receive_unlock_instructions', default: "Didn't receive unlock instructions?"), new_unlock_path(resource_name) %><br />
+  <% end %>
+
+  <% if devise_mapping.omniauthable? %>
+    <% resource_class.omniauth_providers.each do |provider| %>
+      <%= link_to t('.sign_in_with_provider', provider: provider.to_s.titleize, default: "Sign in with #{provider.to_s.titleize}"), omniauth_authorize_path(resource_name, provider) %><br />
+    <% end %>
+  <% end %>
+</div>

data/app/views/devise/unlocks/new.html.erb

@@ -0,0 +1,16 @@
+<%= bootstrap_devise_error_messages! %>
+
+<h1><%= t('.resend_unlock_instructions', default: 'Resend unlock instructions') %></h1>
+
+<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post, html: { role: 'form' } }) do |f| %>
+  <div class="form-group">
+    <%= f.label :email %>
+    <%= f.email_field :email, autofocus: true, class: 'form-control' %>
+  </div>
+
+  <div class="form-group">
+    <%= f.submit t('.resend_unlock_instructions', default: 'Resend unlock instructions'), class: 'btn btn-primary'%>
+  </div>
+<% end %>
+
+<%= render 'devise/shared/links' %>

data/devise-bootstrap-views.gemspec

@@ -4,20 +4,20 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "devise-bootstrap-views"
+  spec.name          = 'devise-bootstrap-views'
   spec.version       = DeviseBootstrapViews::VERSION
-  spec.authors       = ["Yinghai Zhao"]
-  spec.email         = ["zyinghai@gmail.com"]
-  spec.summary       = %q{Devise Bootstrap views with i18n support.}
-  spec.description   = %q{Devise Bootstrap views with i18n support.}
-  spec.homepage      = ""
-  spec.license       = "MIT"
+  spec.authors       = ['Yinghai Zhao']
+  spec.email         = ['zyinghai@gmail.com']
+  spec.summary       = 'Bootstrap views for Devise.'
+  spec.description   = 'Bootstrap views for Devise with I18n support.'
+  spec.homepage      = 'https://github.com/hisea/devise-bootstrap-views'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'rake', '~> 11.0'
 end

data/lib/devise-bootstrap-views.rb

@@ -1,5 +1,6 @@
 require 'rails'
 require 'devise_bootstrap_views_helper'
+
 module DeviseBootstrapViews
   class Engine < ::Rails::Engine
   end
@@ -16,13 +17,9 @@ module DeviseBootstrapViews
       end
     end
 
-    protected
-
     def self.pattern_from(args)
       array = Array(args || [])
       array.blank? ? '*' : "{#{array.join ','}}"
     end
   end
 end
-
-

data/lib/devise_bootstrap_views_helper.rb

@@ -1,19 +1,21 @@
-# -*- encoding : utf-8 -*-
-
 module DeviseBootstrapViewsHelper
   def bootstrap_devise_error_messages!
     return '' if resource.errors.empty?
 
-    messages = resource.errors.full_messages.map { |msg| content_tag(:li, msg) }.join
-    sentence = I18n.t('errors.messages.not_saved',
+    messages = resource.errors.full_messages.map { |message| content_tag(:li, message) }.join
+    sentence = I18n.t(
+      'errors.messages.not_saved',
       count: resource.errors.count,
-      resource: resource.class.model_name.human.downcase)
+      resource: resource.class.model_name.human.downcase
+    )
 
     html = <<-HTML
-    <div class="alert alert-danger alert-block devise-bs">
-      <button type="button" class="close" data-dismiss="alert">&times;</button>
-      <h5>#{sentence}</h5>
-      <ul>#{messages}</ul>
+    <div class="alert alert-danger">
+      <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+        <span aria-hidden="true">&times;</span>
+      </button>
+      <h4 class="alert-heading">#{sentence}</h4>
+      <ul class="mb-0">#{messages}</ul>
     </div>
     HTML
 

data/lib/generators/devise/views/bootstrap_templates/bootstrap_templates_generator.rb

@@ -2,8 +2,9 @@ module Devise
   module Views
     class BootstrapTemplatesGenerator < Rails::Generators::Base
       source_root File.expand_path('../../../../../../app/views', __FILE__)
+
       def copy_views
-         directory("erb", Rails.root.join("app", "views", "devise"))
+        directory('devise', Rails.root.join('app', 'views', 'devise'))
       end
     end
   end

data/lib/generators/devise/views/locale/locale_generator.rb

@@ -1,5 +1,3 @@
-require 'net/http'
-
 module Devise
   module Views
     class LocaleGenerator < Rails::Generators::NamedBase
@@ -7,8 +5,9 @@ module Devise
         repo_url = 'https://raw.githubusercontent.com/tigrish/devise-i18n/master/rails/locales/'
         download_url = URI.parse("#{repo_url}#{name}.yml")
         downloaded_file = Net::HTTP.get(download_url).force_encoding('UTF-8')
-        File.write(Rails.root.join(
-          "config", "locales", "devise.views.#{name}.yml"), downloaded_file)
+        File.write(
+          Rails.root.join('config', 'locales', "devise.views.#{name}.yml"), downloaded_file
+        )
       end
     end
   end