Merge branch 'specto-fixes' into main

.editorconfig

@@ -0,0 +1,5 @@
+root = true
+
+[*.{js,css}]
+indent_style = space
+indent_size = 2

reValuate/home/static/home/css/gallery.css

@@ -1,18 +1,21 @@
-.popup{
+.popup {
 	width: 900px;
 	margin: auto;
-    text-align: center
+	text-align: center;
 }
-.popup img{
+
+.popup img {
 	width: 200px;
 	height: 200px;
-    cursor: pointer
+	cursor: pointer;
 }
-.show{
+
+.show {
 	z-index: 999;
 	display: none;
 }
-.show .overlay{
+
+.show .overlay {
 	width: 100%;
 	height: 100%;
 	background: rgba(0,0,0,.66);
@@ -20,7 +23,8 @@
 	top: 0;
 	left: 0;
 }
-.show .img-show{
+
+.show .img-show {
 	width: 600px;
 	height: 400px;
 	background: #FFF;
@@ -28,16 +32,18 @@
 	top: 50%;
 	left: 50%;
 	transform: translate(-50%,-50%);
-    overflow: hidden
+	overflow: hidden;
 }
-.img-show span{
+
+.img-show span {
 	position: absolute;
 	top: 10px;
 	right: 10px;
 	z-index: 99;
 	cursor: pointer;
 }
-.img-show img{
+
+.img-show img {
 	width: 100%;
 	height: 100%;
 	position: absolute;
@@ -49,36 +55,36 @@
 	box-sizing: border-box;
 	margin: 0;
 	padding: 0;
-  }
+}
 
-  body {
+body {
 	font-family: Raleway;
 	background-color: #202125;
-  }
+}
 
-  .heading {
+.heading {
 	text-align: center;
 	font-size: 2.0em;
 	letter-spacing: 1px;
 	padding: 40px;
 	color: white;
-  }
+}
 
-  .gallery-image {
+.gallery-image {
 	padding: 20px;
 	display: flex;
 	flex-wrap: wrap;
 	justify-content: center;
-  }
+}
 
-  .gallery-image img {
+.gallery-image img {
 	height: 250px;
 	width: 350px;
 	transform: scale(1.0);
 	transition: transform 0.4s ease;
-  }
+}
 
-  .img-box {
+.img-box {
 	box-sizing: content-box;
 	margin: 10px;
 	height: 250px;
@@ -88,47 +94,34 @@
 	color: white;
 	position: relative;
 	background-color: white;
-  }
+}
 
-  .caption {
+.caption {
 	position: absolute;
 	bottom: 5px;
 	left: 20px;
 	opacity: 0.0;
 	transition: transform 0.3s ease, opacity 0.3s ease;
-  }
+}
 
-  .transparent-box {
+.transparent-box {
 	height: 250px;
 	width: 350px;
-    background-color:rgba(0, 0, 0, 0);
+	background-color: rgba(0, 0, 0, 0);
 	position: absolute;
 	top: 0;
 	left: 0;
 	transition: background-color 0.3s ease;
-  }
+}
 
-  .img-box:hover img { 
-    transform: scale(1.1);
-  }
+.img-box:hover img { transform: scale(1.1); }
+.img-box:hover .transparent-box { background-color: rgba(0, 0, 0, 0.5); }
 
-  .img-box:hover .transparent-box {
-    background-color:rgba(0, 0, 0, 0.5);
-  }
-  
-  .img-box:hover .caption {
+.img-box:hover .caption {
 	transform: translateY(-20px);
 	opacity: 1.0;
-  }
+}
 
-  .img-box:hover {
-    cursor: pointer;
-  }
-  
-  .caption > p:nth-child(2) {
-    font-size: 0.8em;
-  }
-  
-  .opacity-low {
-    opacity: 0.5;
-  }
+.img-box:hover { cursor: pointer; }
+.caption > p:nth-child(2) { font-size: 0.8em; }
+.opacity-low { opacity: 0.5; }

reValuate/home/static/home/css/style.css

@@ -138,17 +138,12 @@ header {
   .menu {
     display: initial;
   }
-
 }
 
 html{
   font-family: Arial, Helvetica, sans-serif;
-
 }
 
-
-
-
 p {
   font-family: Arial, Helvetica, sans-serif;
 
@@ -167,7 +162,7 @@ ul.emoji{
 
 .question{
   color: gray;
-  font-size:20px;
+  font-size: 20px;
 }
 
 ul.nothing{
@@ -178,7 +173,7 @@ a.footer{
   /* background:radial-gradient(circle, rgba(0,159,12,1) 0%, rgba(8,96,0,1) 100%);
   -webkit-background-clip: text;
   -webkit-text-fill-color: transparent; */
-  color:lightgreen;
+  color: lightgreen;
 }
 footer{
   font-size: small;

reValuate/home/views.py

@@ -6,10 +6,12 @@ from users.models import User
 import operator
 from upload.models import Media
 import requests
+from django.db.models import Sum
+
 
 def homePage(request):
     iter_var = 0
-    all_balance = []
+    all_balance = 0
     Cashier = False
     Processor = False
 
@@ -30,7 +32,6 @@ def homePage(request):
         userQR = f"Name = {request.user.username}, Date Joined = {request.user.date_joined.date()}, ID = {request.user.id}, isCashier={Cashier}, isProcessor={Processor}, Balance = {userBalance}"
     else:
         userQR=None
-    a = Balance.objects.all()
 
     for user in a:
         all_balance.append(user.balanceValue)

reValuate/templates/base.html

@@ -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,12 +10,10 @@
         <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>
@@ -75,4 +72,4 @@
             {% endblock %}
     </div>
     </body>
-    </html>
+</html>

reValuate/templates/getBalance.html

@@ -1,7 +1,7 @@
-<!-- templates/home.html -->
 {% extends 'base.html' %}
 
 {% block title %}Home{% endblock %}
+
 {% block optionalParams%}
 <style>
 .checkmark__circle {
@@ -56,6 +56,7 @@
 </style>
 
 {% endblock %}
+
 {% block content %}
 <div class="centered" style="text-align: center;">
 

reValuate/templates/home.html

@@ -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>

reValuate/templates/leaderboard.html

@@ -1,6 +1,7 @@
 {% extends 'base.html' %}
 
 {% block title %}Класация{% endblock %}
+
 {% block optionalParams %}
 <style>
 

reValuate/templates/registration/signup.html

@@ -11,7 +11,7 @@
     -o-background-size: cover;
     background-size: cover;
     font-family: Arial, Helvetica, sans-serif;
-}
+  }
   #page-wrap{
     padding: 20vh;
   }

reValuate/templates/showAllImage.html

@@ -1,6 +1,8 @@
 {% extends 'base.html' %}
 {% load static %}
+
 {% block title %} My Images {% endblock %}
+
 {% block optionalParams %}
 <style>