Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Add a button to link to Gmail on email verification #2230

Merged
merged 5 commits into from
Nov 14, 2023
Merged

feat: Add a button to link to Gmail on email verification #2230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1d1fa74
feat: Add open in Gmail button to verify email page
faucomte97 Nov 8, 2023
911711b
Fix tests
faucomte97 Nov 8, 2023
9f1b1f0
Bring plane back
faucomte97 Nov 8, 2023
60e9a35
Merge branch 'master' into verification_gmail
faucomte97 Nov 13, 2023
0c53449
Feedback
faucomte97 Nov 13, 2023
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
11 changes: 11 additions & 0 deletions portal/static/portal/sass/partials/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,17 @@ table {
}
}

.button-email {
&:after {
content: "\e0be";
font-family: "Material Icons Outlined";
position: relative;
top: 2px;
left: 5px;
line-height: 0.9em;
}
}

.button--regular,
.ui-dialog-buttonset button {
@include _padding(10px, 15px, 10px, 15px);
Expand Down
6 changes: 3 additions & 3 deletions portal/static/portal/sass/partials/_forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,9 @@ form {
color: $color-text-secondary;
background-color: $color-primary-400;

a,
a:hover,
a:focus {
a:not(.button--home),
a:not(.button--home):hover,
a:not(.button--home):focus {
color: $color-text-secondary;
}

Expand Down
12 changes: 5 additions & 7 deletions portal/templates/portal/email_verification_needed.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@
<h4>We need to verify your email address</h4>
<img class="background" title="Paper Plane" alt="Verification email sent" src="{% static 'portal/img/paper_plane.png' %}">
<p class="text-left">An email has been sent to the address you provided.</p>
<p class="text-left">Please follow the link within the email to verify your details. This will expire in 1 hour.</p>
<p class="text-left">If you don't receive the email within the next few minutes, check your spam folder.</p>
<p class="text-left">Please follow the link within the email to verify your details. This will expire in one hour.</p>
<p class="text-left">If you don't receive the email within the next few minutes, please check your spam folder.</p>
<div>
{% if usertype == "TEACHER" %}
<a id="home_button" href="{% url 'home' %}" class="button button--primary button--login">Back to homepage</a>
{% else %}
<a id="home_button" href="{% url 'home' %}" class="button button--home">Back to homepage</a>
{% endif %}
<a target="_blank" href="https://mail.google.com/mail/#search/from%3Ano-reply%40codeforlife.education+subject%3AEmail+Verification"
class="button button--home button-email">Open in Gmail</a>
</div>
<p class="text-left"><a id="home_button" href="{% url 'home' %}">&lt; back to homepage</a></p>
{% endblock form_content %}