From 35896eb72f0431409028e1d9e0a8c30c829c554f Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 20 Mar 2024 07:21:25 +0000 Subject: [PATCH 1/9] update version requirement --- Admin/Installer.php | 2 +- Admin/Routes/Web/Api.php | 2 +- Admin/Routes/Web/Backend.php | 2 +- Admin/Status.php | 2 +- Admin/Uninstaller.php | 2 +- Admin/Updater.php | 2 +- Controller/ApiController.php | 2 +- Controller/BackendController.php | 2 +- Controller/Controller.php | 2 +- Models/PermissionCategory.php | 2 +- Theme/Backend/Lang/de.lang.php | 2 +- Theme/Backend/Lang/en.lang.php | 2 +- Theme/Backend/search-result.tpl.php | 2 +- tests/Admin/AdminTest.php | 2 +- tests/Autoloader.php | 2 +- tests/Bootstrap.php | 2 +- tests/Controller/ApiControllerTest.php | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index 50c974b..3bc9fb4 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -2,7 +2,7 @@ /** * Jingga * - * PHP Version 8.1 + * PHP Version 8.2 * * @package Modules\Search\Admin * @copyright Dennis Eichhorn diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index b55d5c9..8bcad6b 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -2,7 +2,7 @@ /** * Jingga * - * PHP Version 8.1 + * PHP Version 8.2 * * @package Modules * @copyright Dennis Eichhorn diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index c128272..28ba773 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -2,7 +2,7 @@ /** * Jingga * - * PHP Version 8.1 + * PHP Version 8.2 * * @package Modules * @copyright Dennis Eichhorn diff --git a/Admin/Status.php b/Admin/Status.php index abb0cac..4b64577 100755 --- a/Admin/Status.php +++ b/Admin/Status.php @@ -2,7 +2,7 @@ /** * Jingga * - * PHP Version 8.1 + * PHP Version 8.2 * * @package Modules\Search\Admin * @copyright Dennis Eichhorn diff --git a/Admin/Uninstaller.php b/Admin/Uninstaller.php index d35a40b..18d4b9a 100755 --- a/Admin/Uninstaller.php +++ b/Admin/Uninstaller.php @@ -2,7 +2,7 @@ /** * Jingga * - * PHP Version 8.1 + * PHP Version 8.2 * * @package Modules\Search\Admin * @copyright Dennis Eichhorn diff --git a/Admin/Updater.php b/Admin/Updater.php index 8d6bcad..af325e1 100755 --- a/Admin/Updater.php +++ b/Admin/Updater.php @@ -2,7 +2,7 @@ /** * Jingga * - * PHP Version 8.1 + * PHP Version 8.2 * * @package Modules\Search\Admin * @copyright Dennis Eichhorn diff --git a/Controller/ApiController.php b/Controller/ApiController.php index e4cbc4f..d640b40 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -2,7 +2,7 @@ /** * Jingga * - * PHP Version 8.1 + * PHP Version 8.2 * * @package Modules\Search * @copyright Dennis Eichhorn diff --git a/Controller/BackendController.php b/Controller/BackendController.php index fabddb7..9442525 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -2,7 +2,7 @@ /** * Jingga * - * PHP Version 8.1 + * PHP Version 8.2 * * @package Modules\Search * @copyright Dennis Eichhorn diff --git a/Controller/Controller.php b/Controller/Controller.php index 1c7581e..1b039eb 100755 --- a/Controller/Controller.php +++ b/Controller/Controller.php @@ -2,7 +2,7 @@ /** * Jingga * - * PHP Version 8.1 + * PHP Version 8.2 * * @package Modules\Search * @copyright Dennis Eichhorn diff --git a/Models/PermissionCategory.php b/Models/PermissionCategory.php index f0fd57e..2dbaa01 100755 --- a/Models/PermissionCategory.php +++ b/Models/PermissionCategory.php @@ -2,7 +2,7 @@ /** * Jingga * - * PHP Version 8.1 + * PHP Version 8.2 * * @package Modules\Search\Models * @copyright Dennis Eichhorn diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index 63aa0b6..2dbbd0b 100644 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -2,7 +2,7 @@ /** * Jingga * - * PHP Version 8.1 + * PHP Version 8.2 * * @package Modules\Localization * @copyright Dennis Eichhorn diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index ac13327..1959704 100644 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -2,7 +2,7 @@ /** * Jingga * - * PHP Version 8.1 + * PHP Version 8.2 * * @package Modules\Localization * @copyright Dennis Eichhorn diff --git a/Theme/Backend/search-result.tpl.php b/Theme/Backend/search-result.tpl.php index abafdc2..3e01d56 100644 --- a/Theme/Backend/search-result.tpl.php +++ b/Theme/Backend/search-result.tpl.php @@ -2,7 +2,7 @@ /** * Jingga * - * PHP Version 8.1 + * PHP Version 8.2 * * @package Modules\QA * @copyright Dennis Eichhorn diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php index 637e278..b5fdfac 100755 --- a/tests/Admin/AdminTest.php +++ b/tests/Admin/AdminTest.php @@ -2,7 +2,7 @@ /** * Jingga * - * PHP Version 8.1 + * PHP Version 8.2 * * @package tests * @copyright Dennis Eichhorn diff --git a/tests/Autoloader.php b/tests/Autoloader.php index 1ff89a2..85165a6 100755 --- a/tests/Autoloader.php +++ b/tests/Autoloader.php @@ -2,7 +2,7 @@ /** * Jingga * - * PHP Version 8.1 + * PHP Version 8.2 * * @package Modules/tests * @copyright Dennis Eichhorn diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index 3e10b9e..face918 100755 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -2,7 +2,7 @@ /** * Jingga * - * PHP Version 8.1 + * PHP Version 8.2 * * @package Modules\Search\tests * @copyright Dennis Eichhorn diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index 0e0850d..074faf5 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -2,7 +2,7 @@ /** * Jingga * - * PHP Version 8.1 + * PHP Version 8.2 * * @package tests * @copyright Dennis Eichhorn From f3a7f59ac3300a1561ea087d184a766d0e59fa1e Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 20 Mar 2024 08:02:39 +0000 Subject: [PATCH 2/9] fix ICLA name --- ICAL.txt => ICLA.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ICAL.txt => ICLA.txt (100%) mode change 100755 => 100644 diff --git a/ICAL.txt b/ICLA.txt old mode 100755 new mode 100644 similarity index 100% rename from ICAL.txt rename to ICLA.txt From 7ee51e95d1e3f678124e3820352cb2d8783ae574 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 29 Mar 2024 15:26:00 +0000 Subject: [PATCH 3/9] started with template fixes --- Admin/Routes/Web/Api.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index 8bcad6b..1a9312d 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -22,6 +22,7 @@ return [ [ 'dest' => '\Modules\Search\Controller\ApiController:search', 'verb' => RouteVerb::ANY, + 'csrf' => true, 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::READ, From 8845ce27e5d484fcb103f9ee5911388526e4f70d Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 29 Mar 2024 15:27:31 +0000 Subject: [PATCH 4/9] remove dynamic start for routes --- Admin/Routes/Web/Backend.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 28ba773..c292a7c 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -18,7 +18,7 @@ use phpOMS\Account\PermissionType; use phpOMS\Router\RouteVerb; return [ - '^.*/search(\?.*|$)' => [ + '^/search(\?.*|$)' => [ [ 'dest' => '\Modules\Search\Controller\BackendController:search', 'verb' => RouteVerb::ANY, From 87ebe98d5d53dfca4c06f1e937904dae5d4afff5 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 7 Apr 2024 17:31:42 +0000 Subject: [PATCH 5/9] ui fixes --- Admin/Routes/Web/Api.php | 1 + Admin/Routes/Web/Backend.php | 1 + 2 files changed, 2 insertions(+) diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index 1a9312d..8ec142b 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -23,6 +23,7 @@ return [ 'dest' => '\Modules\Search\Controller\ApiController:search', 'verb' => RouteVerb::ANY, 'csrf' => true, + 'active' => true, 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::READ, diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index c292a7c..62ec2d3 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -22,6 +22,7 @@ return [ [ 'dest' => '\Modules\Search\Controller\BackendController:search', 'verb' => RouteVerb::ANY, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, From d852591d8352aa40d1a93089f197330353ab2afa Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 7 Apr 2024 17:47:07 +0000 Subject: [PATCH 6/9] autofixes --- Admin/Routes/Web/Api.php | 2 +- Admin/Routes/Web/Backend.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index 8ec142b..ecb10b4 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -23,7 +23,7 @@ return [ 'dest' => '\Modules\Search\Controller\ApiController:search', 'verb' => RouteVerb::ANY, 'csrf' => true, - 'active' => true, + 'active' => true, 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::READ, diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 62ec2d3..1bc1258 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -22,7 +22,7 @@ return [ [ 'dest' => '\Modules\Search\Controller\BackendController:search', 'verb' => RouteVerb::ANY, - 'active' => true, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, From 3ca35857690f604d909186019a7d5e1c1481c0cb Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 7 Apr 2024 18:11:04 +0000 Subject: [PATCH 7/9] fix tag-lists --- Theme/Backend/search-result.tpl.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Theme/Backend/search-result.tpl.php b/Theme/Backend/search-result.tpl.php index 3e01d56..4204ca8 100644 --- a/Theme/Backend/search-result.tpl.php +++ b/Theme/Backend/search-result.tpl.php @@ -51,12 +51,14 @@ foreach ($this->data as $controller) : +
icon) ? '' : '' . $this->printHtml($tag->icon) . ''; ?> printHtml($tag->getL11n()); ?> +
From 6099cb9e4d98e7a15462c2b057a0c6c2792636e8 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 24 Apr 2024 03:20:46 +0000 Subject: [PATCH 8/9] more tests and some fixes --- .github/workflows/main.yml | 9 +++++++-- Models/Navigation.js | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e1e05f8..278096d 100755 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,10 +13,15 @@ on: - cron: '0 0 1,15 * *' jobs: - general_module_workflow: + general_module_workflow_php: uses: Karaka-Management/Karaka/.github/workflows/php_template.yml@develop secrets: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_PAT: ${{ secrets.GH_PAT }} CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - + general_module_workflow_js: + uses: Karaka-Management/Karaka/.github/workflows/js_template.yml@develop + secrets: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GH_PAT: ${{ secrets.GH_PAT }} + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} \ No newline at end of file diff --git a/Models/Navigation.js b/Models/Navigation.js index fc462f9..e847d65 100755 --- a/Models/Navigation.js +++ b/Models/Navigation.js @@ -9,12 +9,12 @@ export class Navigation { constructor (data) { if (typeof data === 'undefined') { - this.scrollPosition = {x: 0, y: 0}; + this.scrollPosition = { x: 0, y: 0 }; this.activeLinks = {}; this.visible = true; this.openCategories = {}; } else { - this.scrollPosition = typeof data.scrollPosition === 'undefined' ? {x : 0, y : 0} : data.scrollPosition; + this.scrollPosition = typeof data.scrollPosition === 'undefined' ? { x: 0, y: 0 } : data.scrollPosition; this.activeLinks = typeof data.activeLinks === 'undefined' ? {} : data.activeLinks; this.visible = typeof data.visible === 'undefined' ? true : data.visible; this.openCategories = typeof data.openCategories === 'undefined' ? {} : data.openCategories; From 44d3f3894366e6626108c642ddf9dfb543fe3b53 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 24 Apr 2024 23:37:25 +0000 Subject: [PATCH 9/9] prepare master merge --- LICENSE.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/LICENSE.txt b/LICENSE.txt index 4ba0161..02b1ff5 100755 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -46,3 +46,7 @@ Unless required by applicable law or agreed to in writing, Licensor provides the 7. Limitation of Liability In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +8. Future Changes + +The Licensor may change the License for future versions as he sees fit.