From 2d75a02c6e89f0e48c27555f4bb1efd79930e93e Mon Sep 17 00:00:00 2001 From: gw3000 Date: Thu, 22 Jun 2023 17:28:44 +0200 Subject: [PATCH] renamed fbf app to bird --- {fbf => bird}/__init__.py | 0 {fbf => bird}/admin.py | 0 {fbf => bird}/apps.py | 4 ++-- {fbf => bird}/forms.py | 0 {fbf => bird}/migrations/0001_initial.py | 4 ++-- {fbf => bird}/migrations/__init__.py | 0 {fbf => bird}/models.py | 0 {fbf/templates/fbf => bird/templates/bird}/bird_all.html | 0 .../fbf => bird/templates/bird}/bird_create.html | 0 .../fbf => bird/templates/bird}/bird_delete.html | 0 .../fbf => bird/templates/bird}/bird_single.html | 0 {fbf => bird}/tests.py | 0 {fbf => bird}/urls.py | 0 {fbf => bird}/views.py | 8 ++++---- core/settings.py | 2 +- core/urls.py | 2 +- fixtures/data.json | 1 - rescuer/migrations/0001_initial.py | 2 +- templates/partials/_footer.html | 2 +- 19 files changed, 12 insertions(+), 13 deletions(-) rename {fbf => bird}/__init__.py (100%) rename {fbf => bird}/admin.py (100%) rename {fbf => bird}/apps.py (66%) rename {fbf => bird}/forms.py (100%) rename {fbf => bird}/migrations/0001_initial.py (96%) rename {fbf => bird}/migrations/__init__.py (100%) rename {fbf => bird}/models.py (100%) rename {fbf/templates/fbf => bird/templates/bird}/bird_all.html (100%) rename {fbf/templates/fbf => bird/templates/bird}/bird_create.html (100%) rename {fbf/templates/fbf => bird/templates/bird}/bird_delete.html (100%) rename {fbf/templates/fbf => bird/templates/bird}/bird_single.html (100%) rename {fbf => bird}/tests.py (100%) rename {fbf => bird}/urls.py (100%) rename {fbf => bird}/views.py (91%) delete mode 100644 fixtures/data.json diff --git a/fbf/__init__.py b/bird/__init__.py similarity index 100% rename from fbf/__init__.py rename to bird/__init__.py diff --git a/fbf/admin.py b/bird/admin.py similarity index 100% rename from fbf/admin.py rename to bird/admin.py diff --git a/fbf/apps.py b/bird/apps.py similarity index 66% rename from fbf/apps.py rename to bird/apps.py index 83fc2ed..27c9f1a 100644 --- a/fbf/apps.py +++ b/bird/apps.py @@ -1,6 +1,6 @@ from django.apps import AppConfig -class FbfConfig(AppConfig): +class BirdConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' - name = 'fbf' + name = 'bird' diff --git a/fbf/forms.py b/bird/forms.py similarity index 100% rename from fbf/forms.py rename to bird/forms.py diff --git a/fbf/migrations/0001_initial.py b/bird/migrations/0001_initial.py similarity index 96% rename from fbf/migrations/0001_initial.py rename to bird/migrations/0001_initial.py index b52568e..d0269e7 100644 --- a/fbf/migrations/0001_initial.py +++ b/bird/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2.2 on 2023-06-10 19:52 +# Generated by Django 4.2.2 on 2023-06-22 15:25 from django.conf import settings from django.db import migrations, models @@ -50,7 +50,7 @@ class Migration(migrations.Migration): ( "bird", models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, to="fbf.bird" + on_delete=django.db.models.deletion.CASCADE, to="bird.bird" ), ), ( diff --git a/fbf/migrations/__init__.py b/bird/migrations/__init__.py similarity index 100% rename from fbf/migrations/__init__.py rename to bird/migrations/__init__.py diff --git a/fbf/models.py b/bird/models.py similarity index 100% rename from fbf/models.py rename to bird/models.py diff --git a/fbf/templates/fbf/bird_all.html b/bird/templates/bird/bird_all.html similarity index 100% rename from fbf/templates/fbf/bird_all.html rename to bird/templates/bird/bird_all.html diff --git a/fbf/templates/fbf/bird_create.html b/bird/templates/bird/bird_create.html similarity index 100% rename from fbf/templates/fbf/bird_create.html rename to bird/templates/bird/bird_create.html diff --git a/fbf/templates/fbf/bird_delete.html b/bird/templates/bird/bird_delete.html similarity index 100% rename from fbf/templates/fbf/bird_delete.html rename to bird/templates/bird/bird_delete.html diff --git a/fbf/templates/fbf/bird_single.html b/bird/templates/bird/bird_single.html similarity index 100% rename from fbf/templates/fbf/bird_single.html rename to bird/templates/bird/bird_single.html diff --git a/fbf/tests.py b/bird/tests.py similarity index 100% rename from fbf/tests.py rename to bird/tests.py diff --git a/fbf/urls.py b/bird/urls.py similarity index 100% rename from fbf/urls.py rename to bird/urls.py diff --git a/fbf/views.py b/bird/views.py similarity index 91% rename from fbf/views.py rename to bird/views.py index 4e3e650..2881051 100644 --- a/fbf/views.py +++ b/bird/views.py @@ -27,7 +27,7 @@ def bird_create(request): request.session["rescuer_id"] = None return redirect("bird_all") context = {"form": form, "rescuer": rescuer} - return render(request, "fbf/bird_create.html", context) + return render(request, "bird/bird_create.html", context) @login_required(login_url="account_login") @@ -43,7 +43,7 @@ def bird_all(request): return redirect("bird_create") else: return redirect("rescuer_create") - return render(request, "fbf/bird_all.html", context) + return render(request, "bird/bird_all.html", context) @login_required(login_url="account_login") @@ -63,7 +63,7 @@ def bird_single(request, id): form.save() return redirect("bird_all") context = {"form": form, "bird": bird} - return render(request, "fbf/bird_single.html", context) + return render(request, "bird/bird_single.html", context) @login_required(login_url="account_login") @@ -73,7 +73,7 @@ def bird_delete(request, id): bird.delete() return redirect("bird_all") context = {"bird": bird} - return render(request, "fbf/bird_delete.html", context) + return render(request, "bird/bird_delete.html", context) @login_required(login_url="account_login") diff --git a/core/settings.py b/core/settings.py index ae84cf5..a8fa798 100644 --- a/core/settings.py +++ b/core/settings.py @@ -53,7 +53,7 @@ INSTALLED_APPS = [ # ----------------------------------- # My Apps # ----------------------------------- - "fbf", + "bird", "rescuer", "sites", ] diff --git a/core/urls.py b/core/urls.py index 71b3430..4712463 100644 --- a/core/urls.py +++ b/core/urls.py @@ -19,7 +19,7 @@ from django.urls import path, include urlpatterns = [ # Dynamic sites - path("bird/", include("fbf.urls")), + path("bird/", include("bird.urls")), path("rescuer/", include("rescuer.urls")), # Admin path("admin/", admin.site.urls), diff --git a/fixtures/data.json b/fixtures/data.json deleted file mode 100644 index e77e9f4..0000000 --- a/fixtures/data.json +++ /dev/null @@ -1 +0,0 @@ -[{"model": "admin.logentry", "pk": 1, "fields": {"action_time": "2023-06-20T18:14:18.847Z", "user": 1, "content_type": 12, "object_id": "62beb88d-f11b-4d24-8220-d3c494929ca7", "object_repr": "Amsel", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 2, "fields": {"action_time": "2023-06-20T18:14:25.593Z", "user": 1, "content_type": 12, "object_id": "00528b58-dca1-49c6-a60c-9f24513d5996", "object_repr": "Spatz", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 3, "fields": {"action_time": "2023-06-20T18:14:29.961Z", "user": 1, "content_type": 12, "object_id": "57f97d76-4efe-43c5-9c1f-e66126f33983", "object_repr": "Kohlmeise", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 4, "fields": {"action_time": "2023-06-20T19:18:19.147Z", "user": 1, "content_type": 7, "object_id": "1", "object_repr": "gw@email.de", "action_flag": 2, "change_message": "[{\"changed\": {\"fields\": [\"Verified\"]}}]"}}, {"model": "admin.logentry", "pk": 5, "fields": {"action_time": "2023-06-20T19:18:24.800Z", "user": 1, "content_type": 7, "object_id": "1", "object_repr": "gw@email.de", "action_flag": 2, "change_message": "[{\"changed\": {\"fields\": [\"Primary\"]}}]"}}, {"model": "auth.permission", "pk": 1, "fields": {"name": "Can add log entry", "content_type": 1, "codename": "add_logentry"}}, {"model": "auth.permission", "pk": 2, "fields": {"name": "Can change log entry", "content_type": 1, "codename": "change_logentry"}}, {"model": "auth.permission", "pk": 3, "fields": {"name": "Can delete log entry", "content_type": 1, "codename": "delete_logentry"}}, {"model": "auth.permission", "pk": 4, "fields": {"name": "Can view log entry", "content_type": 1, "codename": "view_logentry"}}, {"model": "auth.permission", "pk": 5, "fields": {"name": "Can add permission", "content_type": 2, "codename": "add_permission"}}, {"model": "auth.permission", "pk": 6, "fields": {"name": "Can change permission", "content_type": 2, "codename": "change_permission"}}, {"model": "auth.permission", "pk": 7, "fields": {"name": "Can delete permission", "content_type": 2, "codename": "delete_permission"}}, {"model": "auth.permission", "pk": 8, "fields": {"name": "Can view permission", "content_type": 2, "codename": "view_permission"}}, {"model": "auth.permission", "pk": 9, "fields": {"name": "Can add group", "content_type": 3, "codename": "add_group"}}, {"model": "auth.permission", "pk": 10, "fields": {"name": "Can change group", "content_type": 3, "codename": "change_group"}}, {"model": "auth.permission", "pk": 11, "fields": {"name": "Can delete group", "content_type": 3, "codename": "delete_group"}}, {"model": "auth.permission", "pk": 12, "fields": {"name": "Can view group", "content_type": 3, "codename": "view_group"}}, {"model": "auth.permission", "pk": 13, "fields": {"name": "Can add user", "content_type": 4, "codename": "add_user"}}, {"model": "auth.permission", "pk": 14, "fields": {"name": "Can change user", "content_type": 4, "codename": "change_user"}}, {"model": "auth.permission", "pk": 15, "fields": {"name": "Can delete user", "content_type": 4, "codename": "delete_user"}}, {"model": "auth.permission", "pk": 16, "fields": {"name": "Can view user", "content_type": 4, "codename": "view_user"}}, {"model": "auth.permission", "pk": 17, "fields": {"name": "Can add content type", "content_type": 5, "codename": "add_contenttype"}}, {"model": "auth.permission", "pk": 18, "fields": {"name": "Can change content type", "content_type": 5, "codename": "change_contenttype"}}, {"model": "auth.permission", "pk": 19, "fields": {"name": "Can delete content type", "content_type": 5, "codename": "delete_contenttype"}}, {"model": "auth.permission", "pk": 20, "fields": {"name": "Can view content type", "content_type": 5, "codename": "view_contenttype"}}, {"model": "auth.permission", "pk": 21, "fields": {"name": "Can add session", "content_type": 6, "codename": "add_session"}}, {"model": "auth.permission", "pk": 22, "fields": {"name": "Can change session", "content_type": 6, "codename": "change_session"}}, {"model": "auth.permission", "pk": 23, "fields": {"name": "Can delete session", "content_type": 6, "codename": "delete_session"}}, {"model": "auth.permission", "pk": 24, "fields": {"name": "Can view session", "content_type": 6, "codename": "view_session"}}, {"model": "auth.permission", "pk": 25, "fields": {"name": "Can add email address", "content_type": 7, "codename": "add_emailaddress"}}, {"model": "auth.permission", "pk": 26, "fields": {"name": "Can change email address", "content_type": 7, "codename": "change_emailaddress"}}, {"model": "auth.permission", "pk": 27, "fields": {"name": "Can delete email address", "content_type": 7, "codename": "delete_emailaddress"}}, {"model": "auth.permission", "pk": 28, "fields": {"name": "Can view email address", "content_type": 7, "codename": "view_emailaddress"}}, {"model": "auth.permission", "pk": 29, "fields": {"name": "Can add email confirmation", "content_type": 8, "codename": "add_emailconfirmation"}}, {"model": "auth.permission", "pk": 30, "fields": {"name": "Can change email confirmation", "content_type": 8, "codename": "change_emailconfirmation"}}, {"model": "auth.permission", "pk": 31, "fields": {"name": "Can delete email confirmation", "content_type": 8, "codename": "delete_emailconfirmation"}}, {"model": "auth.permission", "pk": 32, "fields": {"name": "Can view email confirmation", "content_type": 8, "codename": "view_emailconfirmation"}}, {"model": "auth.permission", "pk": 33, "fields": {"name": "Can add social account", "content_type": 9, "codename": "add_socialaccount"}}, {"model": "auth.permission", "pk": 34, "fields": {"name": "Can change social account", "content_type": 9, "codename": "change_socialaccount"}}, {"model": "auth.permission", "pk": 35, "fields": {"name": "Can delete social account", "content_type": 9, "codename": "delete_socialaccount"}}, {"model": "auth.permission", "pk": 36, "fields": {"name": "Can view social account", "content_type": 9, "codename": "view_socialaccount"}}, {"model": "auth.permission", "pk": 37, "fields": {"name": "Can add social application", "content_type": 10, "codename": "add_socialapp"}}, {"model": "auth.permission", "pk": 38, "fields": {"name": "Can change social application", "content_type": 10, "codename": "change_socialapp"}}, {"model": "auth.permission", "pk": 39, "fields": {"name": "Can delete social application", "content_type": 10, "codename": "delete_socialapp"}}, {"model": "auth.permission", "pk": 40, "fields": {"name": "Can view social application", "content_type": 10, "codename": "view_socialapp"}}, {"model": "auth.permission", "pk": 41, "fields": {"name": "Can add social application token", "content_type": 11, "codename": "add_socialtoken"}}, {"model": "auth.permission", "pk": 42, "fields": {"name": "Can change social application token", "content_type": 11, "codename": "change_socialtoken"}}, {"model": "auth.permission", "pk": 43, "fields": {"name": "Can delete social application token", "content_type": 11, "codename": "delete_socialtoken"}}, {"model": "auth.permission", "pk": 44, "fields": {"name": "Can view social application token", "content_type": 11, "codename": "view_socialtoken"}}, {"model": "auth.permission", "pk": 45, "fields": {"name": "Can add bird", "content_type": 12, "codename": "add_bird"}}, {"model": "auth.permission", "pk": 46, "fields": {"name": "Can change bird", "content_type": 12, "codename": "change_bird"}}, {"model": "auth.permission", "pk": 47, "fields": {"name": "Can delete bird", "content_type": 12, "codename": "delete_bird"}}, {"model": "auth.permission", "pk": 48, "fields": {"name": "Can view bird", "content_type": 12, "codename": "view_bird"}}, {"model": "auth.permission", "pk": 49, "fields": {"name": "Can add fallen bird", "content_type": 13, "codename": "add_fallenbird"}}, {"model": "auth.permission", "pk": 50, "fields": {"name": "Can change fallen bird", "content_type": 13, "codename": "change_fallenbird"}}, {"model": "auth.permission", "pk": 51, "fields": {"name": "Can delete fallen bird", "content_type": 13, "codename": "delete_fallenbird"}}, {"model": "auth.permission", "pk": 52, "fields": {"name": "Can view fallen bird", "content_type": 13, "codename": "view_fallenbird"}}, {"model": "auth.permission", "pk": 53, "fields": {"name": "Can add rescuer", "content_type": 14, "codename": "add_rescuer"}}, {"model": "auth.permission", "pk": 54, "fields": {"name": "Can change rescuer", "content_type": 14, "codename": "change_rescuer"}}, {"model": "auth.permission", "pk": 55, "fields": {"name": "Can delete rescuer", "content_type": 14, "codename": "delete_rescuer"}}, {"model": "auth.permission", "pk": 56, "fields": {"name": "Can view rescuer", "content_type": 14, "codename": "view_rescuer"}}, {"model": "auth.user", "pk": 1, "fields": {"password": "pbkdf2_sha256$600000$N5uj8atTrwlw1OdzQ3A5WW$zAQj069JNni9bhSxJeQXjaeAXbOCmDsVaaRoEZx6lmc=", "last_login": "2023-06-20T19:18:37.658Z", "is_superuser": true, "username": "gw", "first_name": "", "last_name": "", "email": "gw@email.de", "is_staff": true, "is_active": true, "date_joined": "2023-06-20T18:13:39.533Z", "groups": [], "user_permissions": []}}, {"model": "contenttypes.contenttype", "pk": 1, "fields": {"app_label": "admin", "model": "logentry"}}, {"model": "contenttypes.contenttype", "pk": 2, "fields": {"app_label": "auth", "model": "permission"}}, {"model": "contenttypes.contenttype", "pk": 3, "fields": {"app_label": "auth", "model": "group"}}, {"model": "contenttypes.contenttype", "pk": 4, "fields": {"app_label": "auth", "model": "user"}}, {"model": "contenttypes.contenttype", "pk": 5, "fields": {"app_label": "contenttypes", "model": "contenttype"}}, {"model": "contenttypes.contenttype", "pk": 6, "fields": {"app_label": "sessions", "model": "session"}}, {"model": "contenttypes.contenttype", "pk": 7, "fields": {"app_label": "account", "model": "emailaddress"}}, {"model": "contenttypes.contenttype", "pk": 8, "fields": {"app_label": "account", "model": "emailconfirmation"}}, {"model": "contenttypes.contenttype", "pk": 9, "fields": {"app_label": "socialaccount", "model": "socialaccount"}}, {"model": "contenttypes.contenttype", "pk": 10, "fields": {"app_label": "socialaccount", "model": "socialapp"}}, {"model": "contenttypes.contenttype", "pk": 11, "fields": {"app_label": "socialaccount", "model": "socialtoken"}}, {"model": "contenttypes.contenttype", "pk": 12, "fields": {"app_label": "fbf", "model": "bird"}}, {"model": "contenttypes.contenttype", "pk": 13, "fields": {"app_label": "fbf", "model": "fallenbird"}}, {"model": "contenttypes.contenttype", "pk": 14, "fields": {"app_label": "rescuer", "model": "rescuer"}}, {"model": "sessions.session", "pk": "l9gseljiu09au7oh1hpwkj4n1nquevun", "fields": {"session_data": ".eJxVj80KAiEURt_F9SD-TGO2bN8zyPV6p7EGDR2hiN49hFnU9juHA9-bOWjb4lql4mJgJybZ8Lt5wDulDsIN0jVzzGkr0fOu8J1WfsmB1vPu_gUWqEvPBq-sMmjNQUkPFjWKMM9GjyOCGSeS00hHAKHJm0AIUlutZBDBg0Bte7RSrTEnR89HLC92kkrYSYiBFarY9gOprevnC-EQR0I:1qBgsx:uAMsAXOx8dNjqfbH3GTYPGaKHlSyQY5joSOvlQr7t6s", "expire_date": "2023-07-04T19:19:27.256Z"}}, {"model": "account.emailaddress", "pk": 1, "fields": {"user": 1, "email": "gw@email.de", "verified": true, "primary": true}}, {"model": "fbf.fallenbird", "pk": "66fe2710-8963-47e6-ba4d-6838b39ea9c9", "fields": {"bird": "62beb88d-f11b-4d24-8220-d3c494929ca7", "date_found": "2023-06-20", "place": "Käthe Kollwitz Straße 16", "created": "2023-06-20T19:19:27.253Z", "updated": "2023-06-20T19:19:27.253Z", "rescuer": "27e91cbb-5dad-4cb8-89e1-192526a40137", "user": 1}}, {"model": "fbf.bird", "pk": "00528b58-dca1-49c6-a60c-9f24513d5996", "fields": {"name": "Spatz"}}, {"model": "fbf.bird", "pk": "57f97d76-4efe-43c5-9c1f-e66126f33983", "fields": {"name": "Kohlmeise"}}, {"model": "fbf.bird", "pk": "62beb88d-f11b-4d24-8220-d3c494929ca7", "fields": {"name": "Amsel"}}, {"model": "rescuer.rescuer", "pk": "27e91cbb-5dad-4cb8-89e1-192526a40137", "fields": {"gender": "Frau", "first_name": "Angela", "last_name": "Piggy", "street": "Sesamstraße", "street_number": "42", "city": "Dreamworld", "zip_code": "0815", "state": "Deutschland", "date_of_birth": "1988-12-12", "email": "ap@email.de", "user": 1}}] \ No newline at end of file diff --git a/rescuer/migrations/0001_initial.py b/rescuer/migrations/0001_initial.py index 69ee7ab..4f21df6 100644 --- a/rescuer/migrations/0001_initial.py +++ b/rescuer/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2.2 on 2023-06-08 15:45 +# Generated by Django 4.2.2 on 2023-06-22 15:25 from django.conf import settings from django.db import migrations, models diff --git a/templates/partials/_footer.html b/templates/partials/_footer.html index 2ebce81..da411ac 100644 --- a/templates/partials/_footer.html +++ b/templates/partials/_footer.html @@ -1,6 +1,6 @@