From d874a35b46daca6387cf0b77d95a777dca2a7140 Mon Sep 17 00:00:00 2001 From: Valentin V / vvval Date: Thu, 17 Dec 2020 18:48:02 +0300 Subject: [PATCH 1/6] bump keeper version --- app/src/Bootloader/AdminBootloader.php | 5 ++++- .../Controller/Keeper/DashboardController.php | 4 ++-- .../Controller/Keeper/ProfileController.php | 2 +- composer.json | 22 +++++++++---------- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/app/src/Bootloader/AdminBootloader.php b/app/src/Bootloader/AdminBootloader.php index 73b6449..0d309e7 100644 --- a/app/src/Bootloader/AdminBootloader.php +++ b/app/src/Bootloader/AdminBootloader.php @@ -11,6 +11,7 @@ namespace App\Bootloader; +use App\Controller\Keeper\DashboardController; use Spiral\DataGrid\Interceptor\GridInterceptor; use Spiral\Domain\CycleInterceptor; use Spiral\Domain\FilterInterceptor; @@ -21,7 +22,9 @@ class AdminBootloader extends KeeperBootloader { - protected const LOAD = [ + protected const DEFAULT_CONTROLLER = DashboardController::class; + protected const PREFIX = '/keeper'; + protected const LOAD = [ Keeper\UIBootloader::class, Keeper\SitemapBootloader::class, Keeper\AnnotatedBootloader::class, diff --git a/app/src/Controller/Keeper/DashboardController.php b/app/src/Controller/Keeper/DashboardController.php index 97544cd..6d6fbe7 100644 --- a/app/src/Controller/Keeper/DashboardController.php +++ b/app/src/Controller/Keeper/DashboardController.php @@ -15,14 +15,14 @@ use Spiral\Prototype\Traits\PrototypeTrait; /** - * @Keeper\Controller(name="dashboard", prefix="") + * @Keeper\Controller(name="dashboard", prefix="", defaultAction="index") */ class DashboardController { use PrototypeTrait; /** - * @Keeper\Action(route="/", methods="GET") + * @Keeper\Action(route="", methods="GET") * @Keeper\Sitemap\Link(title="Dashboard", parent="root", options={"icon": "home"}) */ public function index() diff --git a/app/src/Controller/Keeper/ProfileController.php b/app/src/Controller/Keeper/ProfileController.php index 5686525..1a83d0b 100644 --- a/app/src/Controller/Keeper/ProfileController.php +++ b/app/src/Controller/Keeper/ProfileController.php @@ -22,7 +22,7 @@ use Spiral\Translator\Traits\TranslatorTrait; /** - * @Keeper\Controller(name="profile", prefix="/") + * @Keeper\Controller(name="profile") */ class ProfileController implements SingletonInterface { diff --git a/composer.json b/composer.json index 824eb10..6c8b0dc 100644 --- a/composer.json +++ b/composer.json @@ -16,22 +16,22 @@ ], "require": { "php": ">=7.2", + "cycle/annotated": "^2.0", + "cycle/migrations": "^1.0", + "cycle/orm": "^1.0", + "cycle/proxy-factory": "^1.0", + "fzaninotto/faker": "^1.9", + "spiral/database": "^2.3", + "spiral/dotenv-bridge": "^1.0", "spiral/framework": "^2.7", + "spiral/helpers": "^1.0", "spiral/jobs": "^2.0", - "spiral/roadrunner": "^1.4", - "spiral/database": "^2.3", + "spiral/keeper": "^0.7.1", "spiral/migrations": "^2.0", "spiral/monolog-bridge": "^1.0", - "spiral/dotenv-bridge": "^1.0", "spiral/nyholm-bridge": "^1.0", - "cycle/orm": "^1.0", - "cycle/proxy-factory": "^1.0", - "cycle/annotated": "^2.0", - "cycle/migrations": "^1.0", - "spiral/toolkit": "^v1.1", - "spiral/helpers": "^1.0", - "spiral/keeper": "^0.5a", - "fzaninotto/faker": "^1.9" + "spiral/roadrunner": "^1.4", + "spiral/toolkit": "^v1.1" }, "require-dev": { "roave/security-advisories": "dev-master", From 9d7765ecb3938a18eb8791e7d0abaa59fe98d247 Mon Sep 17 00:00:00 2001 From: Valentin V / vvval Date: Thu, 17 Dec 2020 18:48:55 +0300 Subject: [PATCH 2/6] update annotations --- app/src/Controller/Keeper/DashboardController.php | 2 +- app/src/Controller/Keeper/ShowcaseController.php | 2 +- app/src/Controller/Keeper/UserController.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/Controller/Keeper/DashboardController.php b/app/src/Controller/Keeper/DashboardController.php index 6d6fbe7..57b9d0c 100644 --- a/app/src/Controller/Keeper/DashboardController.php +++ b/app/src/Controller/Keeper/DashboardController.php @@ -23,7 +23,7 @@ class DashboardController /** * @Keeper\Action(route="", methods="GET") - * @Keeper\Sitemap\Link(title="Dashboard", parent="root", options={"icon": "home"}) + * @Keeper\Sitemap\Link(title="Dashboard", parent="root", options={"icon": "home"}, position=1.0) */ public function index() { diff --git a/app/src/Controller/Keeper/ShowcaseController.php b/app/src/Controller/Keeper/ShowcaseController.php index 2f9c957..61b4f50 100644 --- a/app/src/Controller/Keeper/ShowcaseController.php +++ b/app/src/Controller/Keeper/ShowcaseController.php @@ -26,7 +26,7 @@ /** * @Keeper\Controller(name="showcase", prefix="/showcase") - * @Keeper\Sitemap\Group(name="showcase", title="Showcase", options={"icon": "cog"}) + * @Keeper\Sitemap\Group(name="showcase", title="Showcase", options={"icon": "cog"}, position=3.0) */ class ShowcaseController { diff --git a/app/src/Controller/Keeper/UserController.php b/app/src/Controller/Keeper/UserController.php index f63185b..892513f 100644 --- a/app/src/Controller/Keeper/UserController.php +++ b/app/src/Controller/Keeper/UserController.php @@ -26,7 +26,7 @@ /** * @Keeper\Controller(name="users", prefix="/users") - * @Keeper\Sitemap\Group(name="users", title="User Management", options={"icon": "users"}) + * @Keeper\Sitemap\Group(name="users", title="User Management", options={"icon": "users"}, position=2.0) */ class UserController { From 6ae1c5b2cb5ad7dc89bd383d54d5e4be2df3341a Mon Sep 17 00:00:00 2001 From: Valentin V / vvval Date: Fri, 18 Dec 2020 16:22:25 +0300 Subject: [PATCH 3/6] add handy makefile --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..6daf880 --- /dev/null +++ b/Makefile @@ -0,0 +1,5 @@ +bash: + docker-compose exec php bash + +up: + docker-compose up -d From 0f346c4fb3ed19160e5c94ffb112da9e1cb2e9a3 Mon Sep 17 00:00:00 2001 From: Valentin V / vvval Date: Fri, 18 Dec 2020 16:22:42 +0300 Subject: [PATCH 4/6] fix showcase view sources --- app/views/keeper/showcase/autocomplete.dark.php | 2 +- app/views/keeper/showcase/datagrids.dark.php | 2 +- app/views/keeper/showcase/datepicker.dark.php | 2 +- app/views/keeper/showcase/forms.dark.php | 2 +- app/views/keeper/showcase/intro.dark.php | 2 +- app/views/keeper/showcase/qrcode.dark.php | 2 +- app/views/keeper/showcase/tinymce.dark.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/views/keeper/showcase/autocomplete.dark.php b/app/views/keeper/showcase/autocomplete.dark.php index f5d08b1..d4ea37e 100644 --- a/app/views/keeper/showcase/autocomplete.dark.php +++ b/app/views/keeper/showcase/autocomplete.dark.php @@ -7,7 +7,7 @@ - diff --git a/app/views/keeper/showcase/datagrids.dark.php b/app/views/keeper/showcase/datagrids.dark.php index 19530f6..dee1d9d 100644 --- a/app/views/keeper/showcase/datagrids.dark.php +++ b/app/views/keeper/showcase/datagrids.dark.php @@ -7,7 +7,7 @@ - diff --git a/app/views/keeper/showcase/datepicker.dark.php b/app/views/keeper/showcase/datepicker.dark.php index 401c2a5..c55f221 100644 --- a/app/views/keeper/showcase/datepicker.dark.php +++ b/app/views/keeper/showcase/datepicker.dark.php @@ -7,7 +7,7 @@ - diff --git a/app/views/keeper/showcase/forms.dark.php b/app/views/keeper/showcase/forms.dark.php index f29029b..0cae00f 100644 --- a/app/views/keeper/showcase/forms.dark.php +++ b/app/views/keeper/showcase/forms.dark.php @@ -7,7 +7,7 @@ - diff --git a/app/views/keeper/showcase/intro.dark.php b/app/views/keeper/showcase/intro.dark.php index b7418d9..34c353d 100644 --- a/app/views/keeper/showcase/intro.dark.php +++ b/app/views/keeper/showcase/intro.dark.php @@ -9,7 +9,7 @@ - diff --git a/app/views/keeper/showcase/qrcode.dark.php b/app/views/keeper/showcase/qrcode.dark.php index 73ee41a..06bfa68 100644 --- a/app/views/keeper/showcase/qrcode.dark.php +++ b/app/views/keeper/showcase/qrcode.dark.php @@ -7,7 +7,7 @@ - diff --git a/app/views/keeper/showcase/tinymce.dark.php b/app/views/keeper/showcase/tinymce.dark.php index 950b7f9..ed3acc8 100644 --- a/app/views/keeper/showcase/tinymce.dark.php +++ b/app/views/keeper/showcase/tinymce.dark.php @@ -7,7 +7,7 @@ - From c48ec9d14bf2f8e1538ee9bbb29a3101c4639783 Mon Sep 17 00:00:00 2001 From: Valentin V / vvval Date: Fri, 18 Dec 2020 16:23:37 +0300 Subject: [PATCH 5/6] fix breadcrumbs --- app/views/keeper/layout/common.dark.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/keeper/layout/common.dark.php b/app/views/keeper/layout/common.dark.php index 6425179..9a81777 100644 --- a/app/views/keeper/layout/common.dark.php +++ b/app/views/keeper/layout/common.dark.php @@ -40,7 +40,7 @@
- +

{{$_ln_->getOption('title')}}

From 4f0498b097a91d80d0ac3cd41a86eadd6f6e6ab1 Mon Sep 17 00:00:00 2001 From: Valentin V / vvval Date: Mon, 21 Dec 2020 13:26:38 +0300 Subject: [PATCH 6/6] bump keeper dep --- Makefile | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6daf880..86b51f1 100644 --- a/Makefile +++ b/Makefile @@ -2,4 +2,4 @@ bash: docker-compose exec php bash up: - docker-compose up -d + docker-compose -f docker-compose.yml -f docker-compose-local.yml up -d diff --git a/composer.json b/composer.json index 6c8b0dc..9f8960f 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "spiral/framework": "^2.7", "spiral/helpers": "^1.0", "spiral/jobs": "^2.0", - "spiral/keeper": "^0.7.1", + "spiral/keeper": "^0.7.2", "spiral/migrations": "^2.0", "spiral/monolog-bridge": "^1.0", "spiral/nyholm-bridge": "^1.0",