diff --git a/apps/templates/accounts/login.html b/apps/authentication/templates/accounts/login.html similarity index 96% rename from apps/templates/accounts/login.html rename to apps/authentication/templates/accounts/login.html index 4fe1965..703220c 100644 --- a/apps/templates/accounts/login.html +++ b/apps/authentication/templates/accounts/login.html @@ -1,4 +1,4 @@ -{% extends "layouts/base.html" %} +{% extends "base.html" %} {% load static %} {% block title %} - Login {% endblock title %} diff --git a/apps/static/css/home/index.css b/apps/home/static/home/css/index.css similarity index 100% rename from apps/static/css/home/index.css rename to apps/home/static/home/css/index.css diff --git a/apps/static/js/home/content.js b/apps/home/static/home/js/content.js similarity index 100% rename from apps/static/js/home/content.js rename to apps/home/static/home/js/content.js diff --git a/apps/static/js/home/filters.js b/apps/home/static/home/js/filters.js similarity index 100% rename from apps/static/js/home/filters.js rename to apps/home/static/home/js/filters.js diff --git a/apps/static/js/home/index.js b/apps/home/static/home/js/index.js similarity index 100% rename from apps/static/js/home/index.js rename to apps/home/static/home/js/index.js diff --git a/apps/static/js/home/servers.js b/apps/home/static/home/js/servers.js similarity index 100% rename from apps/static/js/home/servers.js rename to apps/home/static/home/js/servers.js diff --git a/apps/static/js/home/settings.js b/apps/home/static/home/js/settings.js similarity index 100% rename from apps/static/js/home/settings.js rename to apps/home/static/home/js/settings.js diff --git a/apps/static/js/home/subscriptions.js b/apps/home/static/home/js/subscriptions.js similarity index 100% rename from apps/static/js/home/subscriptions.js rename to apps/home/static/home/js/subscriptions.js diff --git a/apps/static/js/home/tabs/subscriptions.js b/apps/home/static/home/js/tabs/subscriptions.js similarity index 100% rename from apps/static/js/home/tabs/subscriptions.js rename to apps/home/static/home/js/tabs/subscriptions.js diff --git a/apps/templates/home/blank.html b/apps/home/templates/home/blank.html similarity index 85% rename from apps/templates/home/blank.html rename to apps/home/templates/home/blank.html index acd04d2..8d4c174 100644 --- a/apps/templates/home/blank.html +++ b/apps/home/templates/home/blank.html @@ -1,10 +1,10 @@ -{% extends "layouts/base.html" %} +{% extends "base.html" %} {% block title %} Blank Page {% endblock title %} {% block stylesheets %} - + {% endblock stylesheets %} diff --git a/apps/templates/home/includes/deletemodal.html b/apps/home/templates/home/includes/deletemodal.html similarity index 100% rename from apps/templates/home/includes/deletemodal.html rename to apps/home/templates/home/includes/deletemodal.html diff --git a/apps/templates/home/includes/filtermodal.html b/apps/home/templates/home/includes/filtermodal.html similarity index 100% rename from apps/templates/home/includes/filtermodal.html rename to apps/home/templates/home/includes/filtermodal.html diff --git a/apps/templates/home/includes/settingsmodal.html b/apps/home/templates/home/includes/settingsmodal.html similarity index 100% rename from apps/templates/home/includes/settingsmodal.html rename to apps/home/templates/home/includes/settingsmodal.html diff --git a/apps/templates/home/includes/settingstab.html b/apps/home/templates/home/includes/settingstab.html similarity index 100% rename from apps/templates/home/includes/settingstab.html rename to apps/home/templates/home/includes/settingstab.html diff --git a/apps/templates/home/includes/submodal.html b/apps/home/templates/home/includes/submodal.html similarity index 100% rename from apps/templates/home/includes/submodal.html rename to apps/home/templates/home/includes/submodal.html diff --git a/apps/templates/home/index.html b/apps/home/templates/home/index.html similarity index 94% rename from apps/templates/home/index.html rename to apps/home/templates/home/index.html index 186f448..05dbb81 100644 --- a/apps/templates/home/index.html +++ b/apps/home/templates/home/index.html @@ -1,11 +1,11 @@ -{% extends 'layouts/base.html' %} +{% extends 'base.html' %} {% load static %} {% block title %}{% endblock title %} {% block stylesheets %} - + {% endblock stylesheets %} @@ -154,12 +154,12 @@ - - - + + + + + + + --> {% endblock javascript %} \ No newline at end of file diff --git a/apps/templates/.gitkeep b/apps/templates/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/core/settings.py b/core/settings.py index b9a8790..170e788 100644 --- a/core/settings.py +++ b/core/settings.py @@ -78,7 +78,7 @@ AUTH_USER_MODEL = "authentication.DiscordUser" TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [BASE_DIR / "apps/templates"], + 'DIRS': [BASE_DIR / "templates"], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ @@ -237,7 +237,7 @@ STATIC_URL = '/static/' # Extra places for collectstatic to find static files. STATICFILES_DIRS = ( - BASE_DIR / 'apps/static', + BASE_DIR / 'static', ) # Media Files diff --git a/apps/static/css/base.css b/static/css/base.css similarity index 100% rename from apps/static/css/base.css rename to static/css/base.css diff --git a/apps/static/css/bootstrap-datepicker3.min.css b/static/css/bootstrap-datepicker3.min.css similarity index 100% rename from apps/static/css/bootstrap-datepicker3.min.css rename to static/css/bootstrap-datepicker3.min.css diff --git a/apps/static/css/bootstrap.css b/static/css/bootstrap.css similarity index 100% rename from apps/static/css/bootstrap.css rename to static/css/bootstrap.css diff --git a/apps/static/css/colours.css b/static/css/colours.css similarity index 100% rename from apps/static/css/colours.css rename to static/css/colours.css diff --git a/apps/static/css/jquery.dataTables.min.css b/static/css/jquery.dataTables.min.css similarity index 100% rename from apps/static/css/jquery.dataTables.min.css rename to static/css/jquery.dataTables.min.css diff --git a/apps/static/css/select2-bootstrap.min.css b/static/css/select2-bootstrap.min.css similarity index 100% rename from apps/static/css/select2-bootstrap.min.css rename to static/css/select2-bootstrap.min.css diff --git a/apps/static/css/select2.css b/static/css/select2.css similarity index 100% rename from apps/static/css/select2.css rename to static/css/select2.css diff --git a/apps/static/css/select2.min.css b/static/css/select2.min.css similarity index 100% rename from apps/static/css/select2.min.css rename to static/css/select2.min.css diff --git a/apps/static/css/toasts.css b/static/css/toasts.css similarity index 100% rename from apps/static/css/toasts.css rename to static/css/toasts.css diff --git a/apps/static/fonts/atkinson-hyperlegible/OFL.txt b/static/fonts/atkinson-hyperlegible/OFL.txt similarity index 100% rename from apps/static/fonts/atkinson-hyperlegible/OFL.txt rename to static/fonts/atkinson-hyperlegible/OFL.txt diff --git a/apps/static/fonts/atkinson-hyperlegible/bold.ttf b/static/fonts/atkinson-hyperlegible/bold.ttf similarity index 100% rename from apps/static/fonts/atkinson-hyperlegible/bold.ttf rename to static/fonts/atkinson-hyperlegible/bold.ttf diff --git a/apps/static/fonts/atkinson-hyperlegible/italic-bold.ttf b/static/fonts/atkinson-hyperlegible/italic-bold.ttf similarity index 100% rename from apps/static/fonts/atkinson-hyperlegible/italic-bold.ttf rename to static/fonts/atkinson-hyperlegible/italic-bold.ttf diff --git a/apps/static/fonts/atkinson-hyperlegible/italic.ttf b/static/fonts/atkinson-hyperlegible/italic.ttf similarity index 100% rename from apps/static/fonts/atkinson-hyperlegible/italic.ttf rename to static/fonts/atkinson-hyperlegible/italic.ttf diff --git a/apps/static/fonts/atkinson-hyperlegible/regular.ttf b/static/fonts/atkinson-hyperlegible/regular.ttf similarity index 100% rename from apps/static/fonts/atkinson-hyperlegible/regular.ttf rename to static/fonts/atkinson-hyperlegible/regular.ttf diff --git a/apps/static/fonts/icons/fontawesome/FontAwesome.otf b/static/fonts/icons/fontawesome/FontAwesome.otf similarity index 100% rename from apps/static/fonts/icons/fontawesome/FontAwesome.otf rename to static/fonts/icons/fontawesome/FontAwesome.otf diff --git a/apps/static/fonts/icons/fontawesome/fontawesome-webfont.eot b/static/fonts/icons/fontawesome/fontawesome-webfont.eot similarity index 100% rename from apps/static/fonts/icons/fontawesome/fontawesome-webfont.eot rename to static/fonts/icons/fontawesome/fontawesome-webfont.eot diff --git a/apps/static/fonts/icons/fontawesome/fontawesome-webfont.svg b/static/fonts/icons/fontawesome/fontawesome-webfont.svg similarity index 100% rename from apps/static/fonts/icons/fontawesome/fontawesome-webfont.svg rename to static/fonts/icons/fontawesome/fontawesome-webfont.svg diff --git a/apps/static/fonts/icons/fontawesome/fontawesome-webfont.ttf b/static/fonts/icons/fontawesome/fontawesome-webfont.ttf similarity index 100% rename from apps/static/fonts/icons/fontawesome/fontawesome-webfont.ttf rename to static/fonts/icons/fontawesome/fontawesome-webfont.ttf diff --git a/apps/static/fonts/icons/fontawesome/fontawesome-webfont.woff b/static/fonts/icons/fontawesome/fontawesome-webfont.woff similarity index 100% rename from apps/static/fonts/icons/fontawesome/fontawesome-webfont.woff rename to static/fonts/icons/fontawesome/fontawesome-webfont.woff diff --git a/apps/static/fonts/icons/fontawesome/fontawesome-webfont.woff2 b/static/fonts/icons/fontawesome/fontawesome-webfont.woff2 similarity index 100% rename from apps/static/fonts/icons/fontawesome/fontawesome-webfont.woff2 rename to static/fonts/icons/fontawesome/fontawesome-webfont.woff2 diff --git a/apps/static/fonts/icons/themify/themify.eot b/static/fonts/icons/themify/themify.eot similarity index 100% rename from apps/static/fonts/icons/themify/themify.eot rename to static/fonts/icons/themify/themify.eot diff --git a/apps/static/fonts/icons/themify/themify.svg b/static/fonts/icons/themify/themify.svg similarity index 100% rename from apps/static/fonts/icons/themify/themify.svg rename to static/fonts/icons/themify/themify.svg diff --git a/apps/static/fonts/icons/themify/themify.ttf b/static/fonts/icons/themify/themify.ttf similarity index 100% rename from apps/static/fonts/icons/themify/themify.ttf rename to static/fonts/icons/themify/themify.ttf diff --git a/apps/static/fonts/icons/themify/themify.woff b/static/fonts/icons/themify/themify.woff similarity index 100% rename from apps/static/fonts/icons/themify/themify.woff rename to static/fonts/icons/themify/themify.woff diff --git a/apps/static/fonts/sora/OFL.txt b/static/fonts/sora/OFL.txt similarity index 100% rename from apps/static/fonts/sora/OFL.txt rename to static/fonts/sora/OFL.txt diff --git a/apps/static/fonts/sora/bold.ttf b/static/fonts/sora/bold.ttf similarity index 100% rename from apps/static/fonts/sora/bold.ttf rename to static/fonts/sora/bold.ttf diff --git a/apps/static/fonts/sora/extraBold.ttf b/static/fonts/sora/extraBold.ttf similarity index 100% rename from apps/static/fonts/sora/extraBold.ttf rename to static/fonts/sora/extraBold.ttf diff --git a/apps/static/fonts/sora/extraLight.ttf b/static/fonts/sora/extraLight.ttf similarity index 100% rename from apps/static/fonts/sora/extraLight.ttf rename to static/fonts/sora/extraLight.ttf diff --git a/apps/static/fonts/sora/light.ttf b/static/fonts/sora/light.ttf similarity index 100% rename from apps/static/fonts/sora/light.ttf rename to static/fonts/sora/light.ttf diff --git a/apps/static/fonts/sora/medium.ttf b/static/fonts/sora/medium.ttf similarity index 100% rename from apps/static/fonts/sora/medium.ttf rename to static/fonts/sora/medium.ttf diff --git a/apps/static/fonts/sora/regular.ttf b/static/fonts/sora/regular.ttf similarity index 100% rename from apps/static/fonts/sora/regular.ttf rename to static/fonts/sora/regular.ttf diff --git a/apps/static/fonts/sora/semiBold.ttf b/static/fonts/sora/semiBold.ttf similarity index 100% rename from apps/static/fonts/sora/semiBold.ttf rename to static/fonts/sora/semiBold.ttf diff --git a/apps/static/fonts/sora/thin.ttf b/static/fonts/sora/thin.ttf similarity index 100% rename from apps/static/fonts/sora/thin.ttf rename to static/fonts/sora/thin.ttf diff --git a/apps/static/images/404.png b/static/images/404.png similarity index 100% rename from apps/static/images/404.png rename to static/images/404.png diff --git a/apps/static/images/500.png b/static/images/500.png similarity index 100% rename from apps/static/images/500.png rename to static/images/500.png diff --git a/apps/static/images/background-texture.webp b/static/images/background-texture.webp similarity index 100% rename from apps/static/images/background-texture.webp rename to static/images/background-texture.webp diff --git a/apps/static/images/background.jpg b/static/images/background.jpg similarity index 100% rename from apps/static/images/background.jpg rename to static/images/background.jpg diff --git a/apps/static/images/bg.jpg b/static/images/bg.jpg similarity index 100% rename from apps/static/images/bg.jpg rename to static/images/bg.jpg diff --git a/apps/static/images/dark-mode.png b/static/images/dark-mode.png similarity index 100% rename from apps/static/images/dark-mode.png rename to static/images/dark-mode.png diff --git a/apps/static/images/datatables/sort_asc.png b/static/images/datatables/sort_asc.png similarity index 100% rename from apps/static/images/datatables/sort_asc.png rename to static/images/datatables/sort_asc.png diff --git a/apps/static/images/datatables/sort_asc_disabled.png b/static/images/datatables/sort_asc_disabled.png similarity index 100% rename from apps/static/images/datatables/sort_asc_disabled.png rename to static/images/datatables/sort_asc_disabled.png diff --git a/apps/static/images/datatables/sort_both.png b/static/images/datatables/sort_both.png similarity index 100% rename from apps/static/images/datatables/sort_both.png rename to static/images/datatables/sort_both.png diff --git a/apps/static/images/datatables/sort_desc.png b/static/images/datatables/sort_desc.png similarity index 100% rename from apps/static/images/datatables/sort_desc.png rename to static/images/datatables/sort_desc.png diff --git a/apps/static/images/datatables/sort_desc_disabled.png b/static/images/datatables/sort_desc_disabled.png similarity index 100% rename from apps/static/images/datatables/sort_desc_disabled.png rename to static/images/datatables/sort_desc_disabled.png diff --git a/apps/static/images/defaultuser.webp b/static/images/defaultuser.webp similarity index 100% rename from apps/static/images/defaultuser.webp rename to static/images/defaultuser.webp diff --git a/apps/static/images/favicon/android-chrome-192x192.png b/static/images/favicon/android-chrome-192x192.png similarity index 100% rename from apps/static/images/favicon/android-chrome-192x192.png rename to static/images/favicon/android-chrome-192x192.png diff --git a/apps/static/images/favicon/android-chrome-512x512.png b/static/images/favicon/android-chrome-512x512.png similarity index 100% rename from apps/static/images/favicon/android-chrome-512x512.png rename to static/images/favicon/android-chrome-512x512.png diff --git a/apps/static/images/favicon/apple-touch-icon.png b/static/images/favicon/apple-touch-icon.png similarity index 100% rename from apps/static/images/favicon/apple-touch-icon.png rename to static/images/favicon/apple-touch-icon.png diff --git a/apps/static/images/favicon/favicon-16x16.png b/static/images/favicon/favicon-16x16.png similarity index 100% rename from apps/static/images/favicon/favicon-16x16.png rename to static/images/favicon/favicon-16x16.png diff --git a/apps/static/images/favicon/favicon-32x32.png b/static/images/favicon/favicon-32x32.png similarity index 100% rename from apps/static/images/favicon/favicon-32x32.png rename to static/images/favicon/favicon-32x32.png diff --git a/apps/static/images/favicon/favicon.ico b/static/images/favicon/favicon.ico similarity index 100% rename from apps/static/images/favicon/favicon.ico rename to static/images/favicon/favicon.ico diff --git a/apps/static/images/favicon/site.webmanifest b/static/images/favicon/site.webmanifest similarity index 100% rename from apps/static/images/favicon/site.webmanifest rename to static/images/favicon/site.webmanifest diff --git a/apps/static/images/installation_contexts.png b/static/images/installation_contexts.png similarity index 100% rename from apps/static/images/installation_contexts.png rename to static/images/installation_contexts.png diff --git a/apps/static/images/light-mode.png b/static/images/light-mode.png similarity index 100% rename from apps/static/images/light-mode.png rename to static/images/light-mode.png diff --git a/apps/static/images/logo.png b/static/images/logo.png similarity index 100% rename from apps/static/images/logo.png rename to static/images/logo.png diff --git a/apps/static/images/logo.svg b/static/images/logo.svg similarity index 100% rename from apps/static/images/logo.svg rename to static/images/logo.svg diff --git a/apps/static/images/placeholder-100x100.png b/static/images/placeholder-100x100.png similarity index 100% rename from apps/static/images/placeholder-100x100.png rename to static/images/placeholder-100x100.png diff --git a/apps/static/images/placeholder-1024x1024.jpeg b/static/images/placeholder-1024x1024.jpeg similarity index 100% rename from apps/static/images/placeholder-1024x1024.jpeg rename to static/images/placeholder-1024x1024.jpeg diff --git a/apps/static/images/pyrss.png b/static/images/pyrss.png similarity index 100% rename from apps/static/images/pyrss.png rename to static/images/pyrss.png diff --git a/apps/static/images/pyrss_logo.webp b/static/images/pyrss_logo.webp similarity index 100% rename from apps/static/images/pyrss_logo.webp rename to static/images/pyrss_logo.webp diff --git a/apps/static/js/api.js b/static/js/api.js similarity index 100% rename from apps/static/js/api.js rename to static/js/api.js diff --git a/apps/static/js/base.js b/static/js/base.js similarity index 100% rename from apps/static/js/base.js rename to static/js/base.js diff --git a/apps/static/js/bootstrap-datepicker.min.js b/static/js/bootstrap-datepicker.min.js similarity index 100% rename from apps/static/js/bootstrap-datepicker.min.js rename to static/js/bootstrap-datepicker.min.js diff --git a/apps/static/js/bootstrap.bundle.min.js b/static/js/bootstrap.bundle.min.js similarity index 100% rename from apps/static/js/bootstrap.bundle.min.js rename to static/js/bootstrap.bundle.min.js diff --git a/apps/static/js/jquery-3.6.0.min.js b/static/js/jquery-3.6.0.min.js similarity index 100% rename from apps/static/js/jquery-3.6.0.min.js rename to static/js/jquery-3.6.0.min.js diff --git a/apps/static/js/jquery.dataTables.min.js b/static/js/jquery.dataTables.min.js similarity index 100% rename from apps/static/js/jquery.dataTables.min.js rename to static/js/jquery.dataTables.min.js diff --git a/apps/static/js/notify.min.js b/static/js/notify.min.js similarity index 100% rename from apps/static/js/notify.min.js rename to static/js/notify.min.js diff --git a/apps/static/js/select2.min.js b/static/js/select2.min.js similarity index 100% rename from apps/static/js/select2.min.js rename to static/js/select2.min.js diff --git a/apps/static/js/table.js b/static/js/table.js similarity index 100% rename from apps/static/js/table.js rename to static/js/table.js diff --git a/apps/static/js/toasts.js b/static/js/toasts.js similarity index 100% rename from apps/static/js/toasts.js rename to static/js/toasts.js diff --git a/apps/templates/layouts/base.html b/templates/base.html similarity index 100% rename from apps/templates/layouts/base.html rename to templates/base.html diff --git a/apps/templates/includes/fonts.html b/templates/includes/fonts.html similarity index 100% rename from apps/templates/includes/fonts.html rename to templates/includes/fonts.html diff --git a/apps/templates/includes/footer.html b/templates/includes/footer.html similarity index 100% rename from apps/templates/includes/footer.html rename to templates/includes/footer.html diff --git a/apps/templates/includes/navbar.html b/templates/includes/navbar.html similarity index 100% rename from apps/templates/includes/navbar.html rename to templates/includes/navbar.html diff --git a/apps/templates/includes/toasts.html b/templates/includes/toasts.html similarity index 100% rename from apps/templates/includes/toasts.html rename to templates/includes/toasts.html