further integration of EAB with Nucleos [WIP]

zikula · Apr 2, 2023 · b2eda1e · b2eda1e
1 parent 68245a4
commit b2eda1e
Show file tree

Hide file tree

Showing 52 changed files with 139 additions and 2,486 deletions.
diff --git a/src/system/ThemeBundle/Controller/Dashboard/AbstractThemedDashboardController.php b/src/system/ThemeBundle/Controller/Dashboard/AbstractThemedDashboardController.php
@@ -16,7 +16,6 @@
 use EasyCorp\Bundle\EasyAdminBundle\Config\Assets;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Dashboard;
-use EasyCorp\Bundle\EasyAdminBundle\Config\MenuItem;
 use EasyCorp\Bundle\EasyAdminBundle\Config\UserMenu;
 use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractDashboardController;
 use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGenerator;
@@ -26,7 +25,6 @@
 use Symfony\Component\Translation\TranslatableMessage;
 use Zikula\Bundle\CoreBundle\Site\SiteDefinitionInterface;
 use Zikula\ThemeBundle\ExtensionMenu\ExtensionMenuCollector;
-use Zikula\ThemeBundle\ExtensionMenu\ExtensionMenuInterface;
 use Zikula\ThemeBundle\Helper\AdminBundleHelper;
 use Zikula\ThemeBundle\Helper\AdminCategoryHelper;
 use Zikula\ThemeBundle\Helper\UserMenuExtensionHelper;

