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

Specto fixes #9

Merged
confestim merged 7 commits from specto-fixes into main 2021-09-10 16:35:54 +02:00
Conversation 0 Commits 7 Files Changed 188 +99 -95
8 changed files with 99 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 88d8de76ec - Show all commits

31
reValuate/templates/base.html
View File

@ -1,9 +1,8 @@
<!DOCTYPE html>
{% load static %}
{% load qr_code %}
<html>
<head>
{% load static %}
{% load qr_code %}
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>{% block title %}reValuate{% endblock %}</title>
@ -11,32 +10,30 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="{% static 'home/css/style.css' %}">
<link rel="shortcut icon" type="image/png" href="{% static 'home/img/logo.png' %}"/>
{% block optionalParams %} {% endblock %}
{% block optionalParams %}{% endblock %}
</head>
<body>
{% block aboveNav %} {% endblock %}
{% block aboveNav %}{% endblock %}
<header id="navbar">
<a class="logo" href="/"><img src="{% static 'home/img/logo.png' %}" style="max-height: 100px;" alt="logo"></a>
<nav>
<ul class="nav__links">
<li><a href="{% url 'leaderboard' %}"><u>Класация</u></a></li>
<li><a href="#"><u>За нас</u></a></li>
{% if user.is_authenticated %}
<li><a href="{% url 'Image' %}"><u>Качи</u></a></li>
<li><a href="{% url 'Media' %}"><u>Прогрес</u></a></li>
{% endif %}
{% if isProcessor %}
<li><a href="{% url 'admin' %}"><u>Админ</u></a></li>
{% endif %}
{% if isCashier %}
<li><a href="{% url 'cashier' %}"><u>Качи</u></a></li>
{% endif %}
</ul>
</nav>
{% if user.is_authenticated %}
@ -44,7 +41,7 @@
{% else %}
<a class="cta" href="{% url 'login' %}">Влез!</a>
{% endif %}
<p class="menu cta">Меню</p>
</header>
<div id="container">
@ -54,7 +51,7 @@
<a href="{% url 'leaderboard' %}">Класация</a>
<a href="#">За нас</a>
{% if user.is_authenticated %}
<a href="{% url 'logout' %}">Излез!</a>
<a href="{% url 'logout' %}">Излез!</a>
{% else %}
<a href="{% url 'login' %}">Влез!</a>
{% endif %}
@ -64,13 +61,13 @@
{% if user.is_authenticated %}
<a href="{% url 'Image' %}">Качи</a>
<a href="{% url 'Media' %}">Прогрес</a>
{% endif %}
{% endif %}
</div>
<script type="text/javascript" src="{% static 'home/js/mobile.js' %}"></script>
</div>
{% block content %}
{% endblock %}
</div>
</body>
</html>
</html>

19
reValuate/templates/getBalance.html
View File

