From a565762f65d3d61654a0aebd535d938b5f2f0461 Mon Sep 17 00:00:00 2001
From: Kristofers Solo <kristians.cagulis@proton.me>
Date: Thu, 19 Jan 2023 17:11:11 +0200
Subject: [PATCH] Updated KARBS

---
 kristofersxyz/apps/karbs/admin.py                   |  3 ---
 kristofersxyz/apps/karbs/apps.py                    |  6 ------
 kristofersxyz/apps/karbs/models.py                  |  3 ---
 kristofersxyz/apps/karbs/tests.py                   |  3 ---
 kristofersxyz/apps/karbs/urls.py                    |  7 -------
 kristofersxyz/apps/karbs/views.py                   | 11 -----------
 kristofersxyz/apps/main/urls.py                     |  2 +-
 kristofersxyz/apps/main/views.py                    |  7 ++++++-
 kristofersxyz/apps/{karbs => projects}/__init__.py  |  0
 kristofersxyz/apps/projects/admin.py                |  3 +++
 kristofersxyz/apps/projects/apps.py                 |  6 ++++++
 .../apps/{karbs => projects}/migrations/__init__.py |  0
 kristofersxyz/apps/projects/models.py               |  3 +++
 kristofersxyz/apps/projects/tests.py                |  3 +++
 kristofersxyz/apps/projects/urls.py                 |  9 +++++++++
 kristofersxyz/apps/projects/views.py                | 13 +++++++++++++
 kristofersxyz/settings.py                           |  2 +-
 kristofersxyz/urls.py                               |  6 +++---
 18 files changed, 48 insertions(+), 39 deletions(-)
 delete mode 100644 kristofersxyz/apps/karbs/admin.py
 delete mode 100644 kristofersxyz/apps/karbs/apps.py
 delete mode 100644 kristofersxyz/apps/karbs/models.py
 delete mode 100644 kristofersxyz/apps/karbs/tests.py
 delete mode 100644 kristofersxyz/apps/karbs/urls.py
 delete mode 100644 kristofersxyz/apps/karbs/views.py
 rename kristofersxyz/apps/{karbs => projects}/__init__.py (100%)
 create mode 100644 kristofersxyz/apps/projects/admin.py
 create mode 100644 kristofersxyz/apps/projects/apps.py
 rename kristofersxyz/apps/{karbs => projects}/migrations/__init__.py (100%)
 create mode 100644 kristofersxyz/apps/projects/models.py
 create mode 100644 kristofersxyz/apps/projects/tests.py
 create mode 100644 kristofersxyz/apps/projects/urls.py
 create mode 100644 kristofersxyz/apps/projects/views.py

diff --git a/kristofersxyz/apps/karbs/admin.py b/kristofersxyz/apps/karbs/admin.py
deleted file mode 100644
index 4185d36..0000000
--- a/kristofersxyz/apps/karbs/admin.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# from django.contrib import admin
-
-# Register your models here.
diff --git a/kristofersxyz/apps/karbs/apps.py b/kristofersxyz/apps/karbs/apps.py
deleted file mode 100644
index 773b6ed..0000000
--- a/kristofersxyz/apps/karbs/apps.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from django.apps import AppConfig
-
-
-class KarbsConfig(AppConfig):
-    default_auto_field = "django.db.models.BigAutoField"
-    name = "karbs"
diff --git a/kristofersxyz/apps/karbs/models.py b/kristofersxyz/apps/karbs/models.py
deleted file mode 100644
index 0b4331b..0000000
--- a/kristofersxyz/apps/karbs/models.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# from django.db import models
-
-# Create your models here.
diff --git a/kristofersxyz/apps/karbs/tests.py b/kristofersxyz/apps/karbs/tests.py
deleted file mode 100644
index a79ca8b..0000000
--- a/kristofersxyz/apps/karbs/tests.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# from django.test import TestCase
-
-# Create your tests here.
diff --git a/kristofersxyz/apps/karbs/urls.py b/kristofersxyz/apps/karbs/urls.py
deleted file mode 100644
index cec7e31..0000000
--- a/kristofersxyz/apps/karbs/urls.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from django.urls import path
-from . import views
-
-urlpatterns = [
-    path("", views.karbs, name="karbs"),
-    path("instructions", views.instructions, name="instructions"),
-]
diff --git a/kristofersxyz/apps/karbs/views.py b/kristofersxyz/apps/karbs/views.py
deleted file mode 100644
index 4579bf8..0000000
--- a/kristofersxyz/apps/karbs/views.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from django.shortcuts import render
-
-
-def instructions(request):
-    """Karbs Instruction"""
-    return render(request, "karbs/instructions.html", {"title": "Karbs Instructions"})
-
-
-def karbs(request):
-    """Karbs install script"""
-    return render(request, "karbs/karbs", {"title": "KARBS"})
diff --git a/kristofersxyz/apps/main/urls.py b/kristofersxyz/apps/main/urls.py
index 0d7543a..32298c2 100644
--- a/kristofersxyz/apps/main/urls.py
+++ b/kristofersxyz/apps/main/urls.py
@@ -4,6 +4,6 @@ from . import views
 
 urlpatterns = [
     path("", views.index, name="home"),
-    path("projects", views.projects, name="projects"),
+    path("karbs", views.karbs, name="karbs"),
     path("lightsaber", views.lightsaber, name="lightsaber"),
 ]
