From d8268b9ec2729a63d071a58fb02253a70230171a Mon Sep 17 00:00:00 2001 From: Mariela Bonilla Date: Thu, 15 Jul 2021 02:25:51 -0600 Subject: [PATCH 1/5] Modificacion de correos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Se modifica el correo de reestablecer contraseña y el de activación de cuenta --- .../resources/i18n/messages_es.properties | 4 +- .../templates/mail/activationEmail.html | 331 ++++++++++++++++- .../templates/mail/creationEmail.html | 331 ++++++++++++++++- .../templates/mail/passwordResetEmail.html | 333 +++++++++++++++++- 4 files changed, 959 insertions(+), 40 deletions(-) diff --git a/src/main/resources/i18n/messages_es.properties b/src/main/resources/i18n/messages_es.properties index 48d7ea4..559f34a 100644 --- a/src/main/resources/i18n/messages_es.properties +++ b/src/main/resources/i18n/messages_es.properties @@ -6,7 +6,7 @@ error.message=Mensaje: # Activation email email.activation.title=Activación de DataSurvey -email.activation.greeting=Estimado/a {0} +email.activation.greeting=¡Hola, {0}! email.activation.text1=Su cuenta en DataSurvey ha sido creada. Por favor, haga clic en el siguiente enlace para activarla: email.activation.text2=Saludos, email.signature=Equipo de DataSurvey. @@ -16,6 +16,6 @@ email.creation.text1=Su cuenta en DataSurvey ha sido creada. Por favor, haga cli # Reset email email.reset.title=Reinicio de contraseña de DataSurvey -email.reset.greeting=Estimado/a {0} +email.reset.greeting=¡Hola, {0}! email.reset.text1=Se ha solicitado el reinicio de la contraseña para su cuenta en DataSurvey. Por favor, haga clic en el siguiente enlace para reiniciarla: email.reset.text2=Saludos, diff --git a/src/main/resources/templates/mail/activationEmail.html b/src/main/resources/templates/mail/activationEmail.html index 0bb53a2..ce17c16 100644 --- a/src/main/resources/templates/mail/activationEmail.html +++ b/src/main/resources/templates/mail/activationEmail.html @@ -1,20 +1,327 @@ - JHipster activation + + + + + + + JHipster activation + + + - -

Dear

-

Your JHipster account has been created, please click on the URL below to activate it:

-

- Activation link -

-

- Regards, -
- JHipster. -

+ + +
+
+ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌  +
+ +
diff --git a/src/main/resources/templates/mail/creationEmail.html b/src/main/resources/templates/mail/creationEmail.html index 4e52898..88585ea 100644 --- a/src/main/resources/templates/mail/creationEmail.html +++ b/src/main/resources/templates/mail/creationEmail.html @@ -1,20 +1,327 @@ - JHipster creation + + + + + + + JHipster creation + + + - -

Dear

-

Your JHipster account has been created, please click on the URL below to access it:

-

- Login link -

-

- Regards, -
- JHipster. -

+ + +
+
+ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌  +
+ +
diff --git a/src/main/resources/templates/mail/passwordResetEmail.html b/src/main/resources/templates/mail/passwordResetEmail.html index 290ca6d..8d43025 100644 --- a/src/main/resources/templates/mail/passwordResetEmail.html +++ b/src/main/resources/templates/mail/passwordResetEmail.html @@ -1,22 +1,327 @@ - JHipster password reset + + + + + + + JHipster password reset + + + - -

Dear

-

- For your JHipster account a password reset was requested, please click on the URL below to reset it: -

-

- Login link -

-

- Regards, -
- JHipster. -

+ + +
+
+ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌  +
+ +
From 3a9f643f6b0297349b2bd854cdb36cc9f0a6b113 Mon Sep 17 00:00:00 2001 From: Mariela Bonilla Date: Thu, 15 Jul 2021 02:34:14 -0600 Subject: [PATCH 2/5] add url datasurvey.org a correos --- src/main/resources/templates/mail/activationEmail.html | 2 +- src/main/resources/templates/mail/creationEmail.html | 2 +- src/main/resources/templates/mail/passwordResetEmail.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/templates/mail/activationEmail.html b/src/main/resources/templates/mail/activationEmail.html index ce17c16..4daaa73 100644 --- a/src/main/resources/templates/mail/activationEmail.html +++ b/src/main/resources/templates/mail/activationEmail.html @@ -317,7 +317,7 @@ -

