diff --git a/templates/app/admin/admin-table.html.twig b/src/Admin/templates/app/admin-table.html.twig
similarity index 100%
rename from templates/app/admin/admin-table.html.twig
rename to src/Admin/templates/app/admin-table.html.twig
diff --git a/templates/app/admin/login.html.twig b/src/Admin/templates/app/login.html.twig
similarity index 100%
rename from templates/app/admin/login.html.twig
rename to src/Admin/templates/app/login.html.twig
diff --git a/src/App/ConfigProvider.php b/src/App/ConfigProvider.php
deleted file mode 100644
index 979e95a..0000000
--- a/src/App/ConfigProvider.php
+++ /dev/null
@@ -1,87 +0,0 @@
- $this->getDependenciesConfig(),
-
- 'dot_form' => $this->getFormsConfig(),
-
- 'routes' => $this->getRoutesConfig(),
- ];
- }
-
- public function getDependenciesConfig(): array
- {
- return [
-
- ];
- }
-
- public function getFormsConfig(): array
- {
- return [
- 'form_manager' => [
- 'factories' => [
- ConfirmDeleteForm::class => InvokableFactory::class,
- ],
- 'aliases' => [
- 'ConfirmDelete' => ConfirmDeleteForm::class,
- ]
- ]
- ];
- }
-
- public function getRoutesConfig(): array
- {
- return [
- [
- 'name' => 'dashboard',
- 'path' => '/dashboard[/[{action}]]',
- 'middleware' => DashboardController::class,
- ],
- [
- // there is already a route named `user` from dot-user package,
- // so we use a diff one for the frontend user management
- 'name' => 'f_user',
- 'path' => '/user[/{action}[/{id:\d+}]]',
- 'middleware' => UserManageController::class,
- ],
-
- //change default route paths for user related stuff into admin
- //we will use 'user' for frontend users
- 'login_route' => [
- 'path' => '/admin/login',
- ],
- 'logout_route' => [
- 'path' => '/admin/logout',
- ],
- 'user_route' => [
- 'path' => '/admin[/{action}[/{id:\d+}]]',
- 'middleware' => [AdminController::class, UserController::class],
- ]
- ];
- }
-}
diff --git a/src/App/src/ConfigProvider.php b/src/App/src/ConfigProvider.php
new file mode 100644
index 0000000..c0f2e52
--- /dev/null
+++ b/src/App/src/ConfigProvider.php
@@ -0,0 +1,64 @@
+ $this->getDependencies(),
+
+ 'dot_form' => $this->getForms(),
+
+ 'templates' => $this->getTemplates(),
+ ];
+ }
+
+ public function getDependencies(): array
+ {
+ return [
+
+ ];
+ }
+
+ public function getForms(): array
+ {
+ return [
+ 'form_manager' => [
+ 'factories' => [
+ ConfirmDeleteForm::class => InvokableFactory::class,
+ ],
+ 'aliases' => [
+ 'ConfirmDelete' => ConfirmDeleteForm::class,
+ ]
+ ]
+ ];
+ }
+
+ public function getTemplates(): array
+ {
+ return [
+ 'paths' => [
+ 'app' => [__DIR__ . '/../templates/app'],
+ 'error' => [__DIR__ . '/../templates/error'],
+ 'layout' => [__DIR__ . '/../templates/layout'],
+ 'partial' => [__DIR__ . '/../templates/partial']
+ ]
+ ];
+ }
+}
diff --git a/src/App/Controller/DashboardController.php b/src/App/src/Controller/DashboardController.php
similarity index 100%
rename from src/App/Controller/DashboardController.php
rename to src/App/src/Controller/DashboardController.php
diff --git a/src/App/Controller/EntityManageBaseController.php b/src/App/src/Controller/EntityManageBaseController.php
similarity index 100%
rename from src/App/Controller/EntityManageBaseController.php
rename to src/App/src/Controller/EntityManageBaseController.php
diff --git a/src/App/Exception/ExceptionInterface.php b/src/App/src/Exception/ExceptionInterface.php
similarity index 100%
rename from src/App/Exception/ExceptionInterface.php
rename to src/App/src/Exception/ExceptionInterface.php
diff --git a/src/App/Exception/InvalidArgumentException.php b/src/App/src/Exception/InvalidArgumentException.php
similarity index 100%
rename from src/App/Exception/InvalidArgumentException.php
rename to src/App/src/Exception/InvalidArgumentException.php
diff --git a/src/App/Exception/RuntimeException.php b/src/App/src/Exception/RuntimeException.php
similarity index 100%
rename from src/App/Exception/RuntimeException.php
rename to src/App/src/Exception/RuntimeException.php
diff --git a/src/App/Factory/AnnotationsCacheFactory.php b/src/App/src/Factory/AnnotationsCacheFactory.php
similarity index 95%
rename from src/App/Factory/AnnotationsCacheFactory.php
rename to src/App/src/Factory/AnnotationsCacheFactory.php
index 08586dd..e8da8fb 100644
--- a/src/App/Factory/AnnotationsCacheFactory.php
+++ b/src/App/src/Factory/AnnotationsCacheFactory.php
@@ -8,7 +8,7 @@
namespace Admin\App\Factory;
use Doctrine\Common\Cache\FilesystemCache;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
/**
* Class AnnotationsCacheFactory
diff --git a/src/App/Form/ConfirmDeleteForm.php b/src/App/src/Form/ConfirmDeleteForm.php
similarity index 100%
rename from src/App/Form/ConfirmDeleteForm.php
rename to src/App/src/Form/ConfirmDeleteForm.php
diff --git a/src/App/Mapper/SearchFinderMapperTrait.php b/src/App/src/Mapper/SearchFinderMapperTrait.php
similarity index 100%
rename from src/App/Mapper/SearchFinderMapperTrait.php
rename to src/App/src/Mapper/SearchFinderMapperTrait.php
diff --git a/src/App/Messages.php b/src/App/src/Messages.php
similarity index 100%
rename from src/App/Messages.php
rename to src/App/src/Messages.php
diff --git a/src/App/Middleware/AdminIndexMiddleware.php b/src/App/src/Middleware/AdminIndexMiddleware.php
similarity index 82%
rename from src/App/Middleware/AdminIndexMiddleware.php
rename to src/App/src/Middleware/AdminIndexMiddleware.php
index 3637d6e..67bdd83 100644
--- a/src/App/Middleware/AdminIndexMiddleware.php
+++ b/src/App/src/Middleware/AdminIndexMiddleware.php
@@ -10,6 +10,8 @@
use Dot\AnnotatedServices\Annotation\Inject;
use Dot\AnnotatedServices\Annotation\Service;
use Dot\Authentication\AuthenticationInterface;
+use Interop\Http\ServerMiddleware\DelegateInterface;
+use Interop\Http\ServerMiddleware\MiddlewareInterface;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use Zend\Diactoros\Response\RedirectResponse;
@@ -21,7 +23,7 @@
*
* @Service
*/
-class AdminIndexMiddleware
+class AdminIndexMiddleware implements MiddlewareInterface
{
/** @var AuthenticationInterface */
protected $authentication;
@@ -44,11 +46,10 @@ public function __construct(AuthenticationInterface $authentication, UrlHelper $
/**
* @param ServerRequestInterface $request
- * @param ResponseInterface $response
- * @param callable|null $next
- * @return RedirectResponse
+ * @param DelegateInterface $delegate
+ * @return ResponseInterface
*/
- public function __invoke(ServerRequestInterface $request, ResponseInterface $response, callable $next = null)
+ public function process(ServerRequestInterface $request, DelegateInterface $delegate): ResponseInterface
{
//if root path is accessed and not authenticated send to login page
//we do this to make interface more user-friendly, by bypassing the authorization guards
@@ -60,6 +61,6 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
}
}
- return $next($request, $response);
+ return $delegate->process($request);
}
}
diff --git a/src/App/Service/AbstractEntityService.php b/src/App/src/Service/AbstractEntityService.php
similarity index 100%
rename from src/App/Service/AbstractEntityService.php
rename to src/App/src/Service/AbstractEntityService.php
diff --git a/src/App/Service/EntityServiceInterface.php b/src/App/src/Service/EntityServiceInterface.php
similarity index 100%
rename from src/App/Service/EntityServiceInterface.php
rename to src/App/src/Service/EntityServiceInterface.php
diff --git a/templates/app/bs-table.html.twig b/src/App/templates/app/bs-table.html.twig
similarity index 100%
rename from templates/app/bs-table.html.twig
rename to src/App/templates/app/bs-table.html.twig
diff --git a/templates/app/dashboard.html.twig b/src/App/templates/app/dashboard.html.twig
similarity index 98%
rename from templates/app/dashboard.html.twig
rename to src/App/templates/app/dashboard.html.twig
index 5572300..c9c0050 100644
--- a/templates/app/dashboard.html.twig
+++ b/src/App/templates/app/dashboard.html.twig
@@ -133,7 +133,7 @@
-
-
+
@@ -149,7 +149,7 @@- -
@@ -167,7 +167,7 @@- -
diff --git a/src/App/templates/error/403.html.twig b/src/App/templates/error/403.html.twig new file mode 100644 index 0000000..213e45e --- /dev/null +++ b/src/App/templates/error/403.html.twig @@ -0,0 +1,15 @@ +{% extends '@layout/default.html.twig' %} + +{% block title %}{{ status }} {{ reason }}{% endblock %} + +{% block content %} +@@ -48,9 +51,7 @@ {% set dummy = element.setAttribute('class', 'form-control') %} {% if showLabels and element.getLabel() is defined and element.getLabel() is not empty %} - {{ formLabel(element) }} - {% endif %} {{ formElement(element) }} diff --git a/templates/partial/menu.html.twig b/src/App/templates/partial/menu.html.twig similarity index 99% rename from templates/partial/menu.html.twig rename to src/App/templates/partial/menu.html.twig index 7b1ef2c..d88250c 100644 --- a/templates/partial/menu.html.twig +++ b/src/App/templates/partial/menu.html.twig @@ -15,16 +15,21 @@ {% endif %} {% if page.getOption('type') and page.getOption('type') == 'separator' %} + + {% else %} +Oops!
+This is awkward.
+We encountered a {{ status }} {{ reason }} error.
++ You don't have enough permissions to view this page. You can Sign out + and try with a more permissive user.
+{% endblock %} diff --git a/templates/error/404.html.twig b/src/App/templates/error/404.html.twig similarity index 100% rename from templates/error/404.html.twig rename to src/App/templates/error/404.html.twig diff --git a/templates/error/error.html.twig b/src/App/templates/error/error.html.twig similarity index 96% rename from templates/error/error.html.twig rename to src/App/templates/error/error.html.twig index 34dc146..05b39e5 100644 --- a/templates/error/error.html.twig +++ b/src/App/templates/error/error.html.twig @@ -16,7 +16,7 @@ You don't have enough permissions to view this page. You can Sign out and try with a more permissive user.
+ Another reason for this error could be that the page you want to access is not available for authenticated + users. You should Sign out before and try again. +
Another reason for this error could be that the page you want to access is not available for authenticated - users. You should Sign out before. + users. You should Sign out before and try again. {% endif %} {% endblock %} diff --git a/templates/layout/default.html.twig b/src/App/templates/layout/default.html.twig similarity index 95% rename from templates/layout/default.html.twig rename to src/App/templates/layout/default.html.twig index dfc94ad..76b515b 100644 --- a/templates/layout/default.html.twig +++ b/src/App/templates/layout/default.html.twig @@ -34,7 +34,7 @@ - DotKernelAdmin + DotKernelAdmin @@ -61,9 +64,7 @@ {% set dummy = element.setAttribute('class', 'form-control') %} {% if showLabels and element.getLabel() is defined and element.getLabel() is not empty %} - {{ formLabel(element) }} - {% endif %} {{ formElement(element) }} @@ -76,4 +77,4 @@ {% endif %} -{% endfor %} \ No newline at end of file +{% endfor %} diff --git a/templates/partial/form-display.html.twig b/src/App/templates/partial/form-display.html.twig similarity index 90% rename from templates/partial/form-display.html.twig rename to src/App/templates/partial/form-display.html.twig index 10fc131..3c20557 100644 --- a/templates/partial/form-display.html.twig +++ b/src/App/templates/partial/form-display.html.twig @@ -10,7 +10,10 @@ {% set dummy = element.setAttribute('class', 'form-control') %} - {{ formLabel(element) }} + {% if showLabels and element.getLabel() is defined and element.getLabel() is not empty %} + {{ formLabel(element) }} + {% endif %} + {{ formCaptcha(element) }}- {% if page.hasChildren() and depth == 0 %} +
{{ page.getOption('label') }}+ {% else %} {% if page.getOption('icon') %} diff --git a/templates/partial/modals.html.twig b/src/App/templates/partial/modals.html.twig similarity index 100% rename from templates/partial/modals.html.twig rename to src/App/templates/partial/modals.html.twig diff --git a/src/User/ConfigProvider.php b/src/User/src/ConfigProvider.php similarity index 78% rename from src/User/ConfigProvider.php rename to src/User/src/ConfigProvider.php index 2baff46..294b716 100644 --- a/src/User/ConfigProvider.php +++ b/src/User/src/ConfigProvider.php @@ -29,24 +29,35 @@ class ConfigProvider public function __invoke(): array { return [ - 'dependencies' => $this->getDependenciesConfig(), + 'dependencies' => $this->getDependencies(), - 'dot_form' => $this->getFormsConfig(), + 'dot_form' => $this->getForms(), - 'dot_hydrator' => $this->getHydratorsConfig(), + 'dot_hydrator' => $this->getHydrators(), - 'dot_ems' => $this->getMappersConfig(), + 'templates' => $this->getTemplates(), + + 'dot_mapper' => $this->getMappers(), ]; } - public function getDependenciesConfig(): array + public function getDependencies(): array { return [ ]; } - public function getFormsConfig(): array + public function getTemplates(): array + { + return [ + 'paths' => [ + 'app' => [__DIR__ . '/../templates/app'] + ] + ]; + } + + public function getForms(): array { return [ 'form_manager' => [ @@ -64,7 +75,7 @@ public function getFormsConfig(): array ]; } - public function getHydratorsConfig(): array + public function getHydrators(): array { return [ 'hydrator_manager' => [ @@ -78,7 +89,7 @@ public function getHydratorsConfig(): array ]; } - public function getMappersConfig(): array + public function getMappers(): array { return [ 'mapper_manager' => [ diff --git a/src/App/Controller/UserController.php b/src/User/src/Controller/UserController.php similarity index 92% rename from src/App/Controller/UserController.php rename to src/User/src/Controller/UserController.php index 8e55946..9923e3d 100644 --- a/src/App/Controller/UserController.php +++ b/src/User/src/Controller/UserController.php @@ -5,8 +5,9 @@ * @license https://github.com/dotkernel/dot-admin/blob/master/LICENSE.md MIT License */ -namespace Admin\App\Controller; +namespace Admin\User\Controller; +use Admin\App\Controller\EntityManageBaseController; use Admin\User\Entity\UserEntity; use Admin\User\Form\UserForm; use Admin\User\Service\UserService; @@ -24,7 +25,7 @@ class UserController extends EntityManageBaseController const ENTITY_NAME_SINGULAR = 'user'; const ENTITY_NAME_PLURAL = 'users'; const ENTITY_ROUTE_NAME = 'f_user'; - const ENTITY_TEMPLATE_NAME = 'user::user-table'; + const ENTITY_TEMPLATE_NAME = 'app::user-table'; const ENTITY_FORM_NAME = 'User'; const ENTITY_DELETE_FORM_NAME = 'ConfirmDelete'; diff --git a/src/User/Entity/UserDetailsEntity.php b/src/User/src/Entity/UserDetailsEntity.php similarity index 100% rename from src/User/Entity/UserDetailsEntity.php rename to src/User/src/Entity/UserDetailsEntity.php diff --git a/src/User/Entity/UserEntity.php b/src/User/src/Entity/UserEntity.php similarity index 100% rename from src/User/Entity/UserEntity.php rename to src/User/src/Entity/UserEntity.php diff --git a/src/User/Factory/UserDbMapperFactory.php b/src/User/src/Factory/UserDbMapperFactory.php similarity index 96% rename from src/User/Factory/UserDbMapperFactory.php rename to src/User/src/Factory/UserDbMapperFactory.php index ffb7a7f..033ae7b 100644 --- a/src/User/Factory/UserDbMapperFactory.php +++ b/src/User/src/Factory/UserDbMapperFactory.php @@ -13,7 +13,7 @@ use Dot\Mapper\Factory\DbMapperFactory; use Dot\User\Entity\RoleEntity; use Dot\User\Options\UserOptions; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; /** * Class UserDbMapperFactory diff --git a/src/User/Factory/UserFieldsetFactory.php b/src/User/src/Factory/UserFieldsetFactory.php similarity index 97% rename from src/User/Factory/UserFieldsetFactory.php rename to src/User/src/Factory/UserFieldsetFactory.php index e05fe15..f81ab91 100644 --- a/src/User/Factory/UserFieldsetFactory.php +++ b/src/User/src/Factory/UserFieldsetFactory.php @@ -12,7 +12,7 @@ use Admin\User\Entity\UserEntity; use Dot\User\Entity\RoleEntity; use Dot\User\Form\UserFieldset; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Zend\Hydrator\HydratorPluginManager; /** diff --git a/src/User/Factory/UserHydratorFactory.php b/src/User/src/Factory/UserHydratorFactory.php similarity index 94% rename from src/User/Factory/UserHydratorFactory.php rename to src/User/src/Factory/UserHydratorFactory.php index 9aa9a25..bce129c 100644 --- a/src/User/Factory/UserHydratorFactory.php +++ b/src/User/src/Factory/UserHydratorFactory.php @@ -11,7 +11,7 @@ use Admin\User\Hydrator\UserHydrator; use Admin\User\Hydrator\RolesHydratingStrategy; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; /** * Class UserHydratorFactory diff --git a/src/User/Form/UserDetailsFieldset.php b/src/User/src/Form/UserDetailsFieldset.php similarity index 100% rename from src/User/Form/UserDetailsFieldset.php rename to src/User/src/Form/UserDetailsFieldset.php diff --git a/src/User/Form/UserFieldset.php b/src/User/src/Form/UserFieldset.php similarity index 100% rename from src/User/Form/UserFieldset.php rename to src/User/src/Form/UserFieldset.php diff --git a/src/User/Form/UserForm.php b/src/User/src/Form/UserForm.php similarity index 100% rename from src/User/Form/UserForm.php rename to src/User/src/Form/UserForm.php diff --git a/src/User/Hydrator/RolesHydratingStrategy.php b/src/User/src/Hydrator/RolesHydratingStrategy.php similarity index 100% rename from src/User/Hydrator/RolesHydratingStrategy.php rename to src/User/src/Hydrator/RolesHydratingStrategy.php diff --git a/src/User/Hydrator/UserHydrator.php b/src/User/src/Hydrator/UserHydrator.php similarity index 100% rename from src/User/Hydrator/UserHydrator.php rename to src/User/src/Hydrator/UserHydrator.php diff --git a/src/User/Mapper/UserDbMapper.php b/src/User/src/Mapper/UserDbMapper.php similarity index 100% rename from src/User/Mapper/UserDbMapper.php rename to src/User/src/Mapper/UserDbMapper.php diff --git a/src/User/Service/UserService.php b/src/User/src/Service/UserService.php similarity index 100% rename from src/User/Service/UserService.php rename to src/User/src/Service/UserService.php diff --git a/templates/app/user/user-table.html.twig b/src/User/templates/app/user-table.html.twig similarity index 100% rename from templates/app/user/user-table.html.twig rename to src/User/templates/app/user-table.html.twig diff --git a/templates/.gitkeep b/templates/.gitkeep deleted file mode 100644 index e69de29..0000000 - -