diff --git a/.env b/.env index e69de29..091dc95 100644 --- a/.env +++ b/.env @@ -0,0 +1,14 @@ +MAILTRAP_USERNAME=58ac7f54c30546 +MAILTRAP_PASSWORD=c3f04d22023e55 +MAILTRAP_ADDRESS=smtp.mailtrap.io +MAILTRAP_DOMAIN=smtp.mailtrap.io +MAILTRAP_PORT=2525 +MAILER_DEFAULT_URL_HOST=localhost:5000 + + +# production +# MAILGUN_DOMAIN= +# MAILGUN_SMTP_LOGIN= +# MAILGUN_SMTP_PASSWORD= +# MAILGUN_SMTP_PORT= +# MAILGUN_SMTP_SERVER= \ No newline at end of file diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb index cf5d780..5da3fbb 100644 --- a/app/views/devise/passwords/edit.html.erb +++ b/app/views/devise/passwords/edit.html.erb @@ -1,24 +1,26 @@ -

<%= t('.change_your_password') %>

+

+ <%= t('.change_your_password') %> +

<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %> <%= render "devise/shared/error_messages", resource: resource %> <%= f.hidden_field :reset_password_token %> -
+
<%= f.label :password, t('.new_password') %>
<% if @minimum_password_length %> <%= t('devise.shared.minimum_password_length', count: @minimum_password_length) %>
<% end %> - <%= f.password_field :password, autofocus: true, autocomplete: "new-password" %> + <%= f.password_field :password, autofocus: true, autocomplete: "new-password", class: TailwindHelper.input_classes %>
-
+
<%= f.label :password_confirmation, t('.confirm_new_password') %>
- <%= f.password_field :password_confirmation, autocomplete: "new-password" %> + <%= f.password_field :password_confirmation, autocomplete: "new-password", class: TailwindHelper.input_classes %>
-
- <%= f.submit t('.change_my_password') %> +
+ <%= f.submit t('.change_my_password'), class: TailwindHelper.primary_button_classes %>
<% end %> diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index 6c84368..7b9a6e8 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -1,15 +1,17 @@ -

<%= t('.forgot_your_password') %>

+

+ <%= t('.forgot_your_password') %> +

<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> <%= render "devise/shared/error_messages", resource: resource %> -
+
<%= f.label :email %>
- <%= f.email_field :email, autofocus: true, autocomplete: "email" %> + <%= f.email_field :email, autofocus: true, autocomplete: "email", class: TailwindHelper.input_classes %>
-
- <%= f.submit t('.send_me_reset_password_instructions') %> +
+ <%= f.submit t('.send_me_reset_password_instructions'), class: TailwindHelper.primary_button_classes %>
<% end %> diff --git a/config/environments/development.rb b/config/environments/development.rb index 326e137..8f8fff0 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -39,6 +39,17 @@ Rails.application.configure do config.action_mailer.perform_caching = false + config.action_mailer.delivery_method = :smtp + config.action_mailer.smtp_settings = { + user_name: ENV["MAILTRAP_USERNAME"], + password: ENV["MAILTRAP_PASSWORD"], + address: ENV["MAILTRAP_ADDRESS"], + domain: ENV["MAILTRAP_DOMAIN"], + port: ENV["MAILTRAP_PORT"], + authentication: :cram_md5, + } + config.action_mailer.default_url_options = { host: ENV["MAILER_DEFAULT_URL_HOST"] } + # Print deprecation notices to the Rails logger. config.active_support.deprecation = :log diff --git a/config/environments/production.rb b/config/environments/production.rb index 722c5c1..b297ec3 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -64,6 +64,15 @@ Rails.application.configure do # config.active_job.queue_name_prefix = "x_stake_production" config.action_mailer.perform_caching = false + config.action_mailer.smtp_settings = { + user_name: ENV["MAILGUN_SMTP_LOGIN"], + password: ENV["MAILGUN_SMTP_PASSWORD"], + address: ENV["MAILGUN_SMTP_SERVER"], + domain: ENV["MAILGUN_DOMAIN"], + port: ENV["MAILGUN_SMTP_PORT"], + authentication: :plain, + } + config.action_mailer.default_url_options = { host: ENV["MAILER_DEFAULT_URL_HOST"] } # Ignore bad email addresses and do not raise email delivery errors. # Set this to true and configure the email server for immediate delivery to raise delivery errors. diff --git a/config/environments/test.rb b/config/environments/test.rb index bdf4e5b..dcb810d 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -38,6 +38,7 @@ Rails.application.configure do config.active_storage.service = :test config.action_mailer.perform_caching = false + config.action_mailer.default_url_options = { host: ENV["MAILER_DEFAULT_URL_HOST"] } # Tell Action Mailer not to deliver emails to the real world. # The :test delivery method accumulates sent emails in the diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index afc9e44..54d968e 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -24,7 +24,7 @@ Devise.setup do |config| # Configure the e-mail address which will be shown in Devise::Mailer, # note that it will be overwritten if you use your own mailer class # with default "from" parameter. - config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com" + config.mailer_sender = "no-reply@xstake.com.br" # Configure the class responsible to send e-mails. # config.mailer = 'Devise::Mailer'