Skip to content

Commit 4c55659

Browse files
lcreidlcreid
committed
Get rid of assets
1 parent 1baaef4 commit 4c55659

19 files changed

Lines changed: 147 additions & 260 deletions

File tree

‎app/assets/stylesheets/devise_bootstrap_form.scss‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎lib/generators/devise/views/bootstrap_form_generator.rb‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,6 @@ def copy_views
2828
copy_invitable_devise
2929
end
3030

31-
def copy_assets
32-
directory "assets/stylesheets", "app/assets/stylesheets"
33-
target_file = if File.exist?("app/assets/stylesheets/application.bootstrap.scss")
34-
"app/assets/stylesheets/application.bootstrap.scss"
35-
else
36-
"app/assets/stylesheets/application.scss"
37-
end
38-
append_to_file target_file do
39-
'@import "devise_bootstrap_form";'
40-
end
41-
end
42-
4331
private
4432

4533
def copy_base_devise(source)

‎test/es_rails_app/Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ gem "rails-i18n"
3636
gem "devise"
3737
gem "devise-i18n"
3838
gem "devise_invitable"
39-
gem "devise-bootstrap-form"
39+
gem "devise-bootstrap-form", path: "../.."
4040

4141
group :development, :test do
4242
# See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem

‎test/es_rails_app/app/assets/stylesheets/devise_bootstrap_form.scss‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎test/es_rails_app/app/views/devise/confirmations/new.html.erb‎

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,17 @@
1-
<div class="devise-bootstrap-form">
2-
<div class="devise-bootstrap-form-row">
3-
<div class="devise-bootstrap-form-col">
4-
<h2 class="text-center"><%= t('.resend_confirmation_instructions') %></h2>
1+
<h2 class="text-center"><%= t(".resend_confirmation_instructions") %></h2>
52

6-
<%= bootstrap_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
7-
<%= render "devise/shared/error_messages", resource: resource %>
3+
<%= bootstrap_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
4+
<%= render "devise/shared/error_messages", resource: resource %>
85

9-
<%= f.email_field :email,
10-
autofocus: true,
11-
autocomplete: "email",
12-
value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %>
13-
<%= f.form_group do %>
14-
<%= f.submit t('.resend_confirmation_instructions'), class: 'btn btn-primary btn-lg btn-block' %>
15-
<% end %>
16-
<% end %>
6+
<%= f.email_field :email,
7+
autofocus: true,
8+
autocomplete: "email",
9+
value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %>
10+
<%= f.form_group class: "d-grid" do %>
11+
<%= f.submit t(".resend_confirmation_instructions"), class: "btn btn-primary btn-lg btn-block" %>
12+
<% end %>
13+
<% end %>
1714

18-
<div class="text-center">
19-
<%= render "devise/shared/links" %>
20-
</div>
21-
</div>
22-
</div>
15+
<div class="d-grid">
16+
<%= render "devise/shared/links" %>
2317
</div>

‎test/es_rails_app/app/views/devise/invitations/edit.html.erb‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
1-
<div class="devise-bootstrap-form">
2-
<div class="devise-bootstrap-form-row">
3-
<div class="devise-bootstrap-form-col">
4-
<h2><%= t 'devise.invitations.edit.header' %></h2>
1+
<h2><%= t "devise.invitations.edit.header" %></h2>
52

6-
<%= bootstrap_form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => { :method => :put } do |f| %>
7-
<%= render "devise/shared/error_messages", resource: resource %>
8-
<%= f.hidden_field :invitation_token, readonly: true %>
3+
<%= bootstrap_form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => { :method => :put } do |f| %>
4+
<%= render "devise/shared/error_messages", resource: resource %>
5+
<%= f.hidden_field :invitation_token, readonly: true %>
96

10-
<% if f.object.class.require_password_on_accepting %>
11-
<%= f.password_field :password %>
12-
<%= f.password_field :password_confirmation, class: "required" %>
13-
<% end %>
7+
<% if f.object.class.require_password_on_accepting %>
8+
<%= f.password_field :password %>
9+
<%= f.password_field :password_confirmation, class: "required" %>
10+
<% end %>
1411

15-
<%= f.submit t("devise.invitations.edit.submit_button"), class: "btn btn-primary btn-lg btn-block" %>
16-
<% end %>
17-
</div>
18-
</div>
19-
</div>
12+
<%= f.submit t("devise.invitations.edit.submit_button"), class: "btn btn-primary btn-lg btn-block" %>
13+
<% end %>