diff --git a/kristofersxyz/apps/main/views.py b/kristofersxyz/apps/main/views.py
index c80090b..55d1d15 100644
--- a/kristofersxyz/apps/main/views.py
+++ b/kristofersxyz/apps/main/views.py
@@ -1,4 +1,4 @@
-from django.shortcuts import render
+from django.shortcuts import redirect, render
 
 
 def index(request):
@@ -11,3 +11,8 @@ def lightsaber(request):
 
 def projects(request):
     return render(request, "main/projects.html", {"title": "Projects"})
+
+
+def karbs(request):
+    """Karbs install script"""
+    return redirect("/projects/karbs/")
diff --git a/kristofersxyz/apps/karbs/__init__.py b/kristofersxyz/apps/projects/__init__.py
similarity index 100%
rename from kristofersxyz/apps/karbs/__init__.py
rename to kristofersxyz/apps/projects/__init__.py
diff --git a/kristofersxyz/apps/projects/admin.py b/kristofersxyz/apps/projects/admin.py
new file mode 100644
index 0000000..8c38f3f
--- /dev/null
+++ b/kristofersxyz/apps/projects/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/kristofersxyz/apps/projects/apps.py b/kristofersxyz/apps/projects/apps.py
new file mode 100644
index 0000000..afae498
--- /dev/null
+++ b/kristofersxyz/apps/projects/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class ProjectsConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'projects'
diff --git a/kristofersxyz/apps/karbs/migrations/__init__.py b/kristofersxyz/apps/projects/migrations/__init__.py
similarity index 100%
rename from kristofersxyz/apps/karbs/migrations/__init__.py
rename to kristofersxyz/apps/projects/migrations/__init__.py
diff --git a/kristofersxyz/apps/projects/models.py b/kristofersxyz/apps/projects/models.py
new file mode 100644
index 0000000..71a8362
--- /dev/null
+++ b/kristofersxyz/apps/projects/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/kristofersxyz/apps/projects/tests.py b/kristofersxyz/apps/projects/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/kristofersxyz/apps/projects/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/kristofersxyz/apps/projects/urls.py b/kristofersxyz/apps/projects/urls.py
new file mode 100644
index 0000000..0c6798a
--- /dev/null
+++ b/kristofersxyz/apps/projects/urls.py
@@ -0,0 +1,9 @@
+from django.urls import path
+
+from . import views
+
+urlpatterns = [
+    path("", views.projects, name="projects"),
+    path("karbs", views.karbs, name="karbs"),
+    path("karbs/instructions", views.instructions, name="instructions"),
+]
diff --git a/kristofersxyz/apps/projects/views.py b/kristofersxyz/apps/projects/views.py
new file mode 100644
index 0000000..65bdc12
--- /dev/null
+++ b/kristofersxyz/apps/projects/views.py
@@ -0,0 +1,13 @@
+from django.shortcuts import render
+
+
+def projects(request):
+    return render(request, "projects/projects.html", {"title": "Projects"})
+
+
+def karbs(request):
+    return render(request, "projects/karbs/karbs", {"title": "KARBS"})
+
+
+def instructions(request):
+    return render(request, "projects/karbs/instructions.html", {"title": "Karbs Instructions"})
diff --git a/kristofersxyz/settings.py b/kristofersxyz/settings.py
index e55083c..ef4c304 100644
--- a/kristofersxyz/settings.py
+++ b/kristofersxyz/settings.py
@@ -46,7 +46,7 @@ INSTALLED_APPS = [
     "django.contrib.staticfiles",
     "fontawesomefree",
     "main",
-    "karbs",
+    "projects",
 ]
 
 MIDDLEWARE = [
diff --git a/kristofersxyz/urls.py b/kristofersxyz/urls.py
index 537c605..272abc0 100644
--- a/kristofersxyz/urls.py
+++ b/kristofersxyz/urls.py
@@ -13,15 +13,15 @@ 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
 from django.conf import settings
 from django.conf.urls.static import static
+from django.contrib import admin
+from django.urls import include, path
 
 urlpatterns = [
     path("admin/", admin.site.urls),
     path("", include("main.urls")),
-    path("karbs/", include("karbs.urls")),
+    path("projects/", include("projects.urls")),
 ]
 
 urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)