Skip to content

Commit

Permalink
updates login templates; checks for authenticated user before saving …
Browse files Browse the repository at this point in the history 
…document
  • Loading branch information
@actlikewill
actlikewill committed Jul 24, 2024
1 parent 5f5a1fa commit 7531f99
Show file tree
Hide file tree
Showing 7 changed files with 254 additions and 212 deletions.
134 changes: 71 additions & 63 deletions peachjam/templates/account/login.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,75 +10,83 @@
rel="stylesheet"/>
{% endblock %}
{% block content %}
<h1 class="mb-3">{% trans 'Log in' %}</h1>
<form method="post" action="{% url 'account_login' %}" id="email-login">
{% csrf_token %}
{% if redirect_field_value %}
<input type="hidden"
name="{{ redirect_field_name }}"
value="{{ redirect_field_value }}"/>
{% endif %}
{% if form.non_field_errors %}
<div class="text-danger">
{% for error in form.non_field_errors %}<p>{{ error }}</p>{% endfor %}
</div>
{% endif %}
<div class="form-group">
<label for="{{ form.login.id_for_label }}">{% trans 'Email address or username' %}</label>
<input type="text"
class="form-control"
name="{{ form.login.name }}"
id="{{ form.login.id_for_label }}"
required
autofocus
placeholder="[email protected]"/>
{% if form.login.errors %}
<div class="text-danger">
{% for error in form.login.errors %}<p>{{ error }}</p>{% endfor %}
</div>
<div class="mb-4 card-header border-bottom m-4 bg-white">
<h1>{% trans 'Log in' %}</h1>
<p class="text-muted">
Dont have an account? <a href="{% url 'account_signup' %}">{% trans 'Sign up here' %}.</a>
</p>
</div>
<div class="card-body mx-4">
<form method="post" action="{% url 'account_login' %}" id="email-login">
{% csrf_token %}
{% if redirect_field_value %}
<input type="hidden"
name="{{ redirect_field_name }}"
value="{{ redirect_field_value }}"/>
{% endif %}
</div>
<div class="form-group">
<label for="{{ form.password.id_for_label }}">{% trans 'Password' %}</label>
<input type="password"
class="form-control"
name="{{ form.password.name }}"
id="{{ form.password.id_for_label }}"
required/>
<div class="my-2">
<a href="{% url 'account_reset_password' %}">{% trans 'Forgot your password?' %}</a>
<a href="{% url 'account_signup' %}">{% trans 'Sign up' %}</a>
</div>
{% if form.password.errors %}
{% if form.non_field_errors %}
<div class="text-danger">
{% for error in form.password.errors %}<p>{{ error }}</p>{% endfor %}
{% for error in form.non_field_errors %}<p class="m-1">{{ error }}</p>{% endfor %}
</div>
{% endif %}
</div>
<div class="my-2">
<button class="btn btn-success btn-block mb-3" type="submit">{% trans 'Log in' %}</button>
</div>
</form>
{% get_providers as socialaccount_providers %}
{% if socialaccount_providers %}<hr class="my-2"/>{% endif %}
<div class="row">
<div class="col-lg-8 mx-auto">
{% for provider in socialaccount_providers %}
<a class="btn btn-block btn-outline-primary mb-3 socialaccount_provider {{ provider.id }}"
href="{% provider_login_url provider.id process='login' %}">
{% if provider.name == "Google" %}
<img alt="google-logo"
src="{% static 'images/google-logo.png' %}"
style="height: 20px;
margin-right: 5px"/>
{% else %}
<i class="fab fa-fw fa-{{ provider.id }}"></i>
{% endif %}
{% blocktrans %}
<div class="mb-3">
<label class="form-label" for="{{ form.login.id_for_label }}">{% trans 'Email address' %}</label>
<input type="text"
class="form-control"
name="{{ form.login.name }}"
id="{{ form.login.id_for_label }}"
required
autofocus
placeholder="[email protected]"/>
{% if form.login.errors %}
<div class="text-danger">
{% for error in form.login.errors %}<p class="m-1">{{ error }}</p>{% endfor %}
</div>
{% endif %}
</div>
<div class="mb-3">
<label class="form-label" for="{{ form.password.id_for_label }}">{% trans 'Password' %}</label>
<input type="password"
class="form-control"
name="{{ form.password.name }}"
id="{{ form.password.id_for_label }}"
required/>
{% if form.password.errors %}
<div class="text-danger">
{% for error in form.password.errors %}<p class="m-1">{{ error }}</p>{% endfor %}
</div>
{% endif %}
</div>
<div class="mb-4">
<button class="btn btn-primary" type="submit">{% trans 'Log in' %}</button>
</div>
<div class="mb-3">
<p class="mb-1">
<a href="{% url 'account_reset_password' %}">{% trans 'Forgot your password?' %}</a>
</p>
</div>
</form>
{% get_providers as socialaccount_providers %}
{% if socialaccount_providers %}<hr class="my-2"/>{% endif %}
<div class="row">
<div class="col-lg-8 mx-auto">
{% for provider in socialaccount_providers %}
<a class="btn btn-block btn-outline-primary mb-3 socialaccount_provider {{ provider.id }}"
href="{% provider_login_url provider.id process='login' %}">
{% if provider.name == "Google" %}
<img alt="google-logo"
src="{% static 'images/google-logo.png' %}"
style="height: 20px;
margin-right: 5px"/>
{% else %}
<i class="fab fa-fw fa-{{ provider.id }}"></i>
{% endif %}
{% blocktrans %}
Log in with {{ provider.name }}
{% endblocktrans %}
</a>
{% endfor %}
</a>
{% endfor %}
</div>
</div>
</div>
{% endblock %}
62 changes: 36 additions & 26 deletions peachjam/templates/account/password_reset.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,40 @@
{% load account i18n %}
{% block title %}Reset Your Password{% endblock %}
{% block content %}
<h1>{% trans 'Reset Your Password' %}</h1>
{% if user.is_authenticated %}
{% include "account/snippets/already_logged_in.html" %}
{% endif %}
<p>
{% trans "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it." %}
</p>
<form method="post" action="{% url 'account_reset_password' %}">
{% csrf_token %}
<div class="form-group">
<label for="{{ form.email.id_for_label }}">{% trans 'Email address' %}</label>
<input type="email"
class="form-control"
name="{{ form.email.name }}"
id="{{ form.email.id_for_label }}"
required/>
{% if form.email.errors %}
<div class="text-danger">
{% for error in form.email.errors %}<p>{{ error }}</p>{% endfor %}
</div>
{% endif %}
</div>
<div class="my-2">
<button class="btn btn-primary btn-block" type="submit">{% trans 'Reset password' %}</button>
</div>
</form>
<div class="mb-4 card-header bg-white m-4 ">
<h1>{% trans 'Reset Your Password' %}</h1>
<p>
<a href="{% url 'home_page' %}">Go back to homepage</a>
</p>
</div>
<div class="card-body mx-4">
{% if user.is_authenticated %}
{% include "account/snippets/already_logged_in.html" %}
{% endif %}
{% blocktrans %}
<div class="mb-3">
<p class="m-1 h5">Forgot your password?</p>
<p class="m-1">Enter your e-mail address below, and we will send you a link to reset it.</p>
</div>
{% endblocktrans %}
<form method="post" action="{% url 'account_reset_password' %}">
{% csrf_token %}
<div class="mb-3">
<label class="form-label" for="{{ form.email.id_for_label }}">{{ form.email.label }}</label>
<input type="email"
class="form-control"
name="{{ form.email.name }}"
id="{{ form.email.id_for_label }}"
required/>
{% if form.email.errors %}
<div class="text-danger">
{% for error in form.email.errors %}<p class="m-1">{{ error }}</p>{% endfor %}
</div>
{% endif %}
</div>
<div class="mb-4">
<button class="btn btn-primary" type="submit">{% trans 'Reset password' %}</button>
</div>
</form>
</div>
{% endblock %}
138 changes: 70 additions & 68 deletions peachjam/templates/account/signup.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,76 +4,78 @@
{% block title %}
{% trans 'Sign Up' %}
{% endblock %}
{% block head-css %}
{{ block.super }}
<link href="https://fonts.googleapis.com/css?family=Roboto"
rel="stylesheet"/>
{% endblock %}
{% block content %}
<h1 class="mb-3">{% trans 'Sign up' %}</h1>
<form method="post">
{% csrf_token %}
{% if form.non_field_errors %}
<div class="text-danger">
{% for error in form.non_field_errors %}<p>{{ error }}</p>{% endfor %}
</div>
{% endif %}
<div class="form-group">
<label for="{{ form.username.id_for_label }}">{% trans 'Username' %}</label>
<input type="text"
class="form-control"
name="{{ form.username.name }}"
id="{{ form.username.id_for_label }}"
required
autofocus/>
{% if form.username.errors %}
<div class="text-danger">
{% for error in form.username.errors %}<p>{{ error }}</p>{% endfor %}
</div>
{% endif %}
</div>
<div class="form-group">
<label for="{{ form.email.id_for_label }}">{% trans 'Email address' %}</label>
<input type="email"
class="form-control"
name="{{ form.email.name }}"
id="{{ form.email.id_for_label }}"
required
placeholder="[email protected]"/>
{% if form.email.errors %}
<div class="text-danger">
{% for error in form.email.errors %}<p>{{ error }}</p>{% endfor %}
</div>
{% endif %}
</div>
<div class="form-group">
<label for="{{ form.password1.id_for_label }}">{% trans 'Password' %}</label>
<input type="password"
class="form-control"
name="{{ form.password1.name }}"
id="{{ form.password1.id_for_label }}"
required/>
{% if form.password1.errors %}
<div class="mb-4 card-header bg-white m-4">
<h1>{% trans 'Sign up' %}</h1>
<p class="text-muted">
Already have an account? <a href="{% url 'account_login' %}">Login here</a>.
</p>
</div>
<div class="card-body mx-4">
<form method="post">
{% csrf_token %}
{% if form.non_field_errors %}
<div class="text-danger">
{% for error in form.password1.errors %}<p>{{ error }}</p>{% endfor %}
{% for error in form.non_field_errors %}<p>{{ error }}</p>{% endfor %}
</div>
{% endif %}
</div>
<div class="form-group">
<label for="{{ form.password2.id_for_label }}">{% trans 'Confirm Password' %}</label>
<input type="password"
class="form-control"
name="{{ form.password2.name }}"
id="{{ form.password2.id_for_label }}"
required/>
{% if form.password2.errors %}
<div class="text-danger">
{% for error in form.password2.errors %}<p>{{ error }}</p>{% endfor %}
</div>
{% endif %}
</div>
<div class="my-2">
<button class="btn btn-success btn-block mb-3" type="submit">{% trans 'Sign up' %}</button>
</div>
</form>
<div class="mb-3">
<label class="form-label" for="{{ form.username.id_for_label }}">{% trans 'Username' %}</label>
<input type="text"
class="form-control"
name="{{ form.username.name }}"
id="{{ form.username.id_for_label }}"
required
autofocus/>
{% if form.username.errors %}
<div class="text-danger">
{% for error in form.username.errors %}<p class="m-1">{{ error }}</p>{% endfor %}
</div>
{% endif %}
</div>
<div class="mb-3">
<label class="form-label" for="{{ form.email.id_for_label }}">{% trans 'Email address' %}</label>
<input type="{{ form.email.type }}"
class="form-control"
name="{{ form.email.name }}"
id="{{ form.email.id_for_label }}"
required
placeholder="[email protected]"/>
{% if form.email.errors %}
<div class="text-danger">
{% for error in form.email.errors %}<p class="m-1">{{ error }}</p>{% endfor %}
</div>
{% endif %}
</div>
<div class="mb-3">
<label class="form-label" for="{{ form.password1.id_for_label }}">{% trans 'Password' %}</label>
<input type="password"
class="form-control"
name="{{ form.password1.name }}"
id="{{ form.password1.id_for_label }}"
required/>
{% if form.password1.errors %}
<div class="text-danger">
{% for error in form.password1.errors %}<p class="m-1">{{ error }}</p>{% endfor %}
</div>
{% endif %}
</div>
<div class="mb-3">
<label class="form-label" for="{{ form.password2.id_for_label }}">{% trans 'Confirm Password' %}</label>
<input type="password"
class="form-control"
name="{{ form.password2.name }}"
id="{{ form.password2.id_for_label }}"
required/>
{% if form.password2.errors %}
<div class="text-danger">
{% for error in form.password2.errors %}<p class="m-1">{{ error }}</p>{% endfor %}
</div>
{% endif %}
</div>
<div class="my-2">
<button class="btn btn-primary mb-3" type="submit">{% trans 'Sign up' %}</button>
</div>
</form>
</div>
{% endblock %}
16 changes: 6 additions & 10 deletions peachjam/templates/allauth/layouts/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,11 @@
{% block title %}{{ title }}{% endblock %}
{% block page-content %}
<div class="card allauth-box">
<div class="card-body">
{% block content %}{% endblock %}
</div>
<div class="card-footer">
{% if SUPPORT_EMAIL %}
<div class="float-left">
{% trans 'Need help? Please email <a href="mailto:{{ SUPPORT_EMAIL }}">{{ SUPPORT_EMAIL }}</a>.' %}
</div>
{% endif %}
</div>
{% block content %}{% endblock %}
{% if SUPPORT_EMAIL %}
<div class="card-footer mx-4 bg-white">
{% trans 'Need help? Please email' %} <a href="mailto:{{ SUPPORT_EMAIL }}">{{ SUPPORT_EMAIL }}</a>.
</div>
{% endif %}
</div>
{% endblock %}
Loading

0 comments on commit 7531f99

Please sign in to comment.