‎test/es_rails_app/app/views/devise/invitations/new.html.erb‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
1-
<div class="devise-bootstrap-form">
2-
<div class="devise-bootstrap-form-row">
3-
<div class="devise-bootstrap-form-col">
4-
<h2 class="text-center"><%= t "devise.invitations.new.header" %></h2>
1+
<h2 class="text-center"><%= t "devise.invitations.new.header" %></h2>
52

6-
<%= bootstrap_form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => {:method => :post} do |f| %>
7-
<%= render "devise/shared/error_messages", resource: resource %>
3+
<%= bootstrap_form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => {:method => :post} do |f| %>
4+
<%= render "devise/shared/error_messages", resource: resource %>
85

9-
<% resource.class.invite_key_fields.each do |field| -%>
10-
<%= f.text_field field %>
11-
<% end -%>
6+
<% resource.class.invite_key_fields.each do |field| -%>
7+
<%= f.text_field field %>
8+
<% end -%>
129

13-
<%= f.submit t("devise.invitations.new.submit_button"), class: "btn btn-primary btn-lg btn-block" %>
14-
<% end %>
15-
</div>
16-
</div>
17-
</div>
10+
<%= f.submit t("devise.invitations.new.submit_button"), class: "btn btn-primary btn-lg btn-block" %>
11+
<% end %>

‎test/es_rails_app/app/views/devise/mailer/invitation_instructions.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<p><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, :invitation_token => @token) %></p>
66

77
<% if @resource.invitation_due_at %>
8-
<p><%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :'devise.mailer.invitation_instructions.accept_until_format')) %></p>
8+
<p><%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :"devise.mailer.invitation_instructions.accept_until_format")) %></p>
99
<% end %>
1010

1111
<p><%= t("devise.mailer.invitation_instructions.ignore") %></p>

‎test/es_rails_app/app/views/devise/mailer/invitation_instructions.text.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<%= accept_invitation_url(@resource, :invitation_token => @token) %>
66

77
<% if @resource.invitation_due_at %>
8-
<%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :'devise.mailer.invitation_instructions.accept_until_format')) %>
8+
<%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :"devise.mailer.invitation_instructions.accept_until_format")) %>
99
<% end %>
1010

1111
<%= t("devise.mailer.invitation_instructions.ignore") %>

‎test/es_rails_app/app/views/devise/passwords/edit.html.erb‎

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,23 @@
1-
<div class="devise-bootstrap-form">
2-
<div class="devise-bootstrap-form-row">
3-
<div class="devise-bootstrap-form-col">
4-
<h2 class="text-center"><%= t('.change_your_password') %></h2>
1+
<h2 class="text-center"><%= t(".change_your_password") %></h2>
52

6-
<%= bootstrap_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
7-
<%= render "devise/shared/error_messages", resource: resource %>
8-
<%= f.hidden_field :reset_password_token %>
3+
<%= bootstrap_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
4+
<%= render "devise/shared/error_messages", resource: resource %>
5+
<%= f.hidden_field :reset_password_token %>
96

10-
<%= f.password_field :password,
11-
autofocus: true,
12-
autocomplete: "new-password",
13-
help: "t('devise.shared.minimum_password_length', count: @minimum_password_length)",
14-
label: t('.new_password') %>
15-
<%= f.password_field :password_confirmation,
16-
label: t('.confirm_new_password'),
17-
autocomplete: "off",
18-
class: "required" %>
19-
<%= f.form_group do %>
20-
<%= f.submit t('.change_my_password'), class: 'btn btn-primary btn-block btn-lg' %>
21-
<% end %>
22-
<% end %>
7+
<%= f.password_field :password,
8+
autofocus: true,
9+
autocomplete: "new-password",
10+
help: "t("devise.shared.minimum_password_length", count: @minimum_password_length)",
11+
label: t(".new_password") %>
12+
<%= f.password_field :password_confirmation,
13+
label: t(".confirm_new_password"),
14+
autocomplete: "off",
15+
class: "required" %>
16+
<%= f.form_group class: "d-grid" do %>
17+
<%= f.submit t(".change_my_password"), class: "btn btn-primary btn-lg" %>
18+
<% end %>
19+
<% end %>
2320

24-
<div class="text-center">
25-
<%= render "devise/shared/links" %>
26-
</div>
27-
</div>
28-
</div>
21+
<div class="d-grid">
22+
<%= render "devise/shared/links" %>
2923
</div>

0 commit comments

Comments
 (0)