1
0
Fork 0

Code style: move all admin-related classes to dedicated namespace

This commit is contained in:
Krzysztof Sikorski 2022-04-25 06:33:16 +02:00
parent 03aa8ce59d
commit 11c3dc8f49
Signed by: krzysztof-sikorski
GPG Key ID: 4EB564BD08FE8476
9 changed files with 19 additions and 10 deletions

View File

@ -6,6 +6,7 @@ use App\Contract\Config\AppParameters;
use App\Contract\Config\AppRoutes;
use App\Contract\UserRoles;
use App\Doctrine\Entity\User;
use App\EasyAdmin\Controller\DashboardController;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
use Symfony\Config\SecurityConfig;
@ -45,7 +46,7 @@ return static function (SecurityConfig $securityConfig, ContainerConfigurator $c
$firewallConfig->logout()->path(value: AppRoutes::LOGOUT);
$accessControlConfig = $securityConfig->accessControl();
$accessControlConfig->path(value: '^/admin');
$accessControlConfig->path(value: DashboardController::ROUTE_SECURITY_REGEXP);
$accessControlConfig->roles(value: [UserRoles::ROLE_ADMIN]);
if ('test' === $containerConfigurator->env()) {

View File

@ -13,6 +13,11 @@ return static function (RoutingConfigurator $routingConfigurator) {
type: AppParameters::CONFIGURATOR_IMPORT_TYPE_ANNOTATION,
);
$routingConfigurator->import(
resource: __DIR__ . '/../src/EasyAdmin/Controller/',
type: AppParameters::CONFIGURATOR_IMPORT_TYPE_ANNOTATION,
);
$routingConfigurator->import(
resource: __DIR__ . '/../src/Kernel.php',
type: AppParameters::CONFIGURATOR_IMPORT_TYPE_ANNOTATION,

View File

@ -12,5 +12,5 @@ final class AppRoutes
public const LOGIN = 'app_login';
public const LOGOUT = 'app_logout';
public const SUBMIT_JSON = 'app_submit_json';
public const ADMIN = 'app_admin';
public const EASYADMIN = 'app_easyadmin';
}

View File

@ -2,7 +2,7 @@
declare(strict_types=1);
namespace App\Controller\Admin;
namespace App\EasyAdmin\Controller;
use App\Contract\Config\AppRoutes;
use App\Doctrine\Entity\PageView;
@ -24,6 +24,9 @@ use Twig\Environment;
final class DashboardController extends AbstractDashboardController
{
public const ROUTE_PATH = '/easyadmin';
public const ROUTE_SECURITY_REGEXP = '^/easyadmin';
public function __construct(
private Environment $twigEnvironment,
private UserRepository $userRepository,
@ -32,7 +35,7 @@ final class DashboardController extends AbstractDashboardController
) {
}
#[Route('/admin', name: AppRoutes::ADMIN)]
#[Route(self::ROUTE_PATH, name: AppRoutes::EASYADMIN)]
public function index(): Response
{
$userTotalCount = $this->userRepository->getTotalCount();
@ -55,7 +58,7 @@ final class DashboardController extends AbstractDashboardController
'page_view_daily_count' => $dataDailyCount,
];
$content = $this->twigEnvironment->render(name: 'admin/dashboard/index.html.twig', context: $context);
$content = $this->twigEnvironment->render(name: 'easyadmin/dashboard/index.html.twig', context: $context);
return new Response(content: $content);
}

View File

@ -2,10 +2,10 @@
declare(strict_types=1);
namespace App\Controller\Admin;
namespace App\EasyAdmin\Controller;
use App\Admin\Field\JsonField;
use App\Doctrine\Entity\PageView;
use App\EasyAdmin\Field\JsonField;
use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
use EasyCorp\Bundle\EasyAdminBundle\Config\Actions;
use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;

View File

@ -2,7 +2,7 @@
declare(strict_types=1);
namespace App\Controller\Admin;
namespace App\EasyAdmin\Controller;
use App\Doctrine\Entity\UserAccessToken;
use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;

View File

@ -2,7 +2,7 @@
declare(strict_types=1);
namespace App\Controller\Admin;
namespace App\EasyAdmin\Controller;
use App\Doctrine\Entity\User;
use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;

View File

@ -1,6 +1,6 @@
<?php
namespace App\Admin\Field;
namespace App\EasyAdmin\Field;
use EasyCorp\Bundle\EasyAdminBundle\Contracts\Field\FieldInterface;
use EasyCorp\Bundle\EasyAdminBundle\Field\FieldTrait;