Fix django-init

Makefile

@@ -119,6 +119,54 @@ class CustomAdminConfig(AdminConfig):
     default_site = "backend.admin.CustomAdminSite"
 endef
 
+define BACKEND_URLS_DJANGO
+from django.conf import settings
+from django.urls import include, path
+from django.contrib import admin
+from rest_framework import routers, serializers, viewsets
+from dj_rest_auth.registration.views import RegisterView
+from siteuser.models import User
+urlpatterns = []
+if settings.DEBUG:
+	urlpatterns += [
+		path("django/doc/", include("django.contrib.admindocs.urls")),
+	]
+urlpatterns += [
+    path('accounts/', include('allauth.urls')),
+    path('django/', admin.site.urls),
+    path('user/', include('siteuser.urls')),
+    path('explorer/', include('explorer.urls')),
+    path("hijack/", include("hijack.urls")),
+]
+if settings.DEBUG:
+    from django.conf.urls.static import static
+    from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+    # Serve static and media files from development server
+    urlpatterns += staticfiles_urlpatterns()
+    urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+    import debug_toolbar
+    urlpatterns += [
+        path("__debug__/", include(debug_toolbar.urls)),
+    ]
+# https://www.django-rest-framework.org/#example
+class UserSerializer(serializers.HyperlinkedModelSerializer):
+    class Meta:
+        model = User
+        fields = ['url', 'username', 'email', 'is_staff']
+
+class UserViewSet(viewsets.ModelViewSet):
+    queryset = User.objects.all()
+    serializer_class = UserSerializer
+router = routers.DefaultRouter()
+router.register(r'users', UserViewSet)
+urlpatterns += [
+    path("api/", include(router.urls)),
+    path("api/", include("rest_framework.urls", namespace="rest_framework")),
+    path("api/", include("dj_rest_auth.urls")),
+    # path("api/register/", RegisterView.as_view(), name="register"),
+]
+endef
+
 define BACKEND_URLS
 from django.conf import settings
 from django.urls import include, path
