diff --git a/backend/lib/Api/Htmx/PasswordReset.hs b/backend/lib/Api/Htmx/PasswordReset.hs index 25138757..bab9f0fa 100644 --- a/backend/lib/Api/Htmx/PasswordReset.hs +++ b/backend/lib/Api/Htmx/PasswordReset.hs @@ -45,7 +45,7 @@ resetEmail = do for_ mToken $ \ token -> do url <- lift $ asks (.url) lift $ Mail.sendMail (Emails.PasswordReset.mail email token url) - html "Check your email" + html "We've sent you a reset link — check your inbox!" getResetToken diff --git a/backend/lib/Emails/PasswordReset.hs b/backend/lib/Emails/PasswordReset.hs index 8a964d55..b864f05c 100644 --- a/backend/lib/Emails/PasswordReset.hs +++ b/backend/lib/Emails/PasswordReset.hs @@ -33,7 +33,7 @@ passwordReset token baseUrl = do br_ [] "Click the button below to reset your password." br_ [] - "If you didn't request a password reset ignore this email. The link will expire in 10 minutes." + "If you didn't request this, no worries — just ignore this email. The link will expire in 10 minutes." br_ [] br_ [] a_ [href_ url, style buttonStyle] "Reset Password" diff --git a/backend/lib/Emails/Welcome.hs b/backend/lib/Emails/Welcome.hs index 204db910..c490d78a 100644 --- a/backend/lib/Emails/Welcome.hs +++ b/backend/lib/Emails/Welcome.hs @@ -20,8 +20,11 @@ mail toAddr = welcome :: Html () welcome = do - b_ "Welcome to Project 2:15." + b_ "Welcome to Project 2:15!" br_ [] br_ [] - "Right now this email is basically blank. " - "We'll fill it in the future and there will be a verification link. " + "We're so glad you've joined us! " + "Jump in whenever you're ready — there's no wrong way to start. " + br_ [] + br_ [] + "Happy studying!" diff --git a/backend/templates/home.html b/backend/templates/home.html index 31a38c1f..6c13177a 100644 --- a/backend/templates/home.html +++ b/backend/templates/home.html @@ -80,7 +80,7 @@

Making Bible
Study Simple!

- Take the complexity out of Bible study and delve deeper into the Word with others + Whether you're brand new to the Bible or have been studying for years, you belong here.

@@ -90,7 +90,7 @@

Intuitive Study Tools

diff --git a/backend/templates/login.html b/backend/templates/login.html index d10d5656..cd99092c 100644 --- a/backend/templates/login.html +++ b/backend/templates/login.html @@ -8,9 +8,9 @@ Logo -

Log In

+

Welcome Back

- Please enter your login credentials below to start using the admin console. + Sign in to continue your study.

{% include "login/form.html" %}
@@ -18,10 +18,9 @@

Log In

-

Making Bible Study Simpler than Ever!

+

Explore the Bible Together

- Take the complexity out of Bible study and delve deeper - into the Word with others + No expertise required — just jump in and start studying with others.

diff --git a/backend/templates/login/form.html b/backend/templates/login/form.html index b8b1589c..a602afbc 100644 --- a/backend/templates/login/form.html +++ b/backend/templates/login/form.html @@ -24,7 +24,7 @@

{% if wasCorrect == 'False' %} -
Email or password incorrect
+
Hmm, that email or password doesn't look right. Give it another try!
{% endif %} diff --git a/backend/templates/notAuthorized.html b/backend/templates/notAuthorized.html index 1863ecdc..0958d341 100644 --- a/backend/templates/notAuthorized.html +++ b/backend/templates/notAuthorized.html @@ -5,14 +5,13 @@
-

404

-

Error: no page found

+

Oops!

+

You'll need to sign in to see this page.

-
@@ -25,7 +24,7 @@

Popular Links:

Contact Us:

-

If you believe this is an error, please contact us.

+

If you believe this is an error, please contact us.

Found an issue?

