From db978e198d69023f529c54d116b67644d269bc55 Mon Sep 17 00:00:00 2001 From: Alejandro Date: Sun, 11 Feb 2024 19:52:11 -0400 Subject: [PATCH] Move some global functions to ViewHelper class --- app/controllers/ViewHelper.php | 16 ++++++++++++++++ app/views/admin/dashboard.php | 2 +- app/views/admin/emails/password_restore.php | 4 ++-- app/views/admin/link.php | 2 +- app/views/admin/list.php | 2 +- app/views/admin/login.php | 2 +- app/views/admin/page.php | 8 ++++---- app/views/admin/partials/lists/media.php | 2 +- app/views/admin/partials/lists/pages.php | 2 +- app/views/admin/partials/nav.php | 2 +- app/views/admin/password_restore.php | 2 +- app/views/admin/post.php | 6 +++--- app/views/admin/settings.php | 2 +- app/views/admin/tag.php | 2 +- app/views/admin/user.php | 2 +- app/views/themes/default/blog.php | 4 ++-- app/views/themes/default/information.php | 4 ++-- app/views/themes/default/page.php | 4 ++-- app/views/themes/default/partials/head.php | 2 +- app/views/themes/default/post.php | 4 ++-- bootstrap/index.php | 14 -------------- 21 files changed, 45 insertions(+), 43 deletions(-) diff --git a/app/controllers/ViewHelper.php b/app/controllers/ViewHelper.php index 92f27c9..d6d626f 100644 --- a/app/controllers/ViewHelper.php +++ b/app/controllers/ViewHelper.php @@ -56,4 +56,20 @@ public function dateFormat(mixed $tstamp): string $formatter->setPattern(\Aurora\App\Setting::get('date_format') ?? ''); return $formatter->format($tstamp); } + + /** + * @see \Aurora\System\Helper::getUrl + */ + public function url(string $path = ''): string + { + return \Aurora\System\Helper::getUrl($path); + } + + /** + * @see \Aurora\System\Language::getCode + */ + public function lang(): string + { + return \Aurora\System\Container::get('language')->getCode(); + } } diff --git a/app/views/admin/dashboard.php b/app/views/admin/dashboard.php index 794b2f3..4a2a0d1 100755 --- a/app/views/admin/dashboard.php +++ b/app/views/admin/dashboard.php @@ -1,5 +1,5 @@ - + <?= t('dashboard') . ' - ' . e(setting('title')) ?> include('admin/partials/head.php') ?> diff --git a/app/views/admin/emails/password_restore.php b/app/views/admin/emails/password_restore.php index 95089a9..780551d 100644 --- a/app/views/admin/emails/password_restore.php +++ b/app/views/admin/emails/password_restore.php @@ -8,8 +8,8 @@

