Minor fixes to recaptcha

Author: louispt1

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

@@ -7,7 +7,7 @@
   )) %>
 <% end %>
 
-<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { "data-turbo" => "false", id: "signup-form" }) do |f| %>
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { "data-turbo" => "false" }) do |f| %>
   <%= render "devise/shared/error_messages", resource: resource %>
 
   <div class="mb-6">
@@ -26,7 +26,7 @@
     <% end %>
   </div>
 
-  <%= recaptcha_v3(action: 'signup', script: true) if Settings.recaptcha.site_key.present? %>
+<%= recaptcha_v3(action: 'signup', script: true) if Settings.recaptcha&.site_key.present? && Settings.recaptcha&.secret_key.present? %>
 
   <%= render(Login::ButtonComponent.new(form: f).with_content(t('.submit'))) %>
 <% end %>

config/settings.yml

@@ -18,6 +18,10 @@ mailchimp:
     list_url: <%= ENV.fetch('MAILCHIMP_LIST_CHANGELOG_URL', nil) %>
     api_key: <%= ENV.fetch('MAILCHIMP_API_KEY', nil) %>
 
+recaptcha:
+  site_key:  <%= ENV.fetch('RECAPTCHA_SITE_KEY', nil) %>
+  secret_key: <%= ENV.fetch('RECAPTCHA_SECRET_KEY', nil) %>
+
 # set to true if the server won't have online access. this disables Sentry,
 # etc.
 standalone: false
@@ -32,7 +36,3 @@ auth:
 # Optionally send error messages to the Sentry service by providing your
 # Sentry DSN:
 sentry_dsn: <%= ENV['SENTRY_DSN'] %>
-
-recaptcha:
-  site_key:  <%= ENV.fetch('RECAPTCHA_SITE_KEY', nil) %>
-  secret_key: <%= ENV.fetch('RECAPTCHA_SECRET_KEY', nil) %>