Getting ready for release!

- fixed up the design - started work on api - fixed some design issues gallery coming soon!
2021-08-27 20:40:01 +03:00 · 2021-08-27 20:40:01 +03:00 · 31f5eaa66b
commit 31f5eaa66b
parent bfbf4fe5f7
9 changed files with 153 additions and 96 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,5 @@
 __django
 reValuate/db.sqlite3
 *.sqlite3
+*/media/*
+*.pyc
--- a/reValuate/api/pycache/views.cpython-39.pyc
+++ b/reValuate/api/pycache/views.cpython-39.pyc
--- a/reValuate/db.sqlite3
+++ b/reValuate/db.sqlite3
--- 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;
+}
--- 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())))

--- a/reValuate/templates/adminView.html
+++ b/reValuate/templates/adminView.html
@ -2,6 +2,9 @@

 {% block optionalParams %}
  <style>
+    .centered{
+      position: absolute;
+    }
    .choiceButtons{
      position: absolute;
      left: 50%;
@ -53,7 +56,7 @@
        <source src="/media/{{ image }}" type="video/mp4">
        </video>
        {% else %}
-        <img src="/media/{{ image }}" style="max-width:500px; max-height: 500px;"><br>
+        <img src="/media/{{ image }}" style="max-width:500px;"><br>
     {% endif %}
        </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>
@ -62,8 +65,9 @@
        <div class="choiceButtons">
        
        
-        <input name="isValid" type="submit" value="Valid" class="Buttons">
-        <input name="isValid" type="submit" value="Invalid" class="Buttons">
+        <input name="isValid" type="submit" value="Valid" class="buttons">
+        <input name="isValid" type="submit" value="Invalid" class="buttons">
+        </div>
      </form>


--- a/reValuate/templates/registration/login.html
+++ b/reValuate/templates/registration/login.html
@ -3,6 +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;
+
+    }
  .buttons{
    background-color: #469330;
    border: none;
@ -15,14 +24,15 @@
    margin: 4px 2px;
    cursor: pointer;
  }
-  .centered{
-    max-height: 20%;
+  #page-wrap{
+    padding: 20vh;
  }
+
 </style>
 {% endblock %}

 {% block content %}
-<div class="centered" style="text-align:center;">
+<div class="centered" id="page-wrap" style="text-align:center;">
 <h2>Влез в акаунта си</h2><br>

 <form method="post">
--- a/reValuate/templates/registration/signup.html
+++ b/reValuate/templates/registration/signup.html
@ -3,31 +3,34 @@
 {% block title %}Sign Up{% endblock %}
 {% block optionalParams %}
 <style>
-  .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;
-  }
-  .centered{
-    max-height: 20%;
+
+  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>
 {% endblock %}
 {% block content %}
-<div class="centered" >
+<div class="centered" id="page-wrap">

  <h2>Регистрирай се</h2><br><br>
  <form method="post">
    {% csrf_token %}
-    {{ form.as_p }}
-    <button type="submit" class="buttons" style="position:absolute; left:50%; right:50%;">Регистрация</button>
+    {% for field in form %}
+    <div class="fieldWrapper">
+        {{ field.errors }}
+        {{ field.label_tag }}<br> {{ field }}
+    </div><br>
+{% endfor %}
+    <button type="submit" class="buttons"">Регистрация</button>
  </form>
  </div>
 {% endblock %}
--- a/reValuate/templates/uploadImage.html
+++ b/reValuate/templates/uploadImage.html
@ -3,80 +3,102 @@
 {% block title %} Image Upload {% endblock %}
 {% block optionalParams%}
 <style>
-.checkmark__circle {
-	stroke-dasharray: 166;
-	stroke-dashoffset: 166;
-	stroke-width: 2;
-	stroke-miterlimit: 10;
-	stroke: #7ac142;
-	fill: none;
-	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{
-		font-size: 50px;
-		max-height: 20%;
-
+	.checkmark__circle {
+		stroke-dasharray: 166;
+		stroke-dashoffset: 166;
+		stroke-width: 2;
+		stroke-miterlimit: 10;
+		stroke: #7ac142;
+		fill: none;
+		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;
+		}
+	}
+
 	.alert {
-	padding: 20px;
-	background-color: #f44336;
-	color: white;
+		padding: 20px;
+		background-color: #f44336;
+		color: white;
 	}

 	.closebtn {
-	margin-left: 15px;
-	color: white;
-	font-weight: bold;
-	float: right;
-	font-size: 22px;
-	line-height: 20px;
-	cursor: pointer;
-	transition: 0.3s;
+		margin-left: 15px;
+		color: white;
+		font-weight: bold;
+		float: right;
+		font-size: 22px;
+		line-height: 20px;
+		cursor: pointer;
+		transition: 0.3s;
 	}

 	.closebtn:hover {
 	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>


@ -90,7 +112,7 @@

 	{% endif %}

-	<div class="centered" style="text-align: center;">
+	<div class="centered" id="page-wrap" style="text-align: center;">
 		{% if user.is_authenticated %}
 		{% if img_obj %}
 			<h1 style="color:#7ac142;">Снимката ти е качена успешно!</h1>
@ -105,7 +127,7 @@
 				<label for="image" style="font-size: 32px;">Качи снимка! </label><br><br><br>
 				<input id="image" style="margin: 0 auto;" type="file" name="image" required><br>
 			<br>
-			<button class="Buttons" type="submit">Качи!</button>
+			<button class="buttons" type="submit">Качи!</button>
 			</form>
 			<br><br>
 			{% endif %}