- +
- + url()) ?> diff --git a/app/views/admin/link.php b/app/views/admin/link.php index 417e952..565b14d 100755 --- a/app/views/admin/link.php +++ b/app/views/admin/link.php @@ -1,5 +1,5 @@ - + <?= t('link') . ' - ' . e(setting('title')) ?> include('admin/partials/head.php') ?> diff --git a/app/views/admin/list.php b/app/views/admin/list.php index 4e86a7d..4212b15 100755 --- a/app/views/admin/list.php +++ b/app/views/admin/list.php @@ -1,5 +1,5 @@ - + <?= e("$title - " . setting('title')) ?> include('admin/partials/head.php') ?> diff --git a/app/views/admin/login.php b/app/views/admin/login.php index 12efd36..edbd472 100755 --- a/app/views/admin/login.php +++ b/app/views/admin/login.php @@ -1,5 +1,5 @@ - + <?= t('sign_in') . ' - ' . e(setting('title')) ?> include('admin/partials/head.php') ?> diff --git a/app/views/admin/page.php b/app/views/admin/page.php index 3885a61..b2a3de4 100755 --- a/app/views/admin/page.php +++ b/app/views/admin/page.php @@ -1,5 +1,5 @@ - + <?= t('page') . ' - ' . e(setting('title')) ?> include('admin/partials/head.php') ?> @@ -18,7 +18,7 @@ - + @@ -85,7 +85,7 @@
- +
@@ -119,7 +119,7 @@ function remove(btn) { } function updateUrl() { - let url = + '/' + get('#slug').value; + let url = url()) ?> + '/' + get('#slug').value; get('#page-link').innerHTML = url; get('#page-link').setAttribute('href', url); } diff --git a/app/views/admin/partials/lists/media.php b/app/views/admin/partials/lists/media.php index 64ee547..0087364 100644 --- a/app/views/admin/partials/lists/media.php +++ b/app/views/admin/partials/lists/media.php @@ -30,7 +30,7 @@
include('icons/dots.svg') ?>
-
include('icons/clipboard.svg') ?>
+
include('icons/clipboard.svg') ?>
include('icons/duplicate.svg') ?> …
include('icons/move_file.svg') ?> …
diff --git a/app/views/admin/partials/lists/pages.php b/app/views/admin/partials/lists/pages.php index cae417d..e03c38b 100755 --- a/app/views/admin/partials/lists/pages.php +++ b/app/views/admin/partials/lists/pages.php @@ -21,7 +21,7 @@
include('icons/dots.svg') ?>
-
include('icons/eye.svg') ?>
+
include('icons/eye.svg') ?>
include('icons/home.svg') ?> - + include('icons/window.svg') ?> diff --git a/app/views/admin/password_restore.php b/app/views/admin/password_restore.php index 08d11d8..98c29f5 100755 --- a/app/views/admin/password_restore.php +++ b/app/views/admin/password_restore.php @@ -1,5 +1,5 @@ - + <?= t('restore_your_password') . ' - ' . e(setting('title')) ?> include('admin/partials/head.php') ?> diff --git a/app/views/admin/post.php b/app/views/admin/post.php index 4392bfd..c5e5f8f 100755 --- a/app/views/admin/post.php +++ b/app/views/admin/post.php @@ -1,5 +1,5 @@ - + <?= t('post') . ' - ' . e(setting('title')) ?> include('admin/partials/head.php') ?> @@ -105,7 +105,7 @@
- +
@@ -146,7 +146,7 @@ function updateUrl() { return; } - let url = + '/' + slug; + let url = url(setting('blog_url'))) ?> + '/' + slug; get('#post-link').innerHTML = url; get('#post-link').setAttribute('href', url); } diff --git a/app/views/admin/settings.php b/app/views/admin/settings.php index 203f837..2a375d2 100755 --- a/app/views/admin/settings.php +++ b/app/views/admin/settings.php @@ -1,5 +1,5 @@ - + <?= t('settings') . ' - ' . e(setting('title')) ?> include('admin/partials/head.php') ?> diff --git a/app/views/admin/tag.php b/app/views/admin/tag.php index e45a7d4..f3c50b4 100755 --- a/app/views/admin/tag.php +++ b/app/views/admin/tag.php @@ -1,5 +1,5 @@ - + <?= t('tag') . ' - ' . e(setting('title')) ?> include('admin/partials/head.php') ?> diff --git a/app/views/admin/user.php b/app/views/admin/user.php index b050cf1..1e78695 100755 --- a/app/views/admin/user.php +++ b/app/views/admin/user.php @@ -1,5 +1,5 @@ - + diff --git a/app/views/themes/default/blog.php b/app/views/themes/default/blog.php index 88e3f97..42fb51c 100755 --- a/app/views/themes/default/blog.php +++ b/app/views/themes/default/blog.php @@ -1,5 +1,5 @@ - + <?= e("$title - " . setting('title')) ?> include('themes/default/partials/head.php') ?> @@ -10,7 +10,7 @@ - + include('themes/default/partials/header.php') ?> diff --git a/app/views/themes/default/information.php b/app/views/themes/default/information.php index 341d170..6f6fc79 100755 --- a/app/views/themes/default/information.php +++ b/app/views/themes/default/information.php @@ -1,10 +1,10 @@ - + <?= e(setting('title')) ?> include('themes/default/partials/head.php') ?> - + diff --git a/app/views/themes/default/page.php b/app/views/themes/default/page.php index 2e1af23..6e3fc5f 100644 --- a/app/views/themes/default/page.php +++ b/app/views/themes/default/page.php @@ -1,12 +1,12 @@ - + <?= e("$title - " . setting('title')) ?> include('themes/default/partials/head.php') ?> - + include('themes/default/partials/header.php') ?> diff --git a/app/views/themes/default/partials/head.php b/app/views/themes/default/partials/head.php index 1e5da8c..76442b6 100755 --- a/app/views/themes/default/partials/head.php +++ b/app/views/themes/default/partials/head.php @@ -5,7 +5,7 @@ - + diff --git a/app/views/themes/default/post.php b/app/views/themes/default/post.php index f0b35f0..1911659 100755 --- a/app/views/themes/default/post.php +++ b/app/views/themes/default/post.php @@ -1,5 +1,5 @@ - + <?= e($post['title'] . ' - ' . setting('title')) ?> include('themes/default/partials/head.php') ?> @@ -10,7 +10,7 @@ - + include('themes/default/partials/header.php') ?> diff --git a/bootstrap/index.php b/bootstrap/index.php index bec9a75..4ab8f81 100644 --- a/bootstrap/index.php +++ b/bootstrap/index.php @@ -22,13 +22,6 @@ function js(mixed $val): string|bool } } -if (!function_exists('url')) { - function url(string $path = ''): string - { - return \Aurora\System\Helper::getUrl($path); - } -} - if (!function_exists('setting')) { function setting(?string $key = null): mixed { @@ -36,13 +29,6 @@ function setting(?string $key = null): mixed } } -if (!function_exists('lang')) { - function lang(): string - { - return \Aurora\System\Container::get('language')->getCode(); - } -} - return function (\Aurora\System\Kernel $kernel) { $languages = []; foreach (glob(\Aurora\System\Helper::getPath('app/languages/*.php')) as $file) {