From af692d405dc755d71602238bccee1f2545344006 Mon Sep 17 00:00:00 2001 From: michigg Date: Mon, 4 Dec 2017 04:46:06 +0100 Subject: [PATCH] Fuck Off --- ofu_app/apps/donar/migrations/0001_initial.py | 4 +- ...030_0029.py => 0002_auto_20171204_0244.py} | 4 +- .../migrations/0003_auto_20171030_0030.py | 22 ------- ...111_1013.py => 0003_auto_20171204_0303.py} | 6 +- .../migrations/0004_auto_20171030_0031.py | 22 ------- .../apps/events/migrations/0001_initial.py | 2 +- ofu_app/apps/food/admin.py | 3 +- ofu_app/apps/food/forms.py | 8 +++ ofu_app/apps/food/migrations/0001_initial.py | 21 ++++++- .../migrations/0002_auto_20171204_0303.py | 24 ++++++++ ofu_app/apps/food/models.py | 15 ++++- ofu_app/apps/food/urls.py | 2 +- ofu_app/apps/food/views.py | 35 ++++++++++-- ofu_app/apps/registration/forms.py | 8 ++- .../registration/migrations/0001_initial.py | 2 +- ofu_app/apps/registration/urls.py | 1 + ofu_app/apps/registration/views.py | 30 ++++++++-- ofu_app/core/urls.py | 30 +++++----- ofu_app/static/css/nav.css | 12 ++-- ofu_app/templates/food/detailed_food.jinja | 57 +++++++++++++------ ofu_app/templates/macros/food_macros.jinja | 52 +++++++++++------ .../registration/account_data_change.jinja | 33 +++++++++++ .../templates/registration/account_view.jinja | 21 ++++++- 23 files changed, 288 insertions(+), 126 deletions(-) rename ofu_app/apps/donar/migrations/{0002_auto_20171030_0029.py => 0002_auto_20171204_0244.py} (83%) delete mode 100644 ofu_app/apps/donar/migrations/0003_auto_20171030_0030.py rename ofu_app/apps/donar/migrations/{0003_auto_20171111_1013.py => 0003_auto_20171204_0303.py} (75%) delete mode 100644 ofu_app/apps/donar/migrations/0004_auto_20171030_0031.py create mode 100644 ofu_app/apps/food/forms.py create mode 100644 ofu_app/apps/food/migrations/0002_auto_20171204_0303.py create mode 100644 ofu_app/templates/registration/account_data_change.jinja diff --git a/ofu_app/apps/donar/migrations/0001_initial.py b/ofu_app/apps/donar/migrations/0001_initial.py index 3ded4d9..d5669f8 100644 --- a/ofu_app/apps/donar/migrations/0001_initial.py +++ b/ofu_app/apps/donar/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.2 on 2017-10-29 23:28 +# Generated by Django 1.11.7 on 2017-12-04 01:44 from __future__ import unicode_literals import datetime @@ -31,7 +31,7 @@ class Migration(migrations.Migration): name='Lecture_Terms', fields=[ ('id', models.AutoField(primary_key=True, serialize=False)), - ('starttime', models.TimeField(default=datetime.datetime(2017, 10, 29, 23, 28, 46, 228504, tzinfo=utc))), + ('starttime', models.TimeField(default=datetime.datetime(2017, 12, 4, 1, 44, 13, 10710, tzinfo=utc))), ], ), migrations.CreateModel( diff --git a/ofu_app/apps/donar/migrations/0002_auto_20171030_0029.py b/ofu_app/apps/donar/migrations/0002_auto_20171204_0244.py similarity index 83% rename from ofu_app/apps/donar/migrations/0002_auto_20171030_0029.py rename to ofu_app/apps/donar/migrations/0002_auto_20171204_0244.py index c974a75..c0c6028 100644 --- a/ofu_app/apps/donar/migrations/0002_auto_20171030_0029.py +++ b/ofu_app/apps/donar/migrations/0002_auto_20171204_0244.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.2 on 2017-10-29 23:29 +# Generated by Django 1.11.7 on 2017-12-04 01:44 from __future__ import unicode_literals import datetime @@ -17,6 +17,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='lecture_terms', name='starttime', - field=models.TimeField(default=datetime.datetime(2017, 10, 29, 23, 29, 23, 775652, tzinfo=utc)), + field=models.TimeField(default=datetime.datetime(2017, 12, 4, 1, 44, 28, 301106, tzinfo=utc)), ), ] diff --git a/ofu_app/apps/donar/migrations/0003_auto_20171030_0030.py b/ofu_app/apps/donar/migrations/0003_auto_20171030_0030.py deleted file mode 100644 index a404c6b..0000000 --- a/ofu_app/apps/donar/migrations/0003_auto_20171030_0030.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2017-10-29 23:30 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models -from django.utils.timezone import utc - - -class Migration(migrations.Migration): - - dependencies = [ - ('donar', '0002_auto_20171030_0029'), - ] - - operations = [ - migrations.AlterField( - model_name='lecture_terms', - name='starttime', - field=models.TimeField(default=datetime.datetime(2017, 10, 29, 23, 30, 14, 805020, tzinfo=utc)), - ), - ] diff --git a/ofu_app/apps/donar/migrations/0003_auto_20171111_1013.py b/ofu_app/apps/donar/migrations/0003_auto_20171204_0303.py similarity index 75% rename from ofu_app/apps/donar/migrations/0003_auto_20171111_1013.py rename to ofu_app/apps/donar/migrations/0003_auto_20171204_0303.py index a33a967..0527bc5 100644 --- a/ofu_app/apps/donar/migrations/0003_auto_20171111_1013.py +++ b/ofu_app/apps/donar/migrations/0003_auto_20171204_0303.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.7 on 2017-11-11 09:13 +# Generated by Django 1.11.7 on 2017-12-04 02:03 from __future__ import unicode_literals import datetime @@ -10,13 +10,13 @@ from django.utils.timezone import utc class Migration(migrations.Migration): dependencies = [ - ('donar', '0002_auto_20171030_0029'), + ('donar', '0002_auto_20171204_0244'), ] operations = [ migrations.AlterField( model_name='lecture_terms', name='starttime', - field=models.TimeField(default=datetime.datetime(2017, 11, 11, 9, 13, 24, 139058, tzinfo=utc)), + field=models.TimeField(default=datetime.datetime(2017, 12, 4, 2, 3, 45, 618615, tzinfo=utc)), ), ] diff --git a/ofu_app/apps/donar/migrations/0004_auto_20171030_0031.py b/ofu_app/apps/donar/migrations/0004_auto_20171030_0031.py deleted file mode 100644 index 07edb6f..0000000 --- a/ofu_app/apps/donar/migrations/0004_auto_20171030_0031.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2017-10-29 23:31 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models -from django.utils.timezone import utc - - -class Migration(migrations.Migration): - - dependencies = [ - ('donar', '0003_auto_20171030_0030'), - ] - - operations = [ - migrations.AlterField( - model_name='lecture_terms', - name='starttime', - field=models.TimeField(default=datetime.datetime(2017, 10, 29, 23, 31, 17, 880353, tzinfo=utc)), - ), - ] diff --git a/ofu_app/apps/events/migrations/0001_initial.py b/ofu_app/apps/events/migrations/0001_initial.py index 8160b3c..5b1d70a 100644 --- a/ofu_app/apps/events/migrations/0001_initial.py +++ b/ofu_app/apps/events/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.6 on 2017-10-25 21:40 +# Generated by Django 1.11.7 on 2017-12-04 01:44 from __future__ import unicode_literals from django.db import migrations, models diff --git a/ofu_app/apps/food/admin.py b/ofu_app/apps/food/admin.py index 6d288c6..ededaa5 100644 --- a/ofu_app/apps/food/admin.py +++ b/ofu_app/apps/food/admin.py @@ -2,11 +2,12 @@ from __future__ import unicode_literals from django.contrib import admin -from apps.food.models import SingleFood, Menu, HappyHour, UserRating +from apps.food.models import SingleFood, Menu, HappyHour, UserRating, UserFoodImage # Register your models here. admin.site.register(SingleFood) admin.site.register(Menu) admin.site.register(HappyHour) admin.site.register(UserRating) +admin.site.register(UserFoodImage) diff --git a/ofu_app/apps/food/forms.py b/ofu_app/apps/food/forms.py new file mode 100644 index 0000000..b451c76 --- /dev/null +++ b/ofu_app/apps/food/forms.py @@ -0,0 +1,8 @@ +from django import forms +from apps.food.models import UserFoodImage + + +class UploadImageForm(forms.ModelForm): + class Meta: + model = UserFoodImage + fields = ['image'] diff --git a/ofu_app/apps/food/migrations/0001_initial.py b/ofu_app/apps/food/migrations/0001_initial.py index a68857d..9c21693 100644 --- a/ofu_app/apps/food/migrations/0001_initial.py +++ b/ofu_app/apps/food/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.2 on 2017-10-29 23:28 +# Generated by Django 1.11.7 on 2017-12-04 01:44 from __future__ import unicode_literals from django.conf import settings @@ -51,11 +51,19 @@ class Migration(migrations.Migration): ('price_student', models.CharField(blank=True, max_length=10, null=True)), ('price_employee', models.CharField(blank=True, max_length=10, null=True)), ('price_guest', models.CharField(blank=True, max_length=10, null=True)), - ('image', models.ImageField(blank=True, upload_to='food/%Y/%m/')), ('rating', models.FloatField(default=0)), ('allergens', models.ManyToManyField(blank=True, to='food.Allergene')), ], ), + migrations.CreateModel( + name='UserFoodImage', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('image', models.ImageField(blank=True, upload_to='food/%Y/%m/%W')), + ('food', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='food.SingleFood')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), migrations.CreateModel( name='UserRating', fields=[ @@ -65,6 +73,11 @@ class Migration(migrations.Migration): ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], ), + migrations.AddField( + model_name='singlefood', + name='image', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='user_images', to='food.UserFoodImage'), + ), migrations.AddField( model_name='menu', name='menu', @@ -74,6 +87,10 @@ class Migration(migrations.Migration): name='happyhour', unique_together=set([('date', 'location', 'starttime', 'endtime')]), ), + migrations.AlterUniqueTogether( + name='userfoodimage', + unique_together=set([('user', 'food')]), + ), migrations.AlterUniqueTogether( name='menu', unique_together=set([('date', 'location')]), diff --git a/ofu_app/apps/food/migrations/0002_auto_20171204_0303.py b/ofu_app/apps/food/migrations/0002_auto_20171204_0303.py new file mode 100644 index 0000000..0f43e37 --- /dev/null +++ b/ofu_app/apps/food/migrations/0002_auto_20171204_0303.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.7 on 2017-12-04 02:03 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('food', '0001_initial'), + ] + + operations = [ + migrations.RemoveField( + model_name='singlefood', + name='image', + ), + migrations.AddField( + model_name='singlefood', + name='image', + field=models.ManyToManyField(related_name='user_images', to='food.UserFoodImage'), + ), + ] diff --git a/ofu_app/apps/food/models.py b/ofu_app/apps/food/models.py index 7e9054d..50979c7 100644 --- a/ofu_app/apps/food/models.py +++ b/ofu_app/apps/food/models.py @@ -27,7 +27,7 @@ class SingleFood(models.Model): price_student = models.CharField(max_length=10, blank=True, null=True) price_employee = models.CharField(max_length=10, blank=True, null=True) price_guest = models.CharField(max_length=10, blank=True, null=True) - image = models.ImageField(upload_to='food/%Y/%m/', blank=True) + image = models.ManyToManyField("UserFoodImage", related_name='user_images') rating = models.FloatField(default=0) allergens = models.ManyToManyField("Allergene", blank=True) @@ -66,3 +66,16 @@ class UserRating(models.Model): def __str__(self): return "User: %s - Rating: %s" % (self.user.username, self.rating) + + +class UserFoodImage(models.Model): + id = models.AutoField(primary_key=True) + user = models.ForeignKey(User, on_delete=models.CASCADE, unique=False) + food = models.ForeignKey(SingleFood) + image = models.ImageField(upload_to='food/%Y/%m/%W', blank=True) + + class Meta: + unique_together = ('user', 'food') + + def __str__(self): + return "User: %s - Rating: %s" % (self.user.username, str(self.image)) diff --git a/ofu_app/apps/food/urls.py b/ofu_app/apps/food/urls.py index c490d74..5ae6244 100644 --- a/ofu_app/apps/food/urls.py +++ b/ofu_app/apps/food/urls.py @@ -13,9 +13,9 @@ Including another URLconf 1. Import the include() function: from django.conf.urls import url, include 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) """ -from django.conf.urls import url from apps.food import views +from django.conf.urls import url, include urlpatterns = [ url(r'^$', views.food, name='food'), diff --git a/ofu_app/apps/food/views.py b/ofu_app/apps/food/views.py index b6810eb..dbddc95 100644 --- a/ofu_app/apps/food/views.py +++ b/ofu_app/apps/food/views.py @@ -2,16 +2,21 @@ from __future__ import unicode_literals import datetime +import os +from django.conf import settings +from django.core.exceptions import ObjectDoesNotExist from django.http import HttpResponse from django.shortcuts import render +from pprint import pprint -from apps.food.models import Menu, HappyHour, SingleFood, UserRating +from apps.food.forms import UploadImageForm +from apps.food.models import Menu, HappyHour, SingleFood, UserRating, UserFoodImage # Create your views here. def daily_food(request): - today = datetime.datetime.now() + today = datetime.datetime.now() - datetime.timedelta(4) feki_menu = Menu.objects.filter(date__exact=today).filter(location__contains="Feldkirchenstraße").last() austr_menu = Menu.objects.filter(date__exact=today).filter(location__contains="Austraße").last() erba_cafete = Menu.objects.filter(date__exact=today).filter(location__contains="Erba").last() @@ -49,8 +54,12 @@ def weekly_food(request): def food_detail(request, id): + if request.method == 'POST': + if pic_upload(request, id) == False: + return HttpResponse(status=404) food = SingleFood.objects.get(id=id) - return render(request, "food/detailed_food.jinja", {'food': food}) + images = UserFoodImage.objects.filter(food=id) + return render(request, "food/detailed_food.jinja", {'food': food, 'images': images}) def all_food(request): @@ -94,7 +103,6 @@ def food_rating(request): food.save() return HttpResponse(status=200) return HttpResponse(status=404) - return HttpResponse(status=403) @@ -106,5 +114,22 @@ def food_image(request): food.image = img food.save() return HttpResponse(status=200) - return HttpResponse(status=404) + + +def pic_upload(request, id): + form = UploadImageForm(request.POST, request.FILES) + if form.is_valid(): + try: + old_user_pic = UserFoodImage.objects.get(user=request.user, food=id) + old_user_pic.delete() + os.remove(os.path.join(settings.MEDIA_ROOT, old_user_pic.image.name)) + except ObjectDoesNotExist: + pass + userPic = form.save(commit=False) + userPic.food = SingleFood.objects.get(id=id) + userPic.user = request.user + userPic.save() + return True + else: + return False diff --git a/ofu_app/apps/registration/forms.py b/ofu_app/apps/registration/forms.py index c387b21..53cbda4 100644 --- a/ofu_app/apps/registration/forms.py +++ b/ofu_app/apps/registration/forms.py @@ -8,4 +8,10 @@ class SignUpForm(UserCreationForm): class Meta: model = User - fields = ('username', 'email', 'password1', 'password2', ) \ No newline at end of file + fields = ('username', 'email', 'password1', 'password2',) + + +class ChangeUserDataForm(forms.ModelForm): + class Meta: + model = User + fields = ('first_name', 'last_name', 'email',) diff --git a/ofu_app/apps/registration/migrations/0001_initial.py b/ofu_app/apps/registration/migrations/0001_initial.py index 453d622..1b182ec 100644 --- a/ofu_app/apps/registration/migrations/0001_initial.py +++ b/ofu_app/apps/registration/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.2 on 2017-10-29 11:07 +# Generated by Django 1.11.7 on 2017-12-04 01:02 from __future__ import unicode_literals from django.conf import settings diff --git a/ofu_app/apps/registration/urls.py b/ofu_app/apps/registration/urls.py index 3713395..1b19141 100644 --- a/ofu_app/apps/registration/urls.py +++ b/ofu_app/apps/registration/urls.py @@ -3,6 +3,7 @@ from apps.registration import views as core_views urlpatterns = [ url(r'^$', core_views.account_view, name='account'), + url(r'^change/$', core_views.account_change, name='change-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[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', diff --git a/ofu_app/apps/registration/views.py b/ofu_app/apps/registration/views.py index 72b3a75..991094a 100644 --- a/ofu_app/apps/registration/views.py +++ b/ofu_app/apps/registration/views.py @@ -1,17 +1,17 @@ from django.contrib.sites.shortcuts import get_current_site -from django.shortcuts import render, redirect +from django.shortcuts import render, redirect, get_object_or_404, render_to_response from django.utils.encoding import force_bytes from django.utils.http import urlsafe_base64_encode from django.template.loader import render_to_string -from apps.registration.forms import SignUpForm +from apps.registration.forms import SignUpForm, ChangeUserDataForm from apps.registration.tokens import account_activation_token from django.contrib.auth import login from django.contrib.auth.models import User 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 +from django.shortcuts import HttpResponse, redirect +from apps.food.models import UserRating, UserFoodImage def signup(request): @@ -62,11 +62,31 @@ def account_activation_sent(request): def account_view(request): if request.user.is_authenticated: user = request.user + food_ratings = UserRating.objects.filter(user=user).order_by('food__name') + food_images = UserFoodImage.objects.filter(user=user) + print(food_images) 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}) + 'last_login': user.last_login, 'food_images': food_images}) + else: + return HttpResponse(status=404) + + +def account_change(request): + if request.user.is_authenticated: + instance = get_object_or_404(User, id=request.user.id) + form = ChangeUserDataForm(request.POST, instance=instance, initial={"first_name": "Hallo"}) + if request.method == 'POST': + if form.is_valid(): + form.save() + return redirect('account') + else: + return HttpResponse(status=404) + else: + return render(request, 'registration/account_data_change.jinja', {'form': form}) + else: return HttpResponse(status=404) diff --git a/ofu_app/core/urls.py b/ofu_app/core/urls.py index c91ab3f..7fc92a0 100755 --- a/ofu_app/core/urls.py +++ b/ofu_app/core/urls.py @@ -17,22 +17,24 @@ from core import views from django.conf.urls import url, include from django.contrib import admin from django.contrib.auth import views as auth_views +from django.conf import settings +from django.conf.urls.static import static urlpatterns = [ - url(r'^login/$', auth_views.login, {'template_name': 'registration/login.jinja'}, name='login'), - url(r'^logout/$', auth_views.logout, {'next_page': 'home'}, name='logout'), - url(r'^admin/', admin.site.urls), - # url(r'^signup/$', core_views.signup, name='signup'), - url(r'^account/', include("apps.registration.urls")), + url(r'^login/$', auth_views.login, {'template_name': 'registration/login.jinja'}, name='login'), + url(r'^logout/$', auth_views.logout, {'next_page': 'home'}, name='logout'), + url(r'^admin/', admin.site.urls), + # url(r'^signup/$', core_views.signup, name='signup'), + url(r'^account/', include("apps.registration.urls")), - url(r'^$', views.home, name="home"), + url(r'^$', views.home, name="home"), - # -- Apps -- - url(r'^food/', include('apps.food.urls')), - url(r'^events/', include('apps.events.urls')), - url(r'^donar/', include('apps.donar.urls')), - url(r'^links/$', views.links, name='links-home'), - url(r'^impressum/$', views.impressum, name='impressum'), + # -- Apps -- + url(r'^food/', include('apps.food.urls')), + url(r'^events/', include('apps.events.urls')), + url(r'^donar/', include('apps.donar.urls')), + url(r'^links/$', views.links, name='links-home'), + url(r'^impressum/$', views.impressum, name='impressum'), - url(r'', include('api.urls')) -] + url(r'', include('api.urls')) + ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/ofu_app/static/css/nav.css b/ofu_app/static/css/nav.css index 5c19023..8018e0f 100644 --- a/ofu_app/static/css/nav.css +++ b/ofu_app/static/css/nav.css @@ -1,14 +1,14 @@ #main-nav { display: table; position: fixed; - left: -200px; + right: -200px; top: 0; background-color: transparent; z-index: 5000; height: 100%; width: 200px; - -webkit-transition: left 0.5s; /* For Safari 3.1 to 6.0 */ - transition: left 0.5s; + -webkit-transition: right 0.5s; /* For Safari 3.1 to 6.0 */ + transition: right 0.5s; } #main-nav .nav-wrapper { @@ -18,7 +18,7 @@ #main-nav .inner-nav .menu-item { padding: 10px; - padding-left: 20px; + padding-right: 20px; width: 100%; display: block; background-color: #ffffff; @@ -39,14 +39,14 @@ background-color: #ffffff; display: block; padding: 10px; - padding-left: 20px; + padding-right: 20px; margin-bottom: 0; text-transform: uppercase; font-weight: bold; } #menu-button:hover #main-nav, #menu-button:active #main-nav { - left: 0; + right: 0; } #menu-button:hover i, #menu-button:active i { diff --git a/ofu_app/templates/food/detailed_food.jinja b/ofu_app/templates/food/detailed_food.jinja index 00d1b20..cb2a53a 100644 --- a/ofu_app/templates/food/detailed_food.jinja +++ b/ofu_app/templates/food/detailed_food.jinja @@ -7,25 +7,50 @@

