-
reCoins Класация
-
+ reCoins Класация
{% for i, z in leaderboard.items %}
{% if forloop.counter == 1 %}
- - {{ forloop.counter }}. {{ i }} има {{ z }}
+ - {{ forloop.counter }}. {{ i }} има {{ z }}
{% elif forloop.counter == 2 %}
- - {{ forloop.counter }}. {{ i }} има {{ z }}
+ - {{ forloop.counter }}. {{ i }} има {{ z }}
{% elif forloop.counter == 3 %}
- - {{ forloop.counter }}. {{ i }} has {{ z }}
+ - {{ forloop.counter }}. {{ i }} has {{ z }}
{% else %}
- - {{ forloop.counter }}. {{ i }} has {{ z }}
+ - {{ forloop.counter }}. {{ i }} has {{ z }}
{% endif %}
{% endfor %}
diff --git a/reValuate/templates/showAllImage.html b/reValuate/templates/showAllImage.html
index de75f73d..37219e9f 100644
--- a/reValuate/templates/showAllImage.html
+++ b/reValuate/templates/showAllImage.html
@@ -35,13 +35,46 @@ html{
display: block;
}
}
+ @-webkit-keyframes tracking-in-expand {
+ 0% {
+ letter-spacing: -0.5em;
+ opacity: 0;
+ }
+ 40% {
+ opacity: 0.6;
+ }
+ 100% {
+ opacity: 1;
+ }
+ }
+
+ @keyframes tracking-in-expand {
+ 0% {
+ letter-spacing: -0.5em;
+ opacity: 0;
+ }
+ 40% {
+ opacity: 0.6;
+ }
+ 100% {
+ opacity: 1;
+ }
+ }
+
+ .tracking-in-expand {
+ -webkit-animation: tracking-in-expand 1s cubic-bezier(0.215, 0.610, 0.355, 1.000) both;
+ animation: tracking-in-expand 1s cubic-bezier(0.215, 0.610, 0.355, 1.000) both;
+ animation-delay: .3s;
+ }
{% endblock %}
+
{% block content %}
{% if user.is_authenticated %}
-
+
+
{% if approved %}
@@ -54,7 +87,7 @@ html{
{% if processing %}
-
Имаш {{ processing }} медия, очакваща одобрение!
+
Имаш медия, очакваща одобрение!
{% endif %}
@@ -62,9 +95,17 @@ html{
Имаш {{ declined }} отказана медия, ако мислиш, че това е грешка, свържи се с нас!
+
{% endif %}
-
-
+
+ {% if no_media %}
+
+
+
+
+
+ {% endif %}
+
{% else %}
You are not logged in
Log In
diff --git a/reValuate/templates/uploadImage.html b/reValuate/templates/uploadImage.html
index e450439b..ca1f69e4 100644
--- a/reValuate/templates/uploadImage.html
+++ b/reValuate/templates/uploadImage.html
@@ -97,8 +97,40 @@
}
#page-wrap{
- padding: 20vh;
+ padding:10vh;
+ width: 25%;
}
+ @-webkit-keyframes tracking-in-expand {
+ 0% {
+ letter-spacing: -0.5em;
+ opacity: 0;
+ }
+ 40% {
+ opacity: 0.6;
+ }
+ 100% {
+ opacity: 1;
+ }
+ }
+
+ @keyframes tracking-in-expand {
+ 0% {
+ letter-spacing: -0.5em;
+ opacity: 0;
+ }
+ 40% {
+ opacity: 0.6;
+ }
+ 100% {
+ opacity: 1;
+ }
+ }
+
+ .tracking-in-expand {
+ -webkit-animation: tracking-in-expand 1s cubic-bezier(0.215, 0.610, 0.355, 1.000) both;
+ animation: tracking-in-expand 1s cubic-bezier(0.215, 0.610, 0.355, 1.000) both;
+ animation-delay: .3s;
+ }
@@ -112,7 +144,7 @@
{% endif %}
-
+
{% if user.is_authenticated %}
{% if img_obj %}
Снимката ти е качена успешно!
diff --git a/reValuate/upload/views.py b/reValuate/upload/views.py
index c9f2d0d4..fd70312d 100644
--- a/reValuate/upload/views.py
+++ b/reValuate/upload/views.py
@@ -30,10 +30,13 @@ def imageUpload(request):
else:
warning = False
- media = Media.objects.filter(user_id=request.user.id).last()
- print(media.tokenized)
- if media.tokenized is None:
- return render(request, "wait.html")
+ try:
+ media = Media.objects.filter(user_id=request.user.id).last()
+ print(media.tokenized)
+ if media.tokenized is None:
+ return render(request, "wait.html")
+ except AttributeError:
+ pass
print(request.user.id)
if request.method == 'POST':
@@ -87,19 +90,25 @@ def viewMedia(request):
approved = []
declined = []
processing = []
+ no_media=True
for i in get_status:
if i.tokenized:
approved.append(i)
- if not i.tokenized:
- declined.append(i)
- if i.tokenized is None:
- processing.append(i)
-
+ no_media = False
+ if i.tokenized is False:
+ declined.append(i)
+ no_media = False
+
+ if i.tokenized is None:
+ no_media = False
+ processing.append(i)
+
context={
"approved":len(approved),
"declined":len(declined),
"processing":len(processing),
+ "no_media":no_media,
}
return render (request, 'showAllImage.html', context)
diff --git a/reValuate/website/urls.py b/reValuate/website/urls.py
index 763f3281..51e9a715 100644
--- a/reValuate/website/urls.py
+++ b/reValuate/website/urls.py
@@ -15,7 +15,7 @@ Including another URLconf
"""
from django.contrib import admin
from django.urls import path, include
-from home.views import homePage, leaderboard
+from home.views import homePage, leaderboard, about
from rest_framework import routers, urls
from api.views import BalanceView, ImageView, AllBalance
from django.conf import settings
@@ -25,7 +25,6 @@ from django.views.generic.base import TemplateView
from upload.views import uploadContent, imageUpload, viewMedia
from users.views import getBalance, addToBalance, adminView, removeBalance
-
router = routers.DefaultRouter()
router.register("balance", BalanceView, basename="balance")
router.register("images", ImageView, basename="image")
@@ -45,7 +44,8 @@ urlpatterns = [
path("admin/", adminView, name="admin"),
path('administrator/', admin.site.urls),
path('api/', include(router.urls)),
- path("leaderboard/", leaderboard, name="leaderboard")
+ path("leaderboard/", leaderboard, name="leaderboard"),
+ path("about/", about, name="About")
]
if settings.DEBUG:
urlpatterns += static(settings.MEDIA_URL,