@@ -691,6 +739,52 @@ EOF
 rm -f /opt/elasticbeanstalk/deployment/*.bak
 endef
 
+define DJANGO_SETTINGS_DEV
+from .base import *
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = "django-insecure-#t%ohiokp+8!7#xh4qzoxuyy=-&sxl*!z-&w%y83h87-jm7p9="
+
+# SECURITY WARNING: define the correct hosts in production!
+ALLOWED_HOSTS = ["*"]
+
+EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
+
+
+try:
+    from .local import *
+except ImportError:
+    pass
+endef
+
+define DJANGO_MANAGE_PY
+#!/usr/bin/env python
+"""Django's command-line utility for administrative tasks."""
+import os
+import sys
+
+
+def main():
+    """Run administrative tasks."""
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "backend.settings.dev")
+    try:
+        from django.core.management import execute_from_command_line
+    except ImportError as exc:
+        raise ImportError(
+            "Couldn't import Django. Are you sure it's installed and "
+            "available on your PYTHONPATH environment variable? Did you "
+            "forget to activate a virtual environment?"
+        ) from exc
+    execute_from_command_line(sys.argv)
+
+
+if __name__ == "__main__":
+    main()
+endef
+
 define DOCKERFILE
 FROM amazonlinux:2023
 RUN dnf install -y shadow-utils python3.11 python3.11-pip make nodejs20-npm nodejs postgresql15 postgresql15-server
@@ -2007,6 +2101,7 @@ export AUTHENTICATION_BACKENDS
 export BABELRC
 export BACKEND_APPS
 export BACKEND_URLS
+export BACKEND_URLS_DJANGO
 export BASE_TEMPLATE
 export BLOCK_CAROUSEL
 export BLOCK_MARKETING
@@ -2020,6 +2115,8 @@ export CONTACT_PAGE_TEST
 export CUSTOM_ADMIN
 export CUSTOM_ENV_EC2_USER
 export CUSTOM_ENV_VAR_FILE
+export DJANGO_MANAGE_PY
+export DJANGO_SETTINGS_DEV
 export DOCKERFILE
 export DOCKERCOMPOSE
 export ESLINTRC
@@ -2249,8 +2346,17 @@ django-custom-admin-default:
 	echo "$$CUSTOM_ADMIN" > backend/admin.py
 	echo "$$BACKEND_APPS" > backend/apps.py
 
-django-init-default: db-init django-install django-init-common
-	django-admin startproject backend
+django-init-default: db-init django-install
+	django-admin startproject backend .
+	@$(ADD_DIR) backend/settings
+	@$(COPY_FILE) backend/settings.py backend/settings/base.py
+	@$(DEL_FILE) backend/settings.py
+	@echo "import os" >> backend/settings/base.py
+	@echo "STATICFILES_DIRS = []" >> backend/settings/base.py
+	@echo "$$DJANGO_MANAGE_PY" > manage.py
+	@echo "$$DJANGO_SETTINGS_DEV" > backend/settings/dev.py
+	@$(MAKE) django-url-patterns
+	@$(MAKE) django-init-common
 	export SETTINGS=backend/settings/base.py; \
 		$(MAKE) django-siteuser
 	@$(MAKE) django-migrations
@@ -2271,14 +2377,6 @@ django-init-common-default:
 	@echo "$$DOCKERCOMPOSE" > docker-compose.yml
 	export SETTINGS=backend/settings/base.py DEV_SETTINGS=backend/settings/dev.py; \
 		$(MAKE) django-settings
-	export SETTINGS=backend/settings/base.py; \
-		$(MAKE) django-model-form-demo
-	export SETTINGS=backend/settings/base.py; \
-		$(MAKE) django-logging-demo
-	export SETTINGS=backend/settings/base.py; \
-		$(MAKE) django-payment
-	export URLS=urls.py; \
-		$(MAKE) django-url-patterns
 	$(MAKE) django-custom-admin
 	$(GIT_ADD) backend
 	$(GIT_ADD) requirements.txt
@@ -2421,12 +2519,6 @@ django-settings-default:
 	echo "INSTALLED_APPS.append('allauth')" >> $(SETTINGS)
 	echo "INSTALLED_APPS.append('allauth.account')" >> $(SETTINGS)
 	echo "INSTALLED_APPS.append('allauth.socialaccount')" >> $(SETTINGS)
-	echo "INSTALLED_APPS.append('wagtailmenus')" >> $(SETTINGS)
-	echo "INSTALLED_APPS.append('wagtailmarkdown')" >> $(SETTINGS)
-	echo "INSTALLED_APPS.append('wagtail_modeladmin')" >> $(SETTINGS)
-	echo "INSTALLED_APPS.append('wagtailseo')" >> $(SETTINGS)
-	echo "INSTALLED_APPS.append('wagtail_color_panel')" >> $(SETTINGS)
-	echo "INSTALLED_APPS.append('wagtail.contrib.settings')" >> $(SETTINGS)
 	echo "INSTALLED_APPS.append('django_extensions')" >> $(SETTINGS)
 	echo "INSTALLED_APPS.append('debug_toolbar')" >> $(DEV_SETTINGS)
 	echo "INSTALLED_APPS.append('crispy_forms')" >> $(SETTINGS)
@@ -2447,8 +2539,6 @@ django-settings-default:
 	echo "LOGIN_REDIRECT_URL = '/'" >> $(SETTINGS)
 	echo "DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'" >> $(SETTINGS)
 	echo "$$AUTHENTICATION_BACKENDS" >> $(SETTINGS)
-	echo "TEMPLATES[0]['OPTIONS']['context_processors'].append('wagtail.contrib.settings.context_processors.settings')" >> $(SETTINGS)
-	echo "TEMPLATES[0]['OPTIONS']['context_processors'].append('wagtailmenus.context_processors.wagtailmenus')">> $(SETTINGS)
 	echo "SILENCED_SYSTEM_CHECKS = ['django_recaptcha.recaptcha_test_key_error']" >> $(SETTINGS)
 	echo "EXPLORER_CONNECTIONS = { 'Default': 'default' }" >> $(SETTINGS)
 	echo "EXPLORER_DEFAULT_CONNECTION = 'default'" >> $(SETTINGS)
@@ -2475,7 +2565,7 @@ django-user-default:
         User.objects.create_user('user', '', 'user')"
 
 django-url-patterns-default:
-	echo "$$BACKEND_URLS" > backend/$(URLS)
+	echo "$$BACKEND_URLS_DJANGO" > backend/urls.py
 
 django-npm-install-save-default:
 	npm install \
@@ -2783,6 +2873,16 @@ wagtail-search-urls:
 	@echo "$$SEARCH_URLS" > search/urls.py
 	$(GIT_ADD) search
 
+wagtail-settings-default:
+	@echo "INSTALLED_APPS.append('wagtailmenus')" >> $(SETTINGS)
+	@echo "INSTALLED_APPS.append('wagtailmarkdown')" >> $(SETTINGS)
+	@echo "INSTALLED_APPS.append('wagtail_modeladmin')" >> $(SETTINGS)
+	@echo "INSTALLED_APPS.append('wagtailseo')" >> $(SETTINGS)
+	@echo "INSTALLED_APPS.append('wagtail_color_panel')" >> $(SETTINGS)
+	@echo "INSTALLED_APPS.append('wagtail.contrib.settings')" >> $(SETTINGS)
+	@echo "TEMPLATES[0]['OPTIONS']['context_processors'].append('wagtail.contrib.settings.context_processors.settings')" >> $(SETTINGS)
+	@echo "TEMPLATES[0]['OPTIONS']['context_processors'].append('wagtailmenus.context_processors.wagtailmenus')">> $(SETTINGS)
+
 wagtail-search-template:
 	@echo "$$SEARCH_TEMPLATE" > search/templates/search/search.html
 
@@ -2830,7 +2930,19 @@ wagtail-backend-templates-default:
 wagtail-start-default:
 	wagtail start backend .
 
+wagtail-url-patterns-default:
+	echo "$$BACKEND_URLS" > backend/urls.py
+
 wagtail-init-default: db-init wagtail-install wagtail-start django-init-common
+	export SETTINGS=backend/settings/base.py; \
+        $(MAKE) wagtail-settings
+	export SETTINGS=backend/settings/base.py; \
+		$(MAKE) django-model-form-demo
+	export SETTINGS=backend/settings/base.py; \
+		$(MAKE) django-logging-demo
+	export SETTINGS=backend/settings/base.py; \
+		$(MAKE) django-payment
+	@$(MAKE) wagtail-url-patterns
 	@$(MAKE) wagtail-homepage
 	@$(MAKE) wagtail-search-template
 	@$(MAKE) wagtail-search-urls