updated files

dotkernel · Jul 11, 2022 · 6409c4f · 6409c4f
1 parent 257d979
commit 6409c4f
Show file tree

Hide file tree

Showing 23 changed files with 262 additions and 123 deletions.
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Dotkernel web starter package suitable for admin applications.
 [![GitHub license](https://img.shields.io/github/license/dotkernel/admin)](https://github.com/dotkernel/admin/blob/3.0/LICENSE.md)
 
 
-![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/admin/3.0.x-dev)
+![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/admin/4.0.0)
 
 
 # Installing DotKernel `admin`
@@ -23,6 +23,7 @@ Dotkernel web starter package suitable for admin applications.
     - [Installing the `admin` Composer package](#installing-the-admin-composer-package)
         - [Installing DotKernel admin](#installing-dotkernel-admin)
     - [Configuration - First Run](#configuration---first-run)
+    - [Manage GeoLite2 database](#manage-geolite2-database)
     - [Testing (Running)](#testing-running)
 
 ## Tools

diff --git a/composer.json b/composer.json
@@ -43,46 +43,46 @@
         }
     },
     "require": {
-        "php": "^7.4",
+        "php": "~7.4.0 || ~8.0.0 || ~8.1.0",
         "ext-gettext": "*",
-        "dotkernel/dot-annotated-services": "^3.1",
-        "dotkernel/dot-cli": "^3.2",
-        "dotkernel/dot-controller": "^3.1",
-        "dotkernel/dot-errorhandler": "^3.1",
-        "dotkernel/dot-flashmessenger": "^3.1",
-        "dotkernel/dot-form": "^4.0",
+        "dotkernel/dot-annotated-services": "^3.2.1",
+        "dotkernel/dot-cli": "^3.2.0",
+        "dotkernel/dot-controller": "^3.2.1",
+        "dotkernel/dot-errorhandler": "^3.2.0",
+        "dotkernel/dot-flashmessenger": "^3.2.0",
+        "dotkernel/dot-form": "^4.0.1",
         "dotkernel/dot-geoip": "^3.3.1",
-        "dotkernel/dot-helpers": "^3.1",
-        "dotkernel/dot-mail": "^3.2",
-        "dotkernel/dot-navigation": "^3.1",
-        "dotkernel/dot-rbac-guard": "^3.1",
-        "dotkernel/dot-session": "^4.2",
-        "dotkernel/dot-twigrenderer": "^3.1",
-        "dotkernel/dot-user-agent-sniffer": "^3.0.2",
-        "laminas/laminas-component-installer": "^2.6",
-        "laminas/laminas-config-aggregator": "^1.7",
-        "laminas/laminas-i18n": "^2.13",
-        "laminas/laminas-math": "^3.5",
-        "mezzio/mezzio": "^3.10",
-        "mezzio/mezzio-authorization-rbac": "^1.3",
-        "mezzio/mezzio-cors": "^1.3",
-        "mezzio/mezzio-fastroute": "^3.5",
-        "ramsey/uuid-doctrine": "^1.8",
-        "roave/psr-container-doctrine": "^2.2",
-        "robmorgan/phinx": "^0.12"
+        "dotkernel/dot-helpers": "^3.2.0",
+        "dotkernel/dot-mail": "^3.3.0",
+        "dotkernel/dot-navigation": "^3.2.0",
+        "dotkernel/dot-rbac-guard": "^3.2.1",
+        "dotkernel/dot-session": "^4.3.0",
+        "dotkernel/dot-twigrenderer": "^3.2.1",
+        "dotkernel/dot-user-agent-sniffer": "^3.1.1",
+        "laminas/laminas-component-installer": "^2.8.0",
+        "laminas/laminas-config-aggregator": "^1.7.0",
+        "laminas/laminas-i18n": "^2.15.0",
+        "laminas/laminas-math": "^3.5.0",
+        "mezzio/mezzio": "^3.11.0",
+        "mezzio/mezzio-authorization-rbac": "^1.3.0",
+        "mezzio/mezzio-cors": "^1.3.0",
+        "mezzio/mezzio-fastroute": "^3.5.0",
+        "ramsey/uuid-doctrine": "^1.8.1",
+        "roave/psr-container-doctrine": "^3.5.0",
+        "robmorgan/phinx": "^0.12.11"
     },
     "require-dev": {
         "laminas/laminas-development-mode": "^3.6",
-        "mezzio/mezzio-tooling": "^1.4",
-        "phpunit/phpunit": "^7.5",
+        "mezzio/mezzio-tooling": "^2.5",
+        "phpunit/phpunit": "^9.5.21",
         "roave/security-advisories": "dev-master",
-        "squizlabs/php_codesniffer": "^3.6",
+        "squizlabs/php_codesniffer": "^3.7",
         "filp/whoops": "^2.14"
     },
     "autoload": {
         "psr-4": {
             "Frontend\\App\\": "src/App/src/",
-            "Frontend\\User\\": "src/User/src/"
+            "Frontend\\Admin\\": "src/Admin/src/"
         }
     },
     "autoload-dev": {

diff --git a/config/autoload/app.global.php b/config/autoload/app.global.php
@@ -2,8 +2,11 @@
 
 declare(strict_types=1);
 
+$baseUrl = 'http://localhost:8080';
+
 $app = [
-    'name' => 'DotKernel Admin V3'
+    'name' => 'DotKernel Admin V4',
+    'url' => $baseUrl
 ];
 
 return [

diff --git a/config/autoload/authentication.global.php b/config/autoload/authentication.global.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use Frontend\User\Entity\Admin;
+use Frontend\Admin\Entity\Admin;
 
 return [
     'doctrine' => [
@@ -12,7 +12,7 @@
                 'identity_class' => Admin::class,
                 'identity_property' => 'identity',
                 'credential_property' => 'password',
-                'credential_callable' => 'Frontend\User\Doctrine\UserAuthentication::verifyCredential',
+                'credential_callable' => 'Frontend\Admin\Doctrine\AdminAuthentication::verifyCredential',
                 'messages' => [
                     'success' => 'Authenticated successfully.',
                     'not_found' => 'Identity not found.',

diff --git a/config/autoload/authorization-guards.global.php b/config/autoload/authorization-guards.global.php
@@ -21,11 +21,6 @@
                         'type' => 'ControllerPermission',
                         'options' => [
                             'rules' => [
-                                [
-                                    'route' => 'user',
-                                    'actions' => [],
-                                    'permissions' => ['authenticated']
-                                ],
                                 [
                                     'route' => 'admin',
                                     'actions' => ['login'],

diff --git a/config/autoload/doctrine.global.php b/config/autoload/doctrine.global.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 use Doctrine\Common\Cache\PhpFileCache;
-use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain;
+use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Ramsey\Uuid\Doctrine\UuidBinaryOrderedTimeType;

diff --git a/config/autoload/navigation.global.php b/config/autoload/navigation.global.php
@@ -25,22 +25,25 @@
                         [
                             'options' => [
                                 'label' => 'Manage admins',
-                                'route' => [
-                                    'route_name' => 'admin',
-                                    'route_params' => ['action' => 'manage']
-                                ],
+                                'route' => '',
                                 'icon' => 'fas fa-user-circle',
-                            ]
-                        ],
-                        [
-                            'options' => [
-                                'label' => 'Manage users',
-                                'route' => [
-                                    'route_name' => 'user',
-                                    'route_params' => ['action' => 'manage']
-                                ],
-                                'icon' => 'fas fa-user',
                             ],
+                            'pages' => [
+                                [
+                                    'options' => [
+                                        'label' => 'Admins',
+                                        'uri' => '/admin/manage',
+                                        'icon' => 'fas fa-user-circle',
+                                    ],
+                                ],
+                                [
+                                    'options' => [
+                                        'label' => 'Logins',
+                                        'uri' => '/admin/logins',
+                                        'icon' => 'fas fa-sign-in-alt',
+                                    ],
+                                ]
+                            ]
                         ],
                         [
                             'options' => [

diff --git a/config/config.php b/config/config.php
@@ -5,7 +5,6 @@
 use Laminas\ConfigAggregator\ArrayProvider;
 use Laminas\ConfigAggregator\ConfigAggregator;
 use Laminas\ConfigAggregator\PhpFileProvider;
-use Laminas\ZendFrameworkBridge\ConfigPostProcessor;
 
 // To enable or disable caching, set the `ConfigAggregator::ENABLE_CACHE` boolean in
 // `config/autoload/local.php`.
@@ -51,7 +50,7 @@ class_exists(\Mezzio\Swoole\ConfigProvider::class)
 
     // Default App module config
     \Frontend\App\ConfigProvider::class,
-    \Frontend\User\ConfigProvider::class,
+    \Frontend\Admin\ConfigProvider::class,
 
     // Load application config in a pre-defined order in such a way that local settings
     // overwrite global settings. (Loaded as first to last):
@@ -63,6 +62,6 @@ class_exists(\Mezzio\Swoole\ConfigProvider::class)
 
     // Load development config if it exists
     new PhpFileProvider(realpath(__DIR__) . '/development.config.php'),
-], $cacheConfig['config_cache_path'], [ConfigPostProcessor::class]);
+], $cacheConfig['config_cache_path']);
 
 return $aggregator->getMergedConfig();
diff --git a/config/pipeline.php b/config/pipeline.php
@@ -75,7 +75,6 @@
     // - route-based validation
     // - etc.
 
-    $app->pipe(TranslatorMiddleware::class);
     $app->pipe(AuthMiddleware::class);
     $app->pipe(ForbiddenHandler::class);
     $app->pipe(RbacGuardMiddleware::class);

diff --git a/data/database/migrations/20200416084050_default_admin_schema.php b/data/database/migrations/20200416084050_default_admin_schema.php
@@ -1,7 +1,7 @@
 <?php
 
 use Phinx\Migration\AbstractMigration;
-use Frontend\User\Entity\Admin;
+use Frontend\Admin\Entity\Admin;
 
 class DefaultAdminSchema extends AbstractMigration
 {

diff --git a/data/database/migrations/20220524142211_log_admin_logins.php b/data/database/migrations/20220524142211_log_admin_logins.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 use Phinx\Migration\AbstractMigration;
-use Frontend\User\Entity\AdminLogin;
+use Frontend\Admin\Entity\AdminLogin;
 
 /**
  * ClassLogAdminLogins

diff --git a/data/database/seeds/AdminSeeder.php b/data/database/seeds/AdminSeeder.php
@@ -1,7 +1,7 @@
 <?php
 namespace Data\Database\Seeds;
 
-use Frontend\User\Entity\Admin;
+use Frontend\Admin\Entity\Admin;
 use Phinx\Seed\AbstractSeed;
 use Ramsey\Uuid\Codec\OrderedTimeCodec;
 use Ramsey\Uuid\Uuid;

diff --git a/src/Admin/src/ConfigProvider.php b/src/Admin/src/ConfigProvider.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Frontend\User;
+namespace Frontend\Admin;
 
 use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
 use Dot\AnnotatedServices\Factory\AnnotatedServiceFactory;