nathan/ptcoffee_django
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/1.3.7'

Browse Source
This commit is contained in:
Nathan Chapman 2022-05-19 18:53:40 -06:00
commit c60433c8d2
5 changed files with 74 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CHANGELOG.md Normal file
View File

@ -0,0 +1,13 @@
# Changelog
All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]
## [1.3.7] - 2022-05-19
### Added
- Visual enhancements
- Change password from account
- Changelog!

17
src/static/styles/main.css
View File

@ -485,7 +485,7 @@ section:not(:last-child) {
background-blend-mode: multiply;
background-size: cover;
background-position: center;
color: white;
color: #f1e8e2;
text-align: center;
padding: 2rem 1rem;
font-family: 'Vollkorn', serif;
@ -577,6 +577,11 @@ article > header {
display: flex;
justify-content: space-between;
align-items: center;
align-content: center;
}
.article__header--with-action h1 {
margin-bottom: 0;
}
article + article {
@ -883,6 +888,16 @@ article + article {
}
/* ==========================================================================
Customer/User
========================================================================== */
.customer__detail-section {
display: grid;
grid-template-columns: repeat(2, 1fr);
gap: 4rem;
}
/* ==========================================================================

40
src/storefront/templates/storefront/customer_detail.html
View File

@ -11,25 +11,27 @@
</header>
<section>
<h4>Info</h4>
<p>
<strong>Email address</strong><br>
{{customer.email}}<br>
<a href="{% url 'account_email' %}">Manage</a>
</p>
<p>
<strong>Default shipping address</strong>
{% with shipping_address=customer.default_shipping_address %}
<address>
{{shipping_address.first_name}}
{{shipping_address.last_name}}<br>
{{shipping_address.street_address_1}}<br>
{% if shipping_address.street_address_2 %}
{{shipping_address.street_address_2}}<br>
{% endif %}
{{shipping_address.city}}, {{shipping_address.state}}, {{shipping_address.postal_code}}
</address>
{% endwith %}
</p>
<div class="customer__detail-section">
<div>
<strong>Email address</strong><br>
{{customer.email}}<br>
<a href="{% url 'account_email' %}">Manage</a>
</div>
<div>
<strong>Default shipping address</strong>
{% with shipping_address=customer.default_shipping_address %}
<address>
{{shipping_address.first_name}}
{{shipping_address.last_name}}<br>
{{shipping_address.street_address_1}}<br>
{% if shipping_address.street_address_2 %}
{{shipping_address.street_address_2}}<br>
{% endif %}
{{shipping_address.city}}, {{shipping_address.state}}, {{shipping_address.postal_code}}
</address>
{% endwith %}
</div>
</div>
</section>
<section>
<h4>Your addresses</h4>

3
src/storefront/templates/storefront/customer_form.html
View File

@ -5,6 +5,9 @@
<header>
<p><a href="{% url 'storefront:customer-detail' customer.pk %}">&larr; Back</a></p>
<h1>Update your profile</h1>
<p>
<a href="{% url 'account_change_password' %}">Change password</a>
</p>
</header>
<section>
<form method="POST" action="{% url 'storefront:customer-update' customer.pk %}">

21
src/templates/account/password_change.html Normal file
View File

@ -0,0 +1,21 @@
{% extends "base.html" %}
{% load i18n %}
{% block head_title %}{% trans "Change Password" %}{% endblock %}
{% block content %}
<article>
<header>
<p><a href="{% url 'storefront:customer-detail' user.pk %}">&larr; Back</a></p>
<h1>{% trans "Change Password" %}</h1>
<a href="{% url 'account_reset_password' %}">{% trans "Forgot Password?" %}</a>
</header>
<form method="POST" action="{% url 'account_change_password' %}" class="password_change">
{% csrf_token %}
{{ form.as_p }}
<input type="submit" value="{% trans "Save changes" %}">
</form>
</article>
{% endblock %}