From f54571eb8f16cffd4d23c8fc569966340f05c187 Mon Sep 17 00:00:00 2001 From: FuzzyGrim Date: Tue, 24 Jan 2023 12:32:25 +0100 Subject: [PATCH] change folder name to src --- Dockerfile | 4 ++-- {yamtarr => src}/app/__init__.py | 0 {yamtarr => src}/app/admin.py | 0 {yamtarr => src}/app/apps.py | 0 {yamtarr => src}/app/forms.py | 0 {yamtarr => src}/app/migrations/0001_initial.py | 0 {yamtarr => src}/app/migrations/__init__.py | 0 {yamtarr => src}/app/models.py | 0 {yamtarr => src}/app/static/css/_edit.scss | 0 {yamtarr => src}/app/static/css/_general.scss | 0 {yamtarr => src}/app/static/css/_home.scss | 0 {yamtarr => src}/app/static/css/_navbar.scss | 0 {yamtarr => src}/app/static/css/_profile.scss | 0 {yamtarr => src}/app/static/css/_search.scss | 0 {yamtarr => src}/app/static/css/bootstrap-icons.css | 0 {yamtarr => src}/app/static/css/bootstrap.min.css | 0 .../app/static/css/bootstrap.min.css.map | 0 {yamtarr => src}/app/static/css/main.css | 0 {yamtarr => src}/app/static/css/main.scss | 0 .../app/static/fonts/bootstrap-icons.woff | Bin .../app/static/fonts/bootstrap-icons.woff2 | Bin {yamtarr => src}/app/static/js/auto-tab.js | 0 .../app/static/js/bootstrap.bundle.min.js | 0 .../app/static/js/bootstrap.bundle.min.js.map | 0 {yamtarr => src}/app/static/js/bootstrap.js | 0 {yamtarr => src}/app/static/js/jquery.js | 0 {yamtarr => src}/app/static/js/modal-load.js | 0 {yamtarr => src}/app/static/js/spinner.js | 0 {yamtarr => src}/app/storage.py | 0 {yamtarr => src}/app/templates/app/edit.html | 0 {yamtarr => src}/app/templates/app/home.html | 0 .../app/templates/app/include/list-head.html | 0 .../app/templates/app/include/list-section.html | 0 .../app/templates/app/include/media-modal.html | 0 .../app/templates/app/include/navbar.html | 0 .../app/templates/app/include/tags.html | 0 {yamtarr => src}/app/templates/app/login.html | 0 {yamtarr => src}/app/templates/app/profile.html | 0 {yamtarr => src}/app/templates/app/register.html | 0 {yamtarr => src}/app/templates/app/search.html | 0 {yamtarr => src}/app/templatetags/__init__.py | 0 {yamtarr => src}/app/templatetags/extras.py | 0 {yamtarr => src}/app/tests/__init__.py | 0 {yamtarr => src}/app/tests/test_imports.py | 0 {yamtarr => src}/app/tests/test_models.py | 0 {yamtarr => src}/app/tests/test_views.py | 0 {yamtarr => src}/app/urls.py | 0 {yamtarr => src}/app/utils/database.py | 0 {yamtarr => src}/app/utils/helpers.py | 0 {yamtarr => src}/app/utils/interactions.py | 0 {yamtarr => src}/app/views.py | 0 {yamtarr => src}/base/__init__.py | 0 {yamtarr => src}/base/settings.py | 8 ++++---- {yamtarr => src}/base/urls.py | 0 {yamtarr => src}/base/wsgi.py | 0 {yamtarr => src}/manage.py | 0 {yamtarr/data => src}/media/images/none.svg | 0 57 files changed, 6 insertions(+), 6 deletions(-) rename {yamtarr => src}/app/__init__.py (100%) rename {yamtarr => src}/app/admin.py (100%) rename {yamtarr => src}/app/apps.py (100%) rename {yamtarr => src}/app/forms.py (100%) rename {yamtarr => src}/app/migrations/0001_initial.py (100%) rename {yamtarr => src}/app/migrations/__init__.py (100%) rename {yamtarr => src}/app/models.py (100%) rename {yamtarr => src}/app/static/css/_edit.scss (100%) rename {yamtarr => src}/app/static/css/_general.scss (100%) rename {yamtarr => src}/app/static/css/_home.scss (100%) rename {yamtarr => src}/app/static/css/_navbar.scss (100%) rename {yamtarr => src}/app/static/css/_profile.scss (100%) rename {yamtarr => src}/app/static/css/_search.scss (100%) rename {yamtarr => src}/app/static/css/bootstrap-icons.css (100%) rename {yamtarr => src}/app/static/css/bootstrap.min.css (100%) rename {yamtarr => src}/app/static/css/bootstrap.min.css.map (100%) rename {yamtarr => src}/app/static/css/main.css (100%) rename {yamtarr => src}/app/static/css/main.scss (100%) rename {yamtarr => src}/app/static/fonts/bootstrap-icons.woff (100%) rename {yamtarr => src}/app/static/fonts/bootstrap-icons.woff2 (100%) rename {yamtarr => src}/app/static/js/auto-tab.js (100%) rename {yamtarr => src}/app/static/js/bootstrap.bundle.min.js (100%) rename {yamtarr => src}/app/static/js/bootstrap.bundle.min.js.map (100%) rename {yamtarr => src}/app/static/js/bootstrap.js (100%) rename {yamtarr => src}/app/static/js/jquery.js (100%) rename {yamtarr => src}/app/static/js/modal-load.js (100%) rename {yamtarr => src}/app/static/js/spinner.js (100%) rename {yamtarr => src}/app/storage.py (100%) rename {yamtarr => src}/app/templates/app/edit.html (100%) rename {yamtarr => src}/app/templates/app/home.html (100%) rename {yamtarr => src}/app/templates/app/include/list-head.html (100%) rename {yamtarr => src}/app/templates/app/include/list-section.html (100%) rename {yamtarr => src}/app/templates/app/include/media-modal.html (100%) rename {yamtarr => src}/app/templates/app/include/navbar.html (100%) rename {yamtarr => src}/app/templates/app/include/tags.html (100%) rename {yamtarr => src}/app/templates/app/login.html (100%) rename {yamtarr => src}/app/templates/app/profile.html (100%) rename {yamtarr => src}/app/templates/app/register.html (100%) rename {yamtarr => src}/app/templates/app/search.html (100%) rename {yamtarr => src}/app/templatetags/__init__.py (100%) rename {yamtarr => src}/app/templatetags/extras.py (100%) rename {yamtarr => src}/app/tests/__init__.py (100%) rename {yamtarr => src}/app/tests/test_imports.py (100%) rename {yamtarr => src}/app/tests/test_models.py (100%) rename {yamtarr => src}/app/tests/test_views.py (100%) rename {yamtarr => src}/app/urls.py (100%) rename {yamtarr => src}/app/utils/database.py (100%) rename {yamtarr => src}/app/utils/helpers.py (100%) rename {yamtarr => src}/app/utils/interactions.py (100%) rename {yamtarr => src}/app/views.py (100%) rename {yamtarr => src}/base/__init__.py (100%) rename {yamtarr => src}/base/settings.py (94%) rename {yamtarr => src}/base/urls.py (100%) rename {yamtarr => src}/base/wsgi.py (100%) rename {yamtarr => src}/manage.py (100%) rename {yamtarr/data => src}/media/images/none.svg (100%) diff --git a/Dockerfile b/Dockerfile index 7849680b..a9b3c77c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,8 +13,8 @@ RUN chmod +x /entrypoint.sh RUN adduser -D user WORKDIR /app -COPY --chown=user:user ./yamtarr . -RUN chown user:user /yamtarr +COPY --chown=user:user ./src . +RUN chown user:user /app USER user RUN [ ! -d "db" ] && mkdir db diff --git a/yamtarr/app/__init__.py b/src/app/__init__.py similarity index 100% rename from yamtarr/app/__init__.py rename to src/app/__init__.py diff --git a/yamtarr/app/admin.py b/src/app/admin.py similarity index 100% rename from yamtarr/app/admin.py rename to src/app/admin.py diff --git a/yamtarr/app/apps.py b/src/app/apps.py similarity index 100% rename from yamtarr/app/apps.py rename to src/app/apps.py diff --git a/yamtarr/app/forms.py b/src/app/forms.py similarity index 100% rename from yamtarr/app/forms.py rename to src/app/forms.py diff --git a/yamtarr/app/migrations/0001_initial.py b/src/app/migrations/0001_initial.py similarity index 100% rename from yamtarr/app/migrations/0001_initial.py rename to src/app/migrations/0001_initial.py diff --git a/yamtarr/app/migrations/__init__.py b/src/app/migrations/__init__.py similarity index 100% rename from yamtarr/app/migrations/__init__.py rename to src/app/migrations/__init__.py diff --git a/yamtarr/app/models.py b/src/app/models.py similarity index 100% rename from yamtarr/app/models.py rename to src/app/models.py diff --git a/yamtarr/app/static/css/_edit.scss b/src/app/static/css/_edit.scss similarity index 100% rename from yamtarr/app/static/css/_edit.scss rename to src/app/static/css/_edit.scss diff --git a/yamtarr/app/static/css/_general.scss b/src/app/static/css/_general.scss similarity index 100% rename from yamtarr/app/static/css/_general.scss rename to src/app/static/css/_general.scss diff --git a/yamtarr/app/static/css/_home.scss b/src/app/static/css/_home.scss similarity index 100% rename from yamtarr/app/static/css/_home.scss rename to src/app/static/css/_home.scss diff --git a/yamtarr/app/static/css/_navbar.scss b/src/app/static/css/_navbar.scss similarity index 100% rename from yamtarr/app/static/css/_navbar.scss rename to src/app/static/css/_navbar.scss diff --git a/yamtarr/app/static/css/_profile.scss b/src/app/static/css/_profile.scss similarity index 100% rename from yamtarr/app/static/css/_profile.scss rename to src/app/static/css/_profile.scss diff --git a/yamtarr/app/static/css/_search.scss b/src/app/static/css/_search.scss similarity index 100% rename from yamtarr/app/static/css/_search.scss rename to src/app/static/css/_search.scss diff --git a/yamtarr/app/static/css/bootstrap-icons.css b/src/app/static/css/bootstrap-icons.css similarity index 100% rename from yamtarr/app/static/css/bootstrap-icons.css rename to src/app/static/css/bootstrap-icons.css diff --git a/yamtarr/app/static/css/bootstrap.min.css b/src/app/static/css/bootstrap.min.css similarity index 100% rename from yamtarr/app/static/css/bootstrap.min.css rename to src/app/static/css/bootstrap.min.css diff --git a/yamtarr/app/static/css/bootstrap.min.css.map b/src/app/static/css/bootstrap.min.css.map similarity index 100% rename from yamtarr/app/static/css/bootstrap.min.css.map rename to src/app/static/css/bootstrap.min.css.map diff --git a/yamtarr/app/static/css/main.css b/src/app/static/css/main.css similarity index 100% rename from yamtarr/app/static/css/main.css rename to src/app/static/css/main.css diff --git a/yamtarr/app/static/css/main.scss b/src/app/static/css/main.scss similarity index 100% rename from yamtarr/app/static/css/main.scss rename to src/app/static/css/main.scss diff --git a/yamtarr/app/static/fonts/bootstrap-icons.woff b/src/app/static/fonts/bootstrap-icons.woff similarity index 100% rename from yamtarr/app/static/fonts/bootstrap-icons.woff rename to src/app/static/fonts/bootstrap-icons.woff diff --git a/yamtarr/app/static/fonts/bootstrap-icons.woff2 b/src/app/static/fonts/bootstrap-icons.woff2 similarity index 100% rename from yamtarr/app/static/fonts/bootstrap-icons.woff2 rename to src/app/static/fonts/bootstrap-icons.woff2 diff --git a/yamtarr/app/static/js/auto-tab.js b/src/app/static/js/auto-tab.js similarity index 100% rename from yamtarr/app/static/js/auto-tab.js rename to src/app/static/js/auto-tab.js diff --git a/yamtarr/app/static/js/bootstrap.bundle.min.js b/src/app/static/js/bootstrap.bundle.min.js similarity index 100% rename from yamtarr/app/static/js/bootstrap.bundle.min.js rename to src/app/static/js/bootstrap.bundle.min.js diff --git a/yamtarr/app/static/js/bootstrap.bundle.min.js.map b/src/app/static/js/bootstrap.bundle.min.js.map similarity index 100% rename from yamtarr/app/static/js/bootstrap.bundle.min.js.map rename to src/app/static/js/bootstrap.bundle.min.js.map diff --git a/yamtarr/app/static/js/bootstrap.js b/src/app/static/js/bootstrap.js similarity index 100% rename from yamtarr/app/static/js/bootstrap.js rename to src/app/static/js/bootstrap.js diff --git a/yamtarr/app/static/js/jquery.js b/src/app/static/js/jquery.js similarity index 100% rename from yamtarr/app/static/js/jquery.js rename to src/app/static/js/jquery.js diff --git a/yamtarr/app/static/js/modal-load.js b/src/app/static/js/modal-load.js similarity index 100% rename from yamtarr/app/static/js/modal-load.js rename to src/app/static/js/modal-load.js diff --git a/yamtarr/app/static/js/spinner.js b/src/app/static/js/spinner.js similarity index 100% rename from yamtarr/app/static/js/spinner.js rename to src/app/static/js/spinner.js diff --git a/yamtarr/app/storage.py b/src/app/storage.py similarity index 100% rename from yamtarr/app/storage.py rename to src/app/storage.py diff --git a/yamtarr/app/templates/app/edit.html b/src/app/templates/app/edit.html similarity index 100% rename from yamtarr/app/templates/app/edit.html rename to src/app/templates/app/edit.html diff --git a/yamtarr/app/templates/app/home.html b/src/app/templates/app/home.html similarity index 100% rename from yamtarr/app/templates/app/home.html rename to src/app/templates/app/home.html diff --git a/yamtarr/app/templates/app/include/list-head.html b/src/app/templates/app/include/list-head.html similarity index 100% rename from yamtarr/app/templates/app/include/list-head.html rename to src/app/templates/app/include/list-head.html diff --git a/yamtarr/app/templates/app/include/list-section.html b/src/app/templates/app/include/list-section.html similarity index 100% rename from yamtarr/app/templates/app/include/list-section.html rename to src/app/templates/app/include/list-section.html diff --git a/yamtarr/app/templates/app/include/media-modal.html b/src/app/templates/app/include/media-modal.html similarity index 100% rename from yamtarr/app/templates/app/include/media-modal.html rename to src/app/templates/app/include/media-modal.html diff --git a/yamtarr/app/templates/app/include/navbar.html b/src/app/templates/app/include/navbar.html similarity index 100% rename from yamtarr/app/templates/app/include/navbar.html rename to src/app/templates/app/include/navbar.html diff --git a/yamtarr/app/templates/app/include/tags.html b/src/app/templates/app/include/tags.html similarity index 100% rename from yamtarr/app/templates/app/include/tags.html rename to src/app/templates/app/include/tags.html diff --git a/yamtarr/app/templates/app/login.html b/src/app/templates/app/login.html similarity index 100% rename from yamtarr/app/templates/app/login.html rename to src/app/templates/app/login.html diff --git a/yamtarr/app/templates/app/profile.html b/src/app/templates/app/profile.html similarity index 100% rename from yamtarr/app/templates/app/profile.html rename to src/app/templates/app/profile.html diff --git a/yamtarr/app/templates/app/register.html b/src/app/templates/app/register.html similarity index 100% rename from yamtarr/app/templates/app/register.html rename to src/app/templates/app/register.html diff --git a/yamtarr/app/templates/app/search.html b/src/app/templates/app/search.html similarity index 100% rename from yamtarr/app/templates/app/search.html rename to src/app/templates/app/search.html diff --git a/yamtarr/app/templatetags/__init__.py b/src/app/templatetags/__init__.py similarity index 100% rename from yamtarr/app/templatetags/__init__.py rename to src/app/templatetags/__init__.py diff --git a/yamtarr/app/templatetags/extras.py b/src/app/templatetags/extras.py similarity index 100% rename from yamtarr/app/templatetags/extras.py rename to src/app/templatetags/extras.py diff --git a/yamtarr/app/tests/__init__.py b/src/app/tests/__init__.py similarity index 100% rename from yamtarr/app/tests/__init__.py rename to src/app/tests/__init__.py diff --git a/yamtarr/app/tests/test_imports.py b/src/app/tests/test_imports.py similarity index 100% rename from yamtarr/app/tests/test_imports.py rename to src/app/tests/test_imports.py diff --git a/yamtarr/app/tests/test_models.py b/src/app/tests/test_models.py similarity index 100% rename from yamtarr/app/tests/test_models.py rename to src/app/tests/test_models.py diff --git a/yamtarr/app/tests/test_views.py b/src/app/tests/test_views.py similarity index 100% rename from yamtarr/app/tests/test_views.py rename to src/app/tests/test_views.py diff --git a/yamtarr/app/urls.py b/src/app/urls.py similarity index 100% rename from yamtarr/app/urls.py rename to src/app/urls.py diff --git a/yamtarr/app/utils/database.py b/src/app/utils/database.py similarity index 100% rename from yamtarr/app/utils/database.py rename to src/app/utils/database.py diff --git a/yamtarr/app/utils/helpers.py b/src/app/utils/helpers.py similarity index 100% rename from yamtarr/app/utils/helpers.py rename to src/app/utils/helpers.py diff --git a/yamtarr/app/utils/interactions.py b/src/app/utils/interactions.py similarity index 100% rename from yamtarr/app/utils/interactions.py rename to src/app/utils/interactions.py diff --git a/yamtarr/app/views.py b/src/app/views.py similarity index 100% rename from yamtarr/app/views.py rename to src/app/views.py diff --git a/yamtarr/base/__init__.py b/src/base/__init__.py similarity index 100% rename from yamtarr/base/__init__.py rename to src/base/__init__.py diff --git a/yamtarr/base/settings.py b/src/base/settings.py similarity index 94% rename from yamtarr/base/settings.py rename to src/base/settings.py index 437ea275..9dc14ba7 100644 --- a/yamtarr/base/settings.py +++ b/src/base/settings.py @@ -87,7 +87,7 @@ WSGI_APPLICATION = 'base.wsgi.application' DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(BASE_DIR, 'data/db.sqlite3') + 'NAME': os.path.join(BASE_DIR, 'db/db.sqlite3') } } @@ -128,8 +128,8 @@ USE_TZ = True STATIC_URL = 'static/' MEDIA_URL = 'media/' -STATIC_ROOT = os.path.join(BASE_DIR, 'data/static') -MEDIA_ROOT = os.path.join(BASE_DIR, 'data/media') +STATIC_ROOT = os.path.join(BASE_DIR, 'static') +MEDIA_ROOT = os.path.join(BASE_DIR, 'media') # Default primary key field type # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field @@ -156,6 +156,6 @@ STATICFILES_FINDERS = [ SASS_PROCESSOR_ENABLED = True -SASS_PROCESSOR_ROOT = os.path.join(BASE_DIR,'data/static') +SASS_PROCESSOR_ROOT = os.path.join(BASE_DIR,'static') SASS_OUTPUT_STYLE = 'compact' \ No newline at end of file diff --git a/yamtarr/base/urls.py b/src/base/urls.py similarity index 100% rename from yamtarr/base/urls.py rename to src/base/urls.py diff --git a/yamtarr/base/wsgi.py b/src/base/wsgi.py similarity index 100% rename from yamtarr/base/wsgi.py rename to src/base/wsgi.py diff --git a/yamtarr/manage.py b/src/manage.py similarity index 100% rename from yamtarr/manage.py rename to src/manage.py diff --git a/yamtarr/data/media/images/none.svg b/src/media/images/none.svg similarity index 100% rename from yamtarr/data/media/images/none.svg rename to src/media/images/none.svg