diff options
| author |  Gareth Coles <[email protected]> | 2018-02-21 09:30:05 +0000 |
|---|---|---|
| committer | Gareth Coles <[email protected]> | 2018-02-21 09:30:05 +0000 |
| commit | ef8e96157f60ba0813cab72a90a6e8e92b44b6f0 (patch) | |
| tree | cbda21178338d3f992072d5f06e4ac4572e433f1 | |
| parent | adds initial unit testing (#22) (diff) | |
Rearrange views and templates
| -rw-r--r-- | pysite/route_manager.py | 1 | ||||
| -rw-r--r-- | pysite/views/error_handlers/http_404.py (renamed from pysite/views/main/error_handlers/http_404.py) | 0 | ||||
| -rw-r--r-- | pysite/views/error_handlers/http_5xx.py (renamed from pysite/views/main/error_handlers/http_5xx.py) | 0 | ||||
| -rw-r--r-- | pysite/views/main/error_handlers/__init__.py | 1 | ||||
| -rw-r--r-- | pysite/views/main/index.py | 2 | ||||
| -rw-r--r-- | pysite/views/main/ws_test.py | 2 | ||||
| -rw-r--r-- | pysite/views/staff/index.py | 2 | ||||
| -rw-r--r-- | templates/main/base.html (renamed from templates/base.html) | 0 | ||||
| -rw-r--r-- | templates/main/index.html (renamed from templates/index.html) | 0 | ||||
| -rw-r--r-- | templates/main/navigation.html (renamed from templates/navigation.html) | 0 | ||||
| -rw-r--r-- | templates/main/ws_test.html (renamed from templates/ws_test.html) | 0 | ||||
| -rw-r--r-- | templates/staff/staff.html (renamed from templates/staff.html) | 0 |
12 files changed, 4 insertions, 4 deletions
diff --git a/pysite/route_manager.py b/pysite/route_manager.py index 105a8f86..494dfbde 100644 --- a/pysite/route_manager.py +++ b/pysite/route_manager.py @@ -36,6 +36,7 @@ class RouteManager: self.main_blueprint = Blueprint("main", __name__) self.log.debug(f"Loading Blueprint: {self.main_blueprint.name}") self.load_views(self.main_blueprint, "pysite/views/main") + self.load_views(self.main_blueprint, "pysite/views/error_handlers") self.app.register_blueprint(self.main_blueprint) self.log.debug("") diff --git a/pysite/views/main/error_handlers/http_404.py b/pysite/views/error_handlers/http_404.py index 1d557d9b..1d557d9b 100644 --- a/pysite/views/main/error_handlers/http_404.py +++ b/pysite/views/error_handlers/http_404.py diff --git a/pysite/views/main/error_handlers/http_5xx.py b/pysite/views/error_handlers/http_5xx.py index ed4d8d82..ed4d8d82 100644 --- a/pysite/views/main/error_handlers/http_5xx.py +++ b/pysite/views/error_handlers/http_5xx.py 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/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") diff --git a/templates/base.html b/templates/main/base.html index 5dd0c02c..5dd0c02c 100644 --- a/templates/base.html +++ b/templates/main/base.html diff --git a/templates/index.html b/templates/main/index.html index 418347d2..418347d2 100644 --- a/templates/index.html +++ b/templates/main/index.html diff --git a/templates/navigation.html b/templates/main/navigation.html index cbd6a36a..cbd6a36a 100644 --- a/templates/navigation.html +++ b/templates/main/navigation.html diff --git a/templates/ws_test.html b/templates/main/ws_test.html index 6ef1bb68..6ef1bb68 100644 --- a/templates/ws_test.html +++ b/templates/main/ws_test.html diff --git a/templates/staff.html b/templates/staff/staff.html index 3017f65c..3017f65c 100644 --- a/templates/staff.html +++ b/templates/staff/staff.html |