added the 2 points photo, 3 points video thing

2021-06-04 11:16:14 +03:00 · 2021-06-04 11:16:14 +03:00 · 5eab487307
commit 5eab487307
parent d43a2d4cf2
16 changed files with 17 additions and 7 deletions
--- a/reValuate/api/pycache/init.cpython-36.pyc
+++ b/reValuate/api/pycache/init.cpython-36.pyc
--- a/reValuate/api/pycache/serializers.cpython-36.pyc
+++ b/reValuate/api/pycache/serializers.cpython-36.pyc
--- a/reValuate/api/pycache/views.cpython-36.pyc
+++ b/reValuate/api/pycache/views.cpython-36.pyc
--- a/reValuate/db.sqlite3
+++ b/reValuate/db.sqlite3
--- a/reValuate/media/1/137542516_1175146582881996_8582922333333306690_n.jpg
+++ b/reValuate/media/1/137542516_1175146582881996_8582922333333306690_n.jpg
--- a/reValuate/media/1/1604-lubuntu-default-wallpaper-neutral.png
+++ b/reValuate/media/1/1604-lubuntu-default-wallpaper-neutral.png
--- a/reValuate/media/1/CardTrooper-TF04-JP-VG.jpg
+++ b/reValuate/media/1/CardTrooper-TF04-JP-VG.jpg
--- a/reValuate/media/1/RiceGum_-_Nae_Nae_Nigga_Official_FULL_Music_Video.mp4
+++ b/reValuate/media/1/RiceGum_-_Nae_Nae_Nigga_Official_FULL_Music_Video.mp4
--- a/reValuate/templates/adminView.html
+++ b/reValuate/templates/adminView.html
@ -53,7 +53,7 @@
        <source src="/media/{{ image }}" type="video/mp4">
        </video>
        {% else %}
-        <img src="/media/{{ image }}" width="500" width="500" ><br>
+        <img src="/media/{{ image }}" style="max-width:500px; max-height: 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>
--- a/reValuate/templates/base.html
+++ b/reValuate/templates/base.html
@ -25,7 +25,9 @@
      </head>
      <body>
        {% block aboveNav %} {% endblock %}
-          <nav  class="navbar navbar-expand-lg bg-success">              <a style="color: white; font-size: 200%;" class="navbar-brand mb-0 h1" href="/"> reValuate | </a>
+        <div>
+          <nav class="navbar navbar-expand-lg fixed-top bg-success"> 
+          <a style="color: white; font-size: 200%;" class="navbar-brand mb-0 h1" href="/"> reValuate | </a>
    
    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#target" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
 	<i class="fas fa-bars" style="color:#000; font-size:28px;"></i>
@ -71,7 +73,8 @@
                </div>
                </ul>
            </nav>
-
+          </div>
+          
            {% block content %}
            {% endblock %}

--- a/reValuate/templates/showAllImage.html
+++ b/reValuate/templates/showAllImage.html
@ -19,7 +19,8 @@
 {% endblock %}
 {% block content %}
 {% if user.is_authenticated %}
-  <div class="centered">
+
+  <div class="mx-auto">
  
    
  {% for i in get_status reversed %}
--- a/reValuate/upload/pycache/models.cpython-36.pyc
+++ b/reValuate/upload/pycache/models.cpython-36.pyc
--- a/reValuate/users/pycache/views.cpython-36.pyc
+++ b/reValuate/users/pycache/views.cpython-36.pyc
--- a/reValuate/users/views.py
+++ b/reValuate/users/views.py
@ -83,17 +83,23 @@ def adminView(request):

            if request.method == "POST":
                if request.POST['isValid'] == "Valid":
+                    imageObj = Media.objects.get(image=latestPicture, user_id=userId)
+                    
+                    if imageObj.is_video:
+                        token_count = 3
+                    else:
+                        token_count = 2
+
                    try:
                        user_instance = Balance.objects.get(user=userId)
-                        sum_balance = 5 + user_instance.balanceValue
+                        sum_balance = token_count + user_instance.balanceValue
                        balAdd = Balance(balanceValue=sum_balance, user_id=user_instance)
                        balAdd.save()
                        print(balAdd)
                    except Balance.DoesNotExist:
-                        balAdd = Balance(balanceValue=5, user_id=userId)
+                        balAdd = Balance(balanceValue=token_count, user_id=userId)
                        balAdd.save()
                    
-                    imageObj = Media.objects.get(image=latestPicture, user_id=userId)
                    imageObj.tokenized = True
                    imageObj.managed_by = request.user.username

--- a/reValuate/website/pycache/settings.cpython-36.pyc
+++ b/reValuate/website/pycache/settings.cpython-36.pyc
--- a/reValuate/website/pycache/urls.cpython-36.pyc
+++ b/reValuate/website/pycache/urls.cpython-36.pyc