From 31f5eaa66b9d5922d8cf76642495f36f35cd0f0c Mon Sep 17 00:00:00 2001 From: Yamozha Date: Fri, 27 Aug 2021 20:40:01 +0300 Subject: [PATCH] Getting ready for release! - fixed up the design - started work on api - fixed some design issues gallery coming soon! --- .gitignore | 2 + .../api/__pycache__/views.cpython-39.pyc | Bin 1380 -> 1579 bytes reValuate/db.sqlite3 | Bin 172032 -> 172032 bytes reValuate/home/static/home/css/style.css | 13 ++ reValuate/home/views.py | 19 ++- reValuate/templates/adminView.html | 10 +- reValuate/templates/registration/login.html | 16 +- reValuate/templates/registration/signup.html | 37 +++-- reValuate/templates/uploadImage.html | 152 ++++++++++-------- 9 files changed, 153 insertions(+), 96 deletions(-) diff --git a/.gitignore b/.gitignore index d720fcdf..b098c584 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ __django reValuate/db.sqlite3 *.sqlite3 +*/media/* +*.pyc diff --git a/reValuate/api/__pycache__/views.cpython-39.pyc b/reValuate/api/__pycache__/views.cpython-39.pyc index 6408ab6de815f30da7277c53c3cf874727808a85..14ff1ec252fa0c7ea64c8fd8fc9d6c11452e3061 100644 GIT binary patch delta 702 zcma)4J5L)y5Z=exKFpmlmJQ}{JfawMAVEc>ND)b(pu!D^;u>^#7YpkEF?SXsO$zt} z)=Jb+S}7tVn)LjNtJCCPWafkb7a&%ePkS@p+7bSsHd8Aef`r&g?^ z!#)#GH6`(N(WPYi3*$e=pR284vHi2IhKpDy&3?gjMZ-LZrG+tMLUj;o^jSinf^iMPn7l z2g4aL<9HYtMau-*+~Rowo|%!}+#GrbSD{2(;4-ALXc?v@w?9)iehz5PnL3~>m?wBs zmS_ISkGln^6LW%Kl7Qw8Qv}llua5NtMk(t_wJm^rO}}Qq`tyyt${a67^3-!`e>px? Y-AJ#~TZw6?bzbI&XjfX{j zz-yt43iDw{Z4I-Z(9e=qoPjWv6Og?`sbtV^w$fNBQ2IA-)IXwHR$pV9(h{P8S9u7J z={sJl*D-wCo!}jg{%qlpKfUVgu9Z<7x{}r zs?QKU6UdgFCCm{5!aQMt@UD$TtWx(E8y<6*$0fb)g_EWvai`6;jC*i4kjIkKUp7L2 mb1&9N_1}cgv(lKx``R0bVG0`zGew)4W@YAcpZToJD}^UBuW%Uv diff --git a/reValuate/db.sqlite3 b/reValuate/db.sqlite3 index d2b846b3a9dda44acff78e36a19b9542715c499d..0f38d02e089014b229dc31d0cdd8bd9cedae7d68 100644 GIT binary patch delta 910 zcmaixO-vI(6vwyJ((cmkpcphk1knQqyUf?_%$9?erlMejieGS$Z1+PTrGSy5T%Zyz zo&XbwUiC~;OYFf!NW2phE*K>-B*w(VgI+u+;#LGbK)k$UChz^{_j@zGB#kdgQ&pbD z=_4`UqM)=*<*aLsrP3jvmw4vBGYnk)!9>Gr6?~5pa9N+8PE^j$#3MJ@&Y)X%RZJ*p716-|3easO%LDC z)=q597dGZS{-~SyNdW8M6?h6Jfdg7VJ#epb+1GN-QE$|C0;D_|LX%_idNUNdE=a*iL0$td!8D-q zs2rEeLlvP1!O2{UYh$2u}~j8uXNGPQ0*HO4XJyX(W)Z*;6+LXpM{;+KR5Q7n?Xf3c%q)c$8_ Ut}ltGOyLkSh>b%0X32}_FQBe8+O4g@3vO#zeOmLP-uuDAWJ0S7@82oDJW58@BQ52O!; z4`vTX4=4`_v4Qapm+Jlj3bzyg0r4;p1`px@5Bv}J5AqM~58@B!vk`F454Yk!0v!+) i{S6Ne00s_401n*`z7LTPG!A+WMX`Y~4!1>K0=q%39ZWd@ diff --git a/reValuate/home/static/home/css/style.css b/reValuate/home/static/home/css/style.css index 41859db9..296ae3e3 100644 --- a/reValuate/home/static/home/css/style.css +++ b/reValuate/home/static/home/css/style.css @@ -252,3 +252,16 @@ footer{ -webkit-animation: scale-in-center 0.5s cubic-bezier(0.250, 0.460, 0.450, 0.940) both; animation: scale-in-center 0.5s cubic-bezier(0.250, 0.460, 0.450, 0.940) both; } + +.buttons{ + background-color: #469330; + border: none; + color: white; + padding: 15px 32px; + text-align: center; + text-decoration: none; + display: inline-block; + font-size: 16px; + margin: 4px 2px; + cursor: pointer; +} diff --git a/reValuate/home/views.py b/reValuate/home/views.py index 3dbecdfb..41556408 100644 --- a/reValuate/home/views.py +++ b/reValuate/home/views.py @@ -52,14 +52,17 @@ def leaderboard(request): users = User.objects.all() leaderboard = {} for i in users: - username = i.username - balance = i.balance.balanceValue - # add media counter and other stuff - if f"{username}" in leaderboard.keys(): - leaderboard[username] = balance + leaderboard[username] - else: - leaderboard[username] = balance - + try: + username = i.username + balance = i.balance.balanceValue + # add media counter and other stuff + if f"{username}" in leaderboard.keys(): + leaderboard[username] = balance + leaderboard[username] + else: + leaderboard[username] = balance + except Exception as e: + pass + leaderboard = dict(sorted(leaderboard.items(), key=operator.itemgetter(0))) leaderboard = dict(reversed(list(leaderboard.items()))) diff --git a/reValuate/templates/adminView.html b/reValuate/templates/adminView.html index 9cbf375e..0a363f79 100644 --- a/reValuate/templates/adminView.html +++ b/reValuate/templates/adminView.html @@ -2,6 +2,9 @@ {% block optionalParams %} {% endblock %} {% block content %} -
+

Влез в акаунта си


diff --git a/reValuate/templates/registration/signup.html b/reValuate/templates/registration/signup.html index 86a91a4f..e46e897b 100644 --- a/reValuate/templates/registration/signup.html +++ b/reValuate/templates/registration/signup.html @@ -3,31 +3,34 @@ {% block title %}Sign Up{% endblock %} {% block optionalParams %} {% endblock %} {% block content %} -
+

Регистрирай се



{% csrf_token %} - {{ form.as_p }} - + {% for field in form %} +
+ {{ field.errors }} + {{ field.label_tag }}
{{ field }} +

+{% endfor %} +
{% endblock %} diff --git a/reValuate/templates/uploadImage.html b/reValuate/templates/uploadImage.html index 0ba588ec..f98bef6b 100644 --- a/reValuate/templates/uploadImage.html +++ b/reValuate/templates/uploadImage.html @@ -3,80 +3,102 @@ {% block title %} Image Upload {% endblock %} {% block optionalParams%} @@ -90,7 +112,7 @@ {% endif %} -
+
{% if user.is_authenticated %} {% if img_obj %}

Снимката ти е качена успешно!

@@ -105,7 +127,7 @@




- +

{% endif %}