Merge branch 'stage_pass' into 'main'

Added stage web page

* adjusted models to reflect open stages for user and some
  fileds added (img, desc uuid passphare etc.)
* new view STAGE which now contains stages and allows to see
  only stage for user on which is currently user at

See merge request djz.88/sifrovacky!2

.gitignore

@@ -104,4 +104,7 @@ GitHub.sublime-settings
 !.vscode/launch.json
 !.vscode/extensions.json
 .history
+
+# Custom #
 db.sqlite3
+media/*

django_apps/settings.py

@@ -23,9 +23,10 @@ BASE_DIR = Path(__file__).resolve().parent.parent
 SECRET_KEY = 'django-insecure-kog+-x*xtt5e7shmxa-ddldzdtz@u#*tj^s9jzm#%&ghy*a8x%'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = False
+#DEBUG = True
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ['*']
 
 
 # Application definition
@@ -40,6 +41,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'tinymce',
 ]
 
 MIDDLEWARE = [
@@ -63,6 +65,7 @@ TEMPLATES = [
             'context_processors': [
                 'django.template.context_processors.debug',
                 'django.template.context_processors.request',
+                'django.template.context_processors.media',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
             ],
@@ -131,3 +134,41 @@ DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
 LOGIN_REDIRECT_URL = 'home'
 LOGOUT_REDIRECT_URL = 'index'
+
+# Custom settings STATIC
+STATIC_URL = "/static/"
+STATIC_ROOT = BASE_DIR / 'static'
+#STATICFILES_DIRS = BASE_DIR / 'static'
+
+# Custom settings MEDIA
+MEDIA_URL = "/media/"
+MEDIA_ROOT = BASE_DIR / 'media'
+
+# TinyMCE settings
+TINYMCE_DEFAULT_CONFIG = {
+    'cleanup_on_startup': True,
+    'custom_undo_redo_levels': 20,
+    'selector': 'textarea',
+    'theme': 'silver',
+    'plugins': '''
+            textcolor save link image media preview codesample contextmenu
+            table code lists fullscreen  insertdatetime  nonbreaking
+            contextmenu directionality searchreplace wordcount visualblocks
+            visualchars code fullscreen autolink lists  charmap print  hr
+            anchor pagebreak
+            ''',
+    'toolbar1': '''
+            fullscreen preview bold italic underline | fontselect,
+            fontsizeselect  | forecolor backcolor | alignleft alignright |
+            aligncenter alignjustify | indent outdent | bullist numlist table |
+            | link image media | codesample |
+            ''',
+    'toolbar2': '''
+            visualblocks visualchars |
+            charmap hr pagebreak nonbreaking anchor |  code |
+            ''',
+    'contextmenu': 'formats | link image',
+    'menubar': True,
+    'statusbar': True,
+}
+

django_apps/urls.py

@@ -15,9 +15,15 @@ Including another URLconf
 """
 from django.contrib import admin
 from django.urls import path, include
+from django.conf.urls.static import static
+from django.conf import settings
+
 
 urlpatterns = [
 #    path('polls/', include('polls.urls')),
     path('sifrovacka/', include('sifrovacka.urls')),
     path('admin/', admin.site.urls),
 ]
+if settings.DEBUG:
+    urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+    urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)

requirements.txt

@@ -2,7 +2,9 @@ appdirs==1.4.4
 asgiref==3.3.4
 asn1crypto==1.4.0
 backcall==0.2.0
+certifi==2021.5.30
 cffi==1.14.6
+charset-normalizer==2.0.4
 confusable-homoglyphs==3.2.0
 cryptography==3.3.2
 dbus-python==1.2.16
@@ -10,8 +12,10 @@ decorator==5.0.9
 distlib==0.3.1
 Django==3.2.3
 django-registration==3.2
+django-tinymce==3.3.0
 entrypoints==0.3
 filelock==3.0.12
+idna==3.2
 importlib-metadata==1.6.0
 ipython==7.27.0
 ipython-genutils==0.2.0
@@ -27,6 +31,7 @@ more-itertools==4.2.0
 parso==0.8.2
 pexpect==4.8.0
 pickleshare==0.7.5
+Pillow==8.3.2
 prompt-toolkit==3.0.20
 ptyprocess==0.7.0
 pycairo==1.20.1
@@ -38,11 +43,13 @@ PyGObject==3.38.0
 pytz==2021.1
 pyxdg==0.27
 PyYAML==5.3.1
+requests==2.26.0
 SecretStorage==3.3.1
 six==1.16.0
 sqlparse==0.4.1
 traitlets==5.0.5
 typing-extensions==3.10.0.0
+urllib3==1.26.6
 virtualenv==20.4.0+ds
 wcwidth==0.2.5
 xdg==5

requirements.txt_

+appdirs==1.4.4
+asgiref==3.3.4
+asn1crypto==1.4.0
+backcall==0.2.0
+certifi==2021.5.30
+cffi==1.14.6
+charset-normalizer==2.0.4
+confusable-homoglyphs==3.2.0
+cryptography==3.3.2
+dbus-python==1.2.16
+decorator==5.0.9
+distlib==0.3.1
+Django==3.2.3
+django-registration==3.2
+entrypoints==0.3
+filelock==3.0.12
+idna==3.2
+importlib-metadata==1.6.0
+ipython==7.27.0
+ipython-genutils==0.2.0
+jedi==0.18.0
+jeepney==0.6.0
+keyring==22.0.1
+keyrings.alt==4.0.2
+Mako==1.1.3
+Markdown==3.3.4
+MarkupSafe==1.1.1
+matplotlib-inline==0.1.2
+more-itertools==4.2.0
+parso==0.8.2
+pexpect==4.8.0
+pickleshare==0.7.5
+Pillow==8.3.2
+prompt-toolkit==3.0.20
+ptyprocess==0.7.0
+pycairo==1.20.1
+pycparser==2.20
+pycrypto==2.6.1
+pycryptodomex==3.9.7
+Pygments==2.7.1
+PyGObject==3.38.0
+pytz==2021.1
+pyxdg==0.27
+PyYAML==5.3.1
+requests==2.26.0
+SecretStorage==3.3.1
+six==1.16.0
+sqlparse==0.4.1
+traitlets==5.0.5
+typing-extensions==3.10.0.0
+urllib3==1.26.6
+virtualenv==20.4.0+ds
+wcwidth==0.2.5
+xdg==5
+zipp==1.0.0

sifrovacka/forms.py

+from django import forms
+#from .models import Sifrovacka, Stages, Participants
+
+class PassphraseForm(forms.Form):
+    passphrase = forms.CharField(label='Vloz heslo k dalsi fazi',
+            max_length=30, widget=forms.TextInput(attrs={'class':
+                'text-input form-field__contro','placeholder':
+                'sem vloz heslo pro postup do dalsi faze'}))
+    stage_current_urlhash = forms.CharField()
+
+#    def clean(self)
+#        cleaned_data = super(PassphraseForm, self).clean()
+#        passphrase = cleaned_data.get('passphrase')
+
+#        if request.user.is_authenticated:
+#            sifrovacka_current_stage_urlhash = Participants.objects.get(id = \
+#                                                tmp_stage_id)
+#                    if (sifrovacka_current_stage_urlhash.at_stage == stage_urlhash):
+#                        print('hehe')
+#                        stage_current_id = Stages.objects.get(stage_urlhash =
+#                                            sifrovacka_current_stage_urlhash.at_stage)
+#                        #sifrovacka_current = Participants.objects.get(id = \
+#                        #                      tmp_stage_id)
+#                    else:
+#                        print('not same')
+#  

sifrovacka/migrations/0012_auto_20210904_1228.py

+# Generated by Django 3.2.3 on 2021-09-04 12:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sifrovacka', '0011_alter_sifrovacka_pub_date'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='stages',
+            name='stage_img',
+            field=models.ImageField(blank=True, upload_to='UserDirectoryPath'),
+        ),
+        migrations.AddField(
+            model_name='stages',
+            name='stage_passphrase',
+            field=models.CharField(default='hesl0Sifrovacka', max_length=30),
+        ),
+        migrations.AlterField(
+            model_name='stages',
+            name='stage_name',
+            field=models.CharField(max_length=80),
+        ),
+    ]

sifrovacka/migrations/0013_stages_stage_urlhash.py

+# Generated by Django 3.2.3 on 2021-09-04 12:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sifrovacka', '0012_auto_20210904_1228'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='stages',
+            name='stage_urlhash',
+            field=models.CharField(default='5f2500a80d7d11ec9b142016b9b07b5b', max_length=32),
+        ),
+    ]

sifrovacka/migrations/0014_auto_20210904_1318.py

+# Generated by Django 3.2.3 on 2021-09-04 13:18
+
+from django.db import migrations, models
+import sifrovacka.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sifrovacka', '0013_stages_stage_urlhash'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='participants',
+            old_name='Inactive',
+            new_name='inactive',
+        ),
+        migrations.AddField(
+            model_name='participants',
+            name='at_stage',
+            field=models.IntegerField(default=1),
+        ),
+        migrations.AlterField(
+            model_name='stages',
+            name='stage_img',
+            field=models.ImageField(blank=True, upload_to=sifrovacka.models.UserDirectoryPath),
+        ),
+        migrations.AlterField(
+            model_name='stages',
+            name='stage_urlhash',
+            field=models.CharField(default='a3c350e80d8211ec9b5f2016b9b07b5b', max_length=32),
+        ),
+    ]

sifrovacka/migrations/0015_auto_20210904_1328.py

+# Generated by Django 3.2.3 on 2021-09-04 13:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sifrovacka', '0014_auto_20210904_1318'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='stages',
+            name='stage_description',
+            field=models.CharField(default='', max_length=500),
+        ),
+        migrations.AlterField(
+            model_name='stages',
+            name='stage_urlhash',
+            field=models.CharField(default='fcb0adee0d8311ecb18b2016b9b07b5b', max_length=32),
+        ),
+    ]

sifrovacka/migrations/0016_auto_20210904_1328.py

+# Generated by Django 3.2.3 on 2021-09-04 13:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sifrovacka', '0015_auto_20210904_1328'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='stages',
+            name='stage_description',
+            field=models.CharField(max_length=500),
+        ),
+        migrations.AlterField(
+            model_name='stages',
+            name='stage_urlhash',
+            field=models.CharField(default='0582c6140d8411ec9c962016b9b07b5b', max_length=32),
+        ),
+    ]

sifrovacka/migrations/0017_alter_stages_stage_urlhash.py

+# Generated by Django 3.2.3 on 2021-09-04 13:29
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sifrovacka', '0016_auto_20210904_1328'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='stages',
+            name='stage_urlhash',
+            field=models.CharField(default='2aa2950a0d8411ecb3ad2016b9b07b5b', max_length=32),
+        ),
+    ]

sifrovacka/migrations/0018_alter_stages_stage_urlhash.py

+# Generated by Django 3.2.3 on 2021-09-04 18:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sifrovacka', '0017_alter_stages_stage_urlhash'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='stages',
+            name='stage_urlhash',
+            field=models.CharField(default='2d64fb520dac11ecb4c92016b9b07b5b', max_length=32),
+        ),
+    ]

sifrovacka/migrations/0019_auto_20210904_1913.py

+# Generated by Django 3.2.3 on 2021-09-04 19:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sifrovacka', '0018_alter_stages_stage_urlhash'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='participants',
+            name='at_stage',
+            field=models.CharField(default='xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx', max_length=32),
+        ),
+        migrations.AlterField(
+            model_name='stages',
+            name='stage_urlhash',
+            field=models.CharField(default='3b1487ba0db411ecae702016b9b07b5b', max_length=32),
+        ),
+    ]

sifrovacka/migrations/0020_auto_20210905_0834.py

+# Generated by Django 3.2.3 on 2021-09-05 08:34
+
+from django.db import migrations, models
+import sifrovacka.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sifrovacka', '0019_auto_20210904_1913'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='sifrovacka',
+            name='sifrovacka_description',
+            field=models.CharField(default='', max_length=500),
+        ),
+        migrations.AddField(
+            model_name='sifrovacka',
+            name='sifrovacka_img',
+            field=models.ImageField(blank=True, upload_to=sifrovacka.models.UserDirectoryPath),
+        ),
+        migrations.AlterField(
+            model_name='stages',
+            name='stage_urlhash',
+            field=models.CharField(default='25aaa7720e2411ecb82f2016b9b07b5b', max_length=32),
+        ),
+    ]

sifrovacka/migrations/0021_auto_20210905_0835.py

+# Generated by Django 3.2.3 on 2021-09-05 08:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sifrovacka', '0020_auto_20210905_0834'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='sifrovacka',
+            name='sifrovacka_description',
+            field=models.CharField(max_length=500),
+        ),
+        migrations.AlterField(
+            model_name='stages',
+            name='stage_urlhash',
+            field=models.CharField(default='39acc55c0e2411ec9d5e2016b9b07b5b', max_length=32),
+        ),
+    ]

sifrovacka/migrations/0022_auto_20210905_1653.py

+# Generated by Django 3.2.3 on 2021-09-05 16:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sifrovacka', '0021_auto_20210905_0835'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='sifrovacka',
+            name='sifrovacka_description',
+            field=models.CharField(max_length=800),
+        ),
+        migrations.AlterField(
+            model_name='stages',
+            name='stage_description',
+            field=models.CharField(max_length=800),
+        ),
+        migrations.AlterField(
+            model_name='stages',
+            name='stage_urlhash',
+            field=models.CharField(default='baacf3800e6911eca1db2016b9b07b5b', max_length=32),
+        ),
+    ]

sifrovacka/migrations/0023_auto_20210905_1654.py

+# Generated by Django 3.2.3 on 2021-09-05 16:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sifrovacka', '0022_auto_20210905_1653'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='sifrovacka',
+            name='sifrovacka_description',
+            field=models.CharField(max_length=2000),
+        ),
+        migrations.AlterField(
+            model_name='stages',
+            name='stage_description',
+            field=models.CharField(max_length=2000),
+        ),
+        migrations.AlterField(
+            model_name='stages',
+            name='stage_urlhash',
+            field=models.CharField(default='f70c86ec0e6911ecb6a22016b9b07b5b', max_length=32),
+        ),
+    ]

sifrovacka/migrations/0024_auto_20210905_1719.py

+# Generated by Django 3.2.3 on 2021-09-05 17:19
+
+from django.db import migrations, models
+import tinymce.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sifrovacka', '0023_auto_20210905_1654'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='sifrovacka',
+            name='sifrovacka_description',
+            field=tinymce.models.HTMLField(),
+        ),
+        migrations.AlterField(
+            model_name='stages',
+            name='stage_description',
+            field=tinymce.models.HTMLField(),
+        ),
+        migrations.AlterField(
+            model_name='stages',
+            name='stage_urlhash',
+            field=models.CharField(default='60bf43560e6d11ecba282016b9b07b5b', max_length=32),
+        ),
+    ]

sifrovacka/migrations/0025_alter_stages_stage_urlhash.py

+# Generated by Django 3.2.3 on 2021-09-05 17:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sifrovacka', '0024_auto_20210905_1719'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='stages',
+            name='stage_urlhash',
+            field=models.CharField(default='3f5301b00e6f11ecbda72016b9b07b5b', max_length=32),
+        ),
+    ]