diff --git a/backend/templates/notFound.html b/backend/templates/notFound.html index 8fec060e..51b34c0b 100644 --- a/backend/templates/notFound.html +++ b/backend/templates/notFound.html @@ -6,7 +6,7 @@

404

-

Error: no page found

+

We couldn't find that page.

diff --git a/backend/templates/passwordReset.html b/backend/templates/passwordReset.html index 8f4c411b..73e305ec 100644 --- a/backend/templates/passwordReset.html +++ b/backend/templates/passwordReset.html @@ -12,7 +12,7 @@

Reset Password

- You Fool! How could you forget you password? Use a password manager. + No worries — it happens! Enter your email and we'll help you get back in.

@@ -25,10 +25,9 @@

Reset Password

-

Making Bible Study Simpler than Ever!

+

Explore the Bible Together

- Take the complexity out of Bible study and delve deeper - into the Word with others + No expertise required — just jump in and start studying with others.

diff --git a/backend/templates/passwordReset/form.html b/backend/templates/passwordReset/form.html index 5134acf3..bd8e87b9 100644 --- a/backend/templates/passwordReset/form.html +++ b/backend/templates/passwordReset/form.html @@ -18,13 +18,13 @@ {% if wasCorrect == 'False' %}
    {% if errors.tokenIsValid != 1 %} -
  • You took to long try again. The token is only valid for 10 mintues.
  • +
  • This link has expired — they're only valid for 10 minutes. No problem, just request a new one!
  • {% endif %} {% if errors.passwordsMatch != 1 %} -
  • Passwords don't match
  • +
  • Those passwords don't match — try again!
  • {% endif %} {% if errors.passwordLength != 1 %} -
  • Password needs to be at least 9 characters long
  • +
  • Your password needs to be at least 9 characters long.
  • {% endif %}
{% endif %} diff --git a/backend/templates/passwordResetToken.html b/backend/templates/passwordResetToken.html index 69225e2b..0820d3be 100644 --- a/backend/templates/passwordResetToken.html +++ b/backend/templates/passwordResetToken.html @@ -10,9 +10,9 @@ Logo -

Sign Up

+

Set New Password

- Join the people studying. + Almost there! Just pick a new password.

{% include "passwordReset/form.html" %}
@@ -20,10 +20,9 @@

Sign Up

-

Making Bible Study Simpler than Ever!

+

Explore the Bible Together

- Take the complexity out of Bible study and delve deeper - into the Word with others + No expertise required — just jump in and start studying with others.

diff --git a/backend/templates/signup.html b/backend/templates/signup.html index 31eb272c..7c10ee18 100644 --- a/backend/templates/signup.html +++ b/backend/templates/signup.html @@ -13,7 +13,7 @@

Sign Up

- Join the people studying. + We're glad you're here! Create your account to get started.

{% include "signup/form.html" %}
@@ -21,10 +21,9 @@

Sign Up

-

Making Bible Study Simpler than Ever!

+

Explore the Bible Together

- Take the complexity out of Bible study and delve deeper - into the Word with others + No expertise required — just jump in and start studying with others.

diff --git a/backend/templates/signup/form.html b/backend/templates/signup/form.html index ef625a5c..2af837ee 100644 --- a/backend/templates/signup/form.html +++ b/backend/templates/signup/form.html @@ -30,19 +30,19 @@ {% if wasCorrect == 'False' %}
    {% if errors.nameNotNull != 1 %} -
  • Need a name
  • +
  • We'll need your name to get started!
  • {% endif %} {% if errors.isNotTaken != 1 %} -
  • Email already taken
  • +
  • That email is already in use — try logging in instead?
  • {% endif %} {% if errors.passwordsMatch != 1 %} -
  • Passwords don't match
  • +
  • Those passwords don't match — try again!
  • {% endif %} {% if errors.passwordLength != 1 %} -
  • Password needs to be at least 9 characters long
  • +
  • Your password needs to be at least 9 characters long.
  • {% endif %} {% if errors.verified != 1 %} -
  • Verification failed
  • +
  • Verification failed — please try again.
  • {% endif %}
{% endif %}