diff --git a/reValuate/db.sqlite3 b/reValuate/db.sqlite3 index 26e2ada1..85e84453 100644 Binary files a/reValuate/db.sqlite3 and b/reValuate/db.sqlite3 differ diff --git a/reValuate/home/__pycache__/views.cpython-39.pyc b/reValuate/home/__pycache__/views.cpython-39.pyc index a5f1e8d5..229d798c 100644 Binary files a/reValuate/home/__pycache__/views.cpython-39.pyc and b/reValuate/home/__pycache__/views.cpython-39.pyc differ diff --git a/reValuate/home/views.py b/reValuate/home/views.py index 257a3190..3dbecdfb 100644 --- a/reValuate/home/views.py +++ b/reValuate/home/views.py @@ -72,13 +72,24 @@ def leaderboard(request): for i in media: username = i.user.username if f"{username}" in user_media.keys(): - user_media[username] = 1 + user_media[username] + user_media[username] += 1 else: user_media[username] = 1 - + user_media = dict(sorted(user_media.items(), key=operator.itemgetter(0))) user_media = dict(reversed(list(user_media.items()))) - + print(user_media) + users = {} + for i in user_media.keys(): + iter_user = User.objects.get(username=i) + iter_user_media = Media.objects.filter(user=iter_user) + if iter_user_media.filter(is_video=True): + user_data = {i:{"Videos":len(iter_user_media.filter(is_video=True)), + "Images":len(iter_user_media.filter(is_video=False))}} + else: + user_data = {i:{"Images":len(iter_user_media.filter(is_video=False))}} + print(user_data) + while len(user_media) > 5: user_media.pop() diff --git a/reValuate/templates/base.html b/reValuate/templates/base.html index 731b0da7..86e64f24 100644 --- a/reValuate/templates/base.html +++ b/reValuate/templates/base.html @@ -71,6 +71,7 @@ {% block content %} {% endblock %} + \ No newline at end of file diff --git a/reValuate/templates/home.html b/reValuate/templates/home.html index 97879008..6a43b082 100644 --- a/reValuate/templates/home.html +++ b/reValuate/templates/home.html @@ -61,7 +61,6 @@

- {% endblock %} \ No newline at end of file diff --git a/reValuate/templates/leaderboard.html b/reValuate/templates/leaderboard.html index caf8d045..2d33fef1 100644 --- a/reValuate/templates/leaderboard.html +++ b/reValuate/templates/leaderboard.html @@ -34,7 +34,7 @@ a { } .container { - width: 300px; + width: 500px; height: auto; border-radius: 10px; background-color: white; @@ -62,13 +62,15 @@ a { overflow: hidden; } -@media only screen and (max-width: 800px) { +@media only screen and (max-width: 1000px) { .container{ + width: fit-content; top:40%; left:50%; } .container-2{ + width: fit-content; top:80%; left:50%; } @@ -87,7 +89,7 @@ a { text-align: center; } .leaderboard .head h1 { - display: inline-block; + display: flex; margin-left: 4px; } @@ -145,7 +147,7 @@ a {
    - {% for i, z in user_media.items %} + {% for i, z in user_media.items reversed %}
  1. {{ i }} {{z}} снимки и видеа