DataSurvey.org

+

DataSurvey.org

diff --git a/src/main/resources/templates/mail/creationEmail.html b/src/main/resources/templates/mail/creationEmail.html index 88585ea..2bc90eb 100644 --- a/src/main/resources/templates/mail/creationEmail.html +++ b/src/main/resources/templates/mail/creationEmail.html @@ -317,7 +317,7 @@ -

DataSurvey.org

+

DataSurvey.org

diff --git a/src/main/resources/templates/mail/passwordResetEmail.html b/src/main/resources/templates/mail/passwordResetEmail.html index 8d43025..b235f94 100644 --- a/src/main/resources/templates/mail/passwordResetEmail.html +++ b/src/main/resources/templates/mail/passwordResetEmail.html @@ -317,7 +317,7 @@ -

DataSurvey.org

+

DataSurvey.org

From ed51fa3694164e1d5ac91fbd1071e46426ed5b93 Mon Sep 17 00:00:00 2001 From: Mariela Bonilla Date: Fri, 16 Jul 2021 04:52:02 -0600 Subject: [PATCH 3/5] =?UTF-8?q?Add=20reestablecer=20contrase=C3=B1a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit se implementó de mejor manera el reestablecer la contraseña modificando y agregaron los estilos respectivos a ambas páginas del reestablcer contraseña y revisando que estuvieran los elementos adecuados y la funcionalidad adecuada --- src/main/resources/i18n/messages.properties | 8 + .../resources/i18n/messages_es.properties | 9 + .../password-reset-finish.component.html | 285 ++++++++++-------- .../finish/password-reset-finish.component.ts | 4 +- .../init/password-reset-init.component.html | 203 ++++++++----- .../init/password-reset-init.component.ts | 23 +- src/main/webapp/i18n/es/activate.json | 4 +- src/main/webapp/i18n/es/global.json | 3 +- src/main/webapp/i18n/es/reset.json | 5 +- 9 files changed, 335 insertions(+), 209 deletions(-) diff --git a/src/main/resources/i18n/messages.properties b/src/main/resources/i18n/messages.properties index a9f66d4..52b6575 100644 --- a/src/main/resources/i18n/messages.properties +++ b/src/main/resources/i18n/messages.properties @@ -19,3 +19,11 @@ email.reset.title=DataSurvey password reset email.reset.greeting=Dear {0} email.reset.text1=For your DataSurvey account a password reset was requested, please click on the URL below to reset it: email.reset.text2=Regards, + +# Password Restored Mail +email.restored.title=Your password was reset in DataSurvey +email.restored.greeting=Hello, {0}! +email.restored.text1=Your DataSurvey password has been successfully reset.. +email.restored.text2=Regards, +email.restored.text3=If you did not make this change, please notify the following email immediately: +email.restored.email=datasurvey@gmail.com diff --git a/src/main/resources/i18n/messages_es.properties b/src/main/resources/i18n/messages_es.properties index 559f34a..32233bb 100644 --- a/src/main/resources/i18n/messages_es.properties +++ b/src/main/resources/i18n/messages_es.properties @@ -19,3 +19,12 @@ email.reset.title=Reinicio de contraseña de DataSurvey email.reset.greeting=¡Hola, {0}! email.reset.text1=Se ha solicitado el reinicio de la contraseña para su cuenta en DataSurvey. Por favor, haga clic en el siguiente enlace para reiniciarla: email.reset.text2=Saludos, + +# Password Restored Mail +email.restored.title=Se restaleció su contraseña en DataSurvey +email.restored.greeting=¡Hola, {0}! +email.restored.text1=Se ha restablecido correctamente su contraseña en DataSurvey. +email.restored.text2=Saludos, +email.restored.text3=Si usted no realizó este cambio, favor notifique inmediatamente al siguiente correo: +email.restored.email=datasurvey@gmail.com + diff --git a/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html b/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html index 3431d36..3aeecc5 100644 --- a/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html +++ b/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html @@ -1,137 +1,172 @@ -
-
-
-

Reset password

- -
- The password reset key is missing. -
- -
- Choose a new password -
- -
- Your password couldn't be reset. Remember a password request is only valid for 24 hours. -
- -
- Your password has been reset. Please - sign in. -
- -
- The password and its confirmation do not match! -
- -
-
-
- - - -
- - Your password is required. - - - - Your password is required to be at least 4 characters. - - - - Your password cannot be longer than 50 characters. - -
- - +