From 859f31065da728fcb1387645ab1c92390b372412 Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Thu, 12 Dec 2024 10:14:46 -0500 Subject: [PATCH] refactor _views folder --- src/web/_controller/blog.php | 8 ++++---- src/web/_controller/bucket.php | 2 +- src/web/_controller/error.php | 2 +- src/web/_controller/home.php | 2 +- src/web/_controller/projects.php | 2 +- src/web/_views/{apps/blog.php => blog/main.php} | 0 src/web/_views/{apps/blog_post.php => blog/post.php} | 0 src/web/_views/{apps/blog_rss.php => blog/rss.php} | 0 .../_views/{apps/blog_writeup.php => blog/writeup.php} | 0 src/web/_views/{apps/bucket.php => bucket/main.php} | 0 src/web/_views/comments.php | 2 +- src/web/_views/{apps/error.php => error/main.php} | 0 src/web/_views/{apps/home.php => home/main.php} | 0 src/web/_views/{apps/projects.php => projects/main.php} | 0 14 files changed, 9 insertions(+), 9 deletions(-) rename src/web/_views/{apps/blog.php => blog/main.php} (100%) rename src/web/_views/{apps/blog_post.php => blog/post.php} (100%) rename src/web/_views/{apps/blog_rss.php => blog/rss.php} (100%) rename src/web/_views/{apps/blog_writeup.php => blog/writeup.php} (100%) rename src/web/_views/{apps/bucket.php => bucket/main.php} (100%) rename src/web/_views/{apps/error.php => error/main.php} (100%) rename src/web/_views/{apps/home.php => home/main.php} (100%) rename src/web/_views/{apps/projects.php => projects/main.php} (100%) diff --git a/src/web/_controller/blog.php b/src/web/_controller/blog.php index 922ae72..2ea45df 100644 --- a/src/web/_controller/blog.php +++ b/src/web/_controller/blog.php @@ -16,7 +16,7 @@ class Blog_controller extends Controller { $data = $this->blog_model->get_data(); $this->view('header', $data); - $this->view('apps/blog', $data); + $this->view('blog/main', $data); $this->view('footer', $data); } @@ -44,7 +44,7 @@ class Blog_controller extends Controller { $this->error(404); } $this->view('header', $data); - $this->view('apps/blog_post', $data); + $this->view('blog/post', $data); $ref = "blog/post/{$name}"; $this->comments_controller->comments($data['post']['meta']['name'], $ref); $this->view('footer', $data); @@ -61,7 +61,7 @@ class Blog_controller extends Controller { $this->error(404); } $this->view('header', $data); - $this->view('apps/blog_writeup', $data); + $this->view('blog/writeup', $data); $ref = "blog/writeup/{$name}"; $this->comments_controller->comments($data['post']['meta']['name'], $ref); $this->view('footer', $data); @@ -71,7 +71,7 @@ class Blog_controller extends Controller { { $data = $this->blog_model->get_data(); header('Content-Type: application/xml'); - $this->view('apps/blog_rss', $data); + $this->view('blog/rss', $data); die(); } diff --git a/src/web/_controller/bucket.php b/src/web/_controller/bucket.php index a7d1023..e14f9b6 100644 --- a/src/web/_controller/bucket.php +++ b/src/web/_controller/bucket.php @@ -16,7 +16,7 @@ class Bucket_controller extends Controller { $this->error(400); return; } - $this->view('apps/bucket', $data); + $this->view('bucket/main', $data); } } diff --git a/src/web/_controller/error.php b/src/web/_controller/error.php index 30bd797..4195531 100644 --- a/src/web/_controller/error.php +++ b/src/web/_controller/error.php @@ -15,7 +15,7 @@ class Error_controller extends Controller { $data = $this->error_model->get_data($code); $this->view('header', $data); - $this->view('apps/error', $data); + $this->view('error/main', $data); $this->view('footer', $data); } diff --git a/src/web/_controller/home.php b/src/web/_controller/home.php index a673e60..89e67e8 100644 --- a/src/web/_controller/home.php +++ b/src/web/_controller/home.php @@ -7,7 +7,7 @@ class Home_controller extends Controller { $data = Model::get_base_data(); $this->view('header', $data); - $this->view('apps/home', $data); + $this->view('home/main', $data); $this->view('footer', $data); } diff --git a/src/web/_controller/projects.php b/src/web/_controller/projects.php index cfa28b5..fea4664 100644 --- a/src/web/_controller/projects.php +++ b/src/web/_controller/projects.php @@ -14,7 +14,7 @@ class Projects_controller extends Controller { $data = $this->projects_model->get_data(); $this->view('header', $data); - $this->view('apps/projects', $data); + $this->view('projects/main', $data); $this->view('footer', $data); } diff --git a/src/web/_views/apps/blog.php b/src/web/_views/blog/main.php similarity index 100% rename from src/web/_views/apps/blog.php rename to src/web/_views/blog/main.php diff --git a/src/web/_views/apps/blog_post.php b/src/web/_views/blog/post.php similarity index 100% rename from src/web/_views/apps/blog_post.php rename to src/web/_views/blog/post.php diff --git a/src/web/_views/apps/blog_rss.php b/src/web/_views/blog/rss.php similarity index 100% rename from src/web/_views/apps/blog_rss.php rename to src/web/_views/blog/rss.php diff --git a/src/web/_views/apps/blog_writeup.php b/src/web/_views/blog/writeup.php similarity index 100% rename from src/web/_views/apps/blog_writeup.php rename to src/web/_views/blog/writeup.php diff --git a/src/web/_views/apps/bucket.php b/src/web/_views/bucket/main.php similarity index 100% rename from src/web/_views/apps/bucket.php rename to src/web/_views/bucket/main.php diff --git a/src/web/_views/comments.php b/src/web/_views/comments.php index f67a90b..01b1619 100644 --- a/src/web/_views/comments.php +++ b/src/web/_views/comments.php @@ -34,7 +34,7 @@ type="hidden" class="hidden" name="ref" - value=""> + value="">