From 53ec846f98a325c606aa5429cd360bfbf5f526f5 Mon Sep 17 00:00:00 2001 From: Tris Forster Date: Mon, 28 Nov 2022 14:11:39 +1100 Subject: [PATCH] Refactored into /app --- dev-requirements.txt => app/dev-requirements.txt | 0 {interface => app/interface}/__init__.py | 0 {interface => app/interface}/admin.py | 0 {interface => app/interface}/apps.py | 0 {interface => app/interface}/fields.py | 0 {interface => app/interface}/forms.py | 0 .../interface}/migrations/0001_initial.py | 0 {interface => app/interface}/migrations/__init__.py | 0 {interface => app/interface}/models.py | 0 .../interface}/static/fonts/Martinhand3.ttf | Bin .../interface}/static/interface/background.png | Bin .../interface}/static/interface/css/polyphonic.css | 0 {interface => app/interface}/templates/base.html | 0 .../interface}/templates/bulma/file_upload.html | 0 .../templates/interface/default_form.html | 0 .../templates/interface/ensemble_detail.html | 0 .../templates/interface/ensemble_list.html | 0 .../templates/interface/ensemble_project_list.html | 0 .../interface}/templates/interface/manage.html | 0 .../templates/interface/project_base.html | 0 .../templates/interface/project_detail.html | 0 .../templates/interface/project_form.html | 0 .../interface}/templates/interface/register.html | 0 .../templates/interface/resource_list.html | 0 .../interface}/templates/interface/s3_upload.html | 0 .../interface}/templates/interface/wiki.html | 0 .../templates/interface/wikipage_form.html | 0 .../interface}/templates/registration/login.html | 0 .../interface}/templatetags/path_filters.py | 0 .../interface}/templatetags/polyphonic.py | 0 .../interface}/templatetags/url_tools.py | 0 {interface => app/interface}/tests/__init__.py | 0 .../interface}/tests/test_integration.py | 0 {interface => app/interface}/tests/test_register.py | 0 {interface => app/interface}/urls.py | 0 {interface => app/interface}/views.py | 0 {library => app/library}/README.md | 0 {library => app/library}/__init__.py | 0 {library => app/library}/admin.py | 0 {library => app/library}/apps.py | 0 {library => app/library}/forms.py | 0 {library => app/library}/imslp.py | 0 {library => app/library}/management/__init__.py | 0 .../library}/management/commands/__init__.py | 0 .../library}/management/commands/import_works.py | 0 {library => app/library}/migrations/0001_initial.py | 0 {library => app/library}/migrations/__init__.py | 0 {library => app/library}/models.py | 0 {library => app/library}/pdf_utils.py | 0 .../library}/templates/library/collection_list.html | 0 .../templates/library/document_annotate.html | 0 .../library}/templates/library/folder_detail.html | 0 .../library}/templates/library/item_list.html | 0 .../templates/library/item_list_manage.html | 0 .../library}/templates/library/project_detail.html | 0 .../library}/templates/library/project_menu.html | 0 .../library}/templates/library/work_detail.html | 0 .../library}/templates/library/work_list.html | 0 .../library}/templates/library/work_partset.html | 0 {library => app/library}/tests.py | 0 {library => app/library}/urls.py | 0 {library => app/library}/views.py | 0 manage.py => app/manage.py | 0 {polyphonic => app/polyphonic}/__init__.py | 0 {polyphonic => app/polyphonic}/asgi.py | 0 .../polyphonic/default_settings.py | 4 ++-- app/polyphonic/settings.py | 7 +++++++ {polyphonic => app/polyphonic}/urls.py | 0 {polyphonic => app/polyphonic}/wsgi.py | 0 requirements.txt => app/requirements.txt | 0 polyphonic/settings.py | 10 ---------- 71 files changed, 9 insertions(+), 12 deletions(-) rename dev-requirements.txt => app/dev-requirements.txt (100%) rename {interface => app/interface}/__init__.py (100%) rename {interface => app/interface}/admin.py (100%) rename {interface => app/interface}/apps.py (100%) rename {interface => app/interface}/fields.py (100%) rename {interface => app/interface}/forms.py (100%) rename {interface => app/interface}/migrations/0001_initial.py (100%) rename {interface => app/interface}/migrations/__init__.py (100%) rename {interface => app/interface}/models.py (100%) rename {interface => app/interface}/static/fonts/Martinhand3.ttf (100%) rename {interface => app/interface}/static/interface/background.png (100%) rename {interface => app/interface}/static/interface/css/polyphonic.css (100%) rename {interface => app/interface}/templates/base.html (100%) rename {interface => app/interface}/templates/bulma/file_upload.html (100%) rename {interface => app/interface}/templates/interface/default_form.html (100%) rename {interface => app/interface}/templates/interface/ensemble_detail.html (100%) rename {interface => app/interface}/templates/interface/ensemble_list.html (100%) rename {interface => app/interface}/templates/interface/ensemble_project_list.html (100%) rename {interface => app/interface}/templates/interface/manage.html (100%) rename {interface => app/interface}/templates/interface/project_base.html (100%) rename {interface => app/interface}/templates/interface/project_detail.html (100%) rename {interface => app/interface}/templates/interface/project_form.html (100%) rename {interface => app/interface}/templates/interface/register.html (100%) rename {interface => app/interface}/templates/interface/resource_list.html (100%) rename {interface => app/interface}/templates/interface/s3_upload.html (100%) rename {interface => app/interface}/templates/interface/wiki.html (100%) rename {interface => app/interface}/templates/interface/wikipage_form.html (100%) rename {interface => app/interface}/templates/registration/login.html (100%) rename {interface => app/interface}/templatetags/path_filters.py (100%) rename {interface => app/interface}/templatetags/polyphonic.py (100%) rename {interface => app/interface}/templatetags/url_tools.py (100%) rename {interface => app/interface}/tests/__init__.py (100%) rename {interface => app/interface}/tests/test_integration.py (100%) rename {interface => app/interface}/tests/test_register.py (100%) rename {interface => app/interface}/urls.py (100%) rename {interface => app/interface}/views.py (100%) rename {library => app/library}/README.md (100%) rename {library => app/library}/__init__.py (100%) rename {library => app/library}/admin.py (100%) rename {library => app/library}/apps.py (100%) rename {library => app/library}/forms.py (100%) rename {library => app/library}/imslp.py (100%) rename {library => app/library}/management/__init__.py (100%) rename {library => app/library}/management/commands/__init__.py (100%) rename {library => app/library}/management/commands/import_works.py (100%) rename {library => app/library}/migrations/0001_initial.py (100%) rename {library => app/library}/migrations/__init__.py (100%) rename {library => app/library}/models.py (100%) rename {library => app/library}/pdf_utils.py (100%) rename {library => app/library}/templates/library/collection_list.html (100%) rename {library => app/library}/templates/library/document_annotate.html (100%) rename {library => app/library}/templates/library/folder_detail.html (100%) rename {library => app/library}/templates/library/item_list.html (100%) rename {library => app/library}/templates/library/item_list_manage.html (100%) rename {library => app/library}/templates/library/project_detail.html (100%) rename {library => app/library}/templates/library/project_menu.html (100%) rename {library => app/library}/templates/library/work_detail.html (100%) rename {library => app/library}/templates/library/work_list.html (100%) rename {library => app/library}/templates/library/work_partset.html (100%) rename {library => app/library}/tests.py (100%) rename {library => app/library}/urls.py (100%) rename {library => app/library}/views.py (100%) rename manage.py => app/manage.py (100%) rename {polyphonic => app/polyphonic}/__init__.py (100%) rename {polyphonic => app/polyphonic}/asgi.py (100%) rename polyphonic/settings_default.py => app/polyphonic/default_settings.py (97%) create mode 100644 app/polyphonic/settings.py rename {polyphonic => app/polyphonic}/urls.py (100%) rename {polyphonic => app/polyphonic}/wsgi.py (100%) rename requirements.txt => app/requirements.txt (100%) delete mode 100644 polyphonic/settings.py diff --git a/dev-requirements.txt b/app/dev-requirements.txt similarity index 100% rename from dev-requirements.txt rename to app/dev-requirements.txt diff --git a/interface/__init__.py b/app/interface/__init__.py similarity index 100% rename from interface/__init__.py rename to app/interface/__init__.py diff --git a/interface/admin.py b/app/interface/admin.py similarity index 100% rename from interface/admin.py rename to app/interface/admin.py diff --git a/interface/apps.py b/app/interface/apps.py similarity index 100% rename from interface/apps.py rename to app/interface/apps.py diff --git a/interface/fields.py b/app/interface/fields.py similarity index 100% rename from interface/fields.py rename to app/interface/fields.py diff --git a/interface/forms.py b/app/interface/forms.py similarity index 100% rename from interface/forms.py rename to app/interface/forms.py diff --git a/interface/migrations/0001_initial.py b/app/interface/migrations/0001_initial.py similarity index 100% rename from interface/migrations/0001_initial.py rename to app/interface/migrations/0001_initial.py diff --git a/interface/migrations/__init__.py b/app/interface/migrations/__init__.py similarity index 100% rename from interface/migrations/__init__.py rename to app/interface/migrations/__init__.py diff --git a/interface/models.py b/app/interface/models.py similarity index 100% rename from interface/models.py rename to app/interface/models.py diff --git a/interface/static/fonts/Martinhand3.ttf b/app/interface/static/fonts/Martinhand3.ttf similarity index 100% rename from interface/static/fonts/Martinhand3.ttf rename to app/interface/static/fonts/Martinhand3.ttf diff --git a/interface/static/interface/background.png b/app/interface/static/interface/background.png similarity index 100% rename from interface/static/interface/background.png rename to app/interface/static/interface/background.png diff --git a/interface/static/interface/css/polyphonic.css b/app/interface/static/interface/css/polyphonic.css similarity index 100% rename from interface/static/interface/css/polyphonic.css rename to app/interface/static/interface/css/polyphonic.css diff --git a/interface/templates/base.html b/app/interface/templates/base.html similarity index 100% rename from interface/templates/base.html rename to app/interface/templates/base.html diff --git a/interface/templates/bulma/file_upload.html b/app/interface/templates/bulma/file_upload.html similarity index 100% rename from interface/templates/bulma/file_upload.html rename to app/interface/templates/bulma/file_upload.html diff --git a/interface/templates/interface/default_form.html b/app/interface/templates/interface/default_form.html similarity index 100% rename from interface/templates/interface/default_form.html rename to app/interface/templates/interface/default_form.html diff --git a/interface/templates/interface/ensemble_detail.html b/app/interface/templates/interface/ensemble_detail.html similarity index 100% rename from interface/templates/interface/ensemble_detail.html rename to app/interface/templates/interface/ensemble_detail.html diff --git a/interface/templates/interface/ensemble_list.html b/app/interface/templates/interface/ensemble_list.html similarity index 100% rename from interface/templates/interface/ensemble_list.html rename to app/interface/templates/interface/ensemble_list.html diff --git a/interface/templates/interface/ensemble_project_list.html b/app/interface/templates/interface/ensemble_project_list.html similarity index 100% rename from interface/templates/interface/ensemble_project_list.html rename to app/interface/templates/interface/ensemble_project_list.html diff --git a/interface/templates/interface/manage.html b/app/interface/templates/interface/manage.html similarity index 100% rename from interface/templates/interface/manage.html rename to app/interface/templates/interface/manage.html diff --git a/interface/templates/interface/project_base.html b/app/interface/templates/interface/project_base.html similarity index 100% rename from interface/templates/interface/project_base.html rename to app/interface/templates/interface/project_base.html diff --git a/interface/templates/interface/project_detail.html b/app/interface/templates/interface/project_detail.html similarity index 100% rename from interface/templates/interface/project_detail.html rename to app/interface/templates/interface/project_detail.html diff --git a/interface/templates/interface/project_form.html b/app/interface/templates/interface/project_form.html similarity index 100% rename from interface/templates/interface/project_form.html rename to app/interface/templates/interface/project_form.html diff --git a/interface/templates/interface/register.html b/app/interface/templates/interface/register.html similarity index 100% rename from interface/templates/interface/register.html rename to app/interface/templates/interface/register.html diff --git a/interface/templates/interface/resource_list.html b/app/interface/templates/interface/resource_list.html similarity index 100% rename from interface/templates/interface/resource_list.html rename to app/interface/templates/interface/resource_list.html diff --git a/interface/templates/interface/s3_upload.html b/app/interface/templates/interface/s3_upload.html similarity index 100% rename from interface/templates/interface/s3_upload.html rename to app/interface/templates/interface/s3_upload.html diff --git a/interface/templates/interface/wiki.html b/app/interface/templates/interface/wiki.html similarity index 100% rename from interface/templates/interface/wiki.html rename to app/interface/templates/interface/wiki.html diff --git a/interface/templates/interface/wikipage_form.html b/app/interface/templates/interface/wikipage_form.html similarity index 100% rename from interface/templates/interface/wikipage_form.html rename to app/interface/templates/interface/wikipage_form.html diff --git a/interface/templates/registration/login.html b/app/interface/templates/registration/login.html similarity index 100% rename from interface/templates/registration/login.html rename to app/interface/templates/registration/login.html diff --git a/interface/templatetags/path_filters.py b/app/interface/templatetags/path_filters.py similarity index 100% rename from interface/templatetags/path_filters.py rename to app/interface/templatetags/path_filters.py diff --git a/interface/templatetags/polyphonic.py b/app/interface/templatetags/polyphonic.py similarity index 100% rename from interface/templatetags/polyphonic.py rename to app/interface/templatetags/polyphonic.py diff --git a/interface/templatetags/url_tools.py b/app/interface/templatetags/url_tools.py similarity index 100% rename from interface/templatetags/url_tools.py rename to app/interface/templatetags/url_tools.py diff --git a/interface/tests/__init__.py b/app/interface/tests/__init__.py similarity index 100% rename from interface/tests/__init__.py rename to app/interface/tests/__init__.py diff --git a/interface/tests/test_integration.py b/app/interface/tests/test_integration.py similarity index 100% rename from interface/tests/test_integration.py rename to app/interface/tests/test_integration.py diff --git a/interface/tests/test_register.py b/app/interface/tests/test_register.py similarity index 100% rename from interface/tests/test_register.py rename to app/interface/tests/test_register.py diff --git a/interface/urls.py b/app/interface/urls.py similarity index 100% rename from interface/urls.py rename to app/interface/urls.py diff --git a/interface/views.py b/app/interface/views.py similarity index 100% rename from interface/views.py rename to app/interface/views.py diff --git a/library/README.md b/app/library/README.md similarity index 100% rename from library/README.md rename to app/library/README.md diff --git a/library/__init__.py b/app/library/__init__.py similarity index 100% rename from library/__init__.py rename to app/library/__init__.py diff --git a/library/admin.py b/app/library/admin.py similarity index 100% rename from library/admin.py rename to app/library/admin.py diff --git a/library/apps.py b/app/library/apps.py similarity index 100% rename from library/apps.py rename to app/library/apps.py diff --git a/library/forms.py b/app/library/forms.py similarity index 100% rename from library/forms.py rename to app/library/forms.py diff --git a/library/imslp.py b/app/library/imslp.py similarity index 100% rename from library/imslp.py rename to app/library/imslp.py diff --git a/library/management/__init__.py b/app/library/management/__init__.py similarity index 100% rename from library/management/__init__.py rename to app/library/management/__init__.py diff --git a/library/management/commands/__init__.py b/app/library/management/commands/__init__.py similarity index 100% rename from library/management/commands/__init__.py rename to app/library/management/commands/__init__.py diff --git a/library/management/commands/import_works.py b/app/library/management/commands/import_works.py similarity index 100% rename from library/management/commands/import_works.py rename to app/library/management/commands/import_works.py diff --git a/library/migrations/0001_initial.py b/app/library/migrations/0001_initial.py similarity index 100% rename from library/migrations/0001_initial.py rename to app/library/migrations/0001_initial.py diff --git a/library/migrations/__init__.py b/app/library/migrations/__init__.py similarity index 100% rename from library/migrations/__init__.py rename to app/library/migrations/__init__.py diff --git a/library/models.py b/app/library/models.py similarity index 100% rename from library/models.py rename to app/library/models.py diff --git a/library/pdf_utils.py b/app/library/pdf_utils.py similarity index 100% rename from library/pdf_utils.py rename to app/library/pdf_utils.py diff --git a/library/templates/library/collection_list.html b/app/library/templates/library/collection_list.html similarity index 100% rename from library/templates/library/collection_list.html rename to app/library/templates/library/collection_list.html diff --git a/library/templates/library/document_annotate.html b/app/library/templates/library/document_annotate.html similarity index 100% rename from library/templates/library/document_annotate.html rename to app/library/templates/library/document_annotate.html diff --git a/library/templates/library/folder_detail.html b/app/library/templates/library/folder_detail.html similarity index 100% rename from library/templates/library/folder_detail.html rename to app/library/templates/library/folder_detail.html diff --git a/library/templates/library/item_list.html b/app/library/templates/library/item_list.html similarity index 100% rename from library/templates/library/item_list.html rename to app/library/templates/library/item_list.html diff --git a/library/templates/library/item_list_manage.html b/app/library/templates/library/item_list_manage.html similarity index 100% rename from library/templates/library/item_list_manage.html rename to app/library/templates/library/item_list_manage.html diff --git a/library/templates/library/project_detail.html b/app/library/templates/library/project_detail.html similarity index 100% rename from library/templates/library/project_detail.html rename to app/library/templates/library/project_detail.html diff --git a/library/templates/library/project_menu.html b/app/library/templates/library/project_menu.html similarity index 100% rename from library/templates/library/project_menu.html rename to app/library/templates/library/project_menu.html diff --git a/library/templates/library/work_detail.html b/app/library/templates/library/work_detail.html similarity index 100% rename from library/templates/library/work_detail.html rename to app/library/templates/library/work_detail.html diff --git a/library/templates/library/work_list.html b/app/library/templates/library/work_list.html similarity index 100% rename from library/templates/library/work_list.html rename to app/library/templates/library/work_list.html diff --git a/library/templates/library/work_partset.html b/app/library/templates/library/work_partset.html similarity index 100% rename from library/templates/library/work_partset.html rename to app/library/templates/library/work_partset.html diff --git a/library/tests.py b/app/library/tests.py similarity index 100% rename from library/tests.py rename to app/library/tests.py diff --git a/library/urls.py b/app/library/urls.py similarity index 100% rename from library/urls.py rename to app/library/urls.py diff --git a/library/views.py b/app/library/views.py similarity index 100% rename from library/views.py rename to app/library/views.py diff --git a/manage.py b/app/manage.py similarity index 100% rename from manage.py rename to app/manage.py diff --git a/polyphonic/__init__.py b/app/polyphonic/__init__.py similarity index 100% rename from polyphonic/__init__.py rename to app/polyphonic/__init__.py diff --git a/polyphonic/asgi.py b/app/polyphonic/asgi.py similarity index 100% rename from polyphonic/asgi.py rename to app/polyphonic/asgi.py diff --git a/polyphonic/settings_default.py b/app/polyphonic/default_settings.py similarity index 97% rename from polyphonic/settings_default.py rename to app/polyphonic/default_settings.py index 9df60a1..78b2969 100644 --- a/polyphonic/settings_default.py +++ b/app/polyphonic/default_settings.py @@ -11,16 +11,16 @@ https://docs.djangoproject.com/en/3.1/ref/settings/ """ from pathlib import Path +from os import environ # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent +SECRET_KEY=environ.get('SECRET_KEY') # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/ -# SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = None # SECURITY WARNING: don't run with debug turned on in production! DEBUG = False diff --git a/app/polyphonic/settings.py b/app/polyphonic/settings.py new file mode 100644 index 0000000..b6d8ec3 --- /dev/null +++ b/app/polyphonic/settings.py @@ -0,0 +1,7 @@ +try: + from .local_settings import * +except ImportError: + from .default_settings import * + + +INSTALLED_APPS += POLYPHONIC_MODULES \ No newline at end of file diff --git a/polyphonic/urls.py b/app/polyphonic/urls.py similarity index 100% rename from polyphonic/urls.py rename to app/polyphonic/urls.py diff --git a/polyphonic/wsgi.py b/app/polyphonic/wsgi.py similarity index 100% rename from polyphonic/wsgi.py rename to app/polyphonic/wsgi.py diff --git a/requirements.txt b/app/requirements.txt similarity index 100% rename from requirements.txt rename to app/requirements.txt diff --git a/polyphonic/settings.py b/polyphonic/settings.py deleted file mode 100644 index 60e84a4..0000000 --- a/polyphonic/settings.py +++ /dev/null @@ -1,10 +0,0 @@ -from .settings_default import * - -SECRET_KEY = "jh984g3i04tv3n09t^&*^v9v" - -try: - from .settings_local import * -except ImportError: - pass - -INSTALLED_APPS += POLYPHONIC_MODULES \ No newline at end of file