From 02aac86b04589e0b1b89cc2a226c85c422152102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sun, 24 Mar 2024 16:25:06 +0100 Subject: [PATCH] Move edit password manually view to a component We're restructuring the CSS of the admin stylesheet, and there was a rule that is only applied to this component. --- app/assets/stylesheets/admin.scss | 4 ---- .../account/edit_password_manually.scss | 3 +++ .../edit_password_manually_component.html.erb | 22 ++++++++++++++++++ .../edit_password_manually_component.rb | 7 ++++++ .../account/edit_password_manually.html.erb | 23 +------------------ 5 files changed, 33 insertions(+), 26 deletions(-) create mode 100644 app/assets/stylesheets/management/account/edit_password_manually.scss create mode 100644 app/components/management/account/edit_password_manually_component.html.erb create mode 100644 app/components/management/account/edit_password_manually_component.rb diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index c1ec1ee29..63451fa3b 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -244,10 +244,6 @@ $table-header: #ecf1f6; text-decoration: underline; } -.no-margin-bottom { - margin-bottom: 0 !important; -} - .enabled { color: $color-success; } diff --git a/app/assets/stylesheets/management/account/edit_password_manually.scss b/app/assets/stylesheets/management/account/edit_password_manually.scss new file mode 100644 index 000000000..c16816657 --- /dev/null +++ b/app/assets/stylesheets/management/account/edit_password_manually.scss @@ -0,0 +1,3 @@ +.no-margin-bottom { + margin-bottom: 0 !important; +} diff --git a/app/components/management/account/edit_password_manually_component.html.erb b/app/components/management/account/edit_password_manually_component.html.erb new file mode 100644 index 000000000..d095757e1 --- /dev/null +++ b/app/components/management/account/edit_password_manually_component.html.erb @@ -0,0 +1,22 @@ +

<%= t("management.account.menu.reset_password_manually") %>

+ +<%= form_for user, url: change_password_management_account_path do |f| %> + <%= f.label :password %> +

<%= t("management.account.edit.password.print_help") %>

+
+ +
+ <%= f.password_field :password, class: "input-group-field no-margin-bottom", label: false, value: nil %> + + + +
+ + <%= link_to t("management.account.edit.password.random"), + "#", + class: "generate-random-value float-right", + data: { "password-complexity": User.password_complexity } %> +
+ + <%= f.submit t("management.account.edit.password.save"), class: "button success" %> +<% end %> diff --git a/app/components/management/account/edit_password_manually_component.rb b/app/components/management/account/edit_password_manually_component.rb new file mode 100644 index 000000000..ab3bd1a99 --- /dev/null +++ b/app/components/management/account/edit_password_manually_component.rb @@ -0,0 +1,7 @@ +class Management::Account::EditPasswordManuallyComponent < ApplicationComponent + attr_reader :user + + def initialize(user) + @user = user + end +end diff --git a/app/views/management/account/edit_password_manually.html.erb b/app/views/management/account/edit_password_manually.html.erb index b86bafaa8..58b090529 100644 --- a/app/views/management/account/edit_password_manually.html.erb +++ b/app/views/management/account/edit_password_manually.html.erb @@ -1,22 +1 @@ -

<%= t("management.account.menu.reset_password_manually") %>

- -<%= form_for managed_user, url: change_password_management_account_path do |f| %> - <%= f.label :password %> -

<%= t("management.account.edit.password.print_help") %>

-
- -
- <%= f.password_field :password, class: "input-group-field no-margin-bottom", label: false, value: nil %> - - - -
- - <%= link_to t("management.account.edit.password.random"), - "#", - class: "generate-random-value float-right", - data: { "password-complexity": User.password_complexity } %> -
- - <%= f.submit t("management.account.edit.password.save"), class: "button success" %> -<% end %> +<%= render Management::Account::EditPasswordManuallyComponent.new(managed_user) %>