boyan_k/reValuate
boyan_k/reValuate
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Getting ready for release!

Browse Source 
- fixed up the design
- started work on api
- fixed some design issues
gallery coming soon!
This commit is contained in:
Yamozha 2021-08-27 20:40:01 +03:00
parent bfbf4fe5f7
commit 31f5eaa66b
9 changed files with 153 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,3 +1,5 @@
__django __django
reValuate/db.sqlite3 reValuate/db.sqlite3
*.sqlite3 *.sqlite3
*/media/*
*.pyc

BIN
reValuate/api/__pycache__/views.cpython-39.pyc
View File

Binary file not shown.

BIN
reValuate/db.sqlite3
View File

Binary file not shown.

13
reValuate/home/static/home/css/style.css
View File

@ -252,3 +252,16 @@ footer{
-webkit-animation: scale-in-center 0.5s cubic-bezier(0.250, 0.460, 0.450, 0.940) both; -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; 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;
}

17
reValuate/home/views.py
View File

@ -52,13 +52,16 @@ def leaderboard(request):
users = User.objects.all() users = User.objects.all()
leaderboard = {} leaderboard = {}
for i in users: for i in users:
username = i.username try:
balance = i.balance.balanceValue username = i.username
# add media counter and other stuff balance = i.balance.balanceValue
if f"{username}" in leaderboard.keys(): # add media counter and other stuff
leaderboard[username] = balance + leaderboard[username] if f"{username}" in leaderboard.keys():
else: leaderboard[username] = balance + leaderboard[username]
leaderboard[username] = balance else:
leaderboard[username] = balance
except Exception as e:
pass
leaderboard = dict(sorted(leaderboard.items(), key=operator.itemgetter(0))) leaderboard = dict(sorted(leaderboard.items(), key=operator.itemgetter(0)))
leaderboard = dict(reversed(list(leaderboard.items()))) leaderboard = dict(reversed(list(leaderboard.items())))

10
reValuate/templates/adminView.html
View File

@ -2,6 +2,9 @@
{% block optionalParams %} {% block optionalParams %}
<style> <style>
.centered{
position: absolute;
}
.choiceButtons{ .choiceButtons{
position: absolute; position: absolute;
left: 50%; left: 50%;
@ -53,7 +56,7 @@
<source src="/media/{{ image }}" type="video/mp4"> <source src="/media/{{ image }}" type="video/mp4">
</video> </video>
{% else %} {% else %}
<img src="/media/{{ image }}" style="max-width:500px; max-height: 500px;"><br> <img src="/media/{{ image }}" style="max-width:500px;"><br>
{% endif %} {% endif %}
</div><br> </div><br>
<p style="text-shadow: 0 0 2px #28a745; float: left;">{{time}} <p style="text-shadow: 0 0 2px #28a745; float: right;">{{date}}</p></p> <p style="text-shadow: 0 0 2px #28a745; float: left;">{{time}} <p style="text-shadow: 0 0 2px #28a745; float: right;">{{date}}</p></p>
@ -62,8 +65,9 @@
<div class="choiceButtons"> <div class="choiceButtons">
<input name="isValid" type="submit" value="Valid" class="Buttons"> <input name="isValid" type="submit" value="Valid" class="buttons">
<input name="isValid" type="submit" value="Invalid" class="Buttons"> <input name="isValid" type="submit" value="Invalid" class="buttons">
</div>
</form> </form>

16
reValuate/templates/registration/login.html
View File

@ -3,6 +3,15 @@
{% block title %}Login{% endblock %} {% block title %}Login{% endblock %}
{% block optionalParams %} {% block optionalParams %}
<style> <style>
html{
background: linear-gradient(180deg, rgba(70,147,48,1) 33%, rgba(109,126,107,1) 100%) no-repeat center center fixed;
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
background-size: cover;
font-family: Arial, Helvetica, sans-serif;
}
.buttons{ .buttons{
background-color: #469330; background-color: #469330;
border: none; border: none;
@ -15,14 +24,15 @@
margin: 4px 2px; margin: 4px 2px;
cursor: pointer; cursor: pointer;
} }
.centered{ #page-wrap{
max-height: 20%; padding: 20vh;
} }
</style> </style>
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="centered" style="text-align:center;"> <div class="centered" id="page-wrap" style="text-align:center;">
<h2>Влез в акаунта си</h2><br> <h2>Влез в акаунта си</h2><br>
<form method="post"> <form method="post">

37
reValuate/templates/registration/signup.html
View File

@ -3,31 +3,34 @@
{% block title %}Sign Up{% endblock %} {% block title %}Sign Up{% endblock %}
{% block optionalParams %} {% block optionalParams %}
<style> <style>
.buttons{
background-color: #469330; html{
border: none; background: linear-gradient(180deg, rgba(70,147,48,1) 33%, rgba(109,126,107,1) 100%) no-repeat center center fixed;
color: white; -webkit-background-size: cover;
padding: 15px 32px; -moz-background-size: cover;
text-align: center; -o-background-size: cover;
text-decoration: none; background-size: cover;
display: inline-block; font-family: Arial, Helvetica, sans-serif;
font-size: 16px; }
margin: 4px 2px; #page-wrap{
cursor: pointer; padding: 20vh;
}
.centered{
max-height: 20%;
} }
</style> </style>
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="centered" > <div class="centered" id="page-wrap">
<h2>Регистрирай се</h2><br><br> <h2>Регистрирай се</h2><br><br>
<form method="post"> <form method="post">
{% csrf_token %} {% csrf_token %}
{{ form.as_p }} {% for field in form %}
<button type="submit" class="buttons" style="position:absolute; left:50%; right:50%;">Регистрация</button> <div class="fieldWrapper">
{{ field.errors }}
{{ field.label_tag }}<br> {{ field }}
</div><br>
{% endfor %}
<button type="submit" class="buttons"">Регистрация</button>
</form> </form>
</div> </div>
{% endblock %} {% endblock %}

146
reValuate/templates/uploadImage.html
View File

@ -3,80 +3,102 @@
{% block title %} Image Upload {% endblock %} {% block title %} Image Upload {% endblock %}
{% block optionalParams%} {% block optionalParams%}
<style> <style>
.checkmark__circle { .checkmark__circle {
stroke-dasharray: 166; stroke-dasharray: 166;
stroke-dashoffset: 166; stroke-dashoffset: 166;
stroke-width: 2; stroke-width: 2;
stroke-miterlimit: 10; stroke-miterlimit: 10;
stroke: #7ac142; stroke: #7ac142;
fill: none; fill: none;
animation: stroke 0.6s cubic-bezier(0.65, 0, 0.45, 1) forwards; animation: stroke 0.6s cubic-bezier(0.65, 0, 0.45, 1) forwards;
}
.checkmark {
width: 56px;
height: 56px;
border-radius: 50%;
display: block;
stroke-width: 2;
stroke: #fff;
stroke-miterlimit: 10;
margin: 10% auto;
box-shadow: inset 0px 0px 0px #7ac142;
animation: fill .4s ease-in-out .4s forwards, scale .3s ease-in-out .9s both;
}
.checkmark__check {
transform-origin: 50% 50%;
stroke-dasharray: 48;
stroke-dashoffset: 48;
animation: stroke 0.3s cubic-bezier(0.65, 0, 0.45, 1) 0.8s forwards;
}
@keyframes stroke {
100% {
stroke-dashoffset: 0;
}
}
@keyframes scale {
0%, 100% {
transform: none;
}
50% {
transform: scale3d(1.1, 1.1, 1);
}
}
@keyframes fill {
100% {
box-shadow: inset 0px 0px 0px 30px #7ac142;
} }
.centered{ .checkmark {
font-size: 50px; width: 56px;
max-height: 20%; height: 56px;
border-radius: 50%;
display: block;
stroke-width: 2;
stroke: #fff;
stroke-miterlimit: 10;
margin: 10% auto;
box-shadow: inset 0px 0px 0px #7ac142;
animation: fill .4s ease-in-out .4s forwards, scale .3s ease-in-out .9s both;
}
.checkmark__check {
transform-origin: 50% 50%;
stroke-dasharray: 48;
stroke-dashoffset: 48;
animation: stroke 0.3s cubic-bezier(0.65, 0, 0.45, 1) 0.8s forwards;
}
@keyframes stroke {
100% {
stroke-dashoffset: 0;
}
}
@keyframes scale {
0%, 100% {
transform: none;
}
50% {
transform: scale3d(1.1, 1.1, 1);
}
}
@keyframes fill {
100% {
box-shadow: inset 0px 0px 0px 30px #7ac142;
}
} }
.alert { .alert {
padding: 20px; padding: 20px;
background-color: #f44336; background-color: #f44336;
color: white; color: white;
} }
.closebtn { .closebtn {
margin-left: 15px; margin-left: 15px;
color: white; color: white;
font-weight: bold; font-weight: bold;
float: right; float: right;
font-size: 22px; font-size: 22px;
line-height: 20px; line-height: 20px;
cursor: pointer; cursor: pointer;
transition: 0.3s; transition: 0.3s;
} }
.closebtn:hover { .closebtn:hover {
color: black; color: black;
} }
.buttons{
margin-top: 10%;
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;
}
html{
background: linear-gradient(180deg, rgba(70,147,48,1) 33%, rgba(109,126,107,1) 100%) no-repeat center center fixed;
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
background-size: cover;
font-family: Arial, Helvetica, sans-serif;
}
#page-wrap{
padding: 20vh;
}
</style> </style>
@ -90,7 +112,7 @@
{% endif %} {% endif %}
<div class="centered" style="text-align: center;"> <div class="centered" id="page-wrap" style="text-align: center;">
{% if user.is_authenticated %} {% if user.is_authenticated %}
{% if img_obj %} {% if img_obj %}
<h1 style="color:#7ac142;">Снимката ти е качена успешно!</h1> <h1 style="color:#7ac142;">Снимката ти е качена успешно!</h1>
@ -105,7 +127,7 @@
<label for="image" style="font-size: 32px;">Качи снимка! </label><br><br><br> <label for="image" style="font-size: 32px;">Качи снимка! </label><br><br><br>
<input id="image" style="margin: 0 auto;" type="file" name="image" required><br> <input id="image" style="margin: 0 auto;" type="file" name="image" required><br>
<br> <br>
<button class="Buttons" type="submit">Качи!</button> <button class="buttons" type="submit">Качи!</button>
</form> </form>
<br><br> <br><br>
{% endif %} {% endif %}