Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/lib/Api/Htmx/PasswordReset.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion backend/lib/Emails/PasswordReset.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
9 changes: 6 additions & 3 deletions backend/lib/Emails/Welcome.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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!"
4 changes: 2 additions & 2 deletions backend/templates/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
<div class="leftText">
<h1>Making Bible <br>Study Simple!</h1>
<p class="description">
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.
</p>
<div class="blueRoundedContainer">
<div>
Expand All @@ -90,7 +90,7 @@ <h3>Intuitive Study Tools</h3>
<div>
<a href="{{base}}/signup">
<button class="buttonContainer">
BEGIN YOUR JOURNEY
GET STARTED
<img src="{{base}}/static/img/arrow-icon.svg">
</button>
</a>
Expand Down
9 changes: 4 additions & 5 deletions backend/templates/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,19 @@
<a link="" href="/app/" aria-current="page">
<img alt="Logo" src="{{base}}/static/img/p215-circle.svg">
</a>
<h1>Log In</h1>
<h1>Welcome Back</h1>
<p>
Please enter your login credentials below to start using the admin console.
Sign in to continue your study.
</p>
{% include "login/form.html" %}
</div>
</div>

<div class="rightColumn">
<div class="centeredDiv">
<h2>Making Bible Study Simpler than Ever!</h2>
<h2>Explore the Bible Together</h2>
<p>
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.
</p>
<img src="{{base}}/static/img/laptop-mockup.png">
</div>
Expand Down
2 changes: 1 addition & 1 deletion backend/templates/login/form.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</a>
</p>
{% if wasCorrect == 'False' %}
<div class="errorText"> Email or password incorrect</div>
<div class="errorText"> Hmm, that email or password doesn't look right. Give it another try!</div>
{% endif %}
<button class="blue" type="submit" onclick="clearErrors()">Log In</button>
</form>
Expand Down
11 changes: 5 additions & 6 deletions backend/templates/notAuthorized.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@
<div id="notFoundContent">
<div class="container">
<div>
<h1 class="header">404</h1>
<h2 class="subheader">Error: no page found</h2>
<h1 class="header">Oops!</h1>
<h2 class="subheader">You'll need to sign in to see this page.</h2>
<div class="returnHome">
<a href="{{base}}/" class="homeButton">
<button class="blue">Return to Home</button>
<a href="{{base}}/login" class="homeButton">
<button class="blue">Sign In</button>
</a>
</div>
<img src="{{base}}/static/img/meme.png" class="image" >
</div>
<div>
<div class="block">
Expand All @@ -25,7 +24,7 @@ <h3>Popular Links:</h3>
</div>
<div class="block">
<h3>Contact Us:</h3>
<p>If you believe this is an error, please <a href="mailto:support@example.com">contact us</a>.</p>
<p>If you believe this is an error, please <a href="mailto:support@p215.church">contact us</a>.</p>
</div>
<div class="block">
<h3>Found an issue?</h3>
Expand Down
2 changes: 1 addition & 1 deletion backend/templates/notFound.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="container">
<div>
<h1 class="header">404</h1>
<h2 class="subheader">Error: no page found</h2>
<h2 class="subheader">We couldn't find that page.</h2>
<div class="returnHome">
<a href="{{base}}/" class="homeButton">
<button class="blue">Return to Home</button>
Expand Down
7 changes: 3 additions & 4 deletions backend/templates/passwordReset.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</a>
<h1>Reset Password</h1>
<p>
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.
</p>
<form hx-post="{{base}}/reset_email" hx-target="this" hx-swap="outerHTML" >
<label for="email">Email</label>
Expand All @@ -25,10 +25,9 @@ <h1>Reset Password</h1>

<div class="rightColumn">
<div class="centeredDiv">
<h2>Making Bible Study Simpler than Ever!</h2>
<h2>Explore the Bible Together</h2>
<p>
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.
</p>
<img src="{{base}}/static/img/laptop-mockup.png">
</div>
Expand Down
6 changes: 3 additions & 3 deletions backend/templates/passwordReset/form.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
{% if wasCorrect == 'False' %}
<ul class="errorText">
{% if errors.tokenIsValid != 1 %}
<li>You took to long try again. The token is only valid for 10 mintues.</li>
<li>This link has expired — they're only valid for 10 minutes. No problem, just request a new one!</li>
{% endif %}
{% if errors.passwordsMatch != 1 %}
<li>Passwords don't match</li>
<li>Those passwords don't match — try again!</li>
{% endif %}
{% if errors.passwordLength != 1 %}
<li>Password needs to be at least 9 characters long</li>
<li>Your password needs to be at least 9 characters long.</li>
{% endif %}
</ul>
{% endif %}
Expand Down
9 changes: 4 additions & 5 deletions backend/templates/passwordResetToken.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,19 @@
<a link="" href="/app/" aria-current="page">
<img alt="Logo" src="{{base}}/static/img/p215-circle.svg">
</a>
<h1>Sign Up</h1>
<h1>Set New Password</h1>
<p>
Join the people studying.
Almost there! Just pick a new password.
</p>
{% include "passwordReset/form.html" %}
</div>
</div>

<div class="rightColumn">
<div class="centeredDiv">
<h2>Making Bible Study Simpler than Ever!</h2>
<h2>Explore the Bible Together</h2>
<p>
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.
</p>
<img src="{{base}}/static/img/laptop-mockup.png">
</div>
Expand Down
7 changes: 3 additions & 4 deletions backend/templates/signup.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,17 @@
</a>
<h1>Sign Up</h1>
<p>
Join the people studying.
We're glad you're here! Create your account to get started.
</p>
{% include "signup/form.html" %}
</div>
</div>

<div class="rightColumn">
<div class="centeredDiv">
<h2>Making Bible Study Simpler than Ever!</h2>
<h2>Explore the Bible Together</h2>
<p>
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.
</p>
<img src="{{base}}/static/img/laptop-mockup.png">
</div>
Expand Down
10 changes: 5 additions & 5 deletions backend/templates/signup/form.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@
{% if wasCorrect == 'False' %}
<ul class="errorText">
{% if errors.nameNotNull != 1 %}
<li>Need a name</li>
<li>We'll need your name to get started!</li>
{% endif %}
{% if errors.isNotTaken != 1 %}
<li>Email already taken</li>
<li>That email is already in use — try logging in instead?</li>
{% endif %}
{% if errors.passwordsMatch != 1 %}
<li>Passwords don't match</li>
<li>Those passwords don't match — try again!</li>
{% endif %}
{% if errors.passwordLength != 1 %}
<li>Password needs to be at least 9 characters long</li>
<li>Your password needs to be at least 9 characters long.</li>
{% endif %}
{% if errors.verified != 1 %}
<li>Verification failed</li>
<li>Verification failed — please try again.</li>
{% endif %}
</ul>
{% endif %}
Expand Down