diff --git a/composer.json b/composer.json index deac5a7ac..7ef857653 100644 --- a/composer.json +++ b/composer.json @@ -72,6 +72,7 @@ "psr-4": { "Sylius\\AdminUi\\": "src/AdminUi/src/", "Sylius\\BootstrapAdminUi\\": "src/BootstrapAdminUi/src/", + "Sylius\\DaisyAdminUi\\": "src/DaisyAdminUi/src/", "Sylius\\TwigExtra\\": "src/TwigExtra/src/", "Sylius\\TwigHooks\\": "src/TwigHooks/src/", "Sylius\\UiTranslations\\": "src/UiTranslations/src/" diff --git a/config/bundles.php b/config/bundles.php index 3b7656806..17dc7366a 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -9,6 +9,7 @@ Sylius\AdminUi\Symfony\SyliusAdminUiBundle::class => ['all' => true], Sylius\UiTranslations\Symfony\SyliusUiTranslationsBundle::class => ['all' => true], Sylius\BootstrapAdminUi\Symfony\SyliusBootstrapAdminUiBundle::class => ['all' => true], + Sylius\DaisyAdminUi\Symfony\SyliusDaisyAdminUiBundle::class => ['all' => true], Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true], Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true], Symfony\UX\LiveComponent\LiveComponentBundle::class => ['all' => true], diff --git a/config/packages/sylius_bootstrap_admin_ui.yaml b/config/packages/sylius_bootstrap_admin_ui.yaml index 5186cc247..a74b4f358 100644 --- a/config/packages/sylius_bootstrap_admin_ui.yaml +++ b/config/packages/sylius_bootstrap_admin_ui.yaml @@ -1,2 +1,3 @@ -imports: - - { resource: '../../src/BootstrapAdminUi/config/app.php' } +#imports: +# - { resource: '../sylius/twig_hooks/**/**' } +# - { resource: '../../src/BootstrapAdminUi/config/app.php' } diff --git a/config/packages/sylius_daisy_admin_ui.yaml b/config/packages/sylius_daisy_admin_ui.yaml new file mode 100644 index 000000000..ea7a0abf8 --- /dev/null +++ b/config/packages/sylius_daisy_admin_ui.yaml @@ -0,0 +1,2 @@ +imports: + - { resource: '../../src/DaisyAdminUi/config/app.php' } diff --git a/config/packages/sylius_twig_hooks.yaml b/config/packages/sylius_twig_hooks.yaml index 9840623d3..8d21d36e0 100644 --- a/config/packages/sylius_twig_hooks.yaml +++ b/config/packages/sylius_twig_hooks.yaml @@ -1,6 +1,3 @@ -imports: - - { resource: '../sylius/twig_hooks/**/**' } - sylius_twig_hooks: hooks: 'app.base': diff --git a/src/BootstrapAdminUi/tests/Functional/.application/config/bundles.php b/src/BootstrapAdminUi/tests/Functional/.application/config/bundles.php index 9cf650501..47fd6f418 100644 --- a/src/BootstrapAdminUi/tests/Functional/.application/config/bundles.php +++ b/src/BootstrapAdminUi/tests/Functional/.application/config/bundles.php @@ -18,7 +18,7 @@ Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true], Symfony\UX\TwigComponent\TwigComponentBundle::class => ['all' => true], Sylius\TwigHooks\SyliusTwigHooksBundle::class => ['all' => true], - Sylius\BootstrapAdminUi\Symfony\SyliusBootstrapAdminUiBundle::class => ['all' => true], + Sylius\BootstrapAdminUi\Symfony\SyliusDaisyAdminUiBundle::class => ['all' => true], Sylius\Bundle\GridBundle\SyliusGridBundle::class => ['all' => true], Sylius\Bundle\ResourceBundle\SyliusResourceBundle::class => ['all' => true], Sylius\TwigExtra\Symfony\SyliusTwigExtraBundle::class => ['all' => true], diff --git a/src/DaisyAdminUi/composer.json b/src/DaisyAdminUi/composer.json new file mode 100644 index 000000000..a632e2910 --- /dev/null +++ b/src/DaisyAdminUi/composer.json @@ -0,0 +1,60 @@ +{ + "name": "sylius/daisy-admin-ui", + "description": "Build your DaisyUI admin panels with Sylius and Symfony UX", + "type": "library", + "require": { + "php": "^8.1", + "pagerfanta/twig": "^4.6", + "sylius/admin-ui": "^0.9", + "sylius/grid-bundle": "^1.13", + "sylius/resource-bundle": "^1.11", + "sylius/twig-extra": "^0.9", + "sylius/twig-hooks": "^0.9", + "symfony/asset": "^6.4 || ^7.0", + "symfony/http-kernel": "^6.4 || ^7.0", + "symfony/http-client": "^6.4 || ^7.0", + "symfony/security-bundle": "^6.4 || ^7.0", + "symfony/ux-autocomplete": "^2.17", + "symfony/ux-icons": "^2.20", + "symfony/ux-live-component": "^2.17" + }, + "require-dev": { + "doctrine/doctrine-bundle": "^2.12", + "doctrine/orm": "^2.0", + "phpunit/phpunit": "^9.6", + "symfony/browser-kit": "^6.4 || ^7.0", + "symfony/console": "^6.4 || ^7.0", + "symfony/css-selector": "^6.4 || ^7.0", + "symfony/dotenv": "^6.4 || ^7.0", + "symfony/framework-bundle": "^6.4 || ^7.0", + "symfony/runtime": "^6.4 || ^7.0", + "symfony/yaml": "^6.4 || ^7.0" + }, + "autoload": { + "psr-4": { + "Sylius\\DaisyAdminUi\\": "src/" + } + }, + "config": { + "allow-plugins": { + "symfony/runtime": true + }, + "sort-packages": true + }, + "repositories": [ + { + "type": "path", + "url": "../**" + } + ], + "extra": { + "symfony": { + "require": "7.1.*" + }, + "branch-alias": { + "dev-main": "0.9-dev" + } + }, + "minimum-stability": "dev", + "prefer-stable": true +} diff --git a/src/DaisyAdminUi/config/app.php b/src/DaisyAdminUi/config/app.php new file mode 100644 index 000000000..a48e0e6a9 --- /dev/null +++ b/src/DaisyAdminUi/config/app.php @@ -0,0 +1,18 @@ +import('./app/**/**.php'); +}; diff --git a/src/DaisyAdminUi/config/app/twig_hooks/.gitignore b/src/DaisyAdminUi/config/app/twig_hooks/.gitignore new file mode 100644 index 000000000..e69de29bb diff --git a/src/DaisyAdminUi/src/Symfony/SyliusDaisyAdminUiBundle.php b/src/DaisyAdminUi/src/Symfony/SyliusDaisyAdminUiBundle.php new file mode 100644 index 000000000..c3bc84e04 --- /dev/null +++ b/src/DaisyAdminUi/src/Symfony/SyliusDaisyAdminUiBundle.php @@ -0,0 +1,39 @@ +path)) { + $reflected = new \ReflectionObject($this); + $this->path = \dirname($reflected->getFileName(), 3); + } + + return $this->path; + } + + public function prependExtension(ContainerConfigurator $container, ContainerBuilder $builder): void + { + $container->extension('sylius_twig_hooks', [ + 'enable_autoprefixing' => true, + 'hook_name_section_separator' => '#', + ]); + } +}