@ -1,7 +1,7 @@
<!-- templates/home.html -->
{% extends 'base.html' %}
{% block title %}Home{% endblock %}
{% block optionalParams%}
<style>
.checkmark__circle {
@ -13,7 +13,7 @@
fill: none;
animation: stroke 0.6s cubic-bezier(0.65, 0, 0.45, 1) forwards;
}
.checkmark {
width: 56px;
height: 56px;
@ -26,14 +26,14 @@
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;
@ -56,17 +56,18 @@
</style>
{% endblock %}
{% block content %}
<div class="centered" style="text-align: center;">
{% if user.is_authenticated %}
{% if userBalance %}
<h1 style="color:#7ac142;">Транзакцията е записана успешно!</h1>
Кликни <a style="color:#7ac142;"href="/remove_balance/">тук</a>, ако искаш да запишеш нова!
<svg class="checkmark" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 52 52">
<circle class="checkmark__circle" cx="26" cy="26" r="25" fill="none"/>
<path class="checkmark__check" fill="none" d="M14.1 27.2l7.1 7.2 16.7-16.8"/>
</svg>
Кликни <a style="color:#7ac142;"href="/remove_balance/">тук</a>, ако искаш да запишеш нова!
<svg class="checkmark" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 52 52">
<circle class="checkmark__circle" cx="26" cy="26" r="25" fill="none"/>
<path class="checkmark__check" fill="none" d="M14.1 27.2l7.1 7.2 16.7-16.8"/>
</svg>
{% endif %}
<div>
{{ qr_code }}

9
reValuate/templates/home.html
View File

@ -1,4 +1,8 @@
{% extends 'base.html' %}
{% load qr_code %}
{% load static %}
{% block optionalParams %}
<style>
html{
@ -11,8 +15,7 @@
}
</style>
{% endblock %}
{% load qr_code %}
{% load static %}
{% block content %}
<div id="page-wrap">
<h1 class="heading">reValuate</h1>
@ -63,4 +66,4 @@
</div>
<footer>Frontend, backend and planning:<br> <a class="footer" href="https://yamozha.xyz">Boyan</a></footer>
{% endblock %}
{% endblock %}

17
reValuate/templates/leaderboard.html
View File

@ -1,17 +1,18 @@
{% extends 'base.html' %}
{% block title %}Класация{% endblock %}
{% block optionalParams %}
<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;
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;
}
.content{
position: absolute;
@ -74,4 +75,4 @@ ul{
{% endfor %}
</div>
</div>
{% endblock %}
{% endblock %}

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

@ -3,15 +3,15 @@
{% block title %}Login{% endblock %}
{% block optionalParams %}
<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;
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{
background-color: #469330;
border: none;

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

@ -5,17 +5,17 @@
<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;
}
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>
{% endblock %}
{% block content %}

26
reValuate/templates/showAllImage.html
View File

@ -1,6 +1,8 @@
{% extends 'base.html' %}
{% load static %}
{% block title %} My Images {% endblock %}
{% block optionalParams %}
<link rel="stylesheet" href="{% static 'home/css/gallery.css' %}">
<style>
@ -28,21 +30,21 @@
<div class="transparent-box">
<div class="caption">
{% if i.reason %}
<p> ❌ Видеото ти е маркирана като невалидно.</p>
<p> ❌ Видеото ти е маркирана като невалидно.</p>
<p class="opacity-low">Ако мислиш че има грешка ни изпратете <a href="mailto:boyan+revaluate@bobokara.com">имейл.</a></p>
{% elif i.tokenized %}
<p > ✅ Видеото ти е валидно!</p>
<p class="opacity-low">Провери баланса си!</p>
{% else %}
<p> ⏳ Видеото ти очаква обработка!</p>
{% endif %}
</div>
</div>
</div>
</div>
{% else %}
<div class="gallery-image popup">
<div class="img-box">
@ -50,20 +52,20 @@
<div class="transparent-box">
<div class="caption">
{% if i.reason %}
<p> ❌ Снимката ти е маркирана като невалидна.</p>
<p> ❌ Снимката ти е маркирана като невалидна.</p>
<p class="opacity-low">Ако мислиш че има грешка ни изпратете <a href="mailto:boyan+revaluate@bobokara.com">имейл.</a></p>
{% elif i.tokenized %}
<p > ✅ Снимката ти е валидна!</p>
<p class="opacity-low">Провери баланса си!</p>
{% else %}
<p> ⏳ Снимката ти очаква обработка!</p>
{% endif %}
{% endif %}
</div>
</div>
</div>
</div>
<!--
<!--
<p style="text-shadow: 0 0 2px #28a745; float: left;">{{forloop.counter}}/{{img_number}} <p style="text-shadow: 0 0 2px #28a745; float: right;">{{i.date}}</p></p> -->
<!-- <br><br>
-->

60
reValuate/templates/uploadImage.html
View File

@ -12,7 +12,7 @@
fill: none;
animation: stroke 0.6s cubic-bezier(0.65, 0, 0.45, 1) forwards;
}
.checkmark {
width: 56px;
height: 56px;
@ -25,14 +25,14 @@
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;
@ -70,35 +70,35 @@
}
.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;
}
.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;
}
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;
}
#page-wrap{
padding: 20vh;
}
</style>
@ -121,7 +121,7 @@
<circle class="checkmark__circle" cx="26" cy="26" r="25" fill="none"/>
<path class="checkmark__check" fill="none" d="M14.1 27.2l7.1 7.2 16.7-16.8"/>
</svg>
{% else %}
{% else %}
<form method="post" enctype="multipart/form-data">
{% csrf_token %}
<label for="image" style="font-size: 32px;">Качи снимка! </label><br><br><br>
@ -131,7 +131,7 @@
</form>
<br><br>
{% endif %}
{% else %}
<p>You are not logged in</p>
<a href="{% url 'login' %}">Log In</a>