commit cb676f90e3d7a3c65e7ec9910e7a1828f25fa845
Author: Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>
Date:   Fri Dec 30 22:38:51 2022 +0100

    initial, migrated to new structure

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..df8c98c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+.venv/
+__pycache__/
+
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..d4a2d0c
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,28 @@
+FROM python:latest
+
+LABEL Maintainer="Wolfgang Hottgenroth wolfgang.hottgenroth@icloud.com"
+
+ARG APP_DIR="/opt/app"
+
+
+RUN \
+    mkdir -p ${APP_DIR} && \
+    useradd -d ${APP_DIR} -u 1000 user
+
+COPY django_project/ ${APP_DIR}
+COPY requirements.txt ${APP_DIR}
+
+WORKDIR ${APP_DIR}
+
+RUN \
+    pip3 install -r ./requirements.txt    
+
+USER 1000:1000
+
+EXPOSE 5000
+EXPOSE 9191
+
+CMD [ "uwsgi", "./wsgi.ini" ]
+
+
+
diff --git a/django_project/db.sqlite3 b/django_project/db.sqlite3
new file mode 100644
index 0000000..5ccefcb
Binary files /dev/null and b/django_project/db.sqlite3 differ
diff --git a/django_project/db.sqlite3-bak b/django_project/db.sqlite3-bak
new file mode 100644
index 0000000..2e0ba1c
Binary files /dev/null and b/django_project/db.sqlite3-bak differ
diff --git a/django_project/django_project/__init__.py b/django_project/django_project/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/django_project/django_project/asgi.py b/django_project/django_project/asgi.py
new file mode 100644
index 0000000..de1aa42
--- /dev/null
+++ b/django_project/django_project/asgi.py
@@ -0,0 +1,16 @@
+"""
+ASGI config for django_project project.
+
+It exposes the ASGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/4.0/howto/deployment/asgi/
+"""
+
+import os
+
+from django.core.asgi import get_asgi_application
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'django_project.settings')
+
+application = get_asgi_application()
diff --git a/django_project/django_project/settings.py b/django_project/django_project/settings.py
new file mode 100644
index 0000000..cf3c337
--- /dev/null
+++ b/django_project/django_project/settings.py
@@ -0,0 +1,126 @@
+"""
+Django settings for django_project project.
+
+Generated by 'django-admin startproject' using Django 4.0.8.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/4.0/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/4.0/ref/settings/
+"""
+
+from pathlib import Path
+
+# Build paths inside the project like this: BASE_DIR / 'subdir'.
+BASE_DIR = Path(__file__).resolve().parent.parent
+
+
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = 'django-insecure-#gdunjr!m#$qe8!9@!qpq5blvjvi#rqherh*q)fq%xn)ck-qqr'
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+ALLOWED_HOSTS = []
+
+
+# Application definition
+
+INSTALLED_APPS = [
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    'pages.apps.PagesConfig',
+]
+
+MIDDLEWARE = [
+    'django.middleware.security.SecurityMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+]
+
+ROOT_URLCONF = 'django_project.urls'
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [
+            BASE_DIR / "templates",
+        ],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
+WSGI_APPLICATION = 'django_project.wsgi.application'
+
+
+# Database
+# https://docs.djangoproject.com/en/4.0/ref/settings/#databases
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': BASE_DIR / 'db.sqlite3',
+    }
+}
+
+
+# Password validation
+# https://docs.djangoproject.com/en/4.0/ref/settings/#auth-password-validators
+
+AUTH_PASSWORD_VALIDATORS = [
+    {
+        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+    },
+]
+
+
+# Internationalization
+# https://docs.djangoproject.com/en/4.0/topics/i18n/
+
+LANGUAGE_CODE = 'en-us'
+
+TIME_ZONE = 'UTC'
+
+USE_I18N = True
+
+USE_TZ = True
+
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/4.0/howto/static-files/
+
+STATIC_URL = 'static/'
+
+# Default primary key field type
+# https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field
+
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
diff --git a/django_project/django_project/urls.py b/django_project/django_project/urls.py
new file mode 100644
index 0000000..1410d34
--- /dev/null
+++ b/django_project/django_project/urls.py
@@ -0,0 +1,22 @@
+"""django_project URL Configuration
+
+The `urlpatterns` list routes URLs to views. For more information please see:
+    https://docs.djangoproject.com/en/4.0/topics/http/urls/
+Examples:
+Function views
+    1. Add an import:  from my_app import views
+    2. Add a URL to urlpatterns:  path('', views.home, name='home')
+Class-based views
+    1. Add an import:  from other_app.views import Home
+    2. Add a URL to urlpatterns:  path('', Home.as_view(), name='home')
+Including another URLconf
+    1. Import the include() function: from django.urls import include, path
+    2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
+"""
+from django.contrib import admin
+from django.urls import path, include
+
+urlpatterns = [
+    path('admin/', admin.site.urls),
+    path("", include("pages.urls")),
+]
diff --git a/django_project/django_project/wsgi.py b/django_project/django_project/wsgi.py
new file mode 100644
index 0000000..391951d
--- /dev/null
+++ b/django_project/django_project/wsgi.py
@@ -0,0 +1,16 @@
+"""
+WSGI config for django_project project.
+
+It exposes the WSGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/4.0/howto/deployment/wsgi/
+"""
+
+import os
+
+from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'django_project.settings')
+
+application = get_wsgi_application()
diff --git a/django_project/manage.py b/django_project/manage.py
new file mode 100755
index 0000000..5ffd8de
--- /dev/null
+++ b/django_project/manage.py
@@ -0,0 +1,22 @@
+#!/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', 'django_project.settings')
+    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()
diff --git a/django_project/pages/__init__.py b/django_project/pages/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/django_project/pages/admin.py b/django_project/pages/admin.py
new file mode 100644
index 0000000..8c38f3f
--- /dev/null
+++ b/django_project/pages/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/django_project/pages/apps.py b/django_project/pages/apps.py
new file mode 100644
index 0000000..cdd024b
--- /dev/null
+++ b/django_project/pages/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class PagesConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'pages'
diff --git a/django_project/pages/migrations/__init__.py b/django_project/pages/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/django_project/pages/models.py b/django_project/pages/models.py
new file mode 100644
index 0000000..71a8362
--- /dev/null
+++ b/django_project/pages/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/django_project/pages/templates/about.html b/django_project/pages/templates/about.html
new file mode 100644
index 0000000..a57e700
--- /dev/null
+++ b/django_project/pages/templates/about.html
@@ -0,0 +1,6 @@
+{% extends "base.html" %}
+
+{% block content %}
+<h1>About Page</h1>
+{% endblock content %}
+
diff --git a/django_project/pages/templates/home.html b/django_project/pages/templates/home.html
new file mode 100644
index 0000000..8143ee8
--- /dev/null
+++ b/django_project/pages/templates/home.html
@@ -0,0 +1,6 @@
+{% extends "base.html" %}
+
+{% block content %}
+<h1>Homepage</h1>
+{% endblock content %}
+
diff --git a/django_project/pages/tests.py b/django_project/pages/tests.py
new file mode 100644
index 0000000..cfb6b66
--- /dev/null
+++ b/django_project/pages/tests.py
@@ -0,0 +1,35 @@
+from django.test import SimpleTestCase
+from django.urls import reverse
+
+# Create your tests here.
+class HomePageTests(SimpleTestCase):
+    def test_url_exists_at_correct_location(self):
+        response = self.client.get("/")
+        self.assertEqual(response.status_code, 200)
+
+    def test_url_available_by_name(self):
+        response = self.client.get(reverse("home"))
+
+    def test_template_name_correct(self):
+        response = self.client.get(reverse("home"))
+        self.assertTemplateUsed(response, "home.html")
+
+    def test_template_content(self):
+        response = self.client.get(reverse("home"))
+        self.assertContains(response, "<h1>Homepage</h1>")        
+
+class AboutPageTests(SimpleTestCase):
+    def test_url_exists_at_correct_location(self):
+        response = self.client.get("/about/")
+        self.assertEqual(response.status_code, 200)
+
+    def test_url_available_by_name(self):
+        response = self.client.get(reverse("about"))
+
+    def test_template_name_correct(self):
+        response = self.client.get(reverse("about"))
+        self.assertTemplateUsed(response, "about.html")
+
+    def test_template_content(self):
+        response = self.client.get(reverse("about"))
+        self.assertContains(response, "<h1>About Page</h1>")        
diff --git a/django_project/pages/urls.py b/django_project/pages/urls.py
new file mode 100644
index 0000000..a3d2a22
--- /dev/null
+++ b/django_project/pages/urls.py
@@ -0,0 +1,7 @@
+from django.urls import path
+from .views import HomePageView, AboutPageView
+
+urlpatterns = [
+    path("", HomePageView.as_view(), name="home"),
+    path("about/", AboutPageView.as_view(), name="about"),
+]
diff --git a/django_project/pages/views.py b/django_project/pages/views.py
new file mode 100644
index 0000000..89c020f
--- /dev/null
+++ b/django_project/pages/views.py
@@ -0,0 +1,9 @@
+from django.shortcuts import render
+from django.views.generic import TemplateView
+
+# Create your views here.
+class HomePageView(TemplateView):
+    template_name = "home.html"
+
+class AboutPageView(TemplateView):
+    template_name = "about.html"
diff --git a/django_project/run.sh b/django_project/run.sh
new file mode 100755
index 0000000..e9c6c44
--- /dev/null
+++ b/django_project/run.sh
@@ -0,0 +1,2 @@
+uwsgi ./wsgi.ini
+
diff --git a/django_project/templates/base.html b/django_project/templates/base.html
new file mode 100644
index 0000000..692ea05
--- /dev/null
+++ b/django_project/templates/base.html
@@ -0,0 +1,6 @@
+<header>
+    <a href="{% url 'home' %}">Home</a> |
+    <a href="{% url 'about' %}">About</a>
+</header>
+
+{% block content %} {% endblock content %}
diff --git a/django_project/wsgi.ini b/django_project/wsgi.ini
new file mode 100644
index 0000000..1270401
--- /dev/null
+++ b/django_project/wsgi.ini
@@ -0,0 +1,6 @@
+[uwsgi]
+http = :5000
+wsgi-file = django_project/wsgi.py
+processes = 4
+stats = :9191
+
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..483da13
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,4 @@
+asgiref==3.6.0
+Django==4.0.8
+sqlparse==0.4.3
+uWSGI==2.0.21