mgoetz/basta-server
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of /media/data_1/www/gogs/gogs-repositories/michigg/ofu-app

Browse Source
This commit is contained in:
www-data 2017-10-31 00:42:11 +01:00
commit d1601117e5
4 changed files with 56 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ofu_app/apps/registration/urls.py
View File

@ -2,7 +2,8 @@ from django.conf.urls import url
from apps.registration import views as core_views
urlpatterns = [
url(r'^$', core_views.signup, name='signup'),
url(r'^$', core_views.account_view, name='account'),
url(r'^signup/$', core_views.signup, name='signup'),
url(r'^account_activation_sent/$', core_views.account_activation_sent, name='account_activation_sent'),
url(r'^activate/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$',
core_views.activate, name='activate'),

14
ofu_app/apps/registration/views.py
View File

@ -11,6 +11,7 @@ from django.utils.encoding import force_text
from django.utils.http import urlsafe_base64_decode
from django.core.mail import send_mail
from django.shortcuts import HttpResponse
from apps.food.models import UserRating
def signup(request):
@ -56,3 +57,16 @@ def activate(request, uidb64, token):
def account_activation_sent(request):
return render(request, 'registration/account_activation_sent.jinja', {})
def account_view(request):
if request.user.is_authenticated:
user = request.user
food_ratings = UserRating.objects.filter(user=user).order_by('food__name')
return render(request, 'registration/account_view.jinja',
{'name': user.username, 'email': user.email, 'date_joined': user.date_joined,
'food_ratings': food_ratings, 'first_name': user.first_name, 'last_name': user.last_name,
'last_login': user.last_login})
else:
return HttpResponse(status=404)

14
ofu_app/templates/registration/account_activation_invalid.jinja
View File

@ -3,9 +3,15 @@
{% block headline %}<h3 class="text-center">BaStA Login</h3>{% endblock %}
{% block content %}
<div class="col-12 text-center p-3 bg-light text-dark">
<h3>Fail</h3>
<p>Your user account couldn't be activated</p>
<p>Please try it again or inform the Administrator.</p>
<div class="col-8 text-center p-3 bg-light text-dark">
<h3>{{ name }}</h3>
<p>E-Mail: {{ email }}</p>
</div>
<div class="col-4 p-3 bg-light text-dark"><p>Date Joined: {{ date_joined }}</p></div>
<div class="col-12 p-3 bg-light text-dark">
<h4>Your Food Ratings:</h4>
{% for rating in food_ratings %}
<p>{{ rating.food.name }}: {{ rating.rating }}</p>
{% endfor %}
</div>
{% endblock %}

30
ofu_app/templates/registration/account_view.jinja Normal file
View File

@ -0,0 +1,30 @@
{% extends 'base.jinja' %}
{% block headline %}<h3 class="text-center">Account</h3>{% endblock %}
{% block content %}
<div class="col-8 text-left p-3 pl-4">
<div class="row p-1">
<div class="col-12 p-3 bg-light text-dark">
<h3>{{ name }}</h3>
<p><strong>Vorname:</strong> {{ first_name }}</p>
<p><strong>Nachname:</strong> {{ last_name }}</p>
<p><strong>E-Mail:</strong> {{ email }}</p>
</div>
</div>
<div class="row p-1">
<div class="col-12 p-3 bg-light text-dark">
<h4>Your Food Ratings:</h4>
{% for rating in food_ratings %}
<p>{{ rating.food.name }}: {{ rating.rating }}</p>
{% endfor %}
</div>
</div>
</div>
<div class="col-4 text-center p-3">
<div class="p-3 bg-light text-dark">
<p>Date joined: {{ date_joined.strftime("%d.%m.%Y") }}</p>
<p>Last Login: {{ last_login.strftime("%d.%m.%Y") }}</p>
</div>
</div>
{% endblock %}