diff --git a/reValuate/templates/home.html b/reValuate/templates/home.html
index 9b5b1c17..97879008 100644
--- a/reValuate/templates/home.html
+++ b/reValuate/templates/home.html
@@ -17,11 +17,12 @@
reValuate
Остават ни още:
{{ fullbalance }} reCoins
+ {% if user.is_authenticated %}
Ти притежаваш {{ userBalance }} от тях.
Твоят QR код:
{% qr_from_text userQR size="M" %}
-
+ {% endif %}
diff --git a/reValuate/templates/leaderboard.html b/reValuate/templates/leaderboard.html
new file mode 100644
index 00000000..ce6f7408
--- /dev/null
+++ b/reValuate/templates/leaderboard.html
@@ -0,0 +1,13 @@
+{% extends 'base.html' %}
+
+{% block title %}Класация{% endblock %}
+
+{% block content %}
+
+
+{% for i, z in leaderboard.items reversed %}
+
+
{{ forloop.counter }}. {{i}} has {{z}} reCoins
+{% endfor %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/reValuate/templates/registration/login.html b/reValuate/templates/registration/login.html
index a78d779b..c0b7038d 100644
--- a/reValuate/templates/registration/login.html
+++ b/reValuate/templates/registration/login.html
@@ -1,15 +1,35 @@
{% extends 'base.html' %}
{% block title %}Login{% endblock %}
+{% block optionalParams %}
+
+{% endblock %}
{% block content %}
-
Log In
+
Влез в акаунта си
{% endblock %}
diff --git a/reValuate/templates/registration/signup.html b/reValuate/templates/registration/signup.html
index efbbcbca..86a91a4f 100644
--- a/reValuate/templates/registration/signup.html
+++ b/reValuate/templates/registration/signup.html
@@ -1,15 +1,33 @@
{% extends 'base.html' %}
{% block title %}Sign Up{% endblock %}
-
+{% block optionalParams %}
+
+{% endblock %}
{% block content %}
-
Sign up
+ Регистрирай се
{% endblock %}
diff --git a/reValuate/templates/showAllImage.html b/reValuate/templates/showAllImage.html
index c6fdfaf0..a4aaa700 100644
--- a/reValuate/templates/showAllImage.html
+++ b/reValuate/templates/showAllImage.html
@@ -3,29 +3,21 @@
{% block title %} My Images {% endblock %}
{% block optionalParams %}
-
-
+
{% endblock %}
{% block content %}
{% if user.is_authenticated %}
Твоята медия
-
+
{% for i in get_status reversed %}
{% if i.is_video %}
+
diff --git a/reValuate/templates/uploadImage.html b/reValuate/templates/uploadImage.html
index 79fbbdaa..0ba588ec 100644
--- a/reValuate/templates/uploadImage.html
+++ b/reValuate/templates/uploadImage.html
@@ -53,6 +53,8 @@
.centered{
font-size: 50px;
+ max-height: 20%;
+
}
.alert {
@@ -75,7 +77,6 @@
.closebtn:hover {
color: black;
}
-
diff --git a/reValuate/upload/__pycache__/__init__.cpython-39.pyc b/reValuate/upload/__pycache__/__init__.cpython-39.pyc
new file mode 100644
index 00000000..68143a16
Binary files /dev/null and b/reValuate/upload/__pycache__/__init__.cpython-39.pyc differ
diff --git a/reValuate/upload/__pycache__/admin.cpython-39.pyc b/reValuate/upload/__pycache__/admin.cpython-39.pyc
new file mode 100644
index 00000000..30715acf
Binary files /dev/null and b/reValuate/upload/__pycache__/admin.cpython-39.pyc differ
diff --git a/reValuate/upload/__pycache__/forms.cpython-39.pyc b/reValuate/upload/__pycache__/forms.cpython-39.pyc
new file mode 100644
index 00000000..b3402601
Binary files /dev/null and b/reValuate/upload/__pycache__/forms.cpython-39.pyc differ
diff --git a/reValuate/upload/__pycache__/models.cpython-39.pyc b/reValuate/upload/__pycache__/models.cpython-39.pyc
new file mode 100644
index 00000000..24e3c016
Binary files /dev/null and b/reValuate/upload/__pycache__/models.cpython-39.pyc differ
diff --git a/reValuate/upload/__pycache__/validators.cpython-39.pyc b/reValuate/upload/__pycache__/validators.cpython-39.pyc
new file mode 100644
index 00000000..495ea947
Binary files /dev/null and b/reValuate/upload/__pycache__/validators.cpython-39.pyc differ
diff --git a/reValuate/upload/__pycache__/views.cpython-39.pyc b/reValuate/upload/__pycache__/views.cpython-39.pyc
new file mode 100644
index 00000000..7b868483
Binary files /dev/null and b/reValuate/upload/__pycache__/views.cpython-39.pyc differ
diff --git a/reValuate/upload/migrations/__pycache__/0001_initial.cpython-39.pyc b/reValuate/upload/migrations/__pycache__/0001_initial.cpython-39.pyc
new file mode 100644
index 00000000..bcb3fe13
Binary files /dev/null and b/reValuate/upload/migrations/__pycache__/0001_initial.cpython-39.pyc differ
diff --git a/reValuate/upload/migrations/__pycache__/0002_balance.cpython-39.pyc b/reValuate/upload/migrations/__pycache__/0002_balance.cpython-39.pyc
new file mode 100644
index 00000000..79f3e536
Binary files /dev/null and b/reValuate/upload/migrations/__pycache__/0002_balance.cpython-39.pyc differ
diff --git a/reValuate/upload/migrations/__pycache__/0003_delete_balance.cpython-39.pyc b/reValuate/upload/migrations/__pycache__/0003_delete_balance.cpython-39.pyc
new file mode 100644
index 00000000..c4cc9656
Binary files /dev/null and b/reValuate/upload/migrations/__pycache__/0003_delete_balance.cpython-39.pyc differ
diff --git a/reValuate/upload/migrations/__pycache__/0004_auto_20210311_1702.cpython-39.pyc b/reValuate/upload/migrations/__pycache__/0004_auto_20210311_1702.cpython-39.pyc
new file mode 100644
index 00000000..b26a06fa
Binary files /dev/null and b/reValuate/upload/migrations/__pycache__/0004_auto_20210311_1702.cpython-39.pyc differ
diff --git a/reValuate/upload/migrations/__pycache__/0005_auto_20210311_1833.cpython-39.pyc b/reValuate/upload/migrations/__pycache__/0005_auto_20210311_1833.cpython-39.pyc
new file mode 100644
index 00000000..ff27d7b1
Binary files /dev/null and b/reValuate/upload/migrations/__pycache__/0005_auto_20210311_1833.cpython-39.pyc differ
diff --git a/reValuate/upload/migrations/__pycache__/0006_auto_20210311_1833.cpython-39.pyc b/reValuate/upload/migrations/__pycache__/0006_auto_20210311_1833.cpython-39.pyc
new file mode 100644
index 00000000..fe78544e
Binary files /dev/null and b/reValuate/upload/migrations/__pycache__/0006_auto_20210311_1833.cpython-39.pyc differ
diff --git a/reValuate/upload/migrations/__pycache__/0007_auto_20210311_1834.cpython-39.pyc b/reValuate/upload/migrations/__pycache__/0007_auto_20210311_1834.cpython-39.pyc
new file mode 100644
index 00000000..ee65dd4a
Binary files /dev/null and b/reValuate/upload/migrations/__pycache__/0007_auto_20210311_1834.cpython-39.pyc differ
diff --git a/reValuate/upload/migrations/__pycache__/0008_auto_20210311_1838.cpython-39.pyc b/reValuate/upload/migrations/__pycache__/0008_auto_20210311_1838.cpython-39.pyc
new file mode 100644
index 00000000..e75e3972
Binary files /dev/null and b/reValuate/upload/migrations/__pycache__/0008_auto_20210311_1838.cpython-39.pyc differ
diff --git a/reValuate/upload/migrations/__pycache__/0009_auto_20210311_1910.cpython-39.pyc b/reValuate/upload/migrations/__pycache__/0009_auto_20210311_1910.cpython-39.pyc
new file mode 100644
index 00000000..45b0c8e0
Binary files /dev/null and b/reValuate/upload/migrations/__pycache__/0009_auto_20210311_1910.cpython-39.pyc differ
diff --git a/reValuate/upload/migrations/__pycache__/0010_auto_20210312_2339.cpython-39.pyc b/reValuate/upload/migrations/__pycache__/0010_auto_20210312_2339.cpython-39.pyc
new file mode 100644
index 00000000..bd04b0c2
Binary files /dev/null and b/reValuate/upload/migrations/__pycache__/0010_auto_20210312_2339.cpython-39.pyc differ
diff --git a/reValuate/upload/migrations/__pycache__/0011_auto_20210312_2341.cpython-39.pyc b/reValuate/upload/migrations/__pycache__/0011_auto_20210312_2341.cpython-39.pyc
new file mode 100644
index 00000000..2c2ac54a
Binary files /dev/null and b/reValuate/upload/migrations/__pycache__/0011_auto_20210312_2341.cpython-39.pyc differ
diff --git a/reValuate/upload/migrations/__pycache__/0012_auto_20210312_2347.cpython-39.pyc b/reValuate/upload/migrations/__pycache__/0012_auto_20210312_2347.cpython-39.pyc
new file mode 100644
index 00000000..723bca30
Binary files /dev/null and b/reValuate/upload/migrations/__pycache__/0012_auto_20210312_2347.cpython-39.pyc differ
diff --git a/reValuate/upload/migrations/__pycache__/0013_auto_20210315_0340.cpython-39.pyc b/reValuate/upload/migrations/__pycache__/0013_auto_20210315_0340.cpython-39.pyc
new file mode 100644
index 00000000..b8214280
Binary files /dev/null and b/reValuate/upload/migrations/__pycache__/0013_auto_20210315_0340.cpython-39.pyc differ
diff --git a/reValuate/upload/migrations/__pycache__/0014_image_time.cpython-39.pyc b/reValuate/upload/migrations/__pycache__/0014_image_time.cpython-39.pyc
new file mode 100644
index 00000000..48af1e7d
Binary files /dev/null and b/reValuate/upload/migrations/__pycache__/0014_image_time.cpython-39.pyc differ
diff --git a/reValuate/upload/migrations/__pycache__/0015_auto_20210315_1745.cpython-39.pyc b/reValuate/upload/migrations/__pycache__/0015_auto_20210315_1745.cpython-39.pyc
new file mode 100644
index 00000000..66396987
Binary files /dev/null and b/reValuate/upload/migrations/__pycache__/0015_auto_20210315_1745.cpython-39.pyc differ
diff --git a/reValuate/upload/migrations/__pycache__/0016_videos.cpython-39.pyc b/reValuate/upload/migrations/__pycache__/0016_videos.cpython-39.pyc
new file mode 100644
index 00000000..3b47f3fd
Binary files /dev/null and b/reValuate/upload/migrations/__pycache__/0016_videos.cpython-39.pyc differ
diff --git a/reValuate/upload/migrations/__pycache__/0017_auto_20210315_1838.cpython-39.pyc b/reValuate/upload/migrations/__pycache__/0017_auto_20210315_1838.cpython-39.pyc
new file mode 100644
index 00000000..c81ade07
Binary files /dev/null and b/reValuate/upload/migrations/__pycache__/0017_auto_20210315_1838.cpython-39.pyc differ
diff --git a/reValuate/upload/migrations/__pycache__/0018_auto_20210315_1839.cpython-39.pyc b/reValuate/upload/migrations/__pycache__/0018_auto_20210315_1839.cpython-39.pyc
new file mode 100644
index 00000000..17a2bb70
Binary files /dev/null and b/reValuate/upload/migrations/__pycache__/0018_auto_20210315_1839.cpython-39.pyc differ
diff --git a/reValuate/upload/migrations/__pycache__/0019_auto_20210315_1841.cpython-39.pyc b/reValuate/upload/migrations/__pycache__/0019_auto_20210315_1841.cpython-39.pyc
new file mode 100644
index 00000000..a49f9d2a
Binary files /dev/null and b/reValuate/upload/migrations/__pycache__/0019_auto_20210315_1841.cpython-39.pyc differ
diff --git a/reValuate/upload/migrations/__pycache__/0020_auto_20210315_1847.cpython-39.pyc b/reValuate/upload/migrations/__pycache__/0020_auto_20210315_1847.cpython-39.pyc
new file mode 100644
index 00000000..d2c47a03
Binary files /dev/null and b/reValuate/upload/migrations/__pycache__/0020_auto_20210315_1847.cpython-39.pyc differ
diff --git a/reValuate/upload/migrations/__pycache__/0021_auto_20210315_1848.cpython-39.pyc b/reValuate/upload/migrations/__pycache__/0021_auto_20210315_1848.cpython-39.pyc
new file mode 100644
index 00000000..3df513c3
Binary files /dev/null and b/reValuate/upload/migrations/__pycache__/0021_auto_20210315_1848.cpython-39.pyc differ
diff --git a/reValuate/upload/migrations/__pycache__/0022_auto_20210315_1852.cpython-39.pyc b/reValuate/upload/migrations/__pycache__/0022_auto_20210315_1852.cpython-39.pyc
new file mode 100644
index 00000000..84c90cc0
Binary files /dev/null and b/reValuate/upload/migrations/__pycache__/0022_auto_20210315_1852.cpython-39.pyc differ
diff --git a/reValuate/upload/migrations/__pycache__/0023_auto_20210315_1901.cpython-39.pyc b/reValuate/upload/migrations/__pycache__/0023_auto_20210315_1901.cpython-39.pyc
new file mode 100644
index 00000000..8ea20c4d
Binary files /dev/null and b/reValuate/upload/migrations/__pycache__/0023_auto_20210315_1901.cpython-39.pyc differ
diff --git a/reValuate/upload/migrations/__pycache__/0024_media_managed_by.cpython-39.pyc b/reValuate/upload/migrations/__pycache__/0024_media_managed_by.cpython-39.pyc
new file mode 100644
index 00000000..2c563e5f
Binary files /dev/null and b/reValuate/upload/migrations/__pycache__/0024_media_managed_by.cpython-39.pyc differ
diff --git a/reValuate/upload/migrations/__pycache__/__init__.cpython-39.pyc b/reValuate/upload/migrations/__pycache__/__init__.cpython-39.pyc
new file mode 100644
index 00000000..9b07fb6d
Binary files /dev/null and b/reValuate/upload/migrations/__pycache__/__init__.cpython-39.pyc differ
diff --git a/reValuate/users/__pycache__/admin.cpython-39.pyc b/reValuate/users/__pycache__/admin.cpython-39.pyc
new file mode 100644
index 00000000..3deb5815
Binary files /dev/null and b/reValuate/users/__pycache__/admin.cpython-39.pyc differ
diff --git a/reValuate/users/__pycache__/models.cpython-39.pyc b/reValuate/users/__pycache__/models.cpython-39.pyc
new file mode 100644
index 00000000..2946a808
Binary files /dev/null and b/reValuate/users/__pycache__/models.cpython-39.pyc differ
diff --git a/reValuate/users/__pycache__/urls.cpython-39.pyc b/reValuate/users/__pycache__/urls.cpython-39.pyc
new file mode 100644
index 00000000..c0b91ab7
Binary files /dev/null and b/reValuate/users/__pycache__/urls.cpython-39.pyc differ
diff --git a/reValuate/users/__pycache__/views.cpython-39.pyc b/reValuate/users/__pycache__/views.cpython-39.pyc
new file mode 100644
index 00000000..311a7e8f
Binary files /dev/null and b/reValuate/users/__pycache__/views.cpython-39.pyc differ
diff --git a/reValuate/users/migrations/__pycache__/0001_initial.cpython-39.pyc b/reValuate/users/migrations/__pycache__/0001_initial.cpython-39.pyc
new file mode 100644
index 00000000..aaca8363
Binary files /dev/null and b/reValuate/users/migrations/__pycache__/0001_initial.cpython-39.pyc differ
diff --git a/reValuate/users/migrations/__pycache__/0002_auto_20210220_2131.cpython-39.pyc b/reValuate/users/migrations/__pycache__/0002_auto_20210220_2131.cpython-39.pyc
new file mode 100644
index 00000000..29891827
Binary files /dev/null and b/reValuate/users/migrations/__pycache__/0002_auto_20210220_2131.cpython-39.pyc differ
diff --git a/reValuate/users/migrations/__pycache__/0003_auto_20210220_2142.cpython-39.pyc b/reValuate/users/migrations/__pycache__/0003_auto_20210220_2142.cpython-39.pyc
new file mode 100644
index 00000000..840b5ebb
Binary files /dev/null and b/reValuate/users/migrations/__pycache__/0003_auto_20210220_2142.cpython-39.pyc differ
diff --git a/reValuate/users/migrations/__pycache__/0004_auto_20210220_2143.cpython-39.pyc b/reValuate/users/migrations/__pycache__/0004_auto_20210220_2143.cpython-39.pyc
new file mode 100644
index 00000000..b14a963e
Binary files /dev/null and b/reValuate/users/migrations/__pycache__/0004_auto_20210220_2143.cpython-39.pyc differ
diff --git a/reValuate/users/migrations/__pycache__/0005_auto_20210307_1544.cpython-39.pyc b/reValuate/users/migrations/__pycache__/0005_auto_20210307_1544.cpython-39.pyc
new file mode 100644
index 00000000..eced300b
Binary files /dev/null and b/reValuate/users/migrations/__pycache__/0005_auto_20210307_1544.cpython-39.pyc differ
diff --git a/reValuate/users/migrations/__pycache__/0006_delete_balance.cpython-39.pyc b/reValuate/users/migrations/__pycache__/0006_delete_balance.cpython-39.pyc
new file mode 100644
index 00000000..8d40ff01
Binary files /dev/null and b/reValuate/users/migrations/__pycache__/0006_delete_balance.cpython-39.pyc differ
diff --git a/reValuate/users/migrations/__pycache__/0007_balance.cpython-39.pyc b/reValuate/users/migrations/__pycache__/0007_balance.cpython-39.pyc
new file mode 100644
index 00000000..a3cfa02f
Binary files /dev/null and b/reValuate/users/migrations/__pycache__/0007_balance.cpython-39.pyc differ
diff --git a/reValuate/users/migrations/__pycache__/0008_transaction.cpython-39.pyc b/reValuate/users/migrations/__pycache__/0008_transaction.cpython-39.pyc
new file mode 100644
index 00000000..9e509afd
Binary files /dev/null and b/reValuate/users/migrations/__pycache__/0008_transaction.cpython-39.pyc differ
diff --git a/reValuate/users/migrations/__pycache__/0009_auto_20210316_1408.cpython-39.pyc b/reValuate/users/migrations/__pycache__/0009_auto_20210316_1408.cpython-39.pyc
new file mode 100644
index 00000000..257a9feb
Binary files /dev/null and b/reValuate/users/migrations/__pycache__/0009_auto_20210316_1408.cpython-39.pyc differ
diff --git a/reValuate/users/migrations/__pycache__/0010_auto_20210316_1415.cpython-39.pyc b/reValuate/users/migrations/__pycache__/0010_auto_20210316_1415.cpython-39.pyc
new file mode 100644
index 00000000..32db08a1
Binary files /dev/null and b/reValuate/users/migrations/__pycache__/0010_auto_20210316_1415.cpython-39.pyc differ
diff --git a/reValuate/users/migrations/__pycache__/0011_auto_20210316_1420.cpython-39.pyc b/reValuate/users/migrations/__pycache__/0011_auto_20210316_1420.cpython-39.pyc
new file mode 100644
index 00000000..86575372
Binary files /dev/null and b/reValuate/users/migrations/__pycache__/0011_auto_20210316_1420.cpython-39.pyc differ
diff --git a/reValuate/users/migrations/__pycache__/0012_auto_20210316_1421.cpython-39.pyc b/reValuate/users/migrations/__pycache__/0012_auto_20210316_1421.cpython-39.pyc
new file mode 100644
index 00000000..c54232fc
Binary files /dev/null and b/reValuate/users/migrations/__pycache__/0012_auto_20210316_1421.cpython-39.pyc differ
diff --git a/reValuate/users/migrations/__pycache__/__init__.cpython-39.pyc b/reValuate/users/migrations/__pycache__/__init__.cpython-39.pyc
new file mode 100644
index 00000000..c2f5fae9
Binary files /dev/null and b/reValuate/users/migrations/__pycache__/__init__.cpython-39.pyc differ
diff --git a/reValuate/website/__pycache__/settings.cpython-39.pyc b/reValuate/website/__pycache__/settings.cpython-39.pyc
new file mode 100644
index 00000000..e817cf5c
Binary files /dev/null and b/reValuate/website/__pycache__/settings.cpython-39.pyc differ
diff --git a/reValuate/website/__pycache__/urls.cpython-39.pyc b/reValuate/website/__pycache__/urls.cpython-39.pyc
new file mode 100644
index 00000000..38b9b767
Binary files /dev/null and b/reValuate/website/__pycache__/urls.cpython-39.pyc differ
diff --git a/reValuate/website/__pycache__/wsgi.cpython-39.pyc b/reValuate/website/__pycache__/wsgi.cpython-39.pyc
new file mode 100644
index 00000000..bef15cdc
Binary files /dev/null and b/reValuate/website/__pycache__/wsgi.cpython-39.pyc differ
diff --git a/reValuate/website/urls.py b/reValuate/website/urls.py
index 6a623c87..26dc3461 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
+from home.views import homePage, leaderboard
from rest_framework import routers, urls
from api.views import BalanceView, ImageView
from django.conf import settings
@@ -41,9 +41,10 @@ urlpatterns = [
path("view_media/", viewMedia, name="Media"),
path("get_balance/",getBalance, name="Balance" ),
path("add_balance/", addToBalance, name="Add"),
- path("remove_balance/", removeBalance, name="Add"),
+ path("remove_balance/", removeBalance, name="cashier"),
path("admin/", adminView, name="admin"),
- path('api/', include(router.urls))
+ path('api/', include(router.urls)),
+ path("leaderboard/", leaderboard, name="leaderboard")
]
if settings.DEBUG: