sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'develop' into feature/workoutslist

Browse Source
This commit is contained in:
Sander Roosendaal
2021-12-28 14:01:17 +01:00
parent a36dd7c4ed b68ace6efc
commit 6f5bee3faa
3 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
rowers/templates/gdpr_optin.html
View File

@@ -11,18 +11,24 @@
you can opt in or delete this user account. you can opt in or delete this user account.
</p> </p>
<h2>GDPR Opt-In</h2> <h2>Data Consent</h2>
<p> <p>
<b> <b>
To comply with the European Union General Data Protection Regulation, To comply with the European Union General Data Protection Regulation,
we need to record your consent to use personal data on this website. we need to record your consent to use personal data on this website.
Please take some time to review our data policies. If you agree and Please take some time to review our data policies. If you agree and
opt in, click the "opt in" button at the bottom to be taken to the site. opt in, click the "opt in" button at the bottom to be taken to the site.
If you do not agree, please use the red button to delete your If you do not agree, please use the button at the end fo the page to delete your
account. This will irreversibly delete all your data on rowsandall.com account. This will irreversibly delete all your data on rowsandall.com
and remove your account. and remove your account.
</b> </b>
</p> </p>
<p>
<a class="button green" href="/rowers/me/gdpr-optin-confirm/?next={{ next }}"><b>OPT IN AND CONTINUE</b></a>
</p>
<hr> <hr>
{% include "privacypolicy.html" %} {% include "privacypolicy.html" %}
@@ -33,26 +39,27 @@
To start or continue using the site, please give your consent by clicking on the green Opt In button below. To start or continue using the site, please give your consent by clicking on the green Opt In button below.
</p> </p>
<p>
<a class="button gray small" href="/rowers/exportallworkouts/">Download your data</a>
</p>
<p> <p>
<a class="button green small" href="/rowers/me/gdpr-optin-confirm/?next={{ next }}">Opt in and continue</a> <a class="button green" href="/rowers/me/gdpr-optin-confirm/?next={{ next }}"><b>OPT IN AND CONTINUE</b></a>
</p> </p>
<p> <p>
<form method="POST" action="/rowers/me/delete/" class="padding"> <form method="POST" action="/rowers/me/delete/" class="padding">
{% csrf_token %} {% csrf_token %}
<input id="id_delete_user" type="hidden" name="delete_user" value="True"> <input id="id_delete_user" type="hidden" name="delete_user" value="True">
<input class="button red small" type="submit" name="action" value="DELETE ACCOUNT"> <input class="button" type="submit" name="action" value="DELETE ACCOUNT">
</form> </form>
</p> </p>
<p>
<a href="/rowers/exportallworkouts/">Download your data</a>
</p>
{% endblock %} {% endblock %}
{% block sidebar %} {% block sidebar %}
{% include 'menu_profile.html' %} {% include 'menu_profile.html' %}
{% endblock %} {% endblock %}

BIN
rowers/tests/testdata/testdata.tcx.gz vendored Normal file
View File

Binary file not shown.

9
rowers/views/paymentviews.py
View File

@@ -784,10 +784,11 @@ def useractivate(request, uidb64, token): # pragma: no cover
['roosendaalsander@gmail.com']) ['roosendaalsander@gmail.com'])
messages.info(request,'Thank you for your email confirmation. Now you can login to your account.') messages.info(request,'Thank you for your email confirmation. YOu are now signed in to your account.')
url = '/login/' login(request, user, backend=settings.AUTHENTICATION_BACKENDS[0])
if user.rower.rowerplan == 'freecoach': url = reverse('workouts_view')
url+='?next=/rowers/me/teams' #if user.rower.rowerplan == 'freecoach':
# url+='?next=/rowers/me/teams'
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
else: else:
return render(request, return render(request,