From 7f01d9a277ed887c75820fbbbc9317431253b5d5 Mon Sep 17 00:00:00 2001 From: Mikkel Munch Mortensen <3xm@detfalskested.dk> Date: Tue, 9 Feb 2021 22:00:55 +0100 Subject: [PATCH] Rip out existing custom apps And move the to "parked_apps" directory, until we've decided what we want to do with them. --- {accounting => parked_apps/accounting}/__init__.py | 0 {accounting => parked_apps/accounting}/admin.py | 0 {accounting => parked_apps/accounting}/apps.py | 0 .../accounting}/migrations/0001_initial.py | 0 .../accounting}/migrations/__init__.py | 0 {accounting => parked_apps/accounting}/models.py | 0 {accounting => parked_apps/accounting}/tests.py | 0 {membership => parked_apps/membership}/__init__.py | 0 {membership => parked_apps/membership}/admin.py | 0 {membership => parked_apps/membership}/apps.py | 0 .../membership}/migrations/0001_initial.py | 0 .../membership}/migrations/__init__.py | 0 {membership => parked_apps/membership}/models.py | 0 {users => parked_apps/users}/__init__.py | 0 {users => parked_apps/users}/admin.py | 0 {users => parked_apps/users}/apps.py | 0 {users => parked_apps/users}/forms.py | 0 {users => parked_apps/users}/migrations/0001_initial.py | 0 {users => parked_apps/users}/migrations/__init__.py | 0 {users => parked_apps/users}/models.py | 0 .../users}/templates/users/logged_out.html | 0 {users => parked_apps/users}/templates/users/login.html | 0 .../users}/templates/users/password_change_done.html | 0 .../users}/templates/users/password_change_form.html | 0 .../users}/templates/users/password_reset_complete.html | 0 .../users}/templates/users/password_reset_confirm.html | 0 .../users}/templates/users/password_reset_done.html | 0 .../users}/templates/users/password_reset_email.html | 0 .../users}/templates/users/password_reset_form.html | 0 {users => parked_apps/users}/templates/users/signup.html | 0 .../users}/templates/users/signup_confirm.html | 0 {users => parked_apps/users}/urls.py | 0 {users => parked_apps/users}/views.py | 0 project/settings/base.py | 5 ----- project/templates/base.html | 8 ++++---- project/urls.py | 2 -- 36 files changed, 4 insertions(+), 11 deletions(-) rename {accounting => parked_apps/accounting}/__init__.py (100%) rename {accounting => parked_apps/accounting}/admin.py (100%) rename {accounting => parked_apps/accounting}/apps.py (100%) rename {accounting => parked_apps/accounting}/migrations/0001_initial.py (100%) rename {accounting => parked_apps/accounting}/migrations/__init__.py (100%) rename {accounting => parked_apps/accounting}/models.py (100%) rename {accounting => parked_apps/accounting}/tests.py (100%) rename {membership => parked_apps/membership}/__init__.py (100%) rename {membership => parked_apps/membership}/admin.py (100%) rename {membership => parked_apps/membership}/apps.py (100%) rename {membership => parked_apps/membership}/migrations/0001_initial.py (100%) rename {membership => parked_apps/membership}/migrations/__init__.py (100%) rename {membership => parked_apps/membership}/models.py (100%) rename {users => parked_apps/users}/__init__.py (100%) rename {users => parked_apps/users}/admin.py (100%) rename {users => parked_apps/users}/apps.py (100%) rename {users => parked_apps/users}/forms.py (100%) rename {users => parked_apps/users}/migrations/0001_initial.py (100%) rename {users => parked_apps/users}/migrations/__init__.py (100%) rename {users => parked_apps/users}/models.py (100%) rename {users => parked_apps/users}/templates/users/logged_out.html (100%) rename {users => parked_apps/users}/templates/users/login.html (100%) rename {users => parked_apps/users}/templates/users/password_change_done.html (100%) rename {users => parked_apps/users}/templates/users/password_change_form.html (100%) rename {users => parked_apps/users}/templates/users/password_reset_complete.html (100%) rename {users => parked_apps/users}/templates/users/password_reset_confirm.html (100%) rename {users => parked_apps/users}/templates/users/password_reset_done.html (100%) rename {users => parked_apps/users}/templates/users/password_reset_email.html (100%) rename {users => parked_apps/users}/templates/users/password_reset_form.html (100%) rename {users => parked_apps/users}/templates/users/signup.html (100%) rename {users => parked_apps/users}/templates/users/signup_confirm.html (100%) rename {users => parked_apps/users}/urls.py (100%) rename {users => parked_apps/users}/views.py (100%) diff --git a/accounting/__init__.py b/parked_apps/accounting/__init__.py similarity index 100% rename from accounting/__init__.py rename to parked_apps/accounting/__init__.py diff --git a/accounting/admin.py b/parked_apps/accounting/admin.py similarity index 100% rename from accounting/admin.py rename to parked_apps/accounting/admin.py diff --git a/accounting/apps.py b/parked_apps/accounting/apps.py similarity index 100% rename from accounting/apps.py rename to parked_apps/accounting/apps.py diff --git a/accounting/migrations/0001_initial.py b/parked_apps/accounting/migrations/0001_initial.py similarity index 100% rename from accounting/migrations/0001_initial.py rename to parked_apps/accounting/migrations/0001_initial.py diff --git a/accounting/migrations/__init__.py b/parked_apps/accounting/migrations/__init__.py similarity index 100% rename from accounting/migrations/__init__.py rename to parked_apps/accounting/migrations/__init__.py diff --git a/accounting/models.py b/parked_apps/accounting/models.py similarity index 100% rename from accounting/models.py rename to parked_apps/accounting/models.py diff --git a/accounting/tests.py b/parked_apps/accounting/tests.py similarity index 100% rename from accounting/tests.py rename to parked_apps/accounting/tests.py diff --git a/membership/__init__.py b/parked_apps/membership/__init__.py similarity index 100% rename from membership/__init__.py rename to parked_apps/membership/__init__.py diff --git a/membership/admin.py b/parked_apps/membership/admin.py similarity index 100% rename from membership/admin.py rename to parked_apps/membership/admin.py diff --git a/membership/apps.py b/parked_apps/membership/apps.py similarity index 100% rename from membership/apps.py rename to parked_apps/membership/apps.py diff --git a/membership/migrations/0001_initial.py b/parked_apps/membership/migrations/0001_initial.py similarity index 100% rename from membership/migrations/0001_initial.py rename to parked_apps/membership/migrations/0001_initial.py diff --git a/membership/migrations/__init__.py b/parked_apps/membership/migrations/__init__.py similarity index 100% rename from membership/migrations/__init__.py rename to parked_apps/membership/migrations/__init__.py diff --git a/membership/models.py b/parked_apps/membership/models.py similarity index 100% rename from membership/models.py rename to parked_apps/membership/models.py diff --git a/users/__init__.py b/parked_apps/users/__init__.py similarity index 100% rename from users/__init__.py rename to parked_apps/users/__init__.py diff --git a/users/admin.py b/parked_apps/users/admin.py similarity index 100% rename from users/admin.py rename to parked_apps/users/admin.py diff --git a/users/apps.py b/parked_apps/users/apps.py similarity index 100% rename from users/apps.py rename to parked_apps/users/apps.py diff --git a/users/forms.py b/parked_apps/users/forms.py similarity index 100% rename from users/forms.py rename to parked_apps/users/forms.py diff --git a/users/migrations/0001_initial.py b/parked_apps/users/migrations/0001_initial.py similarity index 100% rename from users/migrations/0001_initial.py rename to parked_apps/users/migrations/0001_initial.py diff --git a/users/migrations/__init__.py b/parked_apps/users/migrations/__init__.py similarity index 100% rename from users/migrations/__init__.py rename to parked_apps/users/migrations/__init__.py diff --git a/users/models.py b/parked_apps/users/models.py similarity index 100% rename from users/models.py rename to parked_apps/users/models.py diff --git a/users/templates/users/logged_out.html b/parked_apps/users/templates/users/logged_out.html similarity index 100% rename from users/templates/users/logged_out.html rename to parked_apps/users/templates/users/logged_out.html diff --git a/users/templates/users/login.html b/parked_apps/users/templates/users/login.html similarity index 100% rename from users/templates/users/login.html rename to parked_apps/users/templates/users/login.html diff --git a/users/templates/users/password_change_done.html b/parked_apps/users/templates/users/password_change_done.html similarity index 100% rename from users/templates/users/password_change_done.html rename to parked_apps/users/templates/users/password_change_done.html diff --git a/users/templates/users/password_change_form.html b/parked_apps/users/templates/users/password_change_form.html similarity index 100% rename from users/templates/users/password_change_form.html rename to parked_apps/users/templates/users/password_change_form.html diff --git a/users/templates/users/password_reset_complete.html b/parked_apps/users/templates/users/password_reset_complete.html similarity index 100% rename from users/templates/users/password_reset_complete.html rename to parked_apps/users/templates/users/password_reset_complete.html diff --git a/users/templates/users/password_reset_confirm.html b/parked_apps/users/templates/users/password_reset_confirm.html similarity index 100% rename from users/templates/users/password_reset_confirm.html rename to parked_apps/users/templates/users/password_reset_confirm.html diff --git a/users/templates/users/password_reset_done.html b/parked_apps/users/templates/users/password_reset_done.html similarity index 100% rename from users/templates/users/password_reset_done.html rename to parked_apps/users/templates/users/password_reset_done.html diff --git a/users/templates/users/password_reset_email.html b/parked_apps/users/templates/users/password_reset_email.html similarity index 100% rename from users/templates/users/password_reset_email.html rename to parked_apps/users/templates/users/password_reset_email.html diff --git a/users/templates/users/password_reset_form.html b/parked_apps/users/templates/users/password_reset_form.html similarity index 100% rename from users/templates/users/password_reset_form.html rename to parked_apps/users/templates/users/password_reset_form.html diff --git a/users/templates/users/signup.html b/parked_apps/users/templates/users/signup.html similarity index 100% rename from users/templates/users/signup.html rename to parked_apps/users/templates/users/signup.html diff --git a/users/templates/users/signup_confirm.html b/parked_apps/users/templates/users/signup_confirm.html similarity index 100% rename from users/templates/users/signup_confirm.html rename to parked_apps/users/templates/users/signup_confirm.html diff --git a/users/urls.py b/parked_apps/users/urls.py similarity index 100% rename from users/urls.py rename to parked_apps/users/urls.py diff --git a/users/views.py b/parked_apps/users/views.py similarity index 100% rename from users/views.py rename to parked_apps/users/views.py diff --git a/project/settings/base.py b/project/settings/base.py index fcbda74..2fac397 100644 --- a/project/settings/base.py +++ b/project/settings/base.py @@ -33,9 +33,6 @@ INSTALLED_APPS = [ "django.contrib.messages", "django.contrib.staticfiles", "django.contrib.sites", - "users", - "accounting", - "membership", ] MIDDLEWARE = [ @@ -100,8 +97,6 @@ AUTH_PASSWORD_VALIDATORS = [ }, ] -AUTH_USER_MODEL = "users.User" - # Internationalization # https://docs.djangoproject.com/en/2.0/topics/i18n/ diff --git a/project/templates/base.html b/project/templates/base.html index a6aaf00..b55ec83 100644 --- a/project/templates/base.html +++ b/project/templates/base.html @@ -13,11 +13,11 @@ diff --git a/project/urls.py b/project/urls.py index 3e82ac1..aede6a3 100644 --- a/project/urls.py +++ b/project/urls.py @@ -1,12 +1,10 @@ """URLs for the membersystem""" from django.contrib import admin -from django.urls import include from django.urls import path from . import views urlpatterns = [ path("", views.index), - path("users/", include("users.urls")), path("admin/", admin.site.urls), ]