From c0e0c2bf625b66e1ebc01619b76590558a1c29f9 Mon Sep 17 00:00:00 2001 From: Zach Gollwitzer Date: Fri, 19 Jul 2024 16:09:05 -0400 Subject: [PATCH 1/5] Bump to v0.1.0-alpha.11 Signed-off-by: Zach Gollwitzer --- config/initializers/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/version.rb b/config/initializers/version.rb index d2b7bd58..c23fbf97 100644 --- a/config/initializers/version.rb +++ b/config/initializers/version.rb @@ -10,7 +10,7 @@ module Maybe private def semver - "0.1.0-alpha.10" + "0.1.0-alpha.11" end end end -- 2.53.0 From 8b0b743b46b793360f93c9cf7ee5f770ee47e1cf Mon Sep 17 00:00:00 2001 From: Tony Yesudas Date: Sat, 20 Jul 2024 21:19:51 +0200 Subject: [PATCH 2/5] Fix form labels --- app/views/accounts/accountables/_investment.html.erb | 2 +- app/views/password_resets/new.html.erb | 2 +- app/views/registrations/new.html.erb | 8 ++++---- app/views/settings/profiles/show.html.erb | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/accounts/accountables/_investment.html.erb b/app/views/accounts/accountables/_investment.html.erb index d403d991..e2b7c2a2 100644 --- a/app/views/accounts/accountables/_investment.html.erb +++ b/app/views/accounts/accountables/_investment.html.erb @@ -1 +1 @@ -<%= f.select :subtype, options_for_select(Investment::SUBTYPES, selected: ""), { label: true } %> +<%= f.select :subtype, options_for_select(Investment::SUBTYPES, selected: ""), { label: t(".subtype") } %> diff --git a/app/views/password_resets/new.html.erb b/app/views/password_resets/new.html.erb index f2b455a0..c777d6fb 100644 --- a/app/views/password_resets/new.html.erb +++ b/app/views/password_resets/new.html.erb @@ -5,7 +5,7 @@ <%= styled_form_with url: password_reset_path, class: "space-y-4" do |form| %> <%= auth_messages form %> - <%= form.email_field :email, label: true, autofocus: false, autocomplete: "email", required: "required", placeholder: "you@example.com" %> + <%= form.email_field :email, label: t(".email"), autofocus: false, autocomplete: "email", required: "required", placeholder: "you@example.com" %> <%= form.submit t(".submit") %> <% end %> diff --git a/app/views/registrations/new.html.erb b/app/views/registrations/new.html.erb index a5714243..4c51af5b 100644 --- a/app/views/registrations/new.html.erb +++ b/app/views/registrations/new.html.erb @@ -3,11 +3,11 @@ %> <%= styled_form_with model: @user, url: registration_path, class: "space-y-4" do |form| %> <%= auth_messages form %> - <%= form.email_field :email, autofocus: false, autocomplete: "email", required: "required", placeholder: "you@example.com", label: true %> - <%= form.password_field :password, autocomplete: "new-password", required: "required", label: true %> - <%= form.password_field :password_confirmation, autocomplete: "new-password", required: "required", label: true %> + <%= form.email_field :email, autofocus: false, autocomplete: "email", required: "required", placeholder: "you@example.com", label: t(".email") %> + <%= form.password_field :password, autocomplete: "new-password", required: "required", label: t(".password") %> + <%= form.password_field :password_confirmation, autocomplete: "new-password", required: "required", label: t(".password_confirmation") %> <% if invite_code_required? %> - <%= form.password_field :invite_code, required: "required", label: true %> + <%= form.password_field :invite_code, required: "required", label: t(".password") %> <% end %> <%= form.submit %> <% end %> diff --git a/app/views/settings/profiles/show.html.erb b/app/views/settings/profiles/show.html.erb index edcab295..2b038c2b 100644 --- a/app/views/settings/profiles/show.html.erb +++ b/app/views/settings/profiles/show.html.erb @@ -32,8 +32,8 @@
- <%= form.text_field :first_name, placeholder: "First name", value: Current.user.first_name, label: true %> - <%= form.text_field :last_name, placeholder: "Last name", value: Current.user.last_name, label: true %> + <%= form.text_field :first_name, placeholder: "First name", value: Current.user.first_name, label: t(".first_name") %> + <%= form.text_field :last_name, placeholder: "Last name", value: Current.user.last_name, label: t(".last_name") %>
<%= form.submit t(".save"), class: "bg-gray-900 hover:bg-gray-700 cursor-pointer text-white rounded-lg px-3 py-2" %> -- 2.53.0 From 088e764ea62a64c19fa57ca2c1f8000fd43063ba Mon Sep 17 00:00:00 2001 From: Tony Yesudas Date: Sat, 20 Jul 2024 21:21:51 +0200 Subject: [PATCH 3/5] Fix typo --- app/views/registrations/new.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/registrations/new.html.erb b/app/views/registrations/new.html.erb index 4c51af5b..f3a95dbe 100644 --- a/app/views/registrations/new.html.erb +++ b/app/views/registrations/new.html.erb @@ -7,7 +7,7 @@ <%= form.password_field :password, autocomplete: "new-password", required: "required", label: t(".password") %> <%= form.password_field :password_confirmation, autocomplete: "new-password", required: "required", label: t(".password_confirmation") %> <% if invite_code_required? %> - <%= form.password_field :invite_code, required: "required", label: t(".password") %> + <%= form.password_field :invite_code, required: "required", label: t(".invite_code") %> <% end %> <%= form.submit %> <% end %> -- 2.53.0 From 689ccbb1e446eac4f187cb1fa0e056b74ed5ffa1 Mon Sep 17 00:00:00 2001 From: Tony Yesudas Date: Sat, 20 Jul 2024 22:45:12 +0200 Subject: [PATCH 4/5] Change form builder --- app/helpers/styled_form_builder.rb | 1 + app/views/accounts/accountables/_investment.html.erb | 2 +- app/views/password_resets/new.html.erb | 2 +- app/views/registrations/new.html.erb | 8 ++++---- app/views/settings/profiles/show.html.erb | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/helpers/styled_form_builder.rb b/app/helpers/styled_form_builder.rb index 01bf22e0..3bd7c3cb 100644 --- a/app/helpers/styled_form_builder.rb +++ b/app/helpers/styled_form_builder.rb @@ -50,6 +50,7 @@ class StyledFormBuilder < ActionView::Helpers::FormBuilder end def label_html(method, options) + return label(method, class: "form-field__label") if options[:label] == true options[:label] ? label(method, options[:label], class: "form-field__label") : "".html_safe end end diff --git a/app/views/accounts/accountables/_investment.html.erb b/app/views/accounts/accountables/_investment.html.erb index e2b7c2a2..d403d991 100644 --- a/app/views/accounts/accountables/_investment.html.erb +++ b/app/views/accounts/accountables/_investment.html.erb @@ -1 +1 @@ -<%= f.select :subtype, options_for_select(Investment::SUBTYPES, selected: ""), { label: t(".subtype") } %> +<%= f.select :subtype, options_for_select(Investment::SUBTYPES, selected: ""), { label: true } %> diff --git a/app/views/password_resets/new.html.erb b/app/views/password_resets/new.html.erb index c777d6fb..f2b455a0 100644 --- a/app/views/password_resets/new.html.erb +++ b/app/views/password_resets/new.html.erb @@ -5,7 +5,7 @@ <%= styled_form_with url: password_reset_path, class: "space-y-4" do |form| %> <%= auth_messages form %> - <%= form.email_field :email, label: t(".email"), autofocus: false, autocomplete: "email", required: "required", placeholder: "you@example.com" %> + <%= form.email_field :email, label: true, autofocus: false, autocomplete: "email", required: "required", placeholder: "you@example.com" %> <%= form.submit t(".submit") %> <% end %> diff --git a/app/views/registrations/new.html.erb b/app/views/registrations/new.html.erb index f3a95dbe..a5714243 100644 --- a/app/views/registrations/new.html.erb +++ b/app/views/registrations/new.html.erb @@ -3,11 +3,11 @@ %> <%= styled_form_with model: @user, url: registration_path, class: "space-y-4" do |form| %> <%= auth_messages form %> - <%= form.email_field :email, autofocus: false, autocomplete: "email", required: "required", placeholder: "you@example.com", label: t(".email") %> - <%= form.password_field :password, autocomplete: "new-password", required: "required", label: t(".password") %> - <%= form.password_field :password_confirmation, autocomplete: "new-password", required: "required", label: t(".password_confirmation") %> + <%= form.email_field :email, autofocus: false, autocomplete: "email", required: "required", placeholder: "you@example.com", label: true %> + <%= form.password_field :password, autocomplete: "new-password", required: "required", label: true %> + <%= form.password_field :password_confirmation, autocomplete: "new-password", required: "required", label: true %> <% if invite_code_required? %> - <%= form.password_field :invite_code, required: "required", label: t(".invite_code") %> + <%= form.password_field :invite_code, required: "required", label: true %> <% end %> <%= form.submit %> <% end %> diff --git a/app/views/settings/profiles/show.html.erb b/app/views/settings/profiles/show.html.erb index 2b038c2b..edcab295 100644 --- a/app/views/settings/profiles/show.html.erb +++ b/app/views/settings/profiles/show.html.erb @@ -32,8 +32,8 @@
- <%= form.text_field :first_name, placeholder: "First name", value: Current.user.first_name, label: t(".first_name") %> - <%= form.text_field :last_name, placeholder: "Last name", value: Current.user.last_name, label: t(".last_name") %> + <%= form.text_field :first_name, placeholder: "First name", value: Current.user.first_name, label: true %> + <%= form.text_field :last_name, placeholder: "Last name", value: Current.user.last_name, label: true %>
<%= form.submit t(".save"), class: "bg-gray-900 hover:bg-gray-700 cursor-pointer text-white rounded-lg px-3 py-2" %> -- 2.53.0 From 93bf1d6225de3ef2aacd48aabc9d65d1e1a0693b Mon Sep 17 00:00:00 2001 From: Tony Yesudas Date: Sat, 20 Jul 2024 22:55:20 +0200 Subject: [PATCH 5/5] Simplify label_html private method of StyledFormBuilder --- app/helpers/styled_form_builder.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/helpers/styled_form_builder.rb b/app/helpers/styled_form_builder.rb index 3bd7c3cb..e730b453 100644 --- a/app/helpers/styled_form_builder.rb +++ b/app/helpers/styled_form_builder.rb @@ -51,6 +51,8 @@ class StyledFormBuilder < ActionView::Helpers::FormBuilder def label_html(method, options) return label(method, class: "form-field__label") if options[:label] == true - options[:label] ? label(method, options[:label], class: "form-field__label") : "".html_safe + return "".html_safe unless options[:label] + + label(method, options[:label], class: "form-field__label") end end -- 2.53.0