added admin user to migrations and read me, reformatted to PSR-1/PSR-2

README.md

@@ -16,6 +16,9 @@ The recommended way to install composer packages is:
 
 ```
 $ composer require bakkerij/cakeadmin:dev-rewrite
+$ composer require friendsofcake/crud:^4.3
+$ composer require gourmet/knp-menu:~0.4
+$ composer require holt59/cakephp3-bootstrap-helpers:dev-master
 ```
 
 ## Load Plugin
@@ -34,3 +37,7 @@ Navigate to the new project's config/app.php and update your Datasources usernam
 $ bin/cake migrations migrate -p Bakkerij/CakeAdmin
 ```
 
+After migrations you will have a default Admin user with the following credentials:
+email - [email protected]
+password - test
+

composer.json

@@ -6,7 +6,8 @@
     "php": ">=5.4.16",
     "cakephp/cakephp": "~3.0",
     "friendsofcake/crud": "^4.3",
-    "gourmet/knp-menu": "~0.4"
+    "gourmet/knp-menu": "~0.4",
+    "holt59/cakephp3-bootstrap-helpers": "dev-master"
   },
   "require-dev": {
     "phpunit/phpunit": "*"

config/Migrations/20160716113123_Initial.php

@@ -1,51 +1,53 @@
 <?php
-use Migrations\AbstractMigration;
 
-class Initial extends AbstractMigration
-{
+  use Migrations\AbstractMigration;
+
+  class Initial extends AbstractMigration {
+
     /**
      * Change Method.
      *
      * More information on this method is available here:
      * http://docs.phinx.org/en/latest/migrations.html#the-change-method
      * @return void
      */
-    public function change()
-    {
-        $table = $this->table('cakeadmin_administrators', ['id' => false, 'primary_key' => ['id']]);
-        $table
-            ->addColumn('id', 'uuid', [
-                'default' => null,
-                'limit' => null,
-                'null' => false,
-            ])
-            ->addColumn('name', 'string', [
-                'default' => null,
-                'limit' => 150,
-                'null' => false,
-            ])
-            ->addColumn('email', 'string', [
-                'default' => null,
-                'limit' => 50,
-                'null' => true,
-            ])
-            ->addColumn('password', 'string', [
-                'default' => null,
-                'limit' => 255,
-                'null' => true,
-            ])
-            ->addColumn('active', 'integer', [
-                'default' => 0,
-                'limit' => 1,
-                'null' => true,
-            ])
-            ->addColumn('request_key', 'string', [
-                'default' => null,
-                'limit' => 255,
-                'null' => true,
-            ])
-            ->addColumn('created', 'datetime')
-            ->addColumn('modified', 'datetime')
-            ->create();
+    public function change() {
+      $table = $this->table('cakeadmin_administrators', ['id' => false, 'primary_key' => ['id']]);
+      $table
+          ->addColumn('id', 'uuid', [
+            'default' => null,
+            'limit' => null,
+            'null' => false,
+          ])
+          ->addColumn('name', 'string', [
+            'default' => null,
+            'limit' => 150,
+            'null' => false,
+          ])
+          ->addColumn('email', 'string', [
+            'default' => null,
+            'limit' => 50,
+            'null' => true,
+          ])
+          ->addColumn('password', 'string', [
+            'default' => null,
+            'limit' => 255,
+            'null' => true,
+          ])
+          ->addColumn('active', 'integer', [
+            'default' => 0,
+            'limit' => 1,
+            'null' => true,
+          ])
+          ->addColumn('request_key', 'string', [
+            'default' => null,
+            'limit' => 255,
+            'null' => true,
+          ])
+          ->addColumn('created', 'datetime')
+          ->addColumn('modified', 'datetime')
+          ->create();
     }
-}
+
+  }
+

config/Migrations/20161123183707_AddAdminUser.php

@@ -0,0 +1,26 @@
+<?php
+
+use Cake\ORM\TableRegistry;
+use Migrations\AbstractMigration;
+
+class AddAdminUser extends AbstractMigration
+{
+    /**
+     * Change Method.
+     *
+     * More information on this method is available here:
+     * http://docs.phinx.org/en/latest/migrations.html#the-change-method
+     * @return void
+     */
+    public function change()
+    {
+      $AdminTable = TableRegistry::get('Bakkerij/CakeAdmin.Administrators');
+      $user = $AdminTable->newEntity([
+        'name' => 'admin',
+        'email' => '[email protected]',
+        'password' => 'test',
+        'active' => 1
+      ]);
+      $AdminTable->save($user);
+    }
+}

src/Controller/Admin/DashboardController.php

@@ -3,13 +3,18 @@
 
 use Bakkerij\CakeAdmin\Controller\AppController;
 use Cake\Datasource\ConnectionManager;
+use \Cake\Event\Event;
 
 /**
  * Dashboard Controller
  *
  */
 class DashboardController extends AppController
 {
+  public function beforeRender(Event $event) {
+    parent::beforeRender($event);
+    $this->viewBuilder()->layout('admin');
+  }
 
     /**
      * Index method

src/Controller/Admin/PostTypesController.php

@@ -57,6 +57,7 @@ public function beforeFilter(Event $event)
 
     public function beforeRender(Event $event)
     {
+        $this->viewBuilder()->layout('admin');
         $this->viewBuilder()->helpers(['Bakkerij/CakeAdmin.PostType' => [
             'data' => $this->postType
         ]]);

src/Controller/AppController.php

@@ -11,8 +11,24 @@ class AppController extends BaseController
 {
 
     use ControllerTrait;
-
     use CakeAdminTrait;
+
+    // https://holt59.github.io/cakephp3-bootstrap-helpers/
+    public $helpers = [
+        'Html' => [
+            'className' => 'Bootstrap.BootstrapHtml',
+            'useCustomFileInput' => true
+        ],
+        'Form' => [
+            'className' => 'Bootstrap.BootstrapForm'
+        ],
+        'Paginator' => [
+            'className' => 'Bootstrap.BootstrapPaginator'
+        ],
+        'Modal' => [
+            'className' => 'Bootstrap.BootstrapModal'
+        ]
+    ];
 
     /**
      * Initialize AppController

src/Template/Bake/Controller/controller.ctp

@@ -0,0 +1,50 @@
+<%
+/**
+ * Controller bake template file
+ *
+ * Allows templating of Controllers generated from bake.
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @since         0.1.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+use Cake\Utility\Inflector;
+
+$defaultModel = $name;
+%>
+<?php
+namespace <%= $namespace %>\Controller<%= $prefix %>;
+
+use <%= $namespace %>\Controller\AppController;
+use Cake\Event\Event;
+
+/**
+ * <%= $name %> Controller
+ *
+ * @property \<%= $namespace %>\Model\Table\<%= $defaultModel %>Table $<%= $defaultModel %>
+<%
+foreach ($components as $component):
+    $classInfo = $this->Bake->classInfo($component, 'Controller/Component', 'Component');
+%>
+ * @property <%= $classInfo['fqn'] %> $<%= $classInfo['name'] %>
+<% endforeach; %>
+ */
+class <%= $name %>Controller extends AppController
+{
+<% echo $this->element('Controller/auth', $actions); %>
+<%
+echo $this->Bake->arrayProperty('helpers', $helpers, ['indent' => false]);
+echo $this->Bake->arrayProperty('components', $components, ['indent' => false]);
+foreach($actions as $action) {
+    echo $this->element('Controller/' . $action);
+}
+%>
+}

src/Template/Bake/Element/Controller/auth.ctp

@@ -0,0 +1,20 @@
+    public function beforeRender(Event $event)
+    {
+        $this->viewBuilder()->layout('admin');
+    }
+
+    public function beforeFilter(Event $event)
+    {
+        parent::beforeFilter($event);
+        $this->Auth->deny();
+    }
+
+    public function isAuthorized($user)
+    {
+        // Registered Users can access
+        if (in_array($this->request->action, [<% foreach($actions as $action) {echo "'$action', ";} %>])) {
+            return true;
+        }
+
+        return parent::isAuthorized($user);
+    }

src/Template/Bake/Element/form.ctp

@@ -0,0 +1,79 @@
+<%
+/**
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @since         0.1.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+use Cake\Utility\Inflector;
+
+$fields = collection($fields)
+    ->filter(function($field) use ($schema) {
+        return $schema->columnType($field) !== 'binary';
+    });
+
+if (isset($modelObject) && $modelObject->behaviors()->has('Tree')) {
+    $fields = $fields->reject(function ($field) {
+        return $field === 'lft' || $field === 'rght';
+    });
+}
+%>
+<?php
+// Title
+$title = __('<%= Inflector::humanize($action) %> <%= $singularHumanName %>');
+$smallTitle = null;
+$this->assign('title', $title);
+echo $this->Layout->setPageTitle($title, $smallTitle);
+?>
+
+<?= $this->Form->create($<%= $singularVar %>) ?>
+    <?php
+<%
+    foreach ($fields as $field) {
+        if (in_array($field, $primaryKey)) {
+            continue;
+        }
+        if (isset($keyFields[$field])) {
+            $fieldData = $schema->column($field);
+            if (!empty($fieldData['null'])) {
+%>
+        echo $this->Form->input('<%= $field %>', ['options' => $<%= $keyFields[$field] %>, 'empty' => true]);
+<%
+            } else {
+%>
+        echo $this->Form->input('<%= $field %>', ['options' => $<%= $keyFields[$field] %>]);
+<%
+            }
+            continue;
+        }
+        if (!in_array($field, ['created', 'modified', 'updated'])) {
+            $fieldData = $schema->column($field);
+            if (in_array($fieldData['type'], ['date', 'datetime', 'time']) && (!empty($fieldData['null']))) {
+%>
+        echo $this->Form->input('<%= $field %>', ['empty' => true]);
+<%
+            } else {
+%>
+        echo $this->Form->input('<%= $field %>');
+<%
+            }
+        }
+    }
+    if (!empty($associations['BelongsToMany'])) {
+        foreach ($associations['BelongsToMany'] as $assocName => $assocData) {
+%>
+        echo $this->Form->input('<%= $assocData['property'] %>._ids', ['options' => $<%= $assocData['variable'] %>]);
+<%
+        }
+    }
+%>
+    ?>
+<?= $this->Form->button(__('Submit'), ['type' => 'submit', 'class' => 'btn btn-primary']) ?>
+<?= $this->Form->end() ?>