From ef8e96157f60ba0813cab72a90a6e8e92b44b6f0 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Wed, 21 Feb 2018 09:30:05 +0000
Subject: Rearrange views and templates

---
 pysite/views/error_handlers/http_404.py      | 12 ++++++++++++
 pysite/views/error_handlers/http_5xx.py      | 12 ++++++++++++
 pysite/views/main/error_handlers/__init__.py |  1 -
 pysite/views/main/error_handlers/http_404.py | 12 ------------
 pysite/views/main/error_handlers/http_5xx.py | 12 ------------
 pysite/views/main/index.py                   |  2 +-
 pysite/views/main/ws_test.py                 |  2 +-
 pysite/views/staff/index.py                  |  2 +-
 8 files changed, 27 insertions(+), 28 deletions(-)
 create mode 100644 pysite/views/error_handlers/http_404.py
 create mode 100644 pysite/views/error_handlers/http_5xx.py
 delete mode 100644 pysite/views/main/error_handlers/__init__.py
 delete mode 100644 pysite/views/main/error_handlers/http_404.py
 delete mode 100644 pysite/views/main/error_handlers/http_5xx.py

(limited to 'pysite/views')

diff --git a/pysite/views/error_handlers/http_404.py b/pysite/views/error_handlers/http_404.py
new file mode 100644
index 00000000..1d557d9b
--- /dev/null
+++ b/pysite/views/error_handlers/http_404.py
@@ -0,0 +1,12 @@
+# coding=utf-8
+from werkzeug.exceptions import NotFound
+
+from pysite.base_route import ErrorView
+
+
+class Error404View(ErrorView):
+    name = "error_404"
+    error_code = 404
+
+    def get(self, error: NotFound):
+        return "replace me with a template, 404 not found", 404
diff --git a/pysite/views/error_handlers/http_5xx.py b/pysite/views/error_handlers/http_5xx.py
new file mode 100644
index 00000000..ed4d8d82
--- /dev/null
+++ b/pysite/views/error_handlers/http_5xx.py
@@ -0,0 +1,12 @@
+# coding=utf-8
+from werkzeug.exceptions import HTTPException
+
+from pysite.base_route import ErrorView
+
+
+class Error404View(ErrorView):
+    name = "error_5xx"
+    error_code = range(500, 600)
+
+    def get(self, error: HTTPException):
+        return "Internal server error. Please try again later!", error.code
diff --git a/pysite/views/main/error_handlers/__init__.py b/pysite/views/main/error_handlers/__init__.py
deleted file mode 100644
index 9bad5790..00000000
--- a/pysite/views/main/error_handlers/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# coding=utf-8
diff --git a/pysite/views/main/error_handlers/http_404.py b/pysite/views/main/error_handlers/http_404.py
deleted file mode 100644
index 1d557d9b..00000000
--- a/pysite/views/main/error_handlers/http_404.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# coding=utf-8
-from werkzeug.exceptions import NotFound
-
-from pysite.base_route import ErrorView
-
-
-class Error404View(ErrorView):
-    name = "error_404"
-    error_code = 404
-
-    def get(self, error: NotFound):
-        return "replace me with a template, 404 not found", 404
diff --git a/pysite/views/main/error_handlers/http_5xx.py b/pysite/views/main/error_handlers/http_5xx.py
deleted file mode 100644
index ed4d8d82..00000000
--- a/pysite/views/main/error_handlers/http_5xx.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# coding=utf-8
-from werkzeug.exceptions import HTTPException
-
-from pysite.base_route import ErrorView
-
-
-class Error404View(ErrorView):
-    name = "error_5xx"
-    error_code = range(500, 600)
-
-    def get(self, error: HTTPException):
-        return "Internal server error. Please try again later!", error.code
diff --git a/pysite/views/main/index.py b/pysite/views/main/index.py
index 0c2d1578..210eb057 100644
--- a/pysite/views/main/index.py
+++ b/pysite/views/main/index.py
@@ -7,4 +7,4 @@ class IndexView(RouteView):
     name = "index"
 
     def get(self):
-        return self.render("index.html")
+        return self.render("main/index.html")
diff --git a/pysite/views/main/ws_test.py b/pysite/views/main/ws_test.py
index c28269a8..c53515c5 100644
--- a/pysite/views/main/ws_test.py
+++ b/pysite/views/main/ws_test.py
@@ -10,6 +10,6 @@ class WSTest(RouteView):
 
     def get(self):
         return self.render(
-            "ws_test.html",
+            "main/ws_test.html",
             server_name=os.environ.get("SERVER_NAME", "localhost")
         )
diff --git a/pysite/views/staff/index.py b/pysite/views/staff/index.py
index c23af392..19e89333 100644
--- a/pysite/views/staff/index.py
+++ b/pysite/views/staff/index.py
@@ -7,4 +7,4 @@ class StaffView(RouteView):
     name = "staff"
 
     def get(self):
-        return self.render("staff.html")
+        return self.render("staff/staff.html")
-- 
cgit v1.2.3