From 8cfb196f367b321a196c24514f23af5cb62f4d17 Mon Sep 17 00:00:00 2001
From: tmn21 <tmn21@inf.ufpr.br>
Date: Fri, 17 Nov 2023 09:40:20 -0300
Subject: [PATCH] ISSUE #59: UPDATE confirmation email
---
app/mailers/user_mailer.rb | 7 ++++++-
app/views/user_mailer/email_confirmation.html.erb | 11 ++++++++---
app/views/user_mailer/email_confirmation.text.erb | 12 +++++++++++-
3 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 1bb6cc43..270fa0bc 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -12,7 +12,12 @@ class UserMailer < ActionMailer::Base
#function to send email confirmation to user, this view is located in app/views/user_mailer/email_confirmation.html.erb
def email_confirmation (user)
@user = user
- mail(to: @user.email, subject: 'Confirmação de email')
+ mail(from: format_sender('plataformamecred@c3sl.ufpr.br', 'Plataforma MEC RED'),
+ to: @user.email,
+ subject: 'Confirme sua conta na Plataforma MEC RED')
end
+ def format_sender(email, name)
+ %("#{name}" <#{email}>)
+ end
end
diff --git a/app/views/user_mailer/email_confirmation.html.erb b/app/views/user_mailer/email_confirmation.html.erb
index e9078392..4f843fad 100644
--- a/app/views/user_mailer/email_confirmation.html.erb
+++ b/app/views/user_mailer/email_confirmation.html.erb
@@ -1,6 +1,11 @@
Olá, <%= @user.name %>! </br>
-<p>Seja bem-vindo à Plataforma MEC de Recursos Educacionais Digitais.</p></br>
+<p>Boas-vindas à Plataforma MEC de Recursos Educacionais Digitais!</p></br>
-Confirme seu e-mail clicando no link:
-<%= confirm_email_v1_user_url(@user.confirm_token)%>
\ No newline at end of file
+Para confirmar sua conta, clique <%= link_to 'aqui', confirm_email_v1_user_url(@user.confirm_token)%>.</br>
+
+<p>Esta mensagem é gerada automaticamente, portanto não pode ser respondida.</p>
+Caso queira se comunicar conosco, acesse nossa aba de <%= link_to 'Contato', 'https://plataformaintegrada.mec.gov.br/contato/Feedback' %>.</br>
+
+<p>Agradecemos seu cadastro,</p></br>
+<p>Equipe Plataforma MEC RED</p>
\ No newline at end of file
diff --git a/app/views/user_mailer/email_confirmation.text.erb b/app/views/user_mailer/email_confirmation.text.erb
index 2e562258..d47f3150 100644
--- a/app/views/user_mailer/email_confirmation.text.erb
+++ b/app/views/user_mailer/email_confirmation.text.erb
@@ -1 +1,11 @@
-<%= confirm_email_v1_user_url(@user.confirm_token) %>
\ No newline at end of file
+Olá, <%= @user.name %>! </br>
+
+Boas-vindas à Plataforma MEC de Recursos Educacionais Digitais!
+
+Para confirmar sua conta, clique <%= link_to 'aqui', confirm_email_v1_user_url(@user.confirm_token)%>.
+
+Esta mensagem é gerada automaticamente, portanto não pode ser respondida.
+Caso queira se comunicar conosco, acesse nossa aba de <%= link_to 'Contato', 'https://plataformaintegrada.mec.gov.br/contato/Feedback' %>.
+
+Agradecemos seu cadastro,
+Equipe Plataforma MEC RED
--
GitLab