diff --git a/app/bird/migrations/0001_initial.py b/app/bird/migrations/0001_initial.py index 4d1288f..90bb067 100644 --- a/app/bird/migrations/0001_initial.py +++ b/app/bird/migrations/0001_initial.py @@ -1,6 +1,5 @@ -# Generated by Django 4.2.2 on 2023-07-10 19:16 +# Generated by Django 4.2.3 on 2023-07-12 12:34 -import bird.models from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -12,145 +11,67 @@ class Migration(migrations.Migration): initial = True dependencies = [ + ('aviary', '0003_alter_aviary_condition'), + ('rescuer', '0002_alter_rescuer_options_alter_rescuer_city_and_more'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ("aviary", "0003_alter_aviary_condition"), - ("rescuer", "0001_initial"), ] operations = [ migrations.CreateModel( - name="Bird", + name='Bird', fields=[ - ( - "id", - models.UUIDField( - default=uuid.uuid4, - editable=False, - primary_key=True, - serialize=False, - ), - ), - ("name", models.CharField(max_length=256, unique=True)), - ( - "description", - models.CharField(max_length=4096, verbose_name="Hilfetext"), - ), + ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), + ('name', models.CharField(max_length=256, unique=True, verbose_name='Bezeichnung')), + ('description', models.CharField(max_length=4096, verbose_name='Hilfetext')), ], options={ - "verbose_name": "Vogel", - "verbose_name_plural": "Vögel", + 'verbose_name': 'Vogel', + 'verbose_name_plural': 'Vögel', }, ), migrations.CreateModel( - name="BirdStatus", + name='BirdStatus', fields=[ - ("id", models.BigAutoField(primary_key=True, serialize=False)), - ("description", models.CharField(max_length=256, unique=True)), + ('id', models.BigAutoField(primary_key=True, serialize=False)), + ('description', models.CharField(max_length=256, unique=True, verbose_name='Bezeichnung')), ], options={ - "verbose_name": "Patientenstatus", - "verbose_name_plural": "Patientenstatus", + 'verbose_name': 'Patientenstatus', + 'verbose_name_plural': 'Patientenstatus', }, ), migrations.CreateModel( - name="Circumstance", + name='Circumstance', fields=[ - ("id", models.BigAutoField(primary_key=True, serialize=False)), - ("description", models.CharField(max_length=256)), + ('id', models.BigAutoField(primary_key=True, serialize=False)), + ('description', models.CharField(max_length=256, verbose_name='Bezeichnung')), ], options={ - "verbose_name": "Fundumstand", - "verbose_name_plural": "Fundumstände", + 'verbose_name': 'Fundumstand', + 'verbose_name_plural': 'Fundumstände', }, ), migrations.CreateModel( - name="FallenBird", + name='FallenBird', fields=[ - ( - "id", - models.UUIDField( - default=uuid.uuid4, - editable=False, - primary_key=True, - serialize=False, - ), - ), - ( - "bird_identifier", - models.CharField(max_length=256, verbose_name="Kennung"), - ), - ("date_found", models.DateField(verbose_name="Datum des Fundes")), - ( - "place", - models.CharField(max_length=256, verbose_name="Ort des Fundes"), - ), - ( - "created", - models.DateTimeField(auto_now_add=True, verbose_name="angelegt am"), - ), - ( - "updated", - models.DateTimeField(auto_now=True, verbose_name="geändert am"), - ), - ("diagnostic_finding", models.CharField(max_length=256)), - ( - "costs", - models.JSONField( - default=bird.models.costs_default, verbose_name="Costs" - ), - ), - ( - "aviary", - models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.SET_NULL, - to="aviary.aviary", - ), - ), - ( - "bird", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - to="bird.bird", - verbose_name="Patient", - ), - ), - ( - "find_circumstances", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - to="bird.circumstance", - ), - ), - ( - "rescuer", - models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.SET_NULL, - to="rescuer.rescuer", - ), - ), - ( - "status", - models.ForeignKey( - default=1, - on_delete=django.db.models.deletion.CASCADE, - to="bird.birdstatus", - ), - ), - ( - "user", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - to=settings.AUTH_USER_MODEL, - ), - ), + ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), + ('bird_identifier', models.CharField(max_length=256, verbose_name='Kennung')), + ('date_found', models.DateField(verbose_name='Datum des Fundes')), + ('place', models.CharField(max_length=256, verbose_name='Ort des Fundes')), + ('created', models.DateTimeField(auto_now_add=True, verbose_name='angelegt am')), + ('updated', models.DateTimeField(auto_now=True, verbose_name='geändert am')), + ('diagnostic_finding', models.CharField(max_length=256, verbose_name='Diagnose bei Fund')), + ('costs', models.DecimalField(decimal_places=2, max_digits=5, verbose_name='Kosten')), + ('aviary', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='aviary.aviary', verbose_name='Voliere')), + ('bird', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bird.bird', verbose_name='Patient')), + ('find_circumstances', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bird.circumstance', verbose_name='Fundumstände')), + ('rescuer', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='rescuer.rescuer', verbose_name='Finder')), + ('status', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='bird.birdstatus')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Benutzer')), ], options={ - "verbose_name": "Patient", - "verbose_name_plural": "Patienten", + 'verbose_name': 'Patient', + 'verbose_name_plural': 'Patienten', }, ), ] diff --git a/app/bird/migrations/0002_alter_bird_name_alter_birdstatus_description_and_more.py b/app/bird/migrations/0002_alter_bird_name_alter_birdstatus_description_and_more.py deleted file mode 100644 index a63b2a3..0000000 --- a/app/bird/migrations/0002_alter_bird_name_alter_birdstatus_description_and_more.py +++ /dev/null @@ -1,37 +0,0 @@ -# Generated by Django 4.2.3 on 2023-07-12 06:59 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("bird", "0001_initial"), - ] - - operations = [ - migrations.AlterField( - model_name="bird", - name="name", - field=models.CharField( - max_length=256, unique=True, verbose_name="Bezeichnung" - ), - ), - migrations.AlterField( - model_name="birdstatus", - name="description", - field=models.CharField( - max_length=256, unique=True, verbose_name="Bezeichnung" - ), - ), - migrations.AlterField( - model_name="circumstance", - name="description", - field=models.CharField(max_length=256, verbose_name="Bezeichnung"), - ), - migrations.AlterField( - model_name="fallenbird", - name="costs", - field=models.DecimalField(decimal_places=2, max_digits=5), - ), - ] diff --git a/app/core/settings.py b/app/core/settings.py index 3664e0d..23233ca 100644 --- a/app/core/settings.py +++ b/app/core/settings.py @@ -1,19 +1,8 @@ -""" -Django settings for core project. - -Generated by 'django-admin startproject' using Django 4.2.2. - -For more information on this file, see -https://docs.djangoproject.com/en/4.2/topics/settings/ - -For the full list of settings and their values, see -https://docs.djangoproject.com/en/4.2/ref/settings/ -""" - import os -import environ from pathlib import Path +import environ + env = environ.Env() @@ -112,17 +101,7 @@ WSGI_APPLICATION = "core.wsgi.application" # https://docs.djangoproject.com/en/4.2/ref/settings/#databases DATABASES = { - "default": { - # "ENGINE": "django.db.backends.sqlite3", - # "NAME": BASE_DIR / "db.sqlite3", - # "ENGINE": "django.db.backends.postgresql", - # "NAME": "django_traefik", - # "USER": "django_traefik", - # "PASSWORD": "django_traefik", - # "HOST": "db", - # "PORT": "5432", - "default": env.db(), - } + "default": env.db(), } @@ -162,6 +141,7 @@ USE_TZ = True STATIC_URL = "static/" STATICFILES_DIRS = [BASE_DIR / "static"] +STATIC_ROOT = BASE_DIR / "staticfiles" STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage" # Default primary key field type diff --git a/app/requirements.txt b/app/requirements.txt index f7b026a..e4ff48b 100644 --- a/app/requirements.txt +++ b/app/requirements.txt @@ -1,12 +1,13 @@ Django>=4.2 -django-environ>=0.9 crispy-bootstrap5>=0.6 django-allauth>=0.50 django-bootstrap-datepicker-plus>=4.0 django-bootstrap-modal-forms>=2 django-crispy-forms>=1 +django-environ==0.9.0 +django-environ>=0.9 django-jazzmin>=2.6.0 -environ>=1 gunicorn>=20.1 names>=0.3.0 -psycopg2-binary>=2.9 \ No newline at end of file +psycopg2-binary>=2.9 +whitenoise>=6.5 diff --git a/docker-compose.yaml b/docker-compose.yaml index ea7e0eb..4202b6f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,14 +3,14 @@ version: '3.8' services: web: build: ./app - command: bash -c 'while !