From fd2e8d48dfbd4229036bb0d0eed19608f3400c37 Mon Sep 17 00:00:00 2001 From: William Date: Tue, 8 Feb 2022 22:59:47 +0100 Subject: [PATCH] Fat commit --- app/core/Config.php | 2 +- app/view/{ => pages}/confirm-logout.php | 0 app/view/{ => pages}/example.php | 0 app/view/{ => pages}/index.php | 0 app/view/{ => pages}/login.php | 0 app/view/{ => pages}/simulator.php | 0 app/view/{ => pages}/teamtable/edit/index.php | 0 app/view/{ => pages}/teamtable/index.php | 0 public/confirm-logout.php | 2 +- public/example.php | 2 +- public/index.php | 2 +- public/login.php | 2 +- public/simulator.php | 2 +- public/teamtable/edit/index.php | 2 +- public/teamtable/index.php | 2 +- 15 files changed, 8 insertions(+), 8 deletions(-) rename app/view/{ => pages}/confirm-logout.php (100%) rename app/view/{ => pages}/example.php (100%) rename app/view/{ => pages}/index.php (100%) rename app/view/{ => pages}/login.php (100%) rename app/view/{ => pages}/simulator.php (100%) rename app/view/{ => pages}/teamtable/edit/index.php (100%) rename app/view/{ => pages}/teamtable/index.php (100%) diff --git a/app/core/Config.php b/app/core/Config.php index 72b7dc4..d72c8ff 100644 --- a/app/core/Config.php +++ b/app/core/Config.php @@ -1,6 +1,6 @@ user->loggedIn) } $app->view('template/header', ["title" => "Bekreft avlogging"]); -$app->view('confirm-logout'); +$app->view('pages/confirm-logout'); $app->view('template/footer'); \ No newline at end of file diff --git a/public/example.php b/public/example.php index ab8e53c..b2249b0 100644 --- a/public/example.php +++ b/public/example.php @@ -13,7 +13,7 @@ $message = $model->returnGivenString('Hei på deg!!'); // Render the view with prepared data $app->view('template/header', ['title' => 'Eksempel side']); -$app->view('example', [ +$app->view('pages/example', [ 'message' => $message ]); $app->view('template/footer'); \ No newline at end of file diff --git a/public/index.php b/public/index.php index 28ae62d..413a6b6 100644 --- a/public/index.php +++ b/public/index.php @@ -2,5 +2,5 @@ $app = require '../app/inc.php'; $app->view('template/header', ["title" => "Forside"]); -$app->view('index'); +$app->view('pages/index'); $app->view('template/footer'); \ No newline at end of file diff --git a/public/login.php b/public/login.php index 8075803..6016ea8 100644 --- a/public/login.php +++ b/public/login.php @@ -18,5 +18,5 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') } $app->view('template/header', ["title" => "Logg inn"]); -$app->view('login'); +$app->view('pages/login'); $app->view('template/footer'); \ No newline at end of file diff --git a/public/simulator.php b/public/simulator.php index 30ecbfb..12615b3 100644 --- a/public/simulator.php +++ b/public/simulator.php @@ -21,5 +21,5 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') } $app->view('template/header', ['title' => 'Simulator']); -$app->view('simulator'); +$app->view('pages/simulator'); $app->view('template/footer'); \ No newline at end of file diff --git a/public/teamtable/edit/index.php b/public/teamtable/edit/index.php index 1c7d6d7..8c1334d 100644 --- a/public/teamtable/edit/index.php +++ b/public/teamtable/edit/index.php @@ -4,5 +4,5 @@ $app = require '../../../app/inc.php'; $model = $app->model('Teamtable'); $app->view('template/header', ['title' => 'Endre lagtabell']); -$app->view('teamtable/edit/index', ["teams" => $model->getTable()]); +$app->view('pages/teamtable/edit/index', ["teams" => $model->getTable()]); $app->view('template/footer'); \ No newline at end of file diff --git a/public/teamtable/index.php b/public/teamtable/index.php index 7083a3d..3de46a9 100644 --- a/public/teamtable/index.php +++ b/public/teamtable/index.php @@ -4,5 +4,5 @@ $app = require '../../app/inc.php'; $model = $app->model('Teamtable'); $app->view('template/header', ['title' => 'Lagtabell']); -$app->view('teamtable/index', ["teams" => $model->getTable()]); +$app->view('pages/teamtable/index', ["teams" => $model->getTable()]); $app->view('template/footer'); \ No newline at end of file