diff --git a/reValuate/api/__pycache__/__init__.cpython-36.pyc b/reValuate/api/__pycache__/__init__.cpython-36.pyc index 2172937b..df580b04 100644 Binary files a/reValuate/api/__pycache__/__init__.cpython-36.pyc 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 index dd55b975..365b6a44 100644 Binary files a/reValuate/api/__pycache__/serializers.cpython-36.pyc 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 index e1bfe324..590d34fa 100644 Binary files a/reValuate/api/__pycache__/views.cpython-36.pyc and b/reValuate/api/__pycache__/views.cpython-36.pyc differ diff --git a/reValuate/db.sqlite3 b/reValuate/db.sqlite3 index 0f38d02e..31a46dce 100644 Binary files a/reValuate/db.sqlite3 and b/reValuate/db.sqlite3 differ diff --git a/reValuate/home/__pycache__/admin.cpython-36.pyc b/reValuate/home/__pycache__/admin.cpython-36.pyc index 6e21981d..9225c2e2 100644 Binary files a/reValuate/home/__pycache__/admin.cpython-36.pyc and b/reValuate/home/__pycache__/admin.cpython-36.pyc differ diff --git a/reValuate/home/__pycache__/models.cpython-36.pyc b/reValuate/home/__pycache__/models.cpython-36.pyc index d1179c14..91a5d5e2 100644 Binary files a/reValuate/home/__pycache__/models.cpython-36.pyc and b/reValuate/home/__pycache__/models.cpython-36.pyc differ diff --git a/reValuate/home/__pycache__/views.cpython-36.pyc b/reValuate/home/__pycache__/views.cpython-36.pyc index c353f29d..e833efe9 100644 Binary files a/reValuate/home/__pycache__/views.cpython-36.pyc and b/reValuate/home/__pycache__/views.cpython-36.pyc differ diff --git a/reValuate/home/static/home/css/style.css b/reValuate/home/static/home/css/style.css index 296ae3e3..a99b3333 100644 --- a/reValuate/home/static/home/css/style.css +++ b/reValuate/home/static/home/css/style.css @@ -187,10 +187,7 @@ footer{ } .centered{ - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); + display:flex; } @-webkit-keyframes text-shadow-pop-right { diff --git a/reValuate/home/static/home/img/approved.png b/reValuate/home/static/home/img/approved.png new file mode 100644 index 00000000..8e6c6306 Binary files /dev/null and b/reValuate/home/static/home/img/approved.png differ diff --git a/reValuate/home/static/home/img/cross.png b/reValuate/home/static/home/img/cross.png new file mode 100644 index 00000000..1c3034b1 Binary files /dev/null and b/reValuate/home/static/home/img/cross.png differ diff --git a/reValuate/home/static/home/img/loading.png b/reValuate/home/static/home/img/loading.png new file mode 100644 index 00000000..a1ce1155 Binary files /dev/null and b/reValuate/home/static/home/img/loading.png differ diff --git a/reValuate/static/home/css/style.css b/reValuate/static/home/css/style.css index 6e53a99a..05f0c614 100644 --- a/reValuate/static/home/css/style.css +++ b/reValuate/static/home/css/style.css @@ -80,7 +80,7 @@ header { height: 100%; width: 0; position: fixed; - z-index: 1; + z-index: 99; left: 0; top: 0; background-color: #469330; @@ -130,7 +130,7 @@ header { } } -@media only screen and (max-width: 1000px) { +@media only screen and (max-width: 800px) { .nav__links, .cta { display: none; @@ -142,11 +142,6 @@ header { } 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; } @@ -189,4 +184,81 @@ footer{ font-size: small; text-align: center; left:50%; -} \ No newline at end of file +} + +.centered{ + display: flex; +} + +@-webkit-keyframes text-shadow-pop-right { + 0% { + text-shadow: 0 0 #555,0 0 #555,0 0 #555,0 0 #555,0 0 #555,0 0 #555,0 0 #555,0 0 #555; + -webkit-transform: translateX(0); + transform: translateX(0) + } + + 100% { + text-shadow: 1px 0 #555,2px 0 #555,3px 0 #555,4px 0 #555,5px 0 #555,6px 0 #555,7px 0 #555,8px 0 #555; + -webkit-transform: translateX(-8px); + transform: translateX(-8px) + } +} + +@keyframes text-shadow-pop-right { + 0% { + text-shadow: 0 0 #555,0 0 #555,0 0 #555,0 0 #555,0 0 #555,0 0 #555,0 0 #555,0 0 #555; + -webkit-transform: translateX(0); + transform: translateX(0) + } + + 100% { + text-shadow: 1px 0 #555,2px 0 #555,3px 0 #555,4px 0 #555,5px 0 #555,6px 0 #555,7px 0 #555,8px 0 #555; + -webkit-transform: translateX(-8px); + transform: translateX(-8px) + } +} + +.text-shadow-pop-right{-webkit-animation:text-shadow-pop-right .6s both;animation:text-shadow-pop-right .6s both} + +@-webkit-keyframes scale-in-center { + 0% { + -webkit-transform: scale(0); + transform: scale(0); + opacity: 1; + } + 100% { + -webkit-transform: scale(1); + transform: scale(1); + opacity: 1; + } +} +@keyframes scale-in-center { + 0% { + -webkit-transform: scale(0); + transform: scale(0); + opacity: 1; + } + 100% { + -webkit-transform: scale(1); + transform: scale(1); + opacity: 1; + } +} + +.scale-in-center { + -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; +} diff --git a/reValuate/static/home/img/loading.png b/reValuate/static/home/img/loading.png new file mode 100644 index 00000000..eaf50169 Binary files /dev/null and b/reValuate/static/home/img/loading.png differ diff --git a/reValuate/templates/home.html b/reValuate/templates/home.html index 6a43b082..0265a181 100644 --- a/reValuate/templates/home.html +++ b/reValuate/templates/home.html @@ -55,7 +55,7 @@

Имате въпроси?

Свържете се с нас!


-

+

diff --git a/reValuate/templates/leaderboard.html b/reValuate/templates/leaderboard.html index dc9d23c3..ad793551 100644 --- a/reValuate/templates/leaderboard.html +++ b/reValuate/templates/leaderboard.html @@ -14,10 +14,9 @@ html{ } .content{ - position: absolute; - top:50%; - left: 50%; - transform: translate(-50%, -50%); + + + display: flex; } #one{ font-size: 64px; diff --git a/reValuate/templates/showAllImage.html b/reValuate/templates/showAllImage.html index a4aaa700..cd8bf5a2 100644 --- a/reValuate/templates/showAllImage.html +++ b/reValuate/templates/showAllImage.html @@ -2,84 +2,68 @@ {% load static %} {% block title %} My Images {% endblock %} {% block optionalParams %} - + #processing{ + flex: 1; + } + @media only screen and (max-width: 600px) { + #page-wrap{ + display: block; + } + } + + {% endblock %} {% block content %} {% if user.is_authenticated %} -

Твоята медия

-
- {% for i in get_status reversed %} - {% if i.is_video %} -
-
- -
-
- {% if i.reason %} -

❌ Видеото ти е маркирана като невалидно.

-

Ако мислиш че има грешка ни изпратете имейл.

- - {% elif i.tokenized %} -

✅ Видеото ти е валидно!

-

Провери баланса си!

- - {% else %} -

⏳ Видеото ти очаква обработка!

- - {% endif %} -
-
-
- - {% else %} -
-
- -
-
- {% if i.reason %} -

❌ Снимката ти е маркирана като невалидна.

-

Ако мислиш че има грешка ни изпратете имейл.

- - {% elif i.tokenized %} -

✅ Снимката ти е валидна!

-

Провери баланса си!

- - {% else %} -

⏳ Снимката ти очаква обработка!

- {% endif %} -
-
-
- - - {% endif %} - {% endfor %} -
-
-
-
-
- X - -
-
+
-{% else %} + {% if approved %} +
+ +


+

Имаш {{ approved }} одобрена медия!

+


+ {% endif %} + + {% if processing %} +
+


+

Имаш {{ processing }} медия, очакваща одобрение!



+
+ {% endif %} + + {% if declined %} +
+


+

Имаш {{ declined }} отказана медия, ако мислиш, че това е грешка, свържи се с нас!

+ {% endif %} +
+
+ {% else %}

You are not logged in

Log In {% endif %} diff --git a/reValuate/templates/wait.html b/reValuate/templates/wait.html new file mode 100644 index 00000000..74e6bbc6 --- /dev/null +++ b/reValuate/templates/wait.html @@ -0,0 +1,116 @@ +{% extends 'base.html' %} + +{% block title %} Изчакай малко! {% endblock %} + +{% block optionalParams %} + +{% endblock %} + +{% block content %} +
+ + + + +

Изчакай малко, снимката/видеото ти е в процес на одобрение!

+
+

Ако този процес отнема прекалено много време според теб, свържи се с нас!

+ +{% endblock %} diff --git a/reValuate/upload/__pycache__/__init__.cpython-36.pyc b/reValuate/upload/__pycache__/__init__.cpython-36.pyc index 8129991f..ca701b71 100644 Binary files a/reValuate/upload/__pycache__/__init__.cpython-36.pyc and b/reValuate/upload/__pycache__/__init__.cpython-36.pyc differ diff --git a/reValuate/upload/__pycache__/admin.cpython-36.pyc b/reValuate/upload/__pycache__/admin.cpython-36.pyc index f8eb74c3..c0ab1054 100644 Binary files a/reValuate/upload/__pycache__/admin.cpython-36.pyc and b/reValuate/upload/__pycache__/admin.cpython-36.pyc differ diff --git a/reValuate/upload/__pycache__/forms.cpython-36.pyc b/reValuate/upload/__pycache__/forms.cpython-36.pyc index 51aa408f..a66a3783 100644 Binary files a/reValuate/upload/__pycache__/forms.cpython-36.pyc and b/reValuate/upload/__pycache__/forms.cpython-36.pyc differ diff --git a/reValuate/upload/__pycache__/models.cpython-36.pyc b/reValuate/upload/__pycache__/models.cpython-36.pyc index 2a3f977f..e4d1adf0 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/upload/__pycache__/validators.cpython-36.pyc b/reValuate/upload/__pycache__/validators.cpython-36.pyc index b78faa4d..d9477779 100644 Binary files a/reValuate/upload/__pycache__/validators.cpython-36.pyc and b/reValuate/upload/__pycache__/validators.cpython-36.pyc differ diff --git a/reValuate/upload/__pycache__/views.cpython-36.pyc b/reValuate/upload/__pycache__/views.cpython-36.pyc index 6d0901ea..573f8a6a 100644 Binary files a/reValuate/upload/__pycache__/views.cpython-36.pyc and b/reValuate/upload/__pycache__/views.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/0025_auto_20210831_1639.py b/reValuate/upload/migrations/0025_auto_20210831_1639.py new file mode 100644 index 00000000..9cf210a2 --- /dev/null +++ b/reValuate/upload/migrations/0025_auto_20210831_1639.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.6 on 2021-08-31 13:39 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('upload', '0024_media_managed_by'), + ] + + operations = [ + migrations.AlterField( + model_name='media', + name='tokenized', + field=models.BooleanField(blank=True, default=False, max_length=3, null=True), + ), + ] diff --git a/reValuate/upload/migrations/0026_auto_20210831_1640.py b/reValuate/upload/migrations/0026_auto_20210831_1640.py new file mode 100644 index 00000000..55018866 --- /dev/null +++ b/reValuate/upload/migrations/0026_auto_20210831_1640.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.6 on 2021-08-31 13:40 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('upload', '0025_auto_20210831_1639'), + ] + + operations = [ + migrations.AlterField( + model_name='media', + name='tokenized', + field=models.BooleanField(blank=True, default=None, max_length=3, null=True), + ), + ] diff --git a/reValuate/upload/migrations/__pycache__/0001_initial.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0001_initial.cpython-36.pyc index 8fea9fe7..643af804 100644 Binary files a/reValuate/upload/migrations/__pycache__/0001_initial.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0001_initial.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0002_balance.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0002_balance.cpython-36.pyc index ded383c3..28fae97a 100644 Binary files a/reValuate/upload/migrations/__pycache__/0002_balance.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0002_balance.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0003_delete_balance.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0003_delete_balance.cpython-36.pyc index 74afd144..148ad043 100644 Binary files a/reValuate/upload/migrations/__pycache__/0003_delete_balance.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0003_delete_balance.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0004_auto_20210311_1702.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0004_auto_20210311_1702.cpython-36.pyc index f25db0ad..720db9d1 100644 Binary files a/reValuate/upload/migrations/__pycache__/0004_auto_20210311_1702.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0004_auto_20210311_1702.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0005_auto_20210311_1833.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0005_auto_20210311_1833.cpython-36.pyc index c16908a9..d2f78647 100644 Binary files a/reValuate/upload/migrations/__pycache__/0005_auto_20210311_1833.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0005_auto_20210311_1833.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0006_auto_20210311_1833.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0006_auto_20210311_1833.cpython-36.pyc index 86367484..9995e56d 100644 Binary files a/reValuate/upload/migrations/__pycache__/0006_auto_20210311_1833.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0006_auto_20210311_1833.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0007_auto_20210311_1834.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0007_auto_20210311_1834.cpython-36.pyc index ff19e4d4..b63e4bb4 100644 Binary files a/reValuate/upload/migrations/__pycache__/0007_auto_20210311_1834.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0007_auto_20210311_1834.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0008_auto_20210311_1838.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0008_auto_20210311_1838.cpython-36.pyc index 5ae2e8fa..f1d586de 100644 Binary files a/reValuate/upload/migrations/__pycache__/0008_auto_20210311_1838.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0008_auto_20210311_1838.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0009_auto_20210311_1910.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0009_auto_20210311_1910.cpython-36.pyc index 82659271..9b85df90 100644 Binary files a/reValuate/upload/migrations/__pycache__/0009_auto_20210311_1910.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0009_auto_20210311_1910.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0010_auto_20210312_2339.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0010_auto_20210312_2339.cpython-36.pyc index b99ff4b3..a7a5b775 100644 Binary files a/reValuate/upload/migrations/__pycache__/0010_auto_20210312_2339.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0010_auto_20210312_2339.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0011_auto_20210312_2341.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0011_auto_20210312_2341.cpython-36.pyc index d0d5065d..b646eba9 100644 Binary files a/reValuate/upload/migrations/__pycache__/0011_auto_20210312_2341.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0011_auto_20210312_2341.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0012_auto_20210312_2347.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0012_auto_20210312_2347.cpython-36.pyc index 6c005f23..03e92fb5 100644 Binary files a/reValuate/upload/migrations/__pycache__/0012_auto_20210312_2347.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0012_auto_20210312_2347.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0013_auto_20210315_0340.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0013_auto_20210315_0340.cpython-36.pyc index 036837c9..d9149fd2 100644 Binary files a/reValuate/upload/migrations/__pycache__/0013_auto_20210315_0340.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0013_auto_20210315_0340.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0014_image_time.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0014_image_time.cpython-36.pyc index 17a65bfb..607f73c8 100644 Binary files a/reValuate/upload/migrations/__pycache__/0014_image_time.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0014_image_time.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0015_auto_20210315_1745.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0015_auto_20210315_1745.cpython-36.pyc index e3e11306..60494556 100644 Binary files a/reValuate/upload/migrations/__pycache__/0015_auto_20210315_1745.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0015_auto_20210315_1745.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0016_videos.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0016_videos.cpython-36.pyc index 37d75bbc..76cdf843 100644 Binary files a/reValuate/upload/migrations/__pycache__/0016_videos.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0016_videos.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0017_auto_20210315_1838.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0017_auto_20210315_1838.cpython-36.pyc index 5ed889b2..8e344f85 100644 Binary files a/reValuate/upload/migrations/__pycache__/0017_auto_20210315_1838.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0017_auto_20210315_1838.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0018_auto_20210315_1839.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0018_auto_20210315_1839.cpython-36.pyc index 5dd96037..5bc28457 100644 Binary files a/reValuate/upload/migrations/__pycache__/0018_auto_20210315_1839.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0018_auto_20210315_1839.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0019_auto_20210315_1841.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0019_auto_20210315_1841.cpython-36.pyc index 777a303e..8d30f705 100644 Binary files a/reValuate/upload/migrations/__pycache__/0019_auto_20210315_1841.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0019_auto_20210315_1841.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0020_auto_20210315_1847.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0020_auto_20210315_1847.cpython-36.pyc index bc60252f..9cb39fd4 100644 Binary files a/reValuate/upload/migrations/__pycache__/0020_auto_20210315_1847.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0020_auto_20210315_1847.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0021_auto_20210315_1848.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0021_auto_20210315_1848.cpython-36.pyc index 29eb2809..90acd6fa 100644 Binary files a/reValuate/upload/migrations/__pycache__/0021_auto_20210315_1848.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0021_auto_20210315_1848.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0022_auto_20210315_1852.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0022_auto_20210315_1852.cpython-36.pyc index e9a41dc7..79a456d8 100644 Binary files a/reValuate/upload/migrations/__pycache__/0022_auto_20210315_1852.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0022_auto_20210315_1852.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0023_auto_20210315_1901.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0023_auto_20210315_1901.cpython-36.pyc index 77693192..5da1e914 100644 Binary files a/reValuate/upload/migrations/__pycache__/0023_auto_20210315_1901.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0023_auto_20210315_1901.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0024_media_managed_by.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0024_media_managed_by.cpython-36.pyc index 95987500..88eec68d 100644 Binary files a/reValuate/upload/migrations/__pycache__/0024_media_managed_by.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0024_media_managed_by.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/__init__.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/__init__.cpython-36.pyc index 3b86eb99..e1f0bdfc 100644 Binary files a/reValuate/upload/migrations/__pycache__/__init__.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/__init__.cpython-36.pyc differ diff --git a/reValuate/upload/views.py b/reValuate/upload/views.py index 7e20338a..c9f2d0d4 100644 --- a/reValuate/upload/views.py +++ b/reValuate/upload/views.py @@ -29,6 +29,11 @@ def imageUpload(request): warning = True else: warning = False + + media = Media.objects.filter(user_id=request.user.id).last() + print(media.tokenized) + if media.tokenized is None: + return render(request, "wait.html") print(request.user.id) if request.method == 'POST': @@ -79,13 +84,23 @@ def imageUpload(request): def viewMedia(request): get_status = Media.objects.filter(user_id=request.user.id) - img_list = os.listdir(settings.MEDIA_ROOT + f"{request.user.id}/") + approved = [] + declined = [] + processing = [] + for i in get_status: + if i.tokenized: + approved.append(i) + if not i.tokenized: + declined.append(i) + if i.tokenized is None: + processing.append(i) + + context={ + "approved":len(approved), + "declined":len(declined), + "processing":len(processing), - context = { - "id":request.user.id, - "get_status":get_status, - "img_number": len(img_list), } return render (request, 'showAllImage.html', context) diff --git a/reValuate/users/__pycache__/admin.cpython-36.pyc b/reValuate/users/__pycache__/admin.cpython-36.pyc index fedbaaca..b5bfcb18 100644 Binary files a/reValuate/users/__pycache__/admin.cpython-36.pyc and b/reValuate/users/__pycache__/admin.cpython-36.pyc differ diff --git a/reValuate/users/__pycache__/models.cpython-36.pyc b/reValuate/users/__pycache__/models.cpython-36.pyc index a50f0b58..a5c0a0a6 100644 Binary files a/reValuate/users/__pycache__/models.cpython-36.pyc and b/reValuate/users/__pycache__/models.cpython-36.pyc differ diff --git a/reValuate/users/__pycache__/urls.cpython-36.pyc b/reValuate/users/__pycache__/urls.cpython-36.pyc index 911b0a36..7529e110 100644 Binary files a/reValuate/users/__pycache__/urls.cpython-36.pyc and b/reValuate/users/__pycache__/urls.cpython-36.pyc differ diff --git a/reValuate/users/__pycache__/views.cpython-36.pyc b/reValuate/users/__pycache__/views.cpython-36.pyc index f07343e9..3a1fbe21 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/migrations/__pycache__/0001_initial.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0001_initial.cpython-36.pyc index 8c8404c1..c53818b5 100644 Binary files a/reValuate/users/migrations/__pycache__/0001_initial.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/0001_initial.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0002_auto_20210220_2131.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0002_auto_20210220_2131.cpython-36.pyc index 1557492e..ee5215ef 100644 Binary files a/reValuate/users/migrations/__pycache__/0002_auto_20210220_2131.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/0002_auto_20210220_2131.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0003_auto_20210220_2142.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0003_auto_20210220_2142.cpython-36.pyc index 1b222b1e..18006e3e 100644 Binary files a/reValuate/users/migrations/__pycache__/0003_auto_20210220_2142.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/0003_auto_20210220_2142.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0004_auto_20210220_2143.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0004_auto_20210220_2143.cpython-36.pyc index 38a0eca0..4038994d 100644 Binary files a/reValuate/users/migrations/__pycache__/0004_auto_20210220_2143.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/0004_auto_20210220_2143.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0005_auto_20210307_1544.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0005_auto_20210307_1544.cpython-36.pyc index a67775bc..4d49a514 100644 Binary files a/reValuate/users/migrations/__pycache__/0005_auto_20210307_1544.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/0005_auto_20210307_1544.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0006_delete_balance.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0006_delete_balance.cpython-36.pyc index 63a169aa..a4c73e28 100644 Binary files a/reValuate/users/migrations/__pycache__/0006_delete_balance.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/0006_delete_balance.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0007_balance.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0007_balance.cpython-36.pyc index f03ff7f8..f22c1604 100644 Binary files a/reValuate/users/migrations/__pycache__/0007_balance.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/0007_balance.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0008_transaction.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0008_transaction.cpython-36.pyc index 8afee7f5..e8da62f7 100644 Binary files a/reValuate/users/migrations/__pycache__/0008_transaction.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/0008_transaction.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0009_auto_20210316_1408.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0009_auto_20210316_1408.cpython-36.pyc index e296b885..0e71b14f 100644 Binary files a/reValuate/users/migrations/__pycache__/0009_auto_20210316_1408.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/0009_auto_20210316_1408.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0010_auto_20210316_1415.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0010_auto_20210316_1415.cpython-36.pyc index 78b32f1f..efa2ee8e 100644 Binary files a/reValuate/users/migrations/__pycache__/0010_auto_20210316_1415.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/0010_auto_20210316_1415.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0011_auto_20210316_1420.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0011_auto_20210316_1420.cpython-36.pyc index acd7a2f9..2ab21ea9 100644 Binary files a/reValuate/users/migrations/__pycache__/0011_auto_20210316_1420.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/0011_auto_20210316_1420.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0012_auto_20210316_1421.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0012_auto_20210316_1421.cpython-36.pyc index a5071146..3f17701d 100644 Binary files a/reValuate/users/migrations/__pycache__/0012_auto_20210316_1421.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/0012_auto_20210316_1421.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/__init__.cpython-36.pyc b/reValuate/users/migrations/__pycache__/__init__.cpython-36.pyc index bb919e86..9af5fb78 100644 Binary files a/reValuate/users/migrations/__pycache__/__init__.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/__init__.cpython-36.pyc differ diff --git a/reValuate/website/__pycache__/settings.cpython-36.pyc b/reValuate/website/__pycache__/settings.cpython-36.pyc index 800de90c..02d48bfe 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 6779820c..33ff6e83 100644 Binary files a/reValuate/website/__pycache__/urls.cpython-36.pyc and b/reValuate/website/__pycache__/urls.cpython-36.pyc differ diff --git a/reValuate/website/__pycache__/wsgi.cpython-36.pyc b/reValuate/website/__pycache__/wsgi.cpython-36.pyc index 3af2ef1a..c7c7953e 100644 Binary files a/reValuate/website/__pycache__/wsgi.cpython-36.pyc and b/reValuate/website/__pycache__/wsgi.cpython-36.pyc differ diff --git a/reValuate/website/settings.py b/reValuate/website/settings.py index 22f12fb4..1ac03cf7 100644 --- a/reValuate/website/settings.py +++ b/reValuate/website/settings.py @@ -26,7 +26,7 @@ BASE_DIR = Path(__file__).resolve().parent.parent SECRET_KEY = '&(v*@m-bz2n9kki!2y)qo5ipp-v+!vfpb4cj=l6n93y&18jht*' # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = False +DEBUG = True ALLOWED_HOSTS = [ "cleener.xyz",