From e992e28e005bcc882f360a6f4e59fd2d314b66fe Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 1 Jun 2019 23:13:49 +0300 Subject: [PATCH] Slim Framework integration #118 #117 - Admin plugin refactoring --- .../admin/{admin.php => bootstrap.php} | 0 .../plugins/admin/{admin.json => plugin.json} | 0 site/plugins/admin/routes.php | 2 + .../admin/views/partials/content-end.php | 4 - .../admin/views/partials/content-start.php | 10 - site/plugins/admin/views/partials/footer.php | 8 - site/plugins/admin/views/partials/head.php | 59 ------ site/plugins/admin/views/partials/navbar.php | 51 ----- site/plugins/admin/views/partials/sidebar.php | 54 ----- site/plugins/admin/views/partials/tail.php | 192 ------------------ .../templates/content/entries/content.php | 50 ----- .../views/templates/content/entries/media.php | 94 --------- .../templates/content/entries/source.php | 58 ------ .../views/templates/extends/snippets/add.php | 43 ---- .../views/templates/extends/snippets/edit.php | 49 ----- .../views/templates/extends/snippets/list.php | 93 --------- .../templates/extends/snippets/rename.php | 44 ---- .../templates/system/information/index.html | 10 - 18 files changed, 2 insertions(+), 819 deletions(-) rename site/plugins/admin/{admin.php => bootstrap.php} (100%) rename site/plugins/admin/{admin.json => plugin.json} (100%) delete mode 100644 site/plugins/admin/views/partials/content-end.php delete mode 100644 site/plugins/admin/views/partials/content-start.php delete mode 100755 site/plugins/admin/views/partials/footer.php delete mode 100755 site/plugins/admin/views/partials/head.php delete mode 100644 site/plugins/admin/views/partials/navbar.php delete mode 100755 site/plugins/admin/views/partials/sidebar.php delete mode 100755 site/plugins/admin/views/partials/tail.php delete mode 100644 site/plugins/admin/views/templates/content/entries/content.php delete mode 100644 site/plugins/admin/views/templates/content/entries/media.php delete mode 100644 site/plugins/admin/views/templates/content/entries/source.php delete mode 100644 site/plugins/admin/views/templates/extends/snippets/add.php delete mode 100644 site/plugins/admin/views/templates/extends/snippets/edit.php delete mode 100644 site/plugins/admin/views/templates/extends/snippets/list.php delete mode 100644 site/plugins/admin/views/templates/extends/snippets/rename.php diff --git a/site/plugins/admin/admin.php b/site/plugins/admin/bootstrap.php similarity index 100% rename from site/plugins/admin/admin.php rename to site/plugins/admin/bootstrap.php diff --git a/site/plugins/admin/admin.json b/site/plugins/admin/plugin.json similarity index 100% rename from site/plugins/admin/admin.json rename to site/plugins/admin/plugin.json diff --git a/site/plugins/admin/routes.php b/site/plugins/admin/routes.php index bd53e34e..82b2eaed 100644 --- a/site/plugins/admin/routes.php +++ b/site/plugins/admin/routes.php @@ -66,3 +66,5 @@ $app->get('/admin/registration', 'UsersController:registration')->setName('admin $app->post('/admin/registration', 'UsersController:registrationProcess')->setName('admin.users.registrationProcess'); $app->get('/admin/login', 'UsersController:login')->setName('admin.users.login'); $app->post('/admin/login', 'UsersController:loginProcess')->setName('admin.users.loginProcess'); +$app->get('/admin/profile', 'UsersController:profile')->setName('admin.users.profile'); +$app->post('/admin/logout', 'UsersController:logoutProcess')->setName('admin.users.logoutProcess'); diff --git a/site/plugins/admin/views/partials/content-end.php b/site/plugins/admin/views/partials/content-end.php deleted file mode 100644 index b4a2865a..00000000 --- a/site/plugins/admin/views/partials/content-end.php +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/site/plugins/admin/views/partials/content-start.php b/site/plugins/admin/views/partials/content-start.php deleted file mode 100644 index 4796e943..00000000 --- a/site/plugins/admin/views/partials/content-start.php +++ /dev/null @@ -1,10 +0,0 @@ - -
-
-
-
diff --git a/site/plugins/admin/views/partials/footer.php b/site/plugins/admin/views/partials/footer.php deleted file mode 100755 index 435c7eeb..00000000 --- a/site/plugins/admin/views/partials/footer.php +++ /dev/null @@ -1,8 +0,0 @@ - - -
-
- - display() ?> - - diff --git a/site/plugins/admin/views/partials/head.php b/site/plugins/admin/views/partials/head.php deleted file mode 100755 index dd3333f8..00000000 --- a/site/plugins/admin/views/partials/head.php +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - FLEXTYPE - - - - - - - - - - - - - - - - - - - - - - - class="content-full-size" > -
- display() ?> -
diff --git a/site/plugins/admin/views/partials/navbar.php b/site/plugins/admin/views/partials/navbar.php deleted file mode 100644 index dc77735a..00000000 --- a/site/plugins/admin/views/partials/navbar.php +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - -
- - - - - - / - - / - - -
- - - -
- / - - - - -
- diff --git a/site/plugins/admin/views/partials/sidebar.php b/site/plugins/admin/views/partials/sidebar.php deleted file mode 100755 index 7088ee8f..00000000 --- a/site/plugins/admin/views/partials/sidebar.php +++ /dev/null @@ -1,54 +0,0 @@ - - - diff --git a/site/plugins/admin/views/partials/tail.php b/site/plugins/admin/views/partials/tail.php deleted file mode 100755 index 39a68c5f..00000000 --- a/site/plugins/admin/views/partials/tail.php +++ /dev/null @@ -1,192 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/site/plugins/admin/views/templates/content/entries/content.php b/site/plugins/admin/views/templates/content/entries/content.php deleted file mode 100644 index 7f54028c..00000000 --- a/site/plugins/admin/views/templates/content/entries/content.php +++ /dev/null @@ -1,50 +0,0 @@ -display(); -Themes::view('admin/views/partials/navbar') - ->assign('links', [ - 'edit_entry' => [ - 'link' => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name, - 'title' => __('admin_content'), - 'attributes' => ['class' => 'navbar-item active'] - ], - 'edit_entry_media' => [ - 'link' => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name . '&media=true', - 'title' => __('admin_media'), - 'attributes' => ['class' => 'navbar-item'] - ], - 'edit_entry_source' => [ - 'link' => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name . '&source=true', - 'title' => __('admin_source'), - 'attributes' => ['class' => 'navbar-item'] - ] - ]) - ->assign('buttons', [ - 'save_entry' => [ - 'link' => 'javascript:;', - 'title' => __('admin_save'), - 'attributes' => ['class' => 'js-save-form-submit float-right btn'] - ], - 'view_entry' => [ - 'link' => Http::getBaseUrl() . '/' . $entry_name, - 'title' => __('admin_preview'), - 'attributes' => ['class' => 'float-right btn', 'target' => '_blank'] - ] - ]) - ->assign('entry', $entry) - ->display(); -Themes::view('admin/views/partials/content-start')->display(); -?> - - - -display() ?> -display() ?> diff --git a/site/plugins/admin/views/templates/content/entries/media.php b/site/plugins/admin/views/templates/content/entries/media.php deleted file mode 100644 index b4bd0ccf..00000000 --- a/site/plugins/admin/views/templates/content/entries/media.php +++ /dev/null @@ -1,94 +0,0 @@ - - -display(); - Themes::view('admin/views/partials/navbar') - ->assign('links', [ - 'edit_entry' => [ - 'link' => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name, - 'title' => __('admin_content'), - 'attributes' => ['class' => 'navbar-item'] - ], - 'edit_entry_media' => [ - 'link' => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name . '&media=true', - 'title' => __('admin_media'), - 'attributes' => ['class' => 'navbar-item active'] - ], - 'edit_entry_source' => [ - 'link' => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name . '&source=true', - 'title' => __('admin_source'), - 'attributes' => ['class' => 'navbar-item'] - ] - ]) - ->assign('entry', $entry) - ->display(); - Themes::view('admin/views/partials/content-start')->display(); -?> - - - 'multipart/form-data', 'class' => 'form-inline form-upload']) ?> - -
-
- - -
-
- 'btn btn-outline-secondary']) ?> -
-
- - -
- - - - - -display() ?> -display() ?> diff --git a/site/plugins/admin/views/templates/content/entries/source.php b/site/plugins/admin/views/templates/content/entries/source.php deleted file mode 100644 index 3da57a76..00000000 --- a/site/plugins/admin/views/templates/content/entries/source.php +++ /dev/null @@ -1,58 +0,0 @@ - - -display(); - Themes::view('admin/views/partials/navbar') - ->assign('links', [ - 'edit_entry' => [ - 'link' => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name, - 'title' => __('admin_content'), - 'attributes' => ['class' => 'navbar-item'] - ], - 'edit_entry_media' => [ - 'link' => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name . '&media=true', - 'title' => __('admin_media'), - 'attributes' => ['class' => 'navbar-item'] - ], - 'edit_entry_source' => [ - 'link' => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name . '&source=true', - 'title' => __('admin_source'), - 'attributes' => ['class' => 'navbar-item active'] - ] - ]) - ->assign('buttons', [ - 'save_entry' => [ - 'link' => 'javascript:;', - 'title' => __('admin_save'), - 'attributes' => ['class' => 'js-save-form-submit float-right btn'] - ], - 'view_entry' => [ - 'link' => Http::getBaseUrl() . '/' . $entry_name, - 'title' => __('admin_preview'), - 'attributes' => ['class' => 'float-right btn', 'target' => '_blank'] - ] - ]) - ->assign('entry', $entry) - ->display(); - Themes::view('admin/views/partials/content-start')->display(); -?> - - 'form']) ?> - - - -
-
-
- 'form-control', 'style' => 'min-height:500px;', 'id' => 'codeMirrorEditor']) ?> -
-
-
- - -display() ?> -display() ?> diff --git a/site/plugins/admin/views/templates/extends/snippets/add.php b/site/plugins/admin/views/templates/extends/snippets/add.php deleted file mode 100644 index 8fedd3a4..00000000 --- a/site/plugins/admin/views/templates/extends/snippets/add.php +++ /dev/null @@ -1,43 +0,0 @@ -display(); -Themes::view('admin/views/partials/navbar') - ->assign('links', [ - 'snippets' => [ - 'link' => Http::getBaseUrl() . '/admin/snippets', - 'title' => __('admin_snippets'), - 'attributes' => ['class' => 'navbar-item'] - ], - 'snippets_add' => [ - 'link' => Http::getBaseUrl() . '/admin/snippets/add', - 'title' => __('admin_create_new_snippet'), - 'attributes' => ['class' => 'navbar-item active'] - ] - ]) - ->display(); -Themes::view('admin/views/partials/content-start')->display(); -?> - -
-
- - -
- 'snippetName']) ?> - 'form-control', 'id' => 'snippetName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_name_empty_input')]) ?> -
-
-
- 'btn btn-black']) ?> - - -display() ?> -display() ?> diff --git a/site/plugins/admin/views/templates/extends/snippets/edit.php b/site/plugins/admin/views/templates/extends/snippets/edit.php deleted file mode 100644 index 7d3dd265..00000000 --- a/site/plugins/admin/views/templates/extends/snippets/edit.php +++ /dev/null @@ -1,49 +0,0 @@ -display(); -Themes::view('admin/views/partials/navbar') - ->assign('links', [ - 'snippet' => [ - 'link' => Http::getBaseUrl() . '/admin/snippets/edit?snippet=' . Http::get('snippet'), - 'title' => __('admin_snippet'), - 'attributes' => ['class' => 'navbar-item active'] - ] - ]) - ->assign('buttons', [ - 'save_entry' => [ - 'link' => 'javascript:;', - 'title' => __('admin_save'), - 'attributes' => ['class' => 'js-save-form-submit float-right btn'] - ] - ]) - ->display(); -Themes::view('admin/views/partials/content-start')->display(); -?> - -
-
- 'form']) ?> - - - -
-
-
- 'form-control', 'style' => 'min-height:500px;', 'id' => 'codeMirrorEditor']) ?> -
-
-
- -
-
- -display() ?> -display() ?> diff --git a/site/plugins/admin/views/templates/extends/snippets/list.php b/site/plugins/admin/views/templates/extends/snippets/list.php deleted file mode 100644 index 9b2296c8..00000000 --- a/site/plugins/admin/views/templates/extends/snippets/list.php +++ /dev/null @@ -1,93 +0,0 @@ - - - -display() ?> -assign('links', [ - 'snippets' => [ - 'link' => Http::getBaseUrl() . '/admin/snippets', - 'title' => __('admin_snippets'), - 'attributes' => ['class' => 'navbar-item active'] - ] - ]) - ->assign('buttons', [ - 'entries' => [ - 'link' => Http::getBaseUrl() . '/admin/snippets/add', - 'title' => __('admin_create_new_snippet'), - 'attributes' => ['class' => 'float-right btn'] - ] - ]) - ->display() -?> -display() ?> - - 0): ?> - - - - - - - - - - - - - - - -
- - -
- - - -
- -
- - - - - - - - -display() ?> -display() ?> diff --git a/site/plugins/admin/views/templates/extends/snippets/rename.php b/site/plugins/admin/views/templates/extends/snippets/rename.php deleted file mode 100644 index 3fafae41..00000000 --- a/site/plugins/admin/views/templates/extends/snippets/rename.php +++ /dev/null @@ -1,44 +0,0 @@ -display(); -Themes::view('admin/views/partials/navbar') - ->assign('links', [ - 'snippets' => [ - 'link' => Http::getBaseUrl() . '/admin/snippets', - 'title' => __('admin_snippets'), - 'attributes' => ['class' => 'navbar-item'] - ], - 'snippets_add' => [ - 'link' => Http::getBaseUrl() . '/admin/snippets/rename?snippet=' . $name_current, - 'title' => __('admin_rename'), - 'attributes' => ['class' => 'navbar-item active'] - ] - ]) - ->display(); -Themes::view('admin/views/partials/content-start')->display(); -?> - -
-
- - - -
- 'snippetName']) ?> - 'form-control', 'id' => 'snippetName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_title_empty_input')]) ?> -
- 'btn btn-black btn-fill btn-wd']) ?> - -
-
- -display() ?> -display() ?> diff --git a/site/plugins/admin/views/templates/system/information/index.html b/site/plugins/admin/views/templates/system/information/index.html index 8db6cfc6..0571ae10 100644 --- a/site/plugins/admin/views/templates/system/information/index.html +++ b/site/plugins/admin/views/templates/system/information/index.html @@ -58,16 +58,6 @@ {% else %} Apache Mod Rewrite{{ tr('admin_not_installed') }} {% endif %} - {% if password_verify %} - password_verify(){{ tr('admin_installed') }} - {% else %} - password_verify(){{ tr('admin_not_installed') }} - {% endif %} - {% if password_hash %} - password_hash(){{ tr('admin_installed') }} - {% else %} - password_hash(){{ tr('admin_not_installed') }} - {% endif %} {% endblock %}