Revert "Merge branch 'prod-test' of https://github.com/ligmitz/cryptic-hunt"

This reverts commit 82e8c98, reversing
changes made to fe8d091.

Author: ligmitz

.dockerignore

@@ -1,5 +1 @@
-.vscode
-venv/
-*/__pycache__/
-README.md
-db.sqlite3
+venv/

.gitignore

@@ -3,5 +3,3 @@
 /static_cdn/*
 **/__pycache__/
 venv/
-
-.vscode

app/docker/Dockerfile Dockerfile

@@ -1,16 +1,14 @@
-ARG PYTHON_VERSION
-FROM python:${PYTHON_VERSION}
+FROM python:3
 
 WORKDIR /app
 
-RUN pip install -U pip wheel setuptools
-
 COPY requirements.txt /app/ 
 
 RUN pip install -r requirements.txt
 
-COPY ../ .
+COPY . /app/
 
 COPY entrypoint.sh /app/
 
+ENTRYPOINT [ "sh", "entrypoint.sh" ]
 

app/accounts/__init__.py accounts/__init__.py

@@ -1,9 +1,10 @@
-# Generated by Django 3.1.6 on 2021-02-08 13:39
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-01-14 11:39
+from __future__ import unicode_literals
 
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
-import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -21,12 +22,10 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('institute', models.CharField(max_length=255, null=True)),
-                ('phoneNumber', models.IntegerField(default=0)),
-                ('current_level_time', models.DateTimeField(default=django.utils.timezone.now)),
+                ('current_level_time', models.DateTimeField(auto_now=True)),
                 ('is_banned', models.BooleanField(default=False)),
                 ('is_admin', models.BooleanField(default=False)),
-                ('is_cleared', models.BooleanField(default=False)),
-                ('current_level', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='questions.level')),
+                ('current_level', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='questions.Level')),
                 ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
         ),

app/accounts/admin.py accounts/admin.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-01-14 15:50
+from __future__ import unicode_literals
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='profile',
+            name='current_level_time',
+            field=models.DateTimeField(default=datetime.datetime(2018, 1, 14, 15, 50, 2, 111189, tzinfo=utc)),
+        ),
+    ]

app/accounts/apps.py accounts/apps.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-01-14 16:30
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0002_auto_20180114_1550'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='profile',
+            name='current_level_time',
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+    ]

app/accounts/forms.py accounts/forms.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.8 on 2021-01-30 06:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0003_auto_20180114_1630'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='profile',
+            name='is_cleared',
+            field=models.BooleanField(default=False),
+        ),
+    ]

app/accounts/migrations/0001_initial.py accounts/migrations/0001_initial.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.17 on 2021-02-02 08:50
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0004_profile_is_cleared'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='profile',
+            name='phoneNumber',
+            field=models.IntegerField(default=0),
+        ),
+    ]

accounts/migrations/0002_auto_20180114_1550.py

@@ -0,0 +1 @@
+/home/karan/anaconda3/bin/activate

accounts/migrations/0003_auto_20180114_1630.py

@@ -0,0 +1 @@
+/home/karan/anaconda3/bin/conda

accounts/migrations/0004_profile_is_cleared.py

@@ -0,0 +1 @@
+/home/karan/anaconda3/bin/deactivate