From 46256d328efbe08e4b519130c5aa41664ff959b8 Mon Sep 17 00:00:00 2001
From: Yamozha <yyamozha@gmail.com>
Date: Wed, 21 Jul 2021 00:16:44 +0300
Subject: [PATCH] small adjustments

---
 reValuate/db.sqlite3                          | Bin 172032 -> 172032 bytes
 .../home/__pycache__/views.cpython-39.pyc     | Bin 1999 -> 2266 bytes
 reValuate/home/views.py                       |  17 ++++++++++++++---
 reValuate/templates/base.html                 |   1 +
 reValuate/templates/home.html                 |   1 -
 reValuate/templates/leaderboard.html          |  10 ++++++----
 6 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/reValuate/db.sqlite3 b/reValuate/db.sqlite3
index 26e2ada12b0be5e9009f20e6e2ff1e366da9b31a..85e84453c045326843a0034660150d68d6e41b7e 100644
GIT binary patch
delta 505
zcmZoTz}0YoYl1Xm&qNt##-5D{<@tOTR;DIa#)f(Z7UrfV2AiMe%Pa7*a=A0`-R9lK
zGm$%oYr0_qqu9m?3S8<<O02BD&B2a_d1YxOIYvnZDcL1yg(l^e21WT*#rY|zS?QU%
zmFbi3&fQXPY-kc?Rhn;>Yw1}Kl<Vs1;*=VZ>=qj7Sma&d=4$2?S?cdzY>@9!SmA3D
z9^jp9WME{dYhbQxWTs#UbCRLCg@u7plM)NqR`Z<f^rWIpv#g>*<7~r3<ASo3%G7)d
z%cSfylN8I0T)kAUim)tKSO4-%$H2+2=PvUyHpq9fiZC}yb@Q;u4lj%FiYTwjP7NrC
zFbNAv3d{B?tnkY>OEWMk_csoYEXXNGb%U|Fm9eRwv6-1UFjyweDQ4zl<@aFV-_GyB
zKZ!q=|IWrnGk#AMW?x1E!BNNxQbfr0%@fyepSYf}*a2uu8Uz0${=@uB_*?nYHa3Rv
jPjCItC}4ydDy(wMj*Pe+%mR|0JZG-d_Cx;}?G^w4&zGIn

delta 471
zcmaiwO>dK60DwzcFKf5g#G4v7lf@eiFW+!5(n4LKUzB!qCZ+;~l>%iGfpXgFvb*TP
z%S=3YUz#QMy6Df)lZn4$&Z8%Pz>_D>b9%jTdcE=P0kX^=){*7vRT^&LJc;uZS;ZiQ
zVesmAxV=*;m4m|8kIk=@yd12SFUu!yAD8a5&s5>qVJ605Xp>pGc+F+eB=SibpZi!G
zB-~=kR&9B)KNG!fIunL9d+a{<=QbJYS}(BEaUiFH=xg(a){L>P*XY#IVB{s9-Y^Z0
zqIIVwk#5%R_F!D^siCP(*ePL{vULLAj5K2yXU!fS4@rygZ833@P*M^C9#Irq+Z&h%
zQYRE>Luz&4R37Zf>ddOCp{@7FTwfbl?s0e+d9E0RQj;T{+X5m{c^Kd+EArN8>{5<0
z<j}ri3=~~IS|}=MqavfiebaxEasG>r866mIOTaN4q8NkX^bRC=g5fEq3Mt63^i_Tl
z6)PnW6u=t12S35zd0=<9*hc<0?kvAt=a)$I>=r*SfM4J{_yW#X%NTrgZjih8{uPxT
S6$RwO#i#r0Z#T%(&wl_Lz?lsI

diff --git a/reValuate/home/__pycache__/views.cpython-39.pyc b/reValuate/home/__pycache__/views.cpython-39.pyc
index a5f1e8d53e6bbe9d66995706e90ee1720e1e1833..229d798ca59eeabf2a41c2fc1b1c4e6c1731918d 100644
GIT binary patch
delta 686
zcmY*X&ubGw6rQ(}{h4GFYt<^j+C+r3QYbxm5)X<Zh#m|c79?&nL)|oK+P7Olm?dD&
zh01`Z3ijBW{s~^ZdJlM(f(YJ4eY4f7v&_f$zW3fYZ-@C<o1O~eYBgZA<jXHlc=#^#
zEjZM3);I8Uz@LJzQ+}sqDzHKj`D^ju!CGJTG7ODaC742tp8muyLQ{X|FXk_k)&qh+
z%XGT5Z_-Xb=+~w9p>kEpX6KnGU1OZ-fqi{EqudDqOIQxded8RkTkP>x&NJ4B{%OU9
zy$iXQ)hU`)o^UAgmEWHguJCqY4-gg4!oSJ{en-B^Pe26wRswmjIY(aQ|8of>FwTQL
z*luJqDllVE0gWU0Mv1K7(m=HX28=3RDNDJcvTx<(?2KZfs>&1okhR16X#TkkQ@$ae
zAKAo@js-kN9L)uEDC;F@_gNz3=yuzRoJWSGQ|Io`iPvR{ZT;0=xpWpyJJt+bFkl>}
zF5P{+*^}t&8%}5JnMA`R_`1xnZbFNoUBP*y+B>Pl6c-JL<amgyMPevL65|r_$WJnf
zT~is=PH49%h<qb=MV!UBK(*LBffliH;k-&Ly{A7r%PsJr1QiI2uMXkQfH%OiLa2lm
sSU(&a7j@I^tgcW?RNdJcjAF4o90@r{(J|KM-4v$(oK&3I(ueMqUw8hS4FCWD

delta 416
zcmYk2y-EW?5XW!!KK3r&T~I+y6Y~MaD-1|LY^+4YMhjD=@{&6+Ch=n~DTK8#FA&&P
zK_9?E@CAGV`$HcfU}G=A*#pIe`R(ld_dmN#I{%jUL(j`;w5)^A6W4wA9R`71VPC*y
zPCo@(Ci;HWp$j-iXgTe$f7CvUJ45tT(Iuo1B9|X}5z6vgzg?|TtpkMLrR)~PE=95}
z?~PYKG6WY!L0i_;F8k)ro-g<qBE4r!04st&<R3NACU9j7CU|7tu^W51AhgI5_E<mG
z0)B|<kpNP?7hg|J%BLWotj*FQsss881%)L-%IWLjc_&6&&a7sWD}fOL2a8HKM@ftc
z)>IDN%!5HD4C1I8;yUG6QYinSqB7-ZP$XOOo!33)gX=S3Gt0!9+_0OCI*BcBblJZM
aqx#??iu(zwd7zq9X8+eRYhIBr_Sz5K=2YJR

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 %}
+        <script type="text/javascript" src="{% static 'home/js/mobile.js' %}"></script>
 
       </body>
     </html>
\ 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 @@
 		<a href="https://www.youtube.com/channel/UCIWblGtjXAxwbTMUbhZ_PDQ"><img src="{% static 'home/img/youtube.png' %}" style="max-width:100px;" ></a>
 	</p>
 </div>
- <script type="text/javascript" src="{% static 'home/js/mobile.js' %}"></script>
 <footer>Frontend, backend and planning:<br> <a class="footer" href="https://yamozha.xyz">Boyan</a></footer>
 
 {% 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 {
 			</div>
 			<div class="body">
 				<ol>
-					{% for i, z in user_media.items %}
+					{% for i, z in user_media.items reversed %}
                     <li>
 						<mark>{{ i }}</mark>
 						<small>{{z}} снимки и видеа</small>