Merge pull request #4 from spiral/bump_keeper

Bump keeper
spiral · Dec 21, 2020 · d705d7e · d705d7e
2 parents 4e06e8a + 4f0498b
commit d705d7e
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 26 deletions.
diff --git a/Makefile b/Makefile
@@ -0,0 +1,5 @@
+bash:
+	docker-compose exec php bash
+
+up:
+	docker-compose -f docker-compose.yml -f docker-compose-local.yml up -d
diff --git 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
@@ -15,15 +15,15 @@
 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\Sitemap\Link(title="Dashboard", parent="root", options={"icon": "home"})
+     * @Keeper\Action(route="", methods="GET")
+     * @Keeper\Sitemap\Link(title="Dashboard", parent="root", options={"icon": "home"}, position=1.0)
      */
     public function index()
     {

diff --git 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/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
@@ -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
 {

diff --git a/app/views/keeper/layout/common.dark.php b/app/views/keeper/layout/common.dark.php
@@ -40,7 +40,7 @@
 
     <define:heading>
       <div class="sf-heading">
-        <keeper:breadcrumps activeRoute="${activeRoute}"/>
+        <keeper:breadcrumbs activeRoute="${activeRoute}"/>
         <h1>
           <block:title>{{$_ln_->getOption('title')}}</block:title>
         </h1>

diff --git a/app/views/keeper/showcase/autocomplete.dark.php b/app/views/keeper/showcase/autocomplete.dark.php
@@ -7,7 +7,7 @@
 </ui:action>
 
 <ui:action>
-    <action:button icon="file" kind="primary" href="https://github.com/spiral/app-keeper/blob/master/app/views/showcase/intro.dark.php"
+    <action:button icon="file" kind="primary" href="https://github.com/spiral/app-keeper/blob/master/app/views/keeper/showcase/intro.dark.php"
                    target="_blank" label="Source Code"/>
 </ui:action>
 

diff --git a/app/views/keeper/showcase/datagrids.dark.php b/app/views/keeper/showcase/datagrids.dark.php
@@ -7,7 +7,7 @@
 </ui:action>
 
 <ui:action>
-    <action:button icon="file" kind="primary" href="https://github.com/spiral/app-keeper/blob/master/app/views/showcase/datagrids.dark.php"
+    <action:button icon="file" kind="primary" href="https://github.com/spiral/app-keeper/blob/master/app/views/keeper/showcase/datagrids.dark.php"
                    target="_blank" label="Source Code"/>
 </ui:action>
 

diff --git a/app/views/keeper/showcase/datepicker.dark.php b/app/views/keeper/showcase/datepicker.dark.php
@@ -7,7 +7,7 @@
 </ui:action>
 
 <ui:action>
-    <action:button icon="file" kind="primary" href="https://github.com/spiral/app-keeper/blob/master/app/views/showcase/datepicker.dark.php"
+    <action:button icon="file" kind="primary" href="https://github.com/spiral/app-keeper/blob/master/app/views/keeper/showcase/datepicker.dark.php"
                    target="_blank" label="Source Code"/>
 </ui:action>
 

diff --git a/app/views/keeper/showcase/forms.dark.php b/app/views/keeper/showcase/forms.dark.php
@@ -7,7 +7,7 @@
 </ui:action>
 
 <ui:action>
-    <action:button icon="file" kind="primary" href="https://github.com/spiral/app-keeper/blob/master/app/views/showcase/forms.dark.php"
+    <action:button icon="file" kind="primary" href="https://github.com/spiral/app-keeper/blob/master/app/views/keeper/showcase/forms.dark.php"
                    target="_blank" label="Source Code"/>
 </ui:action>
 

diff --git a/app/views/keeper/showcase/intro.dark.php b/app/views/keeper/showcase/intro.dark.php
@@ -9,7 +9,7 @@
 </ui:action>
 
 <ui:action>
-    <action:button icon="file" kind="primary" href="https://github.com/spiral/app-keeper/blob/master/app/views/showcase/intro.dark.php"
+    <action:button icon="file" kind="primary" href="https://github.com/spiral/app-keeper/blob/master/app/views/keeper/showcase/intro.dark.php"
                    target="_blank" label="Source Code"/>
 </ui:action>
 

diff --git a/app/views/keeper/showcase/qrcode.dark.php b/app/views/keeper/showcase/qrcode.dark.php
@@ -7,7 +7,7 @@
 </ui:action>
 
 <ui:action>
-    <action:button icon="file" kind="primary" href="https://github.com/spiral/app-keeper/blob/master/app/views/showcase/qrcode.dark.php"
+    <action:button icon="file" kind="primary" href="https://github.com/spiral/app-keeper/blob/master/app/views/keeper/showcase/qrcode.dark.php"
                    target="_blank" label="Source Code"/>
 </ui:action>
 

diff --git a/app/views/keeper/showcase/tinymce.dark.php b/app/views/keeper/showcase/tinymce.dark.php
@@ -7,7 +7,7 @@
 </ui:action>
 
 <ui:action>
-    <action:button icon="file" kind="primary" href="https://github.com/spiral/app-keeper/blob/master/app/views/showcase/tinymce.dark.php"
+    <action:button icon="file" kind="primary" href="https://github.com/spiral/app-keeper/blob/master/app/views/keeper/showcase/tinymce.dark.php"
                    target="_blank" label="Source Code"/>
 </ui:action>
 

diff --git 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.2",
         "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",