diff --git a/src/system/ThemeBundle/Helper/UserMenuExtensionHelper.php b/src/system/ThemeBundle/Helper/UserMenuExtensionHelper.php
@@ -28,14 +28,14 @@ public function configureUserMenu(UserMenu $menu, UserInterface $user): UserMenu
     {
         return $menu
             // TODO full name (with fallback to username)
-            //->setName($user->getFullName())
+            // ->setName($user->getFullName())
 
             // TODO avatar
             // the default user avatar is a generic avatar icon
             // you can return an URL with the avatar image
-            //->setAvatarUrl($user->getProfileImageUrl())
+            // ->setAvatarUrl($user->getProfileImageUrl())
             // use this method if you don't want to display the user image
-            //->displayUserAvatar(false)
+            // ->displayUserAvatar(false)
             // you can also pass an email address to use gravatar's service
             ->setGravatarEmail($user->getEmailCanonical())
 

diff --git a/src/system/ThemeBundle/Menu/ExtensionMenu.php b/src/system/ThemeBundle/Menu/ExtensionMenu.php
@@ -32,9 +32,6 @@ public function __construct(
 
     protected function getAdmin(): iterable
     {
-        yield MenuItem::linktoRoute('Bundle categories list', 'fas fa-list', 'zikulathemebundle_admin_view')
-            ->setPermission('ROLE_ADMIN');
-
         if ($this->localeApi->multilingual() && 'dev' === $this->environment) {
             $localizationItems = [];
             $request = $this->requestStack->getCurrentRequest();

diff --git a/src/system/ThemeBundle/Resources/public/js/ZikulaThemeBundle.JSConfig.js b/src/system/ThemeBundle/Resources/public/js/ZikulaThemeBundle.JSConfig.js
diff --git a/src/system/ThemeBundle/Resources/public/js/ZikulaThemeBundle.Phpinfo.js b/src/system/ThemeBundle/Resources/public/js/ZikulaThemeBundle.Phpinfo.js
@@ -1,9 +1,5 @@
 // Copyright Zikula, licensed MIT.
 
-(function($) {
-    $(document).ready(function() {
-        $(function() {
-            $('#phpinfo table').addClass('table table-striped table-bordered');
-        });
-    });
-})(jQuery);
+window.addEventListener('load', function () {
+    document.querySelectorAll('#phpinfo table').forEach(el => el.classList.add('table', 'table-striped', 'table-bordered'));
+}, false);
diff --git a/src/system/ThemeBundle/Resources/views/Branding/overview.html.twig b/src/system/ThemeBundle/Resources/views/Branding/overview.html.twig
@@ -23,7 +23,7 @@
     </tr>
 {% endmacro %}
 
-{% block content_title 'Branding' %}
+{% block content_title 'Branding'|trans %}
 {% block main %}
     <fieldset>
         <legend>{% trans %}Branding images{% endtrans %}</legend>

diff --git a/src/system/ThemeBundle/Resources/views/Tool/phpinfo.html.twig b/src/system/ThemeBundle/Resources/views/Tool/phpinfo.html.twig
@@ -1,10 +1,16 @@
-{{ pageAddAsset('stylesheet', zasset('@ZikulaThemeBundle:css/phpinfo.css'), 100) }}
-<h3>
-    <span class="fas fa-info-circle"></span>
-    {% trans %}PHP configuration{% endtrans %}
-    {{ pageSetVar('title', 'PHP configuration'|trans) }}
-</h3>
-<div id="phpinfo">
-    {{ phpinfo|raw }}
-</div>
-{{ pageAddAsset('javascript', zasset('@ZikulaThemeBundle:js/ZikulaThemeBundle.Phpinfo.js')) }}
+{% extends '@EasyAdmin/page/content.html.twig' %}
+
+{% block content_title 'PHP configuration'|trans %}
+{% block main %}
+    <div id="phpinfo">
+        {{ phpinfo|raw }}
+    </div>
+{% endblock %}
+{% block head_stylesheets %}
+    {{ parent() }}
+    <link rel="stylesheet" href="{{ asset('bundles/zikulatheme/css/phpinfo.css') }}" />
+{% endblock %}
+{% block body_javascript %}
+    {{ parent() }}
+    <script src="{{ asset('bundles/zikulatheme/js/ZikulaThemeBundle.Phpinfo.js') }}"></script>
+{% endblock body_javascript %}
diff --git a/src/system/ThemeBundle/Resources/views/Tool/testmail.html.twig b/src/system/ThemeBundle/Resources/views/Tool/testmail.html.twig
@@ -1,32 +1,31 @@
-<h3>
-    <span class="fas fa-envelope"></span>
-    {% trans %}Test mailer settings{% endtrans %}
-    {{ pageSetVar('title', 'Test mailer settings'|trans) }}
-</h3>
+{% extends '@EasyAdmin/page/content.html.twig' %}
 
-{{ form_start(form) }}
-{{ form_errors(form) }}
+{% block content_title 'Test mailer settings'|trans %}
+{% block main %}
+    {{ form_start(form) }}
+    {{ form_errors(form) }}
 
-<fieldset>
-    <legend>{% trans %}Settings test{% endtrans %}</legend>
-    {{ form_row(form.fromName) }}
-    {{ form_row(form.fromAddress) }}
-    {{ form_row(form.toName) }}
-    {{ form_row(form.toAddress) }}
-    {{ form_row(form.subject) }}
-    {{ form_row(form.messageType) }}
-    <div data-switch="zikulathemebundle_mailtest[messageType]" data-switch-value="html,multipart">
-        {{ form_row(form.bodyHtml) }}
-    </div>
-    <div data-switch="zikulathemebundle_mailtest[messageType]" data-switch-value="text,multipart">
-        {{ form_row(form.bodyText) }}
-    </div>
-</fieldset>
+    <fieldset>
+        <legend>{% trans %}Settings test{% endtrans %}</legend>
+        {{ form_row(form.fromName) }}
+        {{ form_row(form.fromAddress) }}
+        {{ form_row(form.toName) }}
+        {{ form_row(form.toAddress) }}
+        {{ form_row(form.subject) }}
+        {{ form_row(form.messageType) }}
+        <div data-switch="zikulathemebundle_mailtest[messageType]" data-switch-value="html,multipart">
+            {{ form_row(form.bodyHtml) }}
+        </div>
+        <div data-switch="zikulathemebundle_mailtest[messageType]" data-switch-value="text,multipart">
+            {{ form_row(form.bodyText) }}
+        </div>
+    </fieldset>
 
-<div class="form-group row">
-    <div class="col-md-9 offset-md-3">
-        {{ form_widget(form.test) }}
-        {{ form_widget(form.cancel) }}
+    <div class="form-group row">
+        <div class="col-md-9 offset-md-3">
+            {{ form_widget(form.test) }}
+            {{ form_widget(form.cancel) }}
+        </div>
     </div>
-</div>
-{{ form_end(form) }}
+    {{ form_end(form) }}
+{% endblock %}
diff --git a/src/system/UsersBundle/Command/DeleteCommand.php b/src/system/UsersBundle/Command/DeleteCommand.php
diff --git a/src/system/UsersBundle/Controller/AccountController.php b/src/system/UsersBundle/Controller/AccountController.php
@@ -25,22 +25,15 @@
 use Zikula\Bundle\CoreBundle\Api\ApiInterface\LocaleApiInterface;
 use Zikula\UsersBundle\Api\ApiInterface\CurrentUserApiInterface;
 use Zikula\UsersBundle\Entity\User;
-use Zikula\UsersBundle\Event\DeleteUserFormPostCreatedEvent;
-use Zikula\UsersBundle\Event\DeleteUserFormPostValidatedEvent;
 use Zikula\UsersBundle\Form\Type\ChangeLanguageType;
-use Zikula\UsersBundle\Helper\DeleteHelper;
 use Zikula\UsersBundle\Repository\UserRepositoryInterface;
-use Zikula\UsersBundle\UsersConstant;
 
 #[Route('/account')]
 #[IsGranted('ROLE_USER')]
 class AccountController extends AbstractController
 {
-    public function __construct(
-        private readonly TranslatorInterface $translator,
-        private readonly bool $displayGraphics,
-        private readonly bool $allowSelfDeletion
-    ) {
+    public function __construct(private readonly TranslatorInterface $translator)
+    {
     }
 
     /**

diff --git a/src/system/UsersBundle/Controller/GroupCrudController.php b/src/system/UsersBundle/Controller/GroupCrudController.php
@@ -27,15 +27,15 @@
 use Nucleos\UserBundle\Model\GroupManager;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
 use Zikula\UsersBundle\Entity\Group;
-use Zikula\UsersBundle\Helper\RoleHelper;
+use Zikula\UsersBundle\Helper\ChoiceHelper;
 use function Symfony\Component\Translation\t;
 
 #[IsGranted('ROLE_ADMIN')]
 class GroupCrudController extends AbstractCrudController
 {
     public function __construct(
         private readonly GroupManager $groupManager,
-        private readonly RoleHelper $roleHelper
+        private readonly ChoiceHelper $choiceHelper
     ) {
     }
 
@@ -66,15 +66,15 @@ public function configureFields(string $pageName): iterable
     {
         yield 'id' => IdField::new('id', t('Id'))->hideOnForm()->setTextAlign('right')->setRequired(true);
         yield 'name' => TextField::new('name', t('Group name'))->setRequired(true);
-        yield 'roles' => ChoiceField::new('roles', t('Roles'))->setRequired(false)->setChoices($this->roleHelper->getRoleOptions())->allowMultipleChoices();
+        yield 'roles' => ChoiceField::new('roles', t('Roles'))->setRequired(false)->setChoices($this->choiceHelper->getRoles())->allowMultipleChoices();
     }
 
     public function configureFilters(Filters $filters): Filters
     {
         return $filters
             ->add('id')
             ->add('name')
-            ->add(ChoiceFilter::new('roles')->setChoices($this->roleHelper->getRoleOptions())->canSelectMultiple())
+            ->add(ChoiceFilter::new('roles')->setChoices($this->choiceHelper->getRoles())->canSelectMultiple())
         ;
     }