{{ food.name }}

-
-
Allergene
-
    - {% for alergen in food.allergens.all() %} -
  • {{ alergen }}
    • - {% endfor %} -
+
+
Allergene
+
    + {% for alergen in food.allergens.all() %} +
  • {{ alergen }}
    • + {% endfor %} +
+
+
+
+
Preise
+
Student: {{ food.price_student }}
+
Employee: {{ food.price_employee }}
+
Guest: {{ food.price_guest }}
-
-
-
Preise
-
Student: {{ food.price_student }}
-
Employee: {{ food.price_employee }}
-
Guest: {{ food.price_guest }}
-
-
Rating: {{ food.rating }}
-
+
Rating: {{ food.rating }}
+ {% if request.user.is_authenticated %} +
+
+

Send a Picture

+
+ {% csrf_token %} + + + + + +
+
+
+ {% if images %} +
+

Pictures

+ {% for image in images %} +
+

{{ image.food.name }}

+ +
+ {% endfor %} +
+ {% endif %} + {% endif %}
{% endblock %} \ No newline at end of file diff --git a/ofu_app/templates/macros/food_macros.jinja b/ofu_app/templates/macros/food_macros.jinja index 504db27..b850a42 100644 --- a/ofu_app/templates/macros/food_macros.jinja +++ b/ofu_app/templates/macros/food_macros.jinja @@ -31,28 +31,43 @@ {% endmacro %} {% macro get_menu(menu) -%} -
    +
      {% for single_food in menu %} -
    • -
      -
      - {% if single_food.price_student %} - -

      {{ single_food.name }}

       - {% else %} -

      {{ single_food.name }}

      - {% endif %} -
      - {% if single_food.price_student %} -
      {{ single_food.price_student }}
      +
    • +
      + {# TODO: without many to many #} + {% if single_food.image.all() %} + {% for image in single_food.image.all() %} + + Bild + + {% endfor %} + {% else %} + + Bild + {% endif %} - {#
      +
      +
      +
      + {% if single_food.price_student %} + +

      {{ single_food.name }}

       + {% else %} +

      {{ single_food.name }}

      + {% endif %} +
      + {% if single_food.price_student %} +
      {{ single_food.price_student }}
      + {% endif %} + {#
      #} -
      -
      -
      - {#
      +
      +
      +
      + {#
      @@ -62,6 +77,7 @@ id="upload-photo" style="display: none !important;"/>
      #} +
      • {% endfor %} diff --git a/ofu_app/templates/registration/account_data_change.jinja b/ofu_app/templates/registration/account_data_change.jinja new file mode 100644 index 0000000..706066e --- /dev/null +++ b/ofu_app/templates/registration/account_data_change.jinja @@ -0,0 +1,33 @@ +{% extends 'base.jinja' %} + +{% block headline %}

      Account

      {% endblock %} + +{% block content %} +
      +
      +
      +
      + {% csrf_token %} + +

      + +

      + +

      + +

      + +

      + + Required. Inform a valid email address. +

      + +
      +
      +
      +
      +{% endblock %} \ No newline at end of file diff --git a/ofu_app/templates/registration/account_view.jinja b/ofu_app/templates/registration/account_view.jinja index 63cd8f1..9897966 100644 --- a/ofu_app/templates/registration/account_view.jinja +++ b/ofu_app/templates/registration/account_view.jinja @@ -10,16 +10,31 @@

      Vorname: {{ first_name }}

      Nachname: {{ last_name }}

      E-Mail: {{ email }}

      + Bearbeiten

Your Food Ratings:

- {% for rating in food_ratings %} -

{{ rating.food.name }}: {{ rating.rating }}

- {% endfor %} +
    + {% for rating in food_ratings %} +
  • {{ rating.food.name }}: {{ rating.rating }}
    • + {% endfor %} +
+
+ {% for image in food_images %} +
+

{{ image.food.name }}

+
+ + Lights + +
+
+ {% endfor %} +