diff --git a/reValuate/api/__pycache__/__init__.cpython-36.pyc b/reValuate/api/__pycache__/__init__.cpython-36.pyc
new file mode 100644
index 00000000..edfd51fb
Binary files /dev/null and b/reValuate/api/__pycache__/__init__.cpython-36.pyc differ
diff --git a/reValuate/api/__pycache__/serializers.cpython-36.pyc b/reValuate/api/__pycache__/serializers.cpython-36.pyc
new file mode 100644
index 00000000..aa60a2d7
Binary files /dev/null and b/reValuate/api/__pycache__/serializers.cpython-36.pyc differ
diff --git a/reValuate/api/__pycache__/views.cpython-36.pyc b/reValuate/api/__pycache__/views.cpython-36.pyc
new file mode 100644
index 00000000..8664878f
Binary files /dev/null and b/reValuate/api/__pycache__/views.cpython-36.pyc differ
diff --git a/reValuate/db.sqlite3 b/reValuate/db.sqlite3
index 9f5cb2f0..e8f0e7a0 100644
Binary files a/reValuate/db.sqlite3 and b/reValuate/db.sqlite3 differ
diff --git a/reValuate/media/1/137542516_1175146582881996_8582922333333306690_n.jpg b/reValuate/media/1/137542516_1175146582881996_8582922333333306690_n.jpg
new file mode 100644
index 00000000..a8bcf1e4
Binary files /dev/null and b/reValuate/media/1/137542516_1175146582881996_8582922333333306690_n.jpg differ
diff --git a/reValuate/media/1/1604-lubuntu-default-wallpaper-neutral.png b/reValuate/media/1/1604-lubuntu-default-wallpaper-neutral.png
new file mode 100644
index 00000000..9d2029e8
Binary files /dev/null and b/reValuate/media/1/1604-lubuntu-default-wallpaper-neutral.png differ
diff --git a/reValuate/media/1/CardTrooper-TF04-JP-VG.jpg b/reValuate/media/1/CardTrooper-TF04-JP-VG.jpg
new file mode 100644
index 00000000..1f6c259a
Binary files /dev/null and b/reValuate/media/1/CardTrooper-TF04-JP-VG.jpg differ
diff --git 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
new file mode 100644
index 00000000..1eabf40a
Binary files /dev/null and b/reValuate/media/1/RiceGum_-_Nae_Nae_Nigga_Official_FULL_Music_Video.mp4 differ
diff --git a/reValuate/templates/adminView.html b/reValuate/templates/adminView.html
index 2f2efc4b..9cbf375e 100644
--- 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>
diff --git a/reValuate/templates/base.html b/reValuate/templates/base.html
index d892b91d..86551f66 100644
--- 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 %}
diff --git a/reValuate/templates/showAllImage.html b/reValuate/templates/showAllImage.html
index 62125813..d6be582f 100644
--- 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 %}
diff --git a/reValuate/upload/__pycache__/models.cpython-36.pyc b/reValuate/upload/__pycache__/models.cpython-36.pyc
index 62c3dbad..4d0c749a 100644
Binary files a/reValuate/upload/__pycache__/models.cpython-36.pyc and b/reValuate/upload/__pycache__/models.cpython-36.pyc differ
diff --git a/reValuate/users/__pycache__/views.cpython-36.pyc b/reValuate/users/__pycache__/views.cpython-36.pyc
index 6712038b..6fdc6894 100644
Binary files a/reValuate/users/__pycache__/views.cpython-36.pyc and b/reValuate/users/__pycache__/views.cpython-36.pyc differ
diff --git a/reValuate/users/views.py b/reValuate/users/views.py
index ce9751a0..d559f439 100644
--- 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
diff --git a/reValuate/website/__pycache__/settings.cpython-36.pyc b/reValuate/website/__pycache__/settings.cpython-36.pyc
index 3dae75fb..e8527876 100644
Binary files a/reValuate/website/__pycache__/settings.cpython-36.pyc and b/reValuate/website/__pycache__/settings.cpython-36.pyc differ
diff --git a/reValuate/website/__pycache__/urls.cpython-36.pyc b/reValuate/website/__pycache__/urls.cpython-36.pyc
index 47c6c778..7cd2c066 100644
Binary files a/reValuate/website/__pycache__/urls.cpython-36.pyc and b/reValuate/website/__pycache__/urls.cpython-36.pyc differ