diff --git a/reValuate/db.sqlite3 b/reValuate/db.sqlite3 index 93f8aabe..3c29c38d 100644 Binary files a/reValuate/db.sqlite3 and b/reValuate/db.sqlite3 differ diff --git a/reValuate/home/__pycache__/views.cpython-38.pyc b/reValuate/home/__pycache__/views.cpython-38.pyc index 679a34d4..86592886 100644 Binary files a/reValuate/home/__pycache__/views.cpython-38.pyc and b/reValuate/home/__pycache__/views.cpython-38.pyc differ diff --git a/reValuate/home/views.py b/reValuate/home/views.py index 92d274b3..ff809b83 100644 --- a/reValuate/home/views.py +++ b/reValuate/home/views.py @@ -1,19 +1,27 @@ from django.shortcuts import render import os.path from users.models import Balance +from django.conf import settings + def homePage(request): iter_var = 0 all_balance = [] + try: balObject = Balance.objects.filter(user=request.user.id) userBalance = balObject.values("balanceValue") + userQR = f"Name = {request.user.username}, Date Joined = {request.user.date_joined.date()}, ID = {request.user.id}, Balance = {userBalance[0]['balanceValue']}" a = Balance.objects.all() + for user in a: all_balance.append(user.balanceValue) print(f"{all_balance}") + limited_coins = settings.ALL_COINS - sum(all_balance) context = { + "userQR":userQR, + "fullbalance": limited_coins, "currencyTotal": sum(all_balance), "userBalance": userBalance[0]["balanceValue"] } diff --git a/reValuate/media/1/Against_Nature_20_second_Clip-uFutjAVqsdQ.mp4 b/reValuate/media/1/Against_Nature_20_second_Clip-uFutjAVqsdQ.mp4 new file mode 100644 index 00000000..793a5b49 Binary files /dev/null and b/reValuate/media/1/Against_Nature_20_second_Clip-uFutjAVqsdQ.mp4 differ diff --git a/reValuate/media/1/Against_Nature_20_second_Clip-uFutjAVqsdQ_2xZOfFS.mp4 b/reValuate/media/1/Against_Nature_20_second_Clip-uFutjAVqsdQ_2xZOfFS.mp4 new file mode 100644 index 00000000..793a5b49 Binary files /dev/null and b/reValuate/media/1/Against_Nature_20_second_Clip-uFutjAVqsdQ_2xZOfFS.mp4 differ diff --git a/reValuate/media/1/Against_Nature_20_second_Clip-uFutjAVqsdQ_85ktnm9.mp4 b/reValuate/media/1/Against_Nature_20_second_Clip-uFutjAVqsdQ_85ktnm9.mp4 new file mode 100644 index 00000000..793a5b49 Binary files /dev/null and b/reValuate/media/1/Against_Nature_20_second_Clip-uFutjAVqsdQ_85ktnm9.mp4 differ diff --git a/reValuate/media/1/Against_Nature_20_second_Clip-uFutjAVqsdQ_E7gQt5b.mp4 b/reValuate/media/1/Against_Nature_20_second_Clip-uFutjAVqsdQ_E7gQt5b.mp4 new file mode 100644 index 00000000..793a5b49 Binary files /dev/null and b/reValuate/media/1/Against_Nature_20_second_Clip-uFutjAVqsdQ_E7gQt5b.mp4 differ diff --git a/reValuate/media/1/Against_Nature_20_second_Clip-uFutjAVqsdQ_K58VDLu.mp4 b/reValuate/media/1/Against_Nature_20_second_Clip-uFutjAVqsdQ_K58VDLu.mp4 new file mode 100644 index 00000000..793a5b49 Binary files /dev/null and b/reValuate/media/1/Against_Nature_20_second_Clip-uFutjAVqsdQ_K58VDLu.mp4 differ diff --git a/reValuate/media/1/PngItem_1280311.png b/reValuate/media/1/PngItem_1280311.png new file mode 100644 index 00000000..c6f113a5 Binary files /dev/null and b/reValuate/media/1/PngItem_1280311.png differ diff --git a/reValuate/media/1/pexels-mali-maeder-802221.jpg b/reValuate/media/1/pexels-mali-maeder-802221.jpg new file mode 100644 index 00000000..473acc3f Binary files /dev/null and b/reValuate/media/1/pexels-mali-maeder-802221.jpg differ diff --git a/reValuate/media/1/pexels-mali-maeder-802221_eeYIsOS.jpg b/reValuate/media/1/pexels-mali-maeder-802221_eeYIsOS.jpg new file mode 100644 index 00000000..473acc3f Binary files /dev/null and b/reValuate/media/1/pexels-mali-maeder-802221_eeYIsOS.jpg differ diff --git a/reValuate/media/images/1/1259275.jpg b/reValuate/media/images/1/1259275.jpg new file mode 100644 index 00000000..1bd583e5 Binary files /dev/null and b/reValuate/media/images/1/1259275.jpg differ diff --git a/reValuate/media/images/1/1259275_FOPUx7z.jpg b/reValuate/media/images/1/1259275_FOPUx7z.jpg new file mode 100644 index 00000000..1bd583e5 Binary files /dev/null and b/reValuate/media/images/1/1259275_FOPUx7z.jpg differ diff --git a/reValuate/media/images/1/pexels-mali-maeder-802221.jpg b/reValuate/media/images/1/pexels-mali-maeder-802221.jpg new file mode 100644 index 00000000..473acc3f Binary files /dev/null and b/reValuate/media/images/1/pexels-mali-maeder-802221.jpg differ diff --git a/reValuate/media/images/1/pexels-mali-maeder-802221_LhXpYHV.jpg b/reValuate/media/images/1/pexels-mali-maeder-802221_LhXpYHV.jpg new file mode 100644 index 00000000..473acc3f Binary files /dev/null and b/reValuate/media/images/1/pexels-mali-maeder-802221_LhXpYHV.jpg differ diff --git a/reValuate/media/images/1/pexels-mali-maeder-802221_o7hSVlc.jpg b/reValuate/media/images/1/pexels-mali-maeder-802221_o7hSVlc.jpg new file mode 100644 index 00000000..473acc3f Binary files /dev/null and b/reValuate/media/images/1/pexels-mali-maeder-802221_o7hSVlc.jpg differ diff --git a/reValuate/media/images/1/wp2058634-3840x1080-wallpapers.jpg b/reValuate/media/images/1/wp2058634-3840x1080-wallpapers.jpg new file mode 100644 index 00000000..c5979a55 Binary files /dev/null and b/reValuate/media/images/1/wp2058634-3840x1080-wallpapers.jpg differ diff --git a/reValuate/media/images/1/wp2058634-3840x1080-wallpapers_dXzQL7E.jpg b/reValuate/media/images/1/wp2058634-3840x1080-wallpapers_dXzQL7E.jpg new file mode 100644 index 00000000..c5979a55 Binary files /dev/null and b/reValuate/media/images/1/wp2058634-3840x1080-wallpapers_dXzQL7E.jpg differ diff --git a/reValuate/templates/adminView.html b/reValuate/templates/adminView.html index 7835fc73..514385c3 100644 --- a/reValuate/templates/adminView.html +++ b/reValuate/templates/adminView.html @@ -47,19 +47,23 @@ {% if image %}
{% csrf_token %} -

Качено от:

{{username}}



- +

Качено от:

{{username}}


+ {% if is_video %} + + {% else %}
- -

+ {% endif %} +

{{time}}

{{date}}

- +


- Валидна + diff --git a/reValuate/templates/base.html b/reValuate/templates/base.html index d3480df7..f2a39a64 100644 --- a/reValuate/templates/base.html +++ b/reValuate/templates/base.html @@ -5,6 +5,7 @@ {% block title %}reValuate{% endblock %} {% load static %} + {% load qr_code %} {% block optionalParams %} {% endblock %} @@ -27,41 +28,43 @@