Compare commits
275 commits
Author | SHA1 | Date | |
---|---|---|---|
Simon Vieille | a80dc9999c | ||
Simon Vieille | b9566853ef | ||
Simon Vieille | bc7e8ef263 | ||
Simon Vieille | 25efd11ea3 | ||
Simon Vieille | e23f7d3c73 | ||
Simon Vieille | 85f054956c | ||
Simon Vieille | b12f4db16f | ||
Simon Vieille | 6bb29dd5c3 | ||
Simon Vieille | 7824e96bab | ||
Simon Vieille | 56177c14da | ||
Simon Vieille | 4f1c5b8f14 | ||
Simon Vieille | e8c9520378 | ||
Simon Vieille | 283223446a | ||
Simon Vieille | 46e01f504f | ||
Simon Vieille | a80ee03fcd | ||
Simon Vieille | d1649a4959 | ||
Simon Vieille | 38791f1d7a | ||
Simon Vieille | d74cd52711 | ||
Simon Vieille | b451df61e8 | ||
Simon Vieille | 7c124008c0 | ||
Simon Vieille | 9cf95dba64 | ||
Simon Vieille | b680946daf | ||
Simon Vieille | 1995298977 | ||
Simon Vieille | 4acba618cb | ||
Simon Vieille | 92eaaba699 | ||
Simon Vieille | 357856f8ce | ||
Simon Vieille | dfbe282d0e | ||
Simon Vieille | 857fcd9897 | ||
Simon Vieille | 48ca5a96e6 | ||
Simon Vieille | 065bb0db22 | ||
Simon Vieille | bf6777054f | ||
Simon Vieille | 51acd82432 | ||
Simon Vieille | c6cbc405e4 | ||
Simon Vieille | 150f3afd6a | ||
Simon Vieille | 4a0e616897 | ||
Simon Vieille | 4eb13a4022 | ||
Simon Vieille | 8bb6267a77 | ||
Simon Vieille | 8044ff3605 | ||
Simon Vieille | 71d3d40d5f | ||
Simon Vieille | 9324837bd9 | ||
Simon Vieille | b8dfaaed10 | ||
Simon Vieille | 2d49b8ddee | ||
Simon Vieille | 232b92267e | ||
Simon Vieille | ca23a22807 | ||
Simon Vieille | 78965bbf10 | ||
Simon Vieille | 7fe1acd47d | ||
Simon Vieille | 26cbaa8469 | ||
Simon Vieille | 7897bafcc2 | ||
Simon Vieille | 63a8a60e2d | ||
Simon Vieille | d01e9d618b | ||
Simon Vieille | 96347a1730 | ||
Simon Vieille | aeb0e6c109 | ||
Simon Vieille | 64258a2d8c | ||
Simon Vieille | 70329ceeda | ||
Simon Vieille | 1adb1ebe2b | ||
Simon Vieille | f57cc8e4d6 | ||
Simon Vieille | b21967028e | ||
Simon Vieille | 5b22851674 | ||
Simon Vieille | 4082bb171a | ||
Simon Vieille | dc19617fb1 | ||
Simon Vieille | dbd2036fb0 | ||
Simon Vieille | 8e2566abc8 | ||
Simon Vieille | 66e1a9c87f | ||
Simon Vieille | 6709c0a303 | ||
Simon Vieille | 614ae40901 | ||
Simon Vieille | 430bff9433 | ||
Simon Vieille | 6441da8a27 | ||
Simon Vieille | 801e3317e7 | ||
Simon Vieille | f7604d2a45 | ||
Simon Vieille | 8a632a1b14 | ||
Simon Vieille | 4701090134 | ||
Simon Vieille | c40c7e3362 | ||
Simon Vieille | 8edbf0cc08 | ||
Simon Vieille | 175321bc2d | ||
Simon Vieille | 5d6531d197 | ||
Simon Vieille | 90603f62e0 | ||
Simon Vieille | 053f4aa5b8 | ||
Simon Vieille | 79754d45c1 | ||
Simon Vieille | c98ea50f30 | ||
Simon Vieille | 0f1bc761b2 | ||
Simon Vieille | 50dbb07314 | ||
Simon Vieille | 72e783f865 | ||
Simon Vieille | ee28c9abb7 | ||
2bd6836a7f | |||
6f961ba79b | |||
e095fc4197 | |||
6736f94eea | |||
93a1e7811d | |||
a0027c0b69 | |||
498c71081d | |||
8713b401f9 | |||
1463f43298 | |||
b89e036c49 | |||
1d0b657c83 | |||
0cadf28738 | |||
ede8d4fdcb | |||
5c3f2ab1e7 | |||
c1eb277a6a | |||
d3f27d97ad | |||
5e392d469a | |||
67f79083ef | |||
b9b07c1409 | |||
521ed5ce64 | |||
dda43ef3cc | |||
c65cc26be8 | |||
2f884df602 | |||
8979fc5beb | |||
bd663838f6 | |||
177b23365b | |||
645ae700d4 | |||
7614c24012 | |||
1f2edf183b | |||
28a4f63640 | |||
7fceefa6d3 | |||
a08c62229d | |||
f97f1dfedf | |||
45b3f6bb80 | |||
21ee41ff29 | |||
8d5de79192 | |||
212afe2775 | |||
16dd0d5744 | |||
9957523c59 | |||
688f66e94e | |||
c9b997e75d | |||
374db9117f | |||
4048152a8e | |||
4385e7a525 | |||
5d3999f766 | |||
03c0d6cfd2 | |||
290a4750bc | |||
7d647d3bb4 | |||
d637c44e5c | |||
19d26e6bd0 | |||
109584d933 | |||
c3209c68dd | |||
4a5b67dd93 | |||
4573a8d31e | |||
405909a4e7 | |||
2b3e2027c9 | |||
76b25f3bca | |||
ca25210d1c | |||
0ab960ed0a | |||
8e0a7f178b | |||
200dd0b8d6 | |||
bd4338bb2d | |||
64b524b04e | |||
6a5c5d899f | |||
b38fe0fe00 | |||
d21ab30ebe | |||
a96a6377d5 | |||
946a421900 | |||
f7eb5b0b49 | |||
0dadc670d9 | |||
4a0b13e6e3 | |||
1936b366df | |||
4541bbfb8a | |||
f3674ad4e0 | |||
ddf1fecc90 | |||
0c61cb9355 | |||
fc1a1c617e | |||
bea2d1cc9f | |||
4bf6b048c3 | |||
81194a1d67 | |||
10221591c2 | |||
231742eb0d | |||
f1d956ee5c | |||
5de35c3408 | |||
f144760085 | |||
e2c9ecb941 | |||
f9a20716a0 | |||
b107f077de | |||
2729b38fd8 | |||
baeecc0f7f | |||
8667188675 | |||
895d5065ca | |||
c688cc0552 | |||
c0340ec5a9 | |||
650ea3ede0 | |||
497ee2f027 | |||
8b13d37e71 | |||
3219ba47aa | |||
7ca8a4aa04 | |||
7ba417a03e | |||
27cbfd1110 | |||
1069a4ad46 | |||
a134a41926 | |||
b915b8b3ed | |||
42ab4d85f0 | |||
902ac81e4b | |||
e74469a687 | |||
219526e3a2 | |||
1cea077598 | |||
de6ca18c0a | |||
3127018a73 | |||
9e0eda4338 | |||
03afb6fb4b | |||
e402c49835 | |||
0a7550940d | |||
5626a2522a | |||
8ebb54c9a9 | |||
98c2d70367 | |||
e623e9fb46 | |||
6b222dd4f7 | |||
bc1f8e7cf9 | |||
Simon Vieille | 3f4aeda307 | ||
Simon Vieille | a13d3c9f3c | ||
Simon Vieille | d80d02bc07 | ||
Simon Vieille | 4491c12684 | ||
Simon Vieille | e54019d4d9 | ||
Simon Vieille | 34747236ef | ||
Simon Vieille | 173ed9aa83 | ||
Simon Vieille | 154e6d3e0b | ||
Simon Vieille | 25a47ebfb1 | ||
Simon Vieille | 9454ceb539 | ||
Simon Vieille | 7dc463d14a | ||
Simon Vieille | e130a42a57 | ||
Simon Vieille | 6f5cda1bbc | ||
Simon Vieille | dd5a2f55de | ||
Simon Vieille | 6074d4cde6 | ||
Simon Vieille | cf3bc02ed7 | ||
Simon Vieille | 6e0a4107c7 | ||
Simon Vieille | a16f4f998e | ||
Simon Vieille | 3540f42c2d | ||
Simon Vieille | d436f38668 | ||
Simon Vieille | 280f7f01b1 | ||
Simon Vieille | baf43e21f9 | ||
Simon Vieille | feb627478b | ||
Simon Vieille | 3d6f6bb7b3 | ||
Simon Vieille | e91a395c34 | ||
Simon Vieille | 061a63d6a2 | ||
Simon Vieille | 41c441105d | ||
Simon Vieille | 65d3aab76e | ||
Simon Vieille | 0f5571b33e | ||
Simon Vieille | af98f7bfea | ||
Simon Vieille | 79817a4e92 | ||
Simon Vieille | c1e7e3ddf0 | ||
Simon Vieille | cf33f4b5a3 | ||
Simon Vieille | 4abb262e5c | ||
Simon Vieille | 17974843d9 | ||
Simon Vieille | a715f7e474 | ||
Simon Vieille | 7eaf77cb9b | ||
Simon Vieille | 3e1b674985 | ||
Simon Vieille | 70a01a2be3 | ||
Simon Vieille | fda4ed5175 | ||
Simon Vieille | 815f578478 | ||
Simon Vieille | 53280aeccd | ||
Simon Vieille | 8e06dab2b3 | ||
Simon Vieille | a8def20853 | ||
Simon Vieille | bd7a2544e8 | ||
Simon Vieille | 99337b341f | ||
Simon Vieille | ff599a7101 | ||
Simon Vieille | 6bf65ccd2b | ||
Simon Vieille | 170e74b5b7 | ||
Simon Vieille | c140f402e4 | ||
Simon Vieille | 1d5e0addec | ||
Simon Vieille | a6250f8f3a | ||
Simon Vieille | 67a5890573 | ||
Simon Vieille | e428ae5674 | ||
Simon Vieille | 0184693743 | ||
Simon Vieille | bb7acbd6de | ||
Simon Vieille | 06805b0293 | ||
Simon Vieille | edc9c25d70 | ||
Simon Vieille | e3f6793ce6 | ||
Simon Vieille | 82d7d98d65 | ||
Simon Vieille | f9f8185280 | ||
Simon Vieille | c39fee15ed | ||
Simon Vieille | df106c70c9 | ||
Simon Vieille | 1b6b3ab0c6 | ||
Simon Vieille | f77c4691b9 | ||
Simon Vieille | 75e3cf41f6 | ||
Simon Vieille | 7fa7d10b01 | ||
Simon Vieille | bb7dfc2f25 | ||
Simon Vieille | a2e7466e12 | ||
Simon Vieille | 2249374547 | ||
Simon Vieille | 443ccabd0b |
149
CHANGELOG.md
149
CHANGELOG.md
|
@ -1,8 +1,157 @@
|
|||
## [Unreleased]
|
||||
|
||||
## [v1.25.1] - 2024-05-13
|
||||
### Added
|
||||
* add drag&drop in the block builder
|
||||
|
||||
## [v1.25.0] - 2024-05-12
|
||||
### Added
|
||||
* add block builder widget
|
||||
* allow to use `window.tinymceModes` to add or override tinymce modes
|
||||
* add border color on tinymce editor
|
||||
### Fixed
|
||||
* fix default crud sort
|
||||
* fix hidden save button in file manager
|
||||
* fix template of CrudController (maker)
|
||||
* fix undefined `window.tinymce.murph`
|
||||
|
||||
## [v1.24.1] - 2024-02-01
|
||||
### Fixed
|
||||
* update Murph version constant
|
||||
|
||||
## [v1.24.0] - 2024-01-27
|
||||
### Added
|
||||
* add CSS class `no-wrap`
|
||||
* copy the pager of the CRUD at the bottom of the list
|
||||
### Fixed
|
||||
* fix an issue with the file manager when editing an item opened in a modal
|
||||
* fix type casting in slugifier
|
||||
|
||||
## [v1.23.0] - 2023-11-01
|
||||
### Added
|
||||
* allow to define templates show before and after a murph collection item
|
||||
* add global batch actions
|
||||
* add constraint `Length` in forms
|
||||
* add sass classes to mange with of elements
|
||||
* set searchFields option on jschoice manager (search on labels)
|
||||
### Changed
|
||||
* refactor services using constructor property promotions
|
||||
* remove twig in the mail notifier service
|
||||
* change pills colors
|
||||
* change border colors of inputs when focused
|
||||
* change colors on js-choices element
|
||||
### Fixed
|
||||
* fix regression on crud sorting
|
||||
* fix test in RepositoryQuery::addForcedFilterHandler
|
||||
* remove parameter $option on CrudConfiguration::setForm and fix CrudController make template
|
||||
* fix the aspect of the actions's column in the crud
|
||||
|
||||
## [v1.22.0] - 2023-09-28
|
||||
### Added
|
||||
* add new options in BooleanField: `toggle|checkbox_class_when_true` and `toggle|checkbox_class_when_false`
|
||||
* add `count` method in repository query
|
||||
* add `addForcedFilterHandler` method in repository query
|
||||
* add `inline_form_validation` option to validate inline forms with custom algo
|
||||
* add crud sorting parameters in the session
|
||||
* add flush option in the entity manager on create, update, remove, and persist methods
|
||||
|
||||
## [1.21.1] - 2023-08-17
|
||||
### Added
|
||||
* add form error handle in inline edit action and refill the form using the previous request content
|
||||
* add form error handle in ssettings actions and refill the form using the previous request content
|
||||
### Fixed
|
||||
* fix tinymce reload when modal is closed and reopened
|
||||
* fix modal hiding when a file is successfuly uploaded in the file manager
|
||||
|
||||
## [1.21.0] - 2023-08-11
|
||||
### Added
|
||||
* allow to use array syntax in string builder filter
|
||||
* add color property in Navigation
|
||||
* add badge with navigation color in admin views
|
||||
* add `default_value` option in crud fields
|
||||
* add `display` option in BooleanField
|
||||
* add associated nodes in page form
|
||||
### Fixed
|
||||
* fix routes in the global settings controller
|
||||
|
||||
## [1.20.0] - 2023-07-27
|
||||
### Added
|
||||
* enable double click on cruds
|
||||
* add block class name for the choice type in the page maker
|
||||
* update file details view on the file manager
|
||||
* add form options in the crud filter action
|
||||
* add trans filter in inline form modal title
|
||||
* add setter to define all fields in a defined context
|
||||
* add filename generator setter in FileUploadHandler
|
||||
* add variable for the sidebar size
|
||||
* add twig block to override defaults actions in crud index template
|
||||
* add option to remove iterable values and/or specifics keys in the twig toArray function
|
||||
* add boolean field for CRUD
|
||||
* add context variable in each controllers to simplify overrides
|
||||
* core.site.name and core.site.logo are not longer required
|
||||
* add default templates when a crud is generated
|
||||
* add boolean 'is_disabled' in the menu item template options
|
||||
### Fixed
|
||||
* fix filemanager date ordering
|
||||
* fix maker CrudController template: remove bad pasted code
|
||||
* fix redirect listener: use boolean instead of integer
|
||||
* fix responsive of account edit template
|
||||
* fix collection widget: allow_add/allow_delete and prototype
|
||||
### Changed
|
||||
* user admin routes are defined in core, custom controller is not required
|
||||
|
||||
## [1.19.0] - 2023-04-15
|
||||
### Added
|
||||
* feat(page): forms for metas, opengraph and extra informations can be removed
|
||||
* feat(navigation): user interface is improved
|
||||
* feat(file): webp is allowed and shown in form widgets and in file manager details
|
||||
* feat(file): the file manager now show the size and the modification date of a file
|
||||
* feat(crud): add option `action` in field to add a link to the view page or to the edition page
|
||||
* feat(crud): add option `inline_form` in field to configure to edit the data
|
||||
* feat(crud): add `setDoubleClick` in the crud configuration
|
||||
|
||||
## [1.18.0] - 2023-01-13
|
||||
### Added
|
||||
* feat(dep): add symfony/runtime
|
||||
* feat(dep): add symfony/flex
|
||||
### Fixed
|
||||
* fix(crud): allow POST in delete actions
|
||||
* fix(crud): remove default page value in abstract crud controller
|
||||
* fix(admin): test site_logo before using it
|
||||
* fix(ui): update z-index of choices__list--dropdown
|
||||
|
||||
## [1.17.1] - 2022-12-03
|
||||
### Fixed
|
||||
* add mising attribute on timestampable (doctrine)
|
||||
|
||||
## [1.17.0] - 2022-11-19
|
||||
### Fixed
|
||||
* fix tinymce modal z-index in tox
|
||||
### Changed
|
||||
* replace annotation with attributes
|
||||
|
||||
## [1.16.0] - 2022-09-06
|
||||
### Added
|
||||
* add A/B testing feature
|
||||
* add cleanup of html string extracted from grapesjs content
|
||||
### Fixed
|
||||
* fix file block type
|
||||
### Changed
|
||||
* remove dashboard action from the core
|
||||
|
||||
## [1.15.0] - 2022-05-09
|
||||
### Added
|
||||
* CrudConfiguration::setAction can receive a callable instead of a boolean in 'enabled' param
|
||||
* add grapesjs-component-code-editor and grapesjs-parser-postcss
|
||||
* hide the backoffice site name when small resolution
|
||||
* add entity_to_array twig function
|
||||
* add default field to show in crud configuration
|
||||
### Fixed
|
||||
* fix the mail notifier
|
||||
* fix sitemap: navigation with several domains
|
||||
* fix regression with editorjs: content not loaded
|
||||
### Changed
|
||||
* change default template to show an entity using `entity_to_array`
|
||||
|
||||
## [1.14.1] - 2022-04-30
|
||||
### Added
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
"symfony/event-dispatcher": "5.4.*",
|
||||
"symfony/expression-language": "5.4.*",
|
||||
"symfony/finder": "5.4.*",
|
||||
"symfony/flex": "^1.3.1",
|
||||
"symfony/flex": "^2.2",
|
||||
"symfony/form": "5.4.*",
|
||||
"symfony/framework-bundle": "5.4.*",
|
||||
"symfony/http-client": "5.4.*",
|
||||
|
@ -60,7 +60,8 @@
|
|||
"symfony/webpack-encore-bundle": "^1.11",
|
||||
"symfony/yaml": "5.4.*",
|
||||
"twig/extra-bundle": "^2.12|^3.3",
|
||||
"twig/twig": "^2.12|^3.3"
|
||||
"twig/twig": "^2.12|^3.3",
|
||||
"symfony/runtime": "^5.4"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
|
|
30
src/core/Ab/AbContainer.php
Normal file
30
src/core/Ab/AbContainer.php
Normal file
|
@ -0,0 +1,30 @@
|
|||
<?php
|
||||
|
||||
namespace App\Core\Ab;
|
||||
|
||||
/**
|
||||
* class AbContainer.
|
||||
*
|
||||
* @author Simon Vieille <simon@deblan.fr>
|
||||
*/
|
||||
class AbContainer implements AbContainerInterface
|
||||
{
|
||||
protected array $tests = [];
|
||||
|
||||
public function add(AbTestInterface $test): self
|
||||
{
|
||||
$this->tests[$test->getName()] = $test;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function has(string $name): bool
|
||||
{
|
||||
return isset($this->tests[$name]);
|
||||
}
|
||||
|
||||
public function get(string $name): AbTestInterface
|
||||
{
|
||||
return $this->tests[$name];
|
||||
}
|
||||
}
|
17
src/core/Ab/AbContainerInterface.php
Normal file
17
src/core/Ab/AbContainerInterface.php
Normal file
|
@ -0,0 +1,17 @@
|
|||
<?php
|
||||
|
||||
namespace App\Core\Ab;
|
||||
|
||||
/**
|
||||
* interface AbContainerInterface.
|
||||
*
|
||||
* @author Simon Vieille <simon@deblan.fr>
|
||||
*/
|
||||
interface AbContainerInterface
|
||||
{
|
||||
public function add(AbTestInterface $test): self;
|
||||
|
||||
public function has(string $name): bool;
|
||||
|
||||
public function get(string $name): AbTestInterface;
|
||||
}
|
123
src/core/Ab/AbTest.php
Normal file
123
src/core/Ab/AbTest.php
Normal file
|
@ -0,0 +1,123 @@
|
|||
<?php
|
||||
|
||||
namespace App\Core\Ab;
|
||||
|
||||
/**
|
||||
* class AbTest.
|
||||
*
|
||||
* @author Simon Vieille <simon@deblan.fr>
|
||||
*/
|
||||
class AbTest implements AbTestInterface
|
||||
{
|
||||
protected $results;
|
||||
protected array $variations = [];
|
||||
protected array $probabilities = [];
|
||||
protected int $duration = 3600 * 24;
|
||||
|
||||
public function __construct(protected string $name)
|
||||
{
|
||||
}
|
||||
|
||||
public function getName(): string
|
||||
{
|
||||
return $this->name;
|
||||
}
|
||||
|
||||
public function getResult()
|
||||
{
|
||||
return $this->result;
|
||||
}
|
||||
|
||||
public function setResult(string $result): self
|
||||
{
|
||||
$this->result = $result;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function isValidVariation($variation): bool
|
||||
{
|
||||
return array_key_exists($variation, $this->variations);
|
||||
}
|
||||
|
||||
public function addVariation(string $name, $value, int $probability = null): self
|
||||
{
|
||||
$this->variations[$name] = $value;
|
||||
$this->probabilities[$name] = $probability;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getVariation($variation)
|
||||
{
|
||||
return $this->variations[$variation];
|
||||
}
|
||||
|
||||
public function getResultValue()
|
||||
{
|
||||
return $this->getVariation($this->getResult());
|
||||
}
|
||||
|
||||
public function setDuration(int $duration): self
|
||||
{
|
||||
$this->duration = $duration;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getDuration(): int
|
||||
{
|
||||
return $this->duration;
|
||||
}
|
||||
|
||||
public function run(): self
|
||||
{
|
||||
$this->result = $this->chance();
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
protected function chance(): string
|
||||
{
|
||||
$sum = 0;
|
||||
$empty = 0;
|
||||
|
||||
foreach ($this->probabilities as $name => $value) {
|
||||
$sum += $value;
|
||||
|
||||
if (empty($value)) {
|
||||
++$empty;
|
||||
}
|
||||
}
|
||||
|
||||
if ($sum > 100) {
|
||||
throw new \LogicException('Test Error: Total variation probabilities is bigger than 100%');
|
||||
}
|
||||
|
||||
if ($sum < 100) {
|
||||
foreach ($this->probabilities as $name => $value) {
|
||||
if (empty($value)) {
|
||||
$this->probabilities[$name] = (100 - $sum) / $empty;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
krsort($this->probabilities);
|
||||
|
||||
$number = mt_rand(0, (int) array_sum($this->probabilities) * 10);
|
||||
$starter = 0;
|
||||
$return = '';
|
||||
|
||||
foreach ($this->probabilities as $key => $val) {
|
||||
$starter += $val * 10;
|
||||
|
||||
if ($number <= $starter) {
|
||||
$return = $key;
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return $return;
|
||||
}
|
||||
}
|
31
src/core/Ab/AbTestInterface.php
Normal file
31
src/core/Ab/AbTestInterface.php
Normal file
|
@ -0,0 +1,31 @@
|
|||
<?php
|
||||
|
||||
namespace App\Core\Ab;
|
||||
|
||||
/**
|
||||
* interface AbTestInterface.
|
||||
*
|
||||
* @author Simon Vieille <simon@deblan.fr>
|
||||
*/
|
||||
interface AbTestInterface
|
||||
{
|
||||
public function getName(): string;
|
||||
|
||||
public function getResult();
|
||||
|
||||
public function setResult(string $result): self;
|
||||
|
||||
public function isValidVariation($variation): bool;
|
||||
|
||||
public function addVariation(string $name, $value, int $probability = null): self;
|
||||
|
||||
public function getVariation($variation);
|
||||
|
||||
public function getResultValue();
|
||||
|
||||
public function setDuration(int $duration): self;
|
||||
|
||||
public function getDuration(): int;
|
||||
|
||||
public function run(): self;
|
||||
}
|
|
@ -13,18 +13,16 @@ use App\Core\Repository\Analytic\ViewRepositoryQuery;
|
|||
*/
|
||||
class DateRangeAnalytic
|
||||
{
|
||||
protected ViewRepositoryQuery $viewQuery;
|
||||
protected RefererRepositoryQuery $refererQuery;
|
||||
protected ?Node $node;
|
||||
protected ?\DateTime $from;
|
||||
protected ?\DateTime $to;
|
||||
protected bool $reload = true;
|
||||
protected array $cache = [];
|
||||
|
||||
public function __construct(ViewRepositoryQuery $viewQuery, RefererRepositoryQuery $refererQuery)
|
||||
{
|
||||
$this->viewQuery = $viewQuery;
|
||||
$this->refererQuery = $refererQuery;
|
||||
public function __construct(
|
||||
protected ViewRepositoryQuery $viewQuery,
|
||||
protected RefererRepositoryQuery $refererQuery
|
||||
) {
|
||||
}
|
||||
|
||||
public function getViews(): array
|
||||
|
@ -83,7 +81,7 @@ class DateRangeAnalytic
|
|||
$datas[$index]['mobileViews'] += $entity->getMobileViews();
|
||||
}
|
||||
|
||||
uasort($datas, function($a, $b) {
|
||||
uasort($datas, function ($a, $b) {
|
||||
if ($a['views'] > $b['views']) {
|
||||
return -1;
|
||||
}
|
||||
|
@ -130,7 +128,7 @@ class DateRangeAnalytic
|
|||
$datas[$index]['uris'][$path] += $entity->getViews();
|
||||
}
|
||||
|
||||
uasort($datas, function($a, $b) {
|
||||
uasort($datas, function ($a, $b) {
|
||||
if ($a['views'] > $b['views']) {
|
||||
return -1;
|
||||
}
|
||||
|
|
|
@ -2,19 +2,18 @@
|
|||
|
||||
namespace App\Core\Annotation;
|
||||
|
||||
use Doctrine\Common\Annotations\Annotation;
|
||||
|
||||
/**
|
||||
* class UrlGenerator.
|
||||
*
|
||||
* @author Simon Vieille <simon@deblan.fr>
|
||||
* @Annotation
|
||||
*/
|
||||
#[\Attribute]
|
||||
class UrlGenerator
|
||||
{
|
||||
public string $service;
|
||||
|
||||
public string $method;
|
||||
|
||||
public array $options = [];
|
||||
public function __construct(
|
||||
public string $service,
|
||||
public string $method,
|
||||
public array $options = []
|
||||
) {
|
||||
}
|
||||
}
|
||||
|
|
|
@ -23,20 +23,12 @@ class LoginFormAuthenticator extends AbstractFormLoginAuthenticator
|
|||
{
|
||||
use TargetPathTrait;
|
||||
|
||||
private EntityManagerInterface $entityManager;
|
||||
|
||||
private UrlGeneratorInterface $urlGenerator;
|
||||
|
||||
private CsrfTokenManagerInterface $csrfTokenManager;
|
||||
|
||||
private UserPasswordEncoderInterface $passwordEncoder;
|
||||
|
||||
public function __construct(EntityManagerInterface $entityManager, UrlGeneratorInterface $urlGenerator, CsrfTokenManagerInterface $csrfTokenManager, UserPasswordEncoderInterface $passwordEncoder)
|
||||
{
|
||||
$this->entityManager = $entityManager;
|
||||
$this->urlGenerator = $urlGenerator;
|
||||
$this->csrfTokenManager = $csrfTokenManager;
|
||||
$this->passwordEncoder = $passwordEncoder;
|
||||
public function __construct(
|
||||
private EntityManagerInterface $entityManager,
|
||||
private UrlGeneratorInterface $urlGenerator,
|
||||
private CsrfTokenManagerInterface $csrfTokenManager,
|
||||
private UserPasswordEncoderInterface $passwordEncoder
|
||||
) {
|
||||
}
|
||||
|
||||
public function supports(Request $request)
|
||||
|
|
47
src/core/BuilderBlock/Block/Bootstrap/AlertBlock.php
Normal file
47
src/core/BuilderBlock/Block/Bootstrap/AlertBlock.php
Normal file
|
@ -0,0 +1,47 @@
|
|||
<?php
|
||||
|
||||
namespace App\Core\BuilderBlock\Block\Bootstrap;
|
||||
|
||||
use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
|
||||
use Symfony\Contracts\Translation\TranslatorInterface;
|
||||
|
||||
#[AutoconfigureTag('builder_block.widget')]
|
||||
class AlertBlock extends BootstrapBlock
|
||||
{
|
||||
public function __construct(protected TranslatorInterface $translator)
|
||||
{
|
||||
}
|
||||
|
||||
public function configure()
|
||||
{
|
||||
parent::configure();
|
||||
|
||||
$options = [];
|
||||
|
||||
foreach ([
|
||||
'Primary' => 'primary',
|
||||
'Secondary' => 'secondary',
|
||||
'Info' => 'info',
|
||||
'Success' => 'success',
|
||||
'Danger' => 'danger',
|
||||
'Warning' => 'warning',
|
||||
'Light' => 'light',
|
||||
'Dark' => 'dark',
|
||||
] as $k => $v) {
|
||||
$options[] = [
|
||||
'text' => $this->translator->trans($k),
|
||||
'value' => $v,
|
||||
];
|
||||
}
|
||||
|
||||
$this
|
||||
->setName('bsAlert')
|
||||
->setLabel('Alert')
|
||||
->setOrder(4)
|
||||
->setIsContainer(true)
|
||||
->setIcon('<i class="fas fa-exclamation-circle"></i>')
|
||||
->setTemplate('@Core/builder_block/bootstrap/alert.html.twig')
|
||||
->addSetting(name: 'level', label: 'Level', type: 'select', extraOptions: ['options' => $options])
|
||||
;
|
||||
}
|
||||
}
|
14
src/core/BuilderBlock/Block/Bootstrap/BootstrapBlock.php
Normal file
14
src/core/BuilderBlock/Block/Bootstrap/BootstrapBlock.php
Normal file
|
@ -0,0 +1,14 @@
|
|||
<?php
|
||||
|
||||
namespace App\Core\BuilderBlock\Block\Bootstrap;
|
||||
|
||||
use App\Core\BuilderBlock\BuilderBlock;
|
||||
use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
|
||||
|
||||
class BootstrapBlock extends BuilderBlock
|
||||
{
|
||||
public function configure()
|
||||
{
|
||||
$this->setCategory('Bootstrap');
|
||||
}
|
||||
}
|
30
src/core/BuilderBlock/Block/Bootstrap/ColumnBlock.php
Normal file
30
src/core/BuilderBlock/Block/Bootstrap/ColumnBlock.php
Normal file
|
@ -0,0 +1,30 @@
|
|||
<?php
|
||||
|
||||
namespace App\Core\BuilderBlock\Block\Bootstrap;
|
||||
|
||||
use App\Core\BuilderBlock\BuilderBlock;
|
||||
use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
|
||||
|
||||
#[AutoconfigureTag('builder_block.widget')]
|
||||
class ColumnBlock extends BootstrapBlock
|
||||
{
|
||||
public function configure()
|
||||
{
|
||||
parent::configure();
|
||||
|
||||
$this
|
||||
->setName('bsColumn')
|
||||
->setLabel('Column')
|
||||
->setIsContainer(true)
|
||||
->setOrder(3)
|
||||
->setClass('col-12 col-lg-2 pr-md-1')
|
||||
->setTemplate('@Core/builder_block/bootstrap/column.html.twig')
|
||||
->setIcon('<i class="fas fa-columns"></i>')
|
||||
->addSetting(name: 'size', label: 'Extra small', type: 'number', attributes: ['min' => 0, 'max' => 12])
|
||||
->addSetting(name: 'sizeSm', label: 'Small', type: 'number', attributes: ['min' => 0, 'max' => 12])
|
||||
->addSetting(name: 'sizeMd', label: 'Medium', type: 'number', attributes: ['min' => 0, 'max' => 12])
|
||||
->addSetting(name: 'sizeLg', label: 'Large', type: 'number', attributes: ['min' => 0, 'max' => 12])
|
||||
->addSetting(name: 'sizeXl', label: 'Extra large', type: 'number', attributes: ['min' => 0, 'max' => 12])
|
||||
;
|
||||
}
|
||||
}
|
25
src/core/BuilderBlock/Block/Bootstrap/ContainerBlock.php
Normal file
25
src/core/BuilderBlock/Block/Bootstrap/ContainerBlock.php
Normal file
|
@ -0,0 +1,25 @@
|
|||
<?php
|
||||
|
||||
namespace App\Core\BuilderBlock\Block\Bootstrap;
|
||||
|
||||
use App\Core\BuilderBlock\BuilderBlock;
|
||||
use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
|
||||
|
||||
#[AutoconfigureTag('builder_block.widget')]
|
||||
class ContainerBlock extends BootstrapBlock
|
||||
{
|
||||
public function configure()
|
||||
{
|
||||
parent::configure();
|
||||
|
||||
$this
|
||||
->setName('bsContainer')
|
||||
->setLabel('Container')
|
||||
->setIsContainer(true)
|
||||
->setOrder(1)
|
||||
->setTemplate('@Core/builder_block/bootstrap/container.html.twig')
|
||||
->setIcon('<i class="fas fa-th"></i>')
|
||||
->addSetting(name: 'isFluid', label: 'Fluid', type: 'checkbox')
|
||||
;
|
||||
}
|
||||
}
|
25
src/core/BuilderBlock/Block/Bootstrap/RowBlock.php
Normal file
25
src/core/BuilderBlock/Block/Bootstrap/RowBlock.php
Normal file
|
@ -0,0 +1,25 @@
|
|||
<?php
|
||||
|
||||
namespace App\Core\BuilderBlock\Block\Bootstrap;
|
||||
|
||||
use App\Core\BuilderBlock\BuilderBlock;
|
||||
use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
|
||||
|
||||
#[AutoconfigureTag('builder_block.widget')]
|
||||
class RowBlock extends BootstrapBlock
|
||||
{
|
||||
public function configure()
|
||||
{
|
||||
parent::configure();
|
||||
|
||||
$this
|
||||
->setName('bsRow')
|
||||
->setLabel('Row')
|
||||
->setOrder(2)
|
||||
->setIsContainer(true)
|
||||
->setIcon('<i class="fas fa-align-justify"></i>')
|
||||
->setTemplate('@Core/builder_block/bootstrap/row.html.twig')
|
||||
->addWidget('bsColumn')
|
||||
;
|
||||
}
|
||||
}
|
14
src/core/BuilderBlock/Block/Editor/EditorBlock.php
Normal file
14
src/core/BuilderBlock/Block/Editor/EditorBlock.php
Normal file
|
@ -0,0 +1,14 @@
|
|||
<?php
|
||||
|
||||
namespace App\Core\BuilderBlock\Block\Editor;
|
||||
|
||||
use App\Core\BuilderBlock\BuilderBlock;
|
||||
use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
|
||||
|
||||
class EditorBlock extends BuilderBlock
|
||||
{
|
||||
public function configure()
|
||||
{
|
||||
$this->setCategory('Editor');
|
||||
}
|
||||
}
|
26
src/core/BuilderBlock/Block/Editor/TextareaBlock.php
Normal file
26
src/core/BuilderBlock/Block/Editor/TextareaBlock.php
Normal file
|
@ -0,0 +1,26 @@
|
|||
<?php
|
||||
|
||||
namespace App\Core\BuilderBlock\Block\Editor;
|
||||
|
||||
use App\Core\BuilderBlock\BuilderBlock;
|
||||
use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
|
||||
|
||||
#[AutoconfigureTag('builder_block.widget')]
|
||||
class TextareaBlock extends EditorBlock
|
||||
{
|
||||
public function configure()
|
||||
{
|
||||
parent::configure();
|
||||
|
||||
$this
|
||||
->setName('textarea')
|
||||
->setLabel('Text')
|
||||
->setIsContainer(false)
|
||||
->setIcon('<i class="fas fa-pencil-alt"></i>')
|
||||
->setTemplate('@Core/builder_block/editor/textarea.html.twig')
|
||||
->addSetting(name: 'nl2br', label: 'Insert line breaks', type: 'checkbox', default: true)
|
||||
->addSetting(name: 'allowHtml', label: 'Allow HTML', type: 'checkbox', default: false)
|
||||
->addSetting(name: 'value', type: 'textarea')
|
||||
;
|
||||
}
|
||||
}
|
24
src/core/BuilderBlock/Block/Editor/TinymceBlock.php
Normal file
24
src/core/BuilderBlock/Block/Editor/TinymceBlock.php
Normal file
|
@ -0,0 +1,24 @@
|
|||
<?php
|
||||
|
||||
namespace App\Core\BuilderBlock\Block\Editor;
|
||||
|
||||
use App\Core\BuilderBlock\BuilderBlock;
|
||||
use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
|
||||
|
||||
#[AutoconfigureTag('builder_block.widget')]
|
||||
class TinymceBlock extends EditorBlock
|
||||
{
|
||||
public function configure()
|
||||
{
|
||||
parent::configure();
|
||||
|
||||
$this
|
||||
->setName('tinymce')
|
||||
->setLabel('TinyMCE')
|
||||
->setIsContainer(false)
|
||||
->setIcon('<i class="fas fa-pencil-alt"></i>')
|
||||
->setTemplate('@Core/builder_block/editor/tinymce.html.twig')
|
||||
->addSetting(name: 'value', type: 'textarea', attributes: ['data-tinymce' => ''])
|
||||
;
|
||||
}
|
||||
}
|
195
src/core/BuilderBlock/BuilderBlock.php
Normal file
195
src/core/BuilderBlock/BuilderBlock.php
Normal file
|
@ -0,0 +1,195 @@
|
|||
<?php
|
||||
|
||||
namespace App\Core\BuilderBlock;
|
||||
|
||||
abstract class BuilderBlock
|
||||
{
|
||||
protected string $name;
|
||||
protected string $label;
|
||||
protected ?string $class = 'col-12';
|
||||
protected ?string $category = null;
|
||||
protected array $settings = [];
|
||||
protected array $widgets = [];
|
||||
protected array $vars = [];
|
||||
protected string $template = '';
|
||||
protected bool $isContainer = false;
|
||||
protected ?string $icon = null;
|
||||
protected int $order = 1;
|
||||
|
||||
abstract public function configure();
|
||||
|
||||
public function setLabel(string $label): self
|
||||
{
|
||||
$this->label = $label;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getLabel(): string
|
||||
{
|
||||
return $this->label;
|
||||
}
|
||||
|
||||
public function setName(string $name): self
|
||||
{
|
||||
$this->name = $name;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getName(): string
|
||||
{
|
||||
return $this->name;
|
||||
}
|
||||
|
||||
public function setCategory(?string $category): self
|
||||
{
|
||||
$this->category = $category;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getCategory(): ?string
|
||||
{
|
||||
return $this->category;
|
||||
}
|
||||
|
||||
public function setIsContainer(bool $isContainer): self
|
||||
{
|
||||
$this->isContainer = $isContainer;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getIsContainer(): bool
|
||||
{
|
||||
return $this->isContainer;
|
||||
}
|
||||
|
||||
public function setWidgets(array $widgets): self
|
||||
{
|
||||
$this->widgets = $widgets;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function addWidget(string $widget): self
|
||||
{
|
||||
if (!in_array($widget, $this->widgets)) {
|
||||
$this->widgets[] = $widget;
|
||||
}
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getWidgets(): array
|
||||
{
|
||||
return $this->widgets;
|
||||
}
|
||||
|
||||
public function setSettings(array $settings): self
|
||||
{
|
||||
$this->settings = $settings;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function addSetting(
|
||||
string $name,
|
||||
string $type = 'input',
|
||||
?string $label = null,
|
||||
array $attributes = [],
|
||||
array $extraOptions = [],
|
||||
$default = null
|
||||
) {
|
||||
$this->settings[$name] = [
|
||||
'label' => $label,
|
||||
'type' => $type,
|
||||
'attr' => $attributes,
|
||||
'default' => $default,
|
||||
];
|
||||
|
||||
foreach ($extraOptions as $key => $value) {
|
||||
if (!in_array($key, array_keys($this->settings[$name]))) {
|
||||
$this->settings[$name][$key] = $value;
|
||||
}
|
||||
}
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getSettings(): array
|
||||
{
|
||||
return $this->settings;
|
||||
}
|
||||
|
||||
public function setTemplate(string $template): self
|
||||
{
|
||||
$this->template = $template;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getTemplate(): string
|
||||
{
|
||||
return $this->template;
|
||||
}
|
||||
|
||||
public function setClass(?string $class): self
|
||||
{
|
||||
$this->class = $class;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getClass(): ?string
|
||||
{
|
||||
return $this->class;
|
||||
}
|
||||
|
||||
public function setIcon(?string $icon): self
|
||||
{
|
||||
$this->icon = $icon;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getIcon(): ?string
|
||||
{
|
||||
return $this->icon;
|
||||
}
|
||||
|
||||
public function setOrder(int $order): self
|
||||
{
|
||||
$this->order = $order;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getOrder(): int
|
||||
{
|
||||
return $this->order;
|
||||
}
|
||||
|
||||
public function buildVars(array $data, array $context)
|
||||
{
|
||||
}
|
||||
|
||||
public function getVars(): array
|
||||
{
|
||||
return $this->vars;
|
||||
}
|
||||
|
||||
public function toArray(): array
|
||||
{
|
||||
return [
|
||||
'label' => $this->getLabel(),
|
||||
'category' => $this->getCategory(),
|
||||
'isContainer' => $this->getIsContainer(),
|
||||
'widgets' => $this->getWidgets(),
|
||||
'settings' => $this->getSettings(),
|
||||
'class' => $this->getClass(),
|
||||
'icon' => $this->getIcon(),
|
||||
];
|
||||
}
|
||||
}
|
41
src/core/BuilderBlock/BuilderBlockContainer.php
Normal file
41
src/core/BuilderBlock/BuilderBlockContainer.php
Normal file
|
@ -0,0 +1,41 @@
|
|||
<?php
|
||||
|
||||
namespace App\Core\BuilderBlock;
|
||||
|
||||
class BuilderBlockContainer
|
||||
{
|
||||
protected array $widgets = [];
|
||||
|
||||
public function addWidget(BuilderBlock $widget): self
|
||||
{
|
||||
$widget->configure();
|
||||
|
||||
$this->widgets[$widget->getName()] = $widget;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function removeWidget(string $name)
|
||||
{
|
||||
unset($this->widgets[$name]);
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getWidgets(): array
|
||||
{
|
||||
usort($this->widgets, fn(BuilderBlock $a, BuilderBlock $b) => $a->getOrder() <=> $b->getOrder());
|
||||
|
||||
return $this->widgets;
|
||||
}
|
||||
|
||||
public function hasWidget(string $name)
|
||||
{
|
||||
return isset($this->widgets[$name]);
|
||||
}
|
||||
|
||||
public function getWidget(string $name): BuilderBlock
|
||||
{
|
||||
return $this->widgets[$name];
|
||||
}
|
||||
}
|
|
@ -12,8 +12,8 @@
|
|||
namespace App\Core\Bundle;
|
||||
|
||||
use App\Core\DependencyInjection\CoreExtension;
|
||||
use Symfony\Component\HttpKernel\Bundle\Bundle;
|
||||
use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
|
||||
use Symfony\Component\HttpKernel\Bundle\Bundle;
|
||||
|
||||
class CoreBundle extends Bundle
|
||||
{
|
||||
|
|
|
@ -5,13 +5,13 @@ namespace App\Core\Cache;
|
|||
use Symfony\Bundle\FrameworkBundle\Console\Application;
|
||||
use Symfony\Component\Console\Input\ArrayInput;
|
||||
use Symfony\Component\Console\Output\BufferedOutput;
|
||||
use Symfony\Component\Finder\Finder;
|
||||
use Symfony\Component\HttpKernel\KernelInterface;
|
||||
use Symfony\Contracts\HttpClient\HttpClientInterface;
|
||||
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
|
||||
use Symfony\Component\HttpClient\Exception\ClientException;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
use Symfony\Component\Finder\Finder;
|
||||
use Symfony\Component\HttpClient\Exception\ClientException;
|
||||
use Symfony\Component\HttpClient\Exception\TransportException;
|
||||
use Symfony\Component\HttpKernel\KernelInterface;
|
||||
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
|
||||
use Symfony\Contracts\HttpClient\HttpClientInterface;
|
||||
|
||||
/**
|
||||
* class SymfonyCacheManager.
|
||||
|
@ -20,15 +20,11 @@ use Symfony\Component\HttpClient\Exception\TransportException;
|
|||
*/
|
||||
class SymfonyCacheManager
|
||||
{
|
||||
protected KernelInterface $kernel;
|
||||
protected HttpClientInterface $httpClient;
|
||||
protected UrlGeneratorInterface $urlGenerator;
|
||||
|
||||
public function __construct(KernelInterface $kernel, HttpClientInterface $httpClient, UrlGeneratorInterface $urlGenerator)
|
||||
{
|
||||
$this->kernel = $kernel;
|
||||
$this->httpClient = $httpClient;
|
||||
$this->urlGenerator = $urlGenerator;
|
||||
public function __construct(
|
||||
protected KernelInterface $kernel,
|
||||
protected HttpClientInterface $httpClient,
|
||||
protected UrlGeneratorInterface $urlGenerator
|
||||
) {
|
||||
}
|
||||
|
||||
public function cleanRouting()
|
||||
|
|
|
@ -18,19 +18,12 @@ class UserCreateCommand extends Command
|
|||
{
|
||||
protected static $defaultName = 'murph:user:create';
|
||||
protected static $defaultDescription = 'Creates a user';
|
||||
protected UserFactory $userFactory;
|
||||
protected EntityManager $entityManager;
|
||||
protected TokenGeneratorInterface $tokenGenerator;
|
||||
|
||||
public function __construct(
|
||||
UserFactory $userFactory,
|
||||
EntityManager $entityManager,
|
||||
TokenGeneratorInterface $tokenGenerator
|
||||
protected UserFactory $userFactory,
|
||||
protected EntityManager $entityManager,
|
||||
protected TokenGeneratorInterface $tokenGenerator
|
||||
) {
|
||||
$this->userFactory = $userFactory;
|
||||
$this->entityManager = $entityManager;
|
||||
$this->tokenGenerator = $tokenGenerator;
|
||||
|
||||
parent::__construct();
|
||||
}
|
||||
|
||||
|
|
|
@ -14,14 +14,10 @@ use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
|
|||
use Symfony\Component\Security\Csrf\TokenGenerator\TokenGeneratorInterface;
|
||||
use ZxcvbnPhp\Zxcvbn;
|
||||
|
||||
/**
|
||||
* @Route("/admin/account")
|
||||
*/
|
||||
#[Route(path: '/admin/account')]
|
||||
class AccountAdminController extends AdminController
|
||||
{
|
||||
/**
|
||||
* @Route("/", name="admin_account")
|
||||
*/
|
||||
#[Route(path: '/', name: 'admin_account')]
|
||||
public function account(Request $request, TotpAuthenticatorInterface $totpAuthenticatorService): Response
|
||||
{
|
||||
$account = $this->getUser();
|
||||
|
@ -31,9 +27,7 @@ class AccountAdminController extends AdminController
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/2fa", name="admin_account_2fa")
|
||||
*/
|
||||
#[Route(path: '/2fa', name: 'admin_account_2fa')]
|
||||
public function twoFactorAuthentication(
|
||||
Request $request,
|
||||
GoogleAuthenticatorInterface $totpAuthenticatorService,
|
||||
|
@ -93,9 +87,7 @@ class AccountAdminController extends AdminController
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/password", name="admin_account_password", methods={"POST"})
|
||||
*/
|
||||
#[Route(path: '/password', name: 'admin_account_password', methods: ['POST'])]
|
||||
public function password(
|
||||
Request $request,
|
||||
UserRepository $repository,
|
||||
|
|
|
@ -9,9 +9,7 @@ use Symfony\Component\Routing\Annotation\Route;
|
|||
|
||||
abstract class AdminController extends AbstractController
|
||||
{
|
||||
/**
|
||||
* @Route("/_ping", name="_ping")
|
||||
*/
|
||||
#[Route(path: '/_ping', name: '_ping')]
|
||||
public function ping()
|
||||
{
|
||||
return $this->json(true);
|
||||
|
|
|
@ -26,7 +26,7 @@ abstract class CrudController extends AdminController
|
|||
|
||||
abstract protected function getConfiguration(): CrudConfiguration;
|
||||
|
||||
protected function doIndex(int $page = 1, RepositoryQuery $query, Request $request, Session $session): Response
|
||||
protected function doIndex(int $page, RepositoryQuery $query, Request $request, Session $session, string $context = 'index'): Response
|
||||
{
|
||||
$configuration = $this->getConfiguration();
|
||||
|
||||
|
@ -35,13 +35,14 @@ abstract class CrudController extends AdminController
|
|||
|
||||
$pager = $query
|
||||
->usefilters($this->filters)
|
||||
->paginate($page, $configuration->getmaxperpage('index'))
|
||||
->paginate($page, $configuration->getMaxPerPage($context))
|
||||
;
|
||||
|
||||
return $this->render($this->getConfiguration()->getView('index'), [
|
||||
return $this->render($this->getConfiguration()->getView($context), [
|
||||
'configuration' => $configuration,
|
||||
'pager' => $pager,
|
||||
'sort' => $this->sort,
|
||||
'context' => $context,
|
||||
'filters' => [
|
||||
'show' => null !== $configuration->getForm('filter'),
|
||||
'isEmpty' => empty($this->filters),
|
||||
|
@ -49,13 +50,13 @@ abstract class CrudController extends AdminController
|
|||
]);
|
||||
}
|
||||
|
||||
protected function doNew(EntityInterface $entity, EntityManager $entityManager, Request $request, callable $beforeCreate = null): Response
|
||||
protected function doNew(EntityInterface $entity, EntityManager $entityManager, Request $request, callable $beforeCreate = null, string $context = 'new'): Response
|
||||
{
|
||||
$configuration = $this->getConfiguration();
|
||||
|
||||
$this->prepareEntity($entity);
|
||||
|
||||
$form = $this->createForm($configuration->getForm('new'), $entity, $configuration->getFormOptions('new'));
|
||||
$form = $this->createForm($configuration->getForm('new'), $entity, $configuration->getFormOptions($context));
|
||||
|
||||
if ($request->isMethod('POST')) {
|
||||
$form->handleRequest($request);
|
||||
|
@ -76,30 +77,32 @@ abstract class CrudController extends AdminController
|
|||
$this->addFlash('warning', 'The form is not valid.');
|
||||
}
|
||||
|
||||
return $this->render($configuration->getView('new'), [
|
||||
return $this->render($configuration->getView($context), [
|
||||
'form' => $form->createView(),
|
||||
'configuration' => $configuration,
|
||||
'context' => $context,
|
||||
'entity' => $entity,
|
||||
]);
|
||||
}
|
||||
|
||||
protected function doShow(EntityInterface $entity): Response
|
||||
protected function doShow(EntityInterface $entity, string $context = 'show'): Response
|
||||
{
|
||||
$configuration = $this->getConfiguration();
|
||||
|
||||
return $this->render($configuration->getView('show'), [
|
||||
return $this->render($configuration->getView($context), [
|
||||
'entity' => $entity,
|
||||
'context' => $context,
|
||||
'configuration' => $configuration,
|
||||
]);
|
||||
}
|
||||
|
||||
protected function doEdit(EntityInterface $entity, EntityManager $entityManager, Request $request, callable $beforeUpdate = null): Response
|
||||
protected function doEdit(EntityInterface $entity, EntityManager $entityManager, Request $request, callable $beforeUpdate = null, string $context = 'edit'): Response
|
||||
{
|
||||
$configuration = $this->getConfiguration();
|
||||
|
||||
$this->prepareEntity($entity);
|
||||
|
||||
$form = $this->createForm($configuration->getForm('edit'), $entity, $configuration->getFormOptions('edit'));
|
||||
$form = $this->createForm($configuration->getForm('edit'), $entity, $configuration->getFormOptions($context));
|
||||
|
||||
if ($request->isMethod('POST')) {
|
||||
$form->handleRequest($request);
|
||||
|
@ -112,22 +115,109 @@ abstract class CrudController extends AdminController
|
|||
$entityManager->update($entity);
|
||||
$this->addFlash('success', 'The data has been saved.');
|
||||
|
||||
return $this->redirectToRoute($configuration->getPageRoute('edit'), array_merge(
|
||||
return $this->redirectToRoute($configuration->getPageRoute($context), array_merge(
|
||||
['entity' => $entity->getId()],
|
||||
$configuration->getPageRouteParams('edit')
|
||||
$configuration->getPageRouteParams($context)
|
||||
));
|
||||
}
|
||||
$this->addFlash('warning', 'The form is not valid.');
|
||||
}
|
||||
|
||||
return $this->render($configuration->getView('edit'), [
|
||||
return $this->render($configuration->getView($context), [
|
||||
'form' => $form->createView(),
|
||||
'context' => $context,
|
||||
'configuration' => $configuration,
|
||||
'entity' => $entity,
|
||||
]);
|
||||
}
|
||||
|
||||
protected function doSort(int $page = 1, RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session): Response
|
||||
protected function doInlineEdit(string $context, string $label, EntityInterface $entity, EntityManager $entityManager, Request $request, callable $beforeUpdate = null): Response
|
||||
{
|
||||
$configuration = $this->getConfiguration();
|
||||
|
||||
$this->prepareEntity($entity);
|
||||
|
||||
$builder = $this->createFormBuilder($entity);
|
||||
$callback = $configuration->getFields($context)[$label]['options']['inline_form'] ?? null;
|
||||
$validationCallback = $configuration->getFields($context)[$label]['options']['inline_form_validation'] ?? null;
|
||||
|
||||
if (null === $callback) {
|
||||
throw $this->createNotFoundException();
|
||||
}
|
||||
|
||||
call_user_func_array($callback, [$builder, $entity]);
|
||||
|
||||
$redirectTo = $request->query->get('redirectTo');
|
||||
|
||||
$form = $builder->getForm();
|
||||
$session = $request->getSession();
|
||||
|
||||
$lastRequestId = sprintf(
|
||||
'inline_request_%s_%s_%s_%s',
|
||||
get_class($entity),
|
||||
$entity->getId(),
|
||||
$context,
|
||||
$label
|
||||
);
|
||||
|
||||
$lastRequest = $session->get($lastRequestId);
|
||||
|
||||
if (null !== $lastRequest && !$request->isMethod('POST')) {
|
||||
$fakeRequest = Request::create(
|
||||
uri: $request->getUri(),
|
||||
method: 'POST',
|
||||
parameters: [$form->getName() => $lastRequest]
|
||||
);
|
||||
|
||||
$form->handleRequest($fakeRequest);
|
||||
|
||||
if (null !== $validationCallback) {
|
||||
call_user_func_array($validationCallback, [$entity, $form, $request]);
|
||||
}
|
||||
|
||||
$session->remove($lastRequestId);
|
||||
}
|
||||
|
||||
if ($request->isMethod('POST')) {
|
||||
$form->handleRequest($request);
|
||||
|
||||
if (null !== $validationCallback) {
|
||||
call_user_func_array($validationCallback, [$entity, $form, $request]);
|
||||
}
|
||||
|
||||
if ($form->isValid()) {
|
||||
if (null !== $beforeUpdate) {
|
||||
call_user_func_array($beforeUpdate, [$entity, $form, $request]);
|
||||
}
|
||||
|
||||
$session->remove($lastRequestId);
|
||||
$entityManager->update($entity);
|
||||
$this->addFlash('success', 'The data has been saved.');
|
||||
|
||||
return $this->redirect($redirectTo);
|
||||
}
|
||||
|
||||
$session->set($lastRequestId, $request->request->get('form'));
|
||||
$this->addFlash('warning', 'The form is not valid.');
|
||||
|
||||
return $this->redirect(sprintf(
|
||||
'%s?data-modal=%s',
|
||||
$redirectTo,
|
||||
urlencode($request->getUri())
|
||||
));
|
||||
}
|
||||
|
||||
return $this->render($configuration->getView('inline_edit'), [
|
||||
'form' => $form->createView(),
|
||||
'configuration' => $configuration,
|
||||
'entity' => $entity,
|
||||
'context' => $context,
|
||||
'label' => $label,
|
||||
'redirectTo' => $redirectTo,
|
||||
]);
|
||||
}
|
||||
|
||||
protected function doSort(int $page, RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session): Response
|
||||
{
|
||||
$configuration = $this->getConfiguration();
|
||||
$context = $request->query->get('context', 'index');
|
||||
|
@ -165,7 +255,7 @@ abstract class CrudController extends AdminController
|
|||
return $this->json([]);
|
||||
}
|
||||
|
||||
protected function doBatch(int $page = 1, RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session): Response
|
||||
protected function doBatch(int $page, RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session): Response
|
||||
{
|
||||
$configuration = $this->getConfiguration();
|
||||
$datas = $request->request->get('batch', []);
|
||||
|
@ -194,16 +284,39 @@ abstract class CrudController extends AdminController
|
|||
|
||||
$query->useFilters($this->filters);
|
||||
|
||||
if ('selection' === $target) {
|
||||
$isSelection = true;
|
||||
$pager = $query->paginate($page, $configuration->getMaxPerPage($context));
|
||||
} else {
|
||||
$isSelection = false;
|
||||
$pager = $query->find();
|
||||
$useSelection = 'selection' === $target;
|
||||
|
||||
if ($batchAction['isGlobal']) {
|
||||
$selection = null;
|
||||
|
||||
if ($useSelection) {
|
||||
$queryClone = clone $query;
|
||||
$pager = $queryClone->paginate($page, $configuration->getMaxPerPage($context));
|
||||
$selection = [];
|
||||
|
||||
foreach ($pager as $key => $entity) {
|
||||
if (isset($items[$key + 1])) {
|
||||
$selection[] = $entity;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$result = $callback($query, $entityManager, $selection);
|
||||
|
||||
if ($result instanceof Response) {
|
||||
return $result;
|
||||
}
|
||||
|
||||
return $this->redirect($request->query->get('redirectTo'));
|
||||
}
|
||||
|
||||
$pager = $useSelection
|
||||
? $query->paginate($page, $configuration->getMaxPerPage($context))
|
||||
: $query->find()
|
||||
;
|
||||
|
||||
foreach ($pager as $key => $entity) {
|
||||
if (($isSelection && isset($items[$key + 1])) || !$isSelection) {
|
||||
if (($useSelection && isset($items[$key + 1])) || !$useSelection) {
|
||||
$callback($entity, $entityManager);
|
||||
}
|
||||
}
|
||||
|
@ -213,7 +326,7 @@ abstract class CrudController extends AdminController
|
|||
return $this->json([]);
|
||||
}
|
||||
|
||||
protected function doDelete(EntityInterface $entity, EntityManager $entityManager, Request $request, callable $beforeDelete = null): Response
|
||||
protected function doDelete(EntityInterface $entity, EntityManager $entityManager, Request $request, callable $beforeDelete = null, string $route = 'index'): Response
|
||||
{
|
||||
$configuration = $this->getConfiguration();
|
||||
|
||||
|
@ -227,10 +340,10 @@ abstract class CrudController extends AdminController
|
|||
$this->addFlash('success', 'The data has been removed.');
|
||||
}
|
||||
|
||||
return $this->redirectToRoute($configuration->getPageRoute('index'));
|
||||
return $this->redirectToRoute($configuration->getPageRoute($route));
|
||||
}
|
||||
|
||||
protected function doFilter(Session $session): Response
|
||||
protected function doFilter(Session $session, string $context = 'filter'): Response
|
||||
{
|
||||
$configuration = $this->getConfiguration();
|
||||
$type = $configuration->getForm('filter');
|
||||
|
@ -239,11 +352,12 @@ abstract class CrudController extends AdminController
|
|||
throw $this->createNotFoundException();
|
||||
}
|
||||
|
||||
$form = $this->createForm($type);
|
||||
$form = $this->createForm($type, null, $configuration->getFormOptions('filter'));
|
||||
$form->submit($session->get($form->getName(), []));
|
||||
|
||||
return $this->render($configuration->getView('filter'), [
|
||||
return $this->render($configuration->getView($context), [
|
||||
'form' => $form->createView(),
|
||||
'context' => $context,
|
||||
'configuration' => $configuration,
|
||||
]);
|
||||
}
|
||||
|
@ -257,7 +371,7 @@ abstract class CrudController extends AdminController
|
|||
return;
|
||||
}
|
||||
|
||||
$form = $this->createForm($type);
|
||||
$form = $this->createForm($type, null, $configuration->getFormOptions('filter'));
|
||||
|
||||
if ($request->query->has($form->getName())) {
|
||||
$filters = $request->query->get($form->getName());
|
||||
|
@ -304,9 +418,27 @@ abstract class CrudController extends AdminController
|
|||
}
|
||||
|
||||
$defaultSort = $configuration->getDefaultSort($context);
|
||||
$session = $request->getSession();
|
||||
|
||||
$name = $request->query->get('_sort', $defaultSort['label'] ?? null);
|
||||
$direction = strtolower($request->query->get('_sort_direction', $defaultSort['direction'] ?? 'asc'));
|
||||
$sessionId = sprintf('%s_%s_sort', $context, get_called_class());
|
||||
$sessionSortName = sprintf('%s_label', $sessionId);
|
||||
$sessionSortDirection = sprintf('%s_direction', $sessionId);
|
||||
|
||||
$name = $request->query->get('_sort', $session->get($sessionSortName)) ?? $defaultSort['label'] ?? null;
|
||||
|
||||
$direction = strtolower(
|
||||
$request->query->get(
|
||||
'_sort_direction',
|
||||
$session->get($sessionSortDirection)
|
||||
) ?? $defaultSort['direction'] ?? 'asc'
|
||||
);
|
||||
|
||||
$session->set($sessionSortName, $name);
|
||||
$session->set($sessionSortDirection, $direction);
|
||||
|
||||
if (empty($name)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!in_array($direction, ['asc', 'desc'])) {
|
||||
$direction = 'asc';
|
||||
|
|
|
@ -8,14 +8,10 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
|||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\Routing\Annotation\Route;
|
||||
|
||||
/**
|
||||
* @Route("/admin/analytic")
|
||||
*/
|
||||
#[Route(path: '/admin/analytic')]
|
||||
class AnalyticController extends AbstractController
|
||||
{
|
||||
/**
|
||||
* @Route("/stats/{node}/{range}", name="admin_analytic_stats")
|
||||
*/
|
||||
#[Route(path: '/stats/{node}/{range}', name: 'admin_analytic_stats')]
|
||||
public function stats(Node $node, DateRangeAnalytic $analytic, string $range = '7days'): Response
|
||||
{
|
||||
if (!in_array($range, ['7days', '30days', '90days', '1year'])) {
|
||||
|
|
|
@ -25,9 +25,7 @@ class AuthController extends AbstractController
|
|||
$this->coreParameters = $parameters->get('core');
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/login", name="auth_login")
|
||||
*/
|
||||
#[Route(path: '/login', name: 'auth_login')]
|
||||
public function login(AuthenticationUtils $authenticationUtils): Response
|
||||
{
|
||||
if ($this->getUser()) {
|
||||
|
@ -45,9 +43,7 @@ class AuthController extends AbstractController
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/resetting/request", name="auth_resetting_request")
|
||||
*/
|
||||
#[Route(path: '/resetting/request', name: 'auth_resetting_request')]
|
||||
public function requestResetting(Request $request, UserRepository $repository, EventDispatcherInterface $eventDispatcher): Response
|
||||
{
|
||||
if ($this->getUser()) {
|
||||
|
@ -85,9 +81,7 @@ class AuthController extends AbstractController
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/resetting/update/{token}", name="auth_resetting_update")
|
||||
*/
|
||||
#[Route(path: '/resetting/update/{token}', name: 'auth_resetting_update')]
|
||||
public function requestUpdate(
|
||||
string $token,
|
||||
Request $request,
|
||||
|
@ -145,9 +139,7 @@ class AuthController extends AbstractController
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/logout", name="auth_logout")
|
||||
*/
|
||||
#[Route(path: '/logout', name: 'auth_logout')]
|
||||
public function logout()
|
||||
{
|
||||
throw new \Exception('This method can be blank - it will be intercepted by the logout key on your firewall');
|
||||
|
|
|
@ -3,23 +3,9 @@
|
|||
namespace App\Core\Controller\Dashboard;
|
||||
|
||||
use App\Core\Controller\Admin\AdminController;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\Routing\Annotation\Route;
|
||||
|
||||
/**
|
||||
* @Route("/admin")
|
||||
*/
|
||||
class DashboardAdminController extends AdminController
|
||||
{
|
||||
/**
|
||||
* @Route("/", name="admin_dashboard_index")
|
||||
*/
|
||||
public function index(): Response
|
||||
{
|
||||
return $this->render('@Core/dashboard/index.html.twig', [
|
||||
]);
|
||||
}
|
||||
|
||||
protected function getSection(): string
|
||||
{
|
||||
return 'dashboard';
|
||||
|
|
40
src/core/Controller/Editor/BuilderBlockController.php
Normal file
40
src/core/Controller/Editor/BuilderBlockController.php
Normal file
|
@ -0,0 +1,40 @@
|
|||
<?php
|
||||
|
||||
namespace App\Core\Controller\Editor;
|
||||
|
||||
use App\Core\BuilderBlock\BuilderBlockContainer;
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
use Symfony\Component\HttpFoundation\JsonResponse;
|
||||
use Symfony\Component\Routing\Annotation\Route;
|
||||
use Symfony\Contracts\Translation\TranslatorInterface;
|
||||
|
||||
#[Route(path: '/admin/editor/builder_block')]
|
||||
class BuilderBlockController extends AbstractController
|
||||
{
|
||||
public function __construct(protected TranslatorInterface $translator)
|
||||
{
|
||||
}
|
||||
|
||||
#[Route(path: '/widgets', name: 'admin_editor_builder_block_widgets', options: ['expose' => true])]
|
||||
public function widgets(BuilderBlockContainer $container): JsonResponse
|
||||
{
|
||||
$data = [];
|
||||
|
||||
foreach ($container->getWidgets() as $widget) {
|
||||
$data[$widget->getName()] = $this->translate($widget->toArray());
|
||||
}
|
||||
|
||||
return $this->json($data);
|
||||
}
|
||||
|
||||
protected function translate(array $data)
|
||||
{
|
||||
$data['label'] = $this->translator->trans($data['label']);
|
||||
|
||||
foreach ($data['settings'] as $key => $value) {
|
||||
$data['settings'][$key]['label'] = $this->translator->trans($data['settings'][$key]['label']);
|
||||
}
|
||||
|
||||
return $data;
|
||||
}
|
||||
}
|
|
@ -9,14 +9,10 @@ use Symfony\Component\HttpFoundation\Request;
|
|||
use Symfony\Component\Routing\Annotation\Route;
|
||||
use Symfony\Contracts\HttpClient\HttpClientInterface;
|
||||
|
||||
/**
|
||||
* @Route("/admin/editor/editorjs")
|
||||
*/
|
||||
#[Route(path: '/admin/editor/editorjs')]
|
||||
class EditorJsController extends AbstractController
|
||||
{
|
||||
/**
|
||||
* @Route("/fetch_url", name="admin_editor_editorjs_fetch_url", options={"expose"=true})
|
||||
*/
|
||||
#[Route(path: '/fetch_url', name: 'admin_editor_editorjs_fetch_url', options: ['expose' => true])]
|
||||
public function fetchUrl(Request $request, HttpClientInterface $client): JsonResponse
|
||||
{
|
||||
$url = filter_var($request->query->get('url'), FILTER_VALIDATE_URL);
|
||||
|
|
|
@ -15,22 +15,16 @@ use Symfony\Component\HttpFoundation\Response;
|
|||
use Symfony\Component\Routing\Annotation\Route;
|
||||
use Symfony\Contracts\Translation\TranslatorInterface;
|
||||
|
||||
/**
|
||||
* @Route("/admin/file_manager")
|
||||
*/
|
||||
#[Route(path: '/admin/file_manager')]
|
||||
class FileManagerAdminController extends AdminController
|
||||
{
|
||||
/**
|
||||
* @Route("/", name="admin_file_manager_index")
|
||||
*/
|
||||
#[Route(path: '/', name: 'admin_file_manager_index')]
|
||||
public function index(): Response
|
||||
{
|
||||
return $this->render('@Core/file_manager/index.html.twig');
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/api/directory", name="admin_file_manager_api_directory", options={"expose"=true})
|
||||
*/
|
||||
#[Route(path: '/api/directory', name: 'admin_file_manager_api_directory', options: ['expose' => true])]
|
||||
public function directory(FsFileManager $manager, Request $request): Response
|
||||
{
|
||||
$options = [
|
||||
|
@ -43,9 +37,7 @@ class FileManagerAdminController extends AdminController
|
|||
return $this->json($files);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/info/{tab}/{context}/{ajax}", name="admin_file_manager_info", options={"expose"=true})
|
||||
*/
|
||||
#[Route(path: '/info/{tab}/{context}/{ajax}', name: 'admin_file_manager_info', options: ['expose' => true])]
|
||||
public function info(
|
||||
FsFileManager $manager,
|
||||
Request $request,
|
||||
|
@ -115,9 +107,7 @@ class FileManagerAdminController extends AdminController
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/directory/new/{ajax}", name="admin_file_manager_directory_new", options={"expose"=true}, methods={"GET", "POST"})
|
||||
*/
|
||||
#[Route(path: '/directory/new/{ajax}', name: 'admin_file_manager_directory_new', options: ['expose' => true], methods: ['GET', 'POST'])]
|
||||
public function directoryNew(FsFileManager $manager, Request $request, TranslatorInterface $translator, bool $ajax = false): Response
|
||||
{
|
||||
$splInfo = $manager->getSplInfo($request->query->get('file'));
|
||||
|
@ -184,9 +174,7 @@ class FileManagerAdminController extends AdminController
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/directory/rename/{ajax}", name="admin_file_manager_directory_rename", methods={"GET", "POST"})
|
||||
*/
|
||||
#[Route(path: '/directory/rename/{ajax}', name: 'admin_file_manager_directory_rename', methods: ['GET', 'POST'])]
|
||||
public function directoryRename(FsFileManager $manager, Request $request, TranslatorInterface $translator, bool $ajax = false): Response
|
||||
{
|
||||
$splInfo = $manager->getSplInfo($request->query->get('file'));
|
||||
|
@ -255,9 +243,7 @@ class FileManagerAdminController extends AdminController
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/file/rename/{ajax}", name="admin_file_manager_file_rename", methods={"GET", "POST"})
|
||||
*/
|
||||
#[Route(path: '/file/rename/{ajax}', name: 'admin_file_manager_file_rename', methods: ['GET', 'POST'])]
|
||||
public function fileRename(FsFileManager $manager, Request $request, TranslatorInterface $translator, bool $ajax = false): Response
|
||||
{
|
||||
$splInfo = $manager->getSplInfo($request->query->get('file'));
|
||||
|
@ -327,9 +313,7 @@ class FileManagerAdminController extends AdminController
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/upload/{ajax}", name="admin_file_manager_upload", options={"expose"=true}, methods={"GET", "POST"})
|
||||
*/
|
||||
#[Route(path: '/upload/{ajax}', name: 'admin_file_manager_upload', options: ['expose' => true], methods: ['GET', 'POST'])]
|
||||
public function upload(FsFileManager $manager, Request $request, TranslatorInterface $translator, bool $ajax = false): Response
|
||||
{
|
||||
$splInfo = $manager->getSplInfo($request->query->get('file'));
|
||||
|
@ -406,9 +390,7 @@ class FileManagerAdminController extends AdminController
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/delete", name="admin_file_manager_delete", methods={"DELETE"})
|
||||
*/
|
||||
#[Route(path: '/delete', name: 'admin_file_manager_delete', methods: ['DELETE', 'POST'])]
|
||||
public function delete(FsFileManager $manager, Request $request): Response
|
||||
{
|
||||
$path = $request->request->get('file');
|
||||
|
|
|
@ -19,65 +19,49 @@ use Symfony\Component\Routing\Annotation\Route;
|
|||
|
||||
class RedirectAdminController extends CrudController
|
||||
{
|
||||
/**
|
||||
* @Route("/admin/redirect/{page}", name="admin_redirect_index", methods={"GET"}, requirements={"page":"\d+"})
|
||||
*/
|
||||
#[Route(path: '/admin/redirect/{page}', name: 'admin_redirect_index', methods: ['GET'], requirements: ['page' => '\d+'])]
|
||||
public function index(RepositoryQuery $query, Request $request, Session $session, int $page = 1): Response
|
||||
{
|
||||
return $this->doIndex($page, $query, $request, $session);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/admin/redirect/new", name="admin_redirect_new", methods={"GET", "POST"})
|
||||
*/
|
||||
#[Route(path: '/admin/redirect/new', name: 'admin_redirect_new', methods: ['GET', 'POST'])]
|
||||
public function new(Factory $factory, EntityManager $entityManager, Request $request): Response
|
||||
{
|
||||
return $this->doNew($factory->create(), $entityManager, $request);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/admin/redirect/show/{entity}", name="admin_redirect_show", methods={"GET"})
|
||||
*/
|
||||
#[Route(path: '/admin/redirect/show/{entity}', name: 'admin_redirect_show', methods: ['GET'])]
|
||||
public function show(Entity $entity): Response
|
||||
{
|
||||
return $this->doShow($entity);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/admin/redirect/filter", name="admin_redirect_filter", methods={"GET"})
|
||||
*/
|
||||
#[Route(path: '/admin/redirect/filter', name: 'admin_redirect_filter', methods: ['GET'])]
|
||||
public function filter(Session $session): Response
|
||||
{
|
||||
return $this->doFilter($session);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/admin/redirect/edit/{entity}", name="admin_redirect_edit", methods={"GET", "POST"})
|
||||
*/
|
||||
#[Route(path: '/admin/redirect/edit/{entity}', name: 'admin_redirect_edit', methods: ['GET', 'POST'])]
|
||||
public function edit(Entity $entity, EntityManager $entityManager, Request $request): Response
|
||||
{
|
||||
return $this->doEdit($entity, $entityManager, $request);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/admin/redirect/sort/{page}", name="admin_redirect_sort", methods={"POST"}, requirements={"page":"\d+"})
|
||||
*/
|
||||
#[Route(path: '/admin/redirect/sort/{page}', name: 'admin_redirect_sort', methods: ['POST'], requirements: ['page' => '\d+'])]
|
||||
public function sort(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response
|
||||
{
|
||||
return $this->doSort($page, $query, $entityManager, $request, $session);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/admin/redirect/batch/{page}", name="admin_redirect_batch", methods={"POST"}, requirements={"page":"\d+"})
|
||||
*/
|
||||
#[Route(path: '/admin/redirect/batch/{page}', name: 'admin_redirect_batch', methods: ['POST'], requirements: ['page' => '\d+'])]
|
||||
public function batch(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response
|
||||
{
|
||||
return $this->doBatch($page, $query, $entityManager, $request, $session);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/admin/redirect/delete/{entity}", name="admin_redirect_delete", methods={"DELETE"})
|
||||
*/
|
||||
#[Route(path: '/admin/redirect/delete/{entity}', name: 'admin_redirect_delete', methods: ['DELETE', 'POST'])]
|
||||
public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response
|
||||
{
|
||||
return $this->doDelete($entity, $entityManager, $request);
|
||||
|
@ -118,11 +102,11 @@ class RedirectAdminController extends CrudController
|
|||
'attr' => ['class' => 'col-6'],
|
||||
])
|
||||
->setField('index', 'Enabled', Field\ButtonField::class, [
|
||||
'property_builder' => function(EntityInterface $entity) {
|
||||
'property_builder' => function (EntityInterface $entity) {
|
||||
return $entity->getIsEnabled() ? 'Yes' : 'No';
|
||||
},
|
||||
'attr' => ['class' => 'col-1'],
|
||||
'button_attr_builder' => function(EntityInterface $entity) {
|
||||
'button_attr_builder' => function (EntityInterface $entity) {
|
||||
return ['class' => 'btn btn-sm btn-'.($entity->getIsEnabled() ? 'success' : 'primary')];
|
||||
},
|
||||
])
|
||||
|
|
|
@ -11,14 +11,10 @@ use Symfony\Component\HttpFoundation\Request;
|
|||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\Routing\Annotation\Route;
|
||||
|
||||
/**
|
||||
* @Route("/admin/navigation_setting")
|
||||
*/
|
||||
#[Route(path: '/admin/navigation_setting')]
|
||||
class NavigationSettingAdminController extends AdminController
|
||||
{
|
||||
/**
|
||||
* @Route("/edit/{entity}", name="admin_navigation_setting_edit")
|
||||
*/
|
||||
#[Route(path: '/edit/{entity}', name: 'admin_navigation_setting_edit')]
|
||||
public function edit(
|
||||
Entity $entity,
|
||||
EntityManager $entityManager,
|
||||
|
@ -35,11 +31,28 @@ class NavigationSettingAdminController extends AdminController
|
|||
$eventDispatcher->dispatch($event, NavigationSettingEvent::FORM_INIT_EVENT);
|
||||
|
||||
$form = $builder->getForm();
|
||||
$redirectTo = $request->query->get('redirectTo');
|
||||
$session = $request->getSession();
|
||||
$lastRequestId = sprintf('setting_request_%s_%s', get_class($entity), $entity->getId());
|
||||
$lastRequest = $session->get($lastRequestId);
|
||||
|
||||
if (null !== $lastRequest && !$request->isMethod('POST')) {
|
||||
$fakeRequest = Request::create(
|
||||
uri: $request->getUri(),
|
||||
method: 'POST',
|
||||
parameters: [$form->getName() => $lastRequest]
|
||||
);
|
||||
|
||||
$form->handleRequest($fakeRequest);
|
||||
$session->remove($lastRequestId);
|
||||
}
|
||||
|
||||
if ($request->isMethod('POST')) {
|
||||
$form->handleRequest($request);
|
||||
|
||||
if ($form->isValid()) {
|
||||
$entityManager->update($entity);
|
||||
$session->remove($lastRequestId);
|
||||
$entityManager->update($entity);
|
||||
$this->addFlash('success', 'The data has been saved.');
|
||||
|
||||
|
@ -48,19 +61,25 @@ class NavigationSettingAdminController extends AdminController
|
|||
]);
|
||||
}
|
||||
|
||||
$session->set($lastRequestId, $request->request->get('form'));
|
||||
$this->addFlash('warning', 'The form is not valid.');
|
||||
|
||||
return $this->redirect(sprintf(
|
||||
'%s?data-modal=%s',
|
||||
$redirectTo,
|
||||
urlencode($request->getUri())
|
||||
));
|
||||
}
|
||||
|
||||
return $this->render('@Core/setting/navigation_setting_admin/edit.html.twig', [
|
||||
'form' => $form->createView(),
|
||||
'entity' => $entity,
|
||||
'options' => $event->getData()['options'],
|
||||
'redirectTo' => $redirectTo,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/delete/{entity}", name="admin_navigation_setting_delete", methods={"DELETE"})
|
||||
*/
|
||||
#[Route(path: '/delete/{entity}', name: 'admin_navigation_setting_delete', methods: ['DELETE', 'POST'])]
|
||||
public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response
|
||||
{
|
||||
if ($this->isCsrfTokenValid('delete'.$entity->getId(), $request->request->get('_token'))) {
|
||||
|
|
|
@ -12,14 +12,10 @@ use Symfony\Component\HttpFoundation\Request;
|
|||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\Routing\Annotation\Route;
|
||||
|
||||
/**
|
||||
* @Route("/admin/setting")
|
||||
*/
|
||||
#[Route(path: '/admin/setting')]
|
||||
class SettingAdminController extends AdminController
|
||||
{
|
||||
/**
|
||||
* @Route("/{page}", name="admin_setting_index", requirements={"page": "\d+"})
|
||||
*/
|
||||
#[Route(path: '/{page}', name: 'admin_setting_index', requirements: ['page' => '\d+'])]
|
||||
public function index(
|
||||
RepositoryQuery $query,
|
||||
EventDispatcherInterface $eventDispatcher,
|
||||
|
@ -38,9 +34,7 @@ class SettingAdminController extends AdminController
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/edit/{entity}", name="admin_setting_edit")
|
||||
*/
|
||||
#[Route(path: '/edit/{entity}', name: 'admin_setting_edit')]
|
||||
public function edit(
|
||||
Entity $entity,
|
||||
EntityManager $entityManager,
|
||||
|
@ -57,30 +51,53 @@ class SettingAdminController extends AdminController
|
|||
$eventDispatcher->dispatch($event, SettingEvent::FORM_INIT_EVENT);
|
||||
|
||||
$form = $builder->getForm();
|
||||
$redirectTo = $request->query->get('redirectTo');
|
||||
$session = $request->getSession();
|
||||
$lastRequestId = sprintf('setting_request_%s_%s', get_class($entity), $entity->getId());
|
||||
$lastRequest = $session->get($lastRequestId);
|
||||
|
||||
if (null !== $lastRequest && !$request->isMethod('POST')) {
|
||||
$fakeRequest = Request::create(
|
||||
uri: $request->getUri(),
|
||||
method: 'POST',
|
||||
parameters: [$form->getName() => $lastRequest]
|
||||
);
|
||||
|
||||
$form->handleRequest($fakeRequest);
|
||||
$session->remove($lastRequestId);
|
||||
}
|
||||
|
||||
if ($request->isMethod('POST')) {
|
||||
$form->handleRequest($request);
|
||||
|
||||
if ($form->isValid()) {
|
||||
$entityManager->update($entity);
|
||||
$session->remove($lastRequestId);
|
||||
$entityManager->update($entity);
|
||||
$this->addFlash('success', 'The data has been saved.');
|
||||
|
||||
return $this->redirectToRoute('admin_setting_index');
|
||||
}
|
||||
|
||||
$session->set($lastRequestId, $request->request->get('form'));
|
||||
$this->addFlash('warning', 'The form is not valid.');
|
||||
|
||||
return $this->redirect(sprintf(
|
||||
'%s?data-modal=%s',
|
||||
$redirectTo,
|
||||
urlencode($request->getUri())
|
||||
));
|
||||
}
|
||||
|
||||
return $this->render('@Core/setting/setting_admin/edit.html.twig', [
|
||||
'form' => $form->createView(),
|
||||
'entity' => $entity,
|
||||
'options' => $event->getData()['options'],
|
||||
'redirectTo' => $redirectTo,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/delete/{entity}", name="admin_setting_delete", methods={"DELETE"})
|
||||
*/
|
||||
#[Route(path: '/delete/{entity}', name: 'admin_setting_delete', methods: ['DELETE', 'POST'])]
|
||||
public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response
|
||||
{
|
||||
if ($this->isCsrfTokenValid('delete'.$entity->getId(), $request->request->get('_token'))) {
|
||||
|
|
|
@ -12,14 +12,10 @@ use Symfony\Component\HttpFoundation\Request;
|
|||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\Routing\Annotation\Route;
|
||||
|
||||
/**
|
||||
* @Route("/admin/site/menu")
|
||||
*/
|
||||
#[Route(path: '/admin/site/menu')]
|
||||
class MenuAdminController extends AdminController
|
||||
{
|
||||
/**
|
||||
* @Route("/new/{navigation}", name="admin_site_menu_new", methods={"POST"})
|
||||
*/
|
||||
#[Route(path: '/new/{navigation}', name: 'admin_site_menu_new', methods: ['POST'])]
|
||||
public function new(Navigation $navigation, EntityFactory $factory, EntityManager $entityManager, Request $request): Response
|
||||
{
|
||||
$entity = $factory->create($navigation);
|
||||
|
@ -39,9 +35,7 @@ class MenuAdminController extends AdminController
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/edit/{entity}", name="admin_site_menu_edit", methods={"POST"})
|
||||
*/
|
||||
#[Route(path: '/edit/{entity}', name: 'admin_site_menu_edit', methods: ['POST'])]
|
||||
public function edit(Entity $entity, EntityManager $entityManager, Request $request): Response
|
||||
{
|
||||
$form = $this->createForm(EntityType::class, $entity);
|
||||
|
@ -59,9 +53,7 @@ class MenuAdminController extends AdminController
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/delete/{entity}", name="admin_site_menu_delete", methods={"DELETE"})
|
||||
*/
|
||||
#[Route(path: '/delete/{entity}', name: 'admin_site_menu_delete', methods: ['DELETE', 'POST'])]
|
||||
public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response
|
||||
{
|
||||
if ($this->isCsrfTokenValid('delete'.$entity->getId(), $request->request->get('_token'))) {
|
||||
|
|
|
@ -20,25 +20,19 @@ use Symfony\Component\Routing\Annotation\Route;
|
|||
|
||||
class NavigationAdminController extends CrudController
|
||||
{
|
||||
/**
|
||||
* @Route("/admin/site/navigation/{page}", name="admin_site_navigation_index", methods={"GET"}, requirements={"page":"\d+"})
|
||||
*/
|
||||
#[Route(path: '/admin/site/navigation/{page}', name: 'admin_site_navigation_index', methods: ['GET'], requirements: ['page' => '\d+'])]
|
||||
public function index(RepositoryQuery $query, Request $request, Session $session, int $page = 1): Response
|
||||
{
|
||||
return $this->doIndex($page, $query, $request, $session);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/admin/site/navigation/new", name="admin_site_navigation_new", methods={"GET", "POST"})
|
||||
*/
|
||||
#[Route(path: '/admin/site/navigation/new', name: 'admin_site_navigation_new', methods: ['GET', 'POST'])]
|
||||
public function new(Factory $factory, EntityManager $entityManager, Request $request): Response
|
||||
{
|
||||
return $this->doNew($factory->create(), $entityManager, $request);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/admin/site/navigation/show/{entity}", name="admin_site_navigation_show", methods={"GET"})
|
||||
*/
|
||||
#[Route(path: '/admin/site/navigation/show/{entity}', name: 'admin_site_navigation_show', methods: ['GET'])]
|
||||
public function show(
|
||||
Entity $entity,
|
||||
EventDispatcherInterface $eventDispatcher,
|
||||
|
@ -60,33 +54,25 @@ class NavigationAdminController extends CrudController
|
|||
return $this->doShow($entity);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/admin/site/navigation/filter", name="admin_site_navigation_filter", methods={"GET"})
|
||||
*/
|
||||
#[Route(path: '/admin/site/navigation/filter', name: 'admin_site_navigation_filter', methods: ['GET'])]
|
||||
public function filter(Session $session): Response
|
||||
{
|
||||
return $this->doFilter($session);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/admin/site/navigation/edit/{entity}", name="admin_site_navigation_edit", methods={"GET", "POST"})
|
||||
*/
|
||||
#[Route(path: '/admin/site/navigation/edit/{entity}', name: 'admin_site_navigation_edit', methods: ['GET', 'POST'])]
|
||||
public function edit(Entity $entity, EntityManager $entityManager, Request $request): Response
|
||||
{
|
||||
return $this->doEdit($entity, $entityManager, $request);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/admin/site/navigation/sort/{page}", name="admin_site_navigation_sort", methods={"POST"}, requirements={"page":"\d+"})
|
||||
*/
|
||||
public function sort(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1, ): Response
|
||||
#[Route(path: '/admin/site/navigation/sort/{page}', name: 'admin_site_navigation_sort', methods: ['POST'], requirements: ['page' => '\d+'])]
|
||||
public function sort(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response
|
||||
{
|
||||
return $this->doSort($page, $query, $entityManager, $request, $session);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/admin/site/navigation/delete/{entity}", name="admin_site_navigation_delete", methods={"DELETE"})
|
||||
*/
|
||||
#[Route(path: '/admin/site/navigation/delete/{entity}', name: 'admin_site_navigation_delete', methods: ['DELETE', 'POST'])]
|
||||
public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response
|
||||
{
|
||||
return $this->doDelete($entity, $entityManager, $request);
|
||||
|
@ -118,9 +104,11 @@ class NavigationAdminController extends CrudController
|
|||
->setView('form', '@Core/site/navigation_admin/_form.html.twig')
|
||||
|
||||
->setIsSortableCollection('index', true)
|
||||
->setDoubleClick('index', true)
|
||||
|
||||
->setField('index', 'Label', Field\TextField::class, [
|
||||
'property' => 'label',
|
||||
'view' => '@Core/site/navigation_admin/field/label.html.twig',
|
||||
'attr' => ['class' => 'miw-200'],
|
||||
])
|
||||
->setField('index', 'Domain', Field\ButtonField::class, [
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
namespace App\Core\Controller\Site;
|
||||
|
||||
use App\Core\Controller\Admin\AdminController;
|
||||
use App\Core\Entity\Site\Node;
|
||||
use App\Core\Entity\Site\Node as Entity;
|
||||
use App\Core\Entity\Site\Page\Page;
|
||||
|
@ -14,24 +13,20 @@ use App\Core\Form\Site\NodeType as EntityType;
|
|||
use App\Core\Manager\EntityManager;
|
||||
use App\Core\Repository\Site\NodeRepository;
|
||||
use App\Core\Site\ControllerLocator;
|
||||
use App\Core\Site\RoleLocator;
|
||||
use App\Core\Site\PageLocator;
|
||||
use App\Core\Site\RoleLocator;
|
||||
use App\Core\Sitemap\SitemapBuilder;
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
||||
use Symfony\Component\Form\FormError;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\Routing\Annotation\Route;
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
|
||||
/**
|
||||
* @Route("/admin/site/node")
|
||||
*/
|
||||
#[Route(path: '/admin/site/node')]
|
||||
class NodeAdminController extends AbstractController
|
||||
{
|
||||
/**
|
||||
* @Route("/new/{node}", name="admin_site_node_new")
|
||||
*/
|
||||
#[Route(path: '/new/{node}', name: 'admin_site_node_new')]
|
||||
public function new(
|
||||
Node $node,
|
||||
EntityFactory $factory,
|
||||
|
@ -103,9 +98,7 @@ class NodeAdminController extends AbstractController
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/edit/{entity}/{tab}", name="admin_site_node_edit")
|
||||
*/
|
||||
#[Route(path: '/edit/{entity}/{tab}', name: 'admin_site_node_edit')]
|
||||
public function edit(
|
||||
Entity $entity,
|
||||
EntityManager $entityManager,
|
||||
|
@ -151,7 +144,7 @@ class NodeAdminController extends AbstractController
|
|||
|
||||
$page = $entity->getPage();
|
||||
|
||||
if ($page !== null) {
|
||||
if (null !== $page) {
|
||||
$pageConfiguration = $pageLocator->getPages()[get_class($page)] ?? null;
|
||||
} else {
|
||||
$pageConfiguration = null;
|
||||
|
@ -166,9 +159,7 @@ class NodeAdminController extends AbstractController
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/urls/{entity}", name="admin_site_node_urls")
|
||||
*/
|
||||
#[Route(path: '/urls/{entity}', name: 'admin_site_node_urls')]
|
||||
public function urls(Entity $entity, SitemapBuilder $builder): Response
|
||||
{
|
||||
return $this->render('@Core/site/node_admin/urls.html.twig', [
|
||||
|
@ -177,9 +168,7 @@ class NodeAdminController extends AbstractController
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/move/{entity}", name="admin_site_node_move")
|
||||
*/
|
||||
#[Route(path: '/move/{entity}', name: 'admin_site_node_move')]
|
||||
public function move(
|
||||
Entity $entity,
|
||||
EntityManager $entityManager,
|
||||
|
@ -233,9 +222,7 @@ class NodeAdminController extends AbstractController
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/toggle/visibility/{entity}", name="admin_site_node_toggle_visibility", methods={"POST"})
|
||||
*/
|
||||
#[Route(path: '/toggle/visibility/{entity}', name: 'admin_site_node_toggle_visibility', methods: ['POST'])]
|
||||
public function toggleVisibility(Entity $entity, EntityManager $entityManager, Request $request): Response
|
||||
{
|
||||
if ($this->isCsrfTokenValid('toggle_visibility'.$entity->getId(), $request->request->get('_token'))) {
|
||||
|
@ -251,9 +238,7 @@ class NodeAdminController extends AbstractController
|
|||
]).sprintf('#node-%d', $entity->getId()));
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/delete/{entity}", name="admin_site_node_delete", methods={"DELETE"})
|
||||
*/
|
||||
#[Route(path: '/delete/{entity}', name: 'admin_site_node_delete', methods: ['DELETE', 'POST'])]
|
||||
public function delete(
|
||||
Entity $entity,
|
||||
NodeRepository $nodeRepository,
|
||||
|
|
|
@ -5,49 +5,41 @@ namespace App\Core\Controller\Site;
|
|||
use App\Core\Controller\Admin\Crud\CrudController;
|
||||
use App\Core\Crud\CrudConfiguration;
|
||||
use App\Core\Crud\Field;
|
||||
use App\Core\Entity\EntityInterface;
|
||||
use App\Core\Entity\Site\Page\Page as Entity;
|
||||
use App\Core\Event\Page\PageEditEvent;
|
||||
use App\Core\Form\Site\Page\Filter\PageFilterType as FilterType;
|
||||
use App\Core\Form\Site\Page\PageType as Type;
|
||||
use App\Core\Manager\EntityManager;
|
||||
use App\Core\Repository\Site\Page\PageRepositoryQuery as RepositoryQuery;
|
||||
use App\Core\Site\PageLocator;
|
||||
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\HttpFoundation\Session\Session;
|
||||
use Symfony\Component\Routing\Annotation\Route;
|
||||
use App\Core\Event\Page\PageEditEvent;
|
||||
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
||||
use App\Core\Entity\EntityInterface;
|
||||
|
||||
class PageAdminController extends CrudController
|
||||
{
|
||||
/**
|
||||
* @Route("/admin/site/page/{page}", name="admin_site_page_index", methods={"GET"}, requirements={"page":"\d+"})
|
||||
*/
|
||||
#[Route(path: '/admin/site/page/{page}', name: 'admin_site_page_index', methods: ['GET'], requirements: ['page' => '\d+'])]
|
||||
public function index(RepositoryQuery $query, Request $request, Session $session, int $page = 1): Response
|
||||
{
|
||||
return $this->doIndex($page, $query, $request, $session);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/admin/site/page/show/{entity}", name="admin_site_page_show", methods={"GET"})
|
||||
*/
|
||||
#[Route(path: '/admin/site/page/show/{entity}', name: 'admin_site_page_show', methods: ['GET'])]
|
||||
public function show(Entity $entity): Response
|
||||
{
|
||||
return $this->doShow($entity);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/admin/site/page/filter", name="admin_site_page_filter", methods={"GET"})
|
||||
*/
|
||||
#[Route(path: '/admin/site/page/filter', name: 'admin_site_page_filter', methods: ['GET'])]
|
||||
public function filter(Session $session): Response
|
||||
{
|
||||
return $this->doFilter($session);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/admin/site/page/edit/{entity}", name="admin_site_page_edit", methods={"GET", "POST"})
|
||||
*/
|
||||
#[Route(path: '/admin/site/page/edit/{entity}', name: 'admin_site_page_edit', methods: ['GET', 'POST'])]
|
||||
public function edit(
|
||||
int $entity,
|
||||
EntityManager $entityManager,
|
||||
|
@ -69,17 +61,13 @@ class PageAdminController extends CrudController
|
|||
return $this->doEdit($entity, $entityManager, $request);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/admin/site/page/delete/{entity}", name="admin_site_page_delete", methods={"DELETE"})
|
||||
*/
|
||||
#[Route(path: '/admin/site/page/delete/{entity}', name: 'admin_site_page_delete', methods: ['DELETE', 'POST'])]
|
||||
public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response
|
||||
{
|
||||
return $this->doDelete($entity, $entityManager, $request);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/admin/site/page/batch/{page}", name="admin_site_page_batch", methods={"POST"}, requirements={"page":"\d+"})
|
||||
*/
|
||||
#[Route(path: '/admin/site/page/batch/{page}', name: 'admin_site_page_batch', methods: ['POST'], requirements: ['page' => '\d+'])]
|
||||
public function batch(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response
|
||||
{
|
||||
return $this->doBatch($page, $query, $entityManager, $request, $session);
|
||||
|
@ -107,6 +95,8 @@ class PageAdminController extends CrudController
|
|||
->setAction('index', 'show', false)
|
||||
->setAction('edit', 'show', false)
|
||||
|
||||
->setDoubleClick('index', true)
|
||||
|
||||
->setField('index', 'Name', Field\TextField::class, [
|
||||
'property' => 'name',
|
||||
'sort' => ['name', '.name'],
|
||||
|
@ -124,7 +114,7 @@ class PageAdminController extends CrudController
|
|||
}],
|
||||
'attr' => ['class' => 'col-6'],
|
||||
])
|
||||
->setBatchAction('index', 'delete', 'Delete', function(EntityInterface $entity, EntityManager $manager) {
|
||||
->setBatchAction('index', 'delete', 'Delete', function (EntityInterface $entity, EntityManager $manager) {
|
||||
$manager->delete($entity);
|
||||
})
|
||||
;
|
||||
|
|
|
@ -11,22 +11,21 @@ use Symfony\Component\Routing\Annotation\Route;
|
|||
|
||||
class SitemapController extends AbstractController
|
||||
{
|
||||
/**
|
||||
* @Route("/sitemap.xml", name="sitemap")
|
||||
*/
|
||||
public function sitemap(Request $request, NavigationRepositoryQuery $navigationRepositoryQuery, SitemapBuilder $builder): Response
|
||||
#[Route(path: '/sitemap.xml', name: 'sitemap')]
|
||||
public function sitemap(Request $request, NavigationRepositoryQuery $query, SitemapBuilder $builder): Response
|
||||
{
|
||||
$navigations = $navigationRepositoryQuery
|
||||
->whereDomain($request->getHost())
|
||||
->find()
|
||||
;
|
||||
$navigations = $query->create()->find();
|
||||
|
||||
$items = [];
|
||||
|
||||
foreach ($navigations as $navigation) {
|
||||
if (!$navigation->matchDomain($request->getHost())) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$items = array_merge(
|
||||
$items,
|
||||
$builder->build($navigation)
|
||||
$builder->build($navigation, $request->getHost())
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -11,14 +11,10 @@ use Symfony\Component\HttpFoundation\Response;
|
|||
use Symfony\Component\HttpFoundation\Session\Session;
|
||||
use Symfony\Component\Routing\Annotation\Route;
|
||||
|
||||
/**
|
||||
* @Route("/admin/site/tree")
|
||||
*/
|
||||
#[Route(path: '/admin/site/tree')]
|
||||
class TreeAdminController extends AdminController
|
||||
{
|
||||
/**
|
||||
* @Route("/", name="admin_site_tree_index")
|
||||
*/
|
||||
#[Route(path: '/', name: 'admin_site_tree_index')]
|
||||
public function index(NavigationRepositoryQuery $navigationQuery, Session $session): Response
|
||||
{
|
||||
$navigation = null;
|
||||
|
@ -48,9 +44,7 @@ class TreeAdminController extends AdminController
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/navigation/{navigation}", name="admin_site_tree_navigation")
|
||||
*/
|
||||
#[Route(path: '/navigation/{navigation}', name: 'admin_site_tree_navigation')]
|
||||
public function navigation(
|
||||
Navigation $navigation,
|
||||
NavigationRepositoryQuery $navigationQuery,
|
||||
|
|
|
@ -13,14 +13,10 @@ use Symfony\Component\HttpFoundation\Request;
|
|||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\Routing\Annotation\Route;
|
||||
|
||||
/**
|
||||
* @Route("/admin/task")
|
||||
*/
|
||||
#[Route(path: '/admin/task')]
|
||||
class TaskAdminController extends AdminController
|
||||
{
|
||||
/**
|
||||
* @Route("/", name="admin_task_index")
|
||||
*/
|
||||
#[Route(path: '/', name: 'admin_task_index')]
|
||||
public function index(EventDispatcherInterface $eventDispatcher): Response
|
||||
{
|
||||
$event = new TaskInitEvent();
|
||||
|
@ -31,9 +27,7 @@ class TaskAdminController extends AdminController
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/run/{task}", name="admin_task_run", methods={"GET"})
|
||||
*/
|
||||
#[Route(path: '/run/{task}', name: 'admin_task_run', methods: ['GET'])]
|
||||
public function run(
|
||||
string $task,
|
||||
Request $request,
|
||||
|
|
|
@ -8,69 +8,55 @@ use App\Core\Crud\Field;
|
|||
use App\Core\Event\Account\PasswordRequestEvent;
|
||||
use App\Core\Factory\UserFactory as Factory;
|
||||
use App\Core\Manager\EntityManager;
|
||||
use App\Core\Security\TokenGenerator;
|
||||
use App\Entity\User as Entity;
|
||||
use App\Form\UserType as Type;
|
||||
use App\Repository\UserRepositoryQuery as RepositoryQuery;
|
||||
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
||||
use Symfony\Component\Form\FormBuilderInterface;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\HttpFoundation\Session\Session;
|
||||
use Symfony\Component\Routing\Annotation\Route;
|
||||
use App\Core\Security\TokenGenerator;
|
||||
|
||||
class UserAdminController extends CrudController
|
||||
{
|
||||
/**
|
||||
* @Route("/admin/user/{page}", name="admin_user_index", methods={"GET"}, requirements={"page":"\d+"})
|
||||
*/
|
||||
protected ?CrudConfiguration $configuration = null;
|
||||
|
||||
public function index(RepositoryQuery $query, Request $request, Session $session, int $page = 1): Response
|
||||
{
|
||||
return $this->doIndex($page, $query, $request, $session);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/admin/user/new", name="admin_user_new", methods={"GET", "POST"})
|
||||
*/
|
||||
public function new(Factory $factory, EntityManager $entityManager, Request $request, TokenGenerator $tokenGenerator): Response
|
||||
{
|
||||
return $this->doNew($factory->create(null, $tokenGenerator->generateToken()), $entityManager, $request);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/admin/user/show/{entity}", name="admin_user_show", methods={"GET"})
|
||||
*/
|
||||
public function show(Entity $entity): Response
|
||||
{
|
||||
return $this->doShow($entity);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/admin/user/filter", name="admin_user_filter", methods={"GET"})
|
||||
*/
|
||||
public function filter(Session $session): Response
|
||||
{
|
||||
return $this->doFilter($session);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/admin/user/edit/{entity}", name="admin_user_edit", methods={"GET", "POST"})
|
||||
*/
|
||||
public function edit(Entity $entity, EntityManager $entityManager, Request $request): Response
|
||||
{
|
||||
return $this->doEdit($entity, $entityManager, $request);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/admin/user/delete/{entity}", name="admin_user_delete", methods={"DELETE"})
|
||||
*/
|
||||
public function inlineEdit(string $context, string $label, Entity $entity, EntityManager $entityManager, Request $request): Response
|
||||
{
|
||||
return $this->doInlineEdit($context, $label, $entity, $entityManager, $request);
|
||||
}
|
||||
|
||||
public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response
|
||||
{
|
||||
return $this->doDelete($entity, $entityManager, $request);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/admin/user/resetting_request/{entity}", name="admin_user_resetting_request", methods={"POST"})
|
||||
*/
|
||||
public function requestResetting(Entity $entity, EventDispatcherInterface $eventDispatcher, Request $request): Response
|
||||
{
|
||||
if ($this->isCsrfTokenValid('resetting_request'.$entity->getId(), $request->request->get('_token'))) {
|
||||
|
@ -95,6 +81,7 @@ class UserAdminController extends CrudController
|
|||
->setPageRoute('index', 'admin_user_index')
|
||||
->setPageRoute('new', 'admin_user_new')
|
||||
->setPageRoute('edit', 'admin_user_edit')
|
||||
->setPageRoute('inline_edit', 'admin_user_inline_edit')
|
||||
->setPageRoute('show', 'admin_user_show')
|
||||
->setPageRoute('delete', 'admin_user_delete')
|
||||
->setPageRoute('filter', 'admin_user_filter')
|
||||
|
@ -110,6 +97,7 @@ class UserAdminController extends CrudController
|
|||
->setView('edit', '@Core/user/user_admin/edit.html.twig')
|
||||
|
||||
->setDefaultSort('index', 'username')
|
||||
->setDoubleClick('index', true)
|
||||
|
||||
->setField('index', 'E-mail', Field\TextField::class, [
|
||||
'property' => 'email',
|
||||
|
@ -120,6 +108,9 @@ class UserAdminController extends CrudController
|
|||
'property' => 'displayName',
|
||||
'sort' => ['displayName', '.displayName'],
|
||||
'attr' => ['class' => 'miw-200'],
|
||||
'inline_form' => function (FormBuilderInterface $builder) {
|
||||
$builder->add('displayName', null);
|
||||
},
|
||||
])
|
||||
;
|
||||
}
|
||||
|
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
namespace App\Core\Crud;
|
||||
|
||||
use App\Core\Crud\Exception\CrudConfigurationException;
|
||||
|
||||
/**
|
||||
* class CrudConfiguration.
|
||||
*
|
||||
|
@ -19,6 +17,7 @@ class CrudConfiguration
|
|||
protected array $actionTitles = [];
|
||||
protected array $forms = [];
|
||||
protected array $formOptions = [];
|
||||
protected array $inlineForms = [];
|
||||
protected array $views = [];
|
||||
protected array $viewDatas = [];
|
||||
protected array $fields = [];
|
||||
|
@ -41,7 +40,7 @@ class CrudConfiguration
|
|||
return self::$self;
|
||||
}
|
||||
|
||||
/* -- */
|
||||
// --
|
||||
|
||||
public function setPageTitle(string $page, string $title): self
|
||||
{
|
||||
|
@ -55,7 +54,7 @@ class CrudConfiguration
|
|||
return $this->pageTitles[$page] ?? $default;
|
||||
}
|
||||
|
||||
/* -- */
|
||||
// --
|
||||
|
||||
public function setPageRoute(string $page, string $route): self
|
||||
{
|
||||
|
@ -81,9 +80,9 @@ class CrudConfiguration
|
|||
return $this->pageRouteParams[$page] ?? [];
|
||||
}
|
||||
|
||||
/* -- */
|
||||
// --
|
||||
|
||||
public function setForm(string $context, string $form, array $options = []): self
|
||||
public function setForm(string $context, string $form): self
|
||||
{
|
||||
$this->forms[$context] = $form;
|
||||
|
||||
|
@ -107,9 +106,9 @@ class CrudConfiguration
|
|||
return $this->formOptions[$context] ?? [];
|
||||
}
|
||||
|
||||
/* -- */
|
||||
// --
|
||||
|
||||
public function setAction(string $page, string $action, bool $enabled): self
|
||||
public function setAction(string $page, string $action, bool|callable $enabled): self
|
||||
{
|
||||
if (!isset($this->actions[$page])) {
|
||||
$this->actions[$page] = [];
|
||||
|
@ -120,13 +119,40 @@ class CrudConfiguration
|
|||
return $this;
|
||||
}
|
||||
|
||||
public function getAction(string $page, string $action, bool $default = true)
|
||||
public function getAction(string $page, string $action, bool $default = true, array $callableParamaters = [])
|
||||
{
|
||||
return $this->actions[$page][$action] ?? $default;
|
||||
if (!isset($this->actions[$page][$action])) {
|
||||
return $default;
|
||||
}
|
||||
|
||||
if (is_bool($this->actions[$page][$action])) {
|
||||
return $this->actions[$page][$action];
|
||||
}
|
||||
|
||||
return call_user_func_array(
|
||||
$this->actions[$page][$action],
|
||||
$callableParamaters
|
||||
);
|
||||
}
|
||||
|
||||
public function setBatchAction(string $page, string $action, string $label, callable $callback): self
|
||||
{
|
||||
public function setGlobalBatchAction(
|
||||
string $page,
|
||||
string $action,
|
||||
string $label,
|
||||
callable $callback
|
||||
): self {
|
||||
$this->setBatchAction($page, $action, $label, $callback);
|
||||
$this->batchActions[$page][$action]['isGlobal'] = true;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function setBatchAction(
|
||||
string $page,
|
||||
string $action,
|
||||
string $label,
|
||||
callable $callback
|
||||
): self {
|
||||
if (!isset($this->batchActions[$page])) {
|
||||
$this->batchActions[$page] = [];
|
||||
}
|
||||
|
@ -134,6 +160,7 @@ class CrudConfiguration
|
|||
$this->batchActions[$page][$action] = [
|
||||
'label' => $label,
|
||||
'callback' => $callback,
|
||||
'isGlobal' => false,
|
||||
];
|
||||
|
||||
return $this;
|
||||
|
@ -154,7 +181,7 @@ class CrudConfiguration
|
|||
return !empty($this->batchActions[$page]);
|
||||
}
|
||||
|
||||
/* -- */
|
||||
// --
|
||||
|
||||
public function setActionTitle(string $page, string $action, string $title): self
|
||||
{
|
||||
|
@ -172,7 +199,7 @@ class CrudConfiguration
|
|||
return $this->actionTitles[$page][$action] ?? $default;
|
||||
}
|
||||
|
||||
/* -- */
|
||||
// --
|
||||
|
||||
public function setView(string $context, string $view): self
|
||||
{
|
||||
|
@ -220,7 +247,7 @@ class CrudConfiguration
|
|||
return $this->viewDatas[$context][$name] ?? $defaultValue;
|
||||
}
|
||||
|
||||
/* -- */
|
||||
// --
|
||||
|
||||
public function setField(string $context, string $label, string $field, array $options): self
|
||||
{
|
||||
|
@ -241,9 +268,16 @@ class CrudConfiguration
|
|||
return $this->fields[$context] ?? [];
|
||||
}
|
||||
|
||||
/* -- */
|
||||
public function setFields(string $context, array $fields): self
|
||||
{
|
||||
$this->fields[$context] = $fields;
|
||||
|
||||
public function setMaxPerPage(string $page, int $max)
|
||||
return $this;
|
||||
}
|
||||
|
||||
// --
|
||||
|
||||
public function setMaxPerPage(string $page, int $max): self
|
||||
{
|
||||
$this->maxPerPage[$page] = $max;
|
||||
|
||||
|
@ -255,7 +289,21 @@ class CrudConfiguration
|
|||
return $this->maxPerPage[$page] ?? $default;
|
||||
}
|
||||
|
||||
/* -- */
|
||||
// --
|
||||
|
||||
public function setDoubleClick(string $page, bool $enabled): self
|
||||
{
|
||||
$this->doubleClick[$page] = $enabled;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getDoubleClick(string $page): bool
|
||||
{
|
||||
return $this->doubleClick[$page] ?? false;
|
||||
}
|
||||
|
||||
// --
|
||||
|
||||
public function setI18n(array $locales, string $defaultLocale): self
|
||||
{
|
||||
|
@ -280,7 +328,7 @@ class CrudConfiguration
|
|||
return !empty($this->locales);
|
||||
}
|
||||
|
||||
/* -- */
|
||||
// --
|
||||
|
||||
public function setDefaultSort(string $context, string $label, string $direction = 'asc'): self
|
||||
{
|
||||
|
|
32
src/core/Crud/Field/BooleanField.php
Normal file
32
src/core/Crud/Field/BooleanField.php
Normal file
|
@ -0,0 +1,32 @@
|
|||
<?php
|
||||
|
||||
namespace App\Core\Crud\Field;
|
||||
|
||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||
|
||||
/**
|
||||
* class BooleanField.
|
||||
*
|
||||
* @author Simon Vieille <simon@deblan.fr>
|
||||
*/
|
||||
class BooleanField extends Field
|
||||
{
|
||||
public function configureOptions(OptionsResolver $resolver): OptionsResolver
|
||||
{
|
||||
parent::configureOptions($resolver);
|
||||
|
||||
$resolver->setDefaults([
|
||||
'view' => '@Core/admin/crud/field/boolean.html.twig',
|
||||
'display' => 'toggle',
|
||||
'checkbox_class_when_true' => 'fa-check-square',
|
||||
'checkbox_class_when_false' => 'fa-square',
|
||||
'toggle_class_when_true' => 'bg-success',
|
||||
'toggle_class_when_false' => 'bg-secondary',
|
||||
'default_value' => false,
|
||||
]);
|
||||
|
||||
$resolver->setAllowedTypes('display', 'string');
|
||||
|
||||
return $resolver;
|
||||
}
|
||||
}
|
|
@ -28,24 +28,31 @@ abstract class Field
|
|||
$resolver->setDefaults([
|
||||
'property' => null,
|
||||
'property_builder' => null,
|
||||
'default_value' => null,
|
||||
'view' => null,
|
||||
'action' => null,
|
||||
'raw' => false,
|
||||
'sort' => null,
|
||||
'href' => null,
|
||||
'href_attr' => [],
|
||||
'attr' => [],
|
||||
'inline_form' => null,
|
||||
'inline_form_validation' => null,
|
||||
]);
|
||||
|
||||
$resolver->setRequired('view');
|
||||
$resolver->setAllowedTypes('property', ['null', 'string']);
|
||||
$resolver->setAllowedTypes('view', 'string');
|
||||
$resolver->setAllowedTypes('action', ['null', 'string']);
|
||||
$resolver->setAllowedTypes('attr', 'array');
|
||||
$resolver->setAllowedTypes('href', ['null', 'string', 'callable']);
|
||||
$resolver->setAllowedTypes('href_attr', 'array', 'callable');
|
||||
$resolver->setAllowedTypes('inline_form', ['null', 'callable']);
|
||||
$resolver->setAllowedTypes('inline_form_validation', ['null', 'callable']);
|
||||
$resolver->setAllowedTypes('href_attr', ['array', 'callable']);
|
||||
$resolver->setAllowedTypes('raw', 'boolean');
|
||||
$resolver->setAllowedTypes('property_builder', ['null', 'callable']);
|
||||
$resolver->setAllowedValues('sort', function($value) {
|
||||
if ($value === null) {
|
||||
$resolver->setAllowedValues('sort', function ($value) {
|
||||
if (null === $value) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
25
src/core/DependencyInjection/Compiler/BuilderBlockPass.php
Normal file
25
src/core/DependencyInjection/Compiler/BuilderBlockPass.php
Normal file
|
@ -0,0 +1,25 @@
|
|||
<?php
|
||||
|
||||
namespace App\Core\DependencyInjection\Compiler;
|
||||
|
||||
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
|
||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
use Symfony\Component\DependencyInjection\Reference;
|
||||
use App\Core\BuilderBlock\BuilderBlockContainer;
|
||||
|
||||
class BuilderBlockPass implements CompilerPassInterface
|
||||
{
|
||||
public function process(ContainerBuilder $container): void
|
||||
{
|
||||
if (!$container->has(BuilderBlockContainer::class)) {
|
||||
return;
|
||||
}
|
||||
|
||||
$definition = $container->findDefinition(BuilderBlockContainer::class);
|
||||
$taggedServices = $container->findTaggedServiceIds('builder_block.widget');
|
||||
|
||||
foreach ($taggedServices as $id => $tags) {
|
||||
$definition->addMethodCall('addWidget', [new Reference($id)]);
|
||||
}
|
||||
}
|
||||
}
|
|
@ -15,6 +15,7 @@ class Configuration implements ConfigurationInterface
|
|||
'image/jpeg',
|
||||
'image/gif',
|
||||
'image/svg+xml',
|
||||
'image/webp',
|
||||
'video/mp4',
|
||||
'audio/mpeg3',
|
||||
'audio/x-mpeg-3',
|
||||
|
@ -50,12 +51,10 @@ class Configuration implements ConfigurationInterface
|
|||
->scalarNode('name')
|
||||
->defaultValue('Murph')
|
||||
->isRequired()
|
||||
->cannotBeEmpty()
|
||||
->end()
|
||||
->scalarNode('logo')
|
||||
->defaultValue('build/images/core/logo.svg')
|
||||
->isRequired()
|
||||
->cannotBeEmpty()
|
||||
->end()
|
||||
->arrayNode('controllers')
|
||||
->prototype('array')
|
||||
|
@ -140,6 +139,7 @@ class Configuration implements ConfigurationInterface
|
|||
->end()
|
||||
->end()
|
||||
->end();
|
||||
;
|
||||
|
||||
return $treeBuilder;
|
||||
}
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
namespace App\Core\DependencyInjection;
|
||||
|
||||
use App\Core\DependencyInjection\Compiler\BuilderBlockPass;
|
||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
use Symfony\Component\DependencyInjection\Extension\Extension;
|
||||
|
||||
|
|
|
@ -6,28 +6,20 @@ use Doctrine\ORM\Mapping as ORM;
|
|||
|
||||
trait Timestampable
|
||||
{
|
||||
/**
|
||||
* @ORM\Column(name="created_at", type="datetime")
|
||||
*/
|
||||
#[ORM\Column(name: 'created_at', type: 'datetime')]
|
||||
protected $createdAt;
|
||||
|
||||
/**
|
||||
* @ORM\Column(name="updated_at", type="datetime")
|
||||
*/
|
||||
#[ORM\Column(name: 'updated_at', type: 'datetime')]
|
||||
protected $updatedAt;
|
||||
|
||||
/**
|
||||
* @ORM\PrePersist
|
||||
*/
|
||||
#[ORM\PrePersist]
|
||||
public function onPrePersist(): void
|
||||
{
|
||||
$this->createdAt = new \DateTime();
|
||||
$this->updatedAt = new \DateTime();
|
||||
}
|
||||
|
||||
/**
|
||||
* @ORM\PreUpdate
|
||||
*/
|
||||
#[ORM\PreUpdate]
|
||||
public function onPreUpdate(): void
|
||||
{
|
||||
$this->updatedAt = new \DateTime();
|
||||
|
|
|
@ -2,43 +2,30 @@
|
|||
|
||||
namespace App\Core\Entity\Analytic;
|
||||
|
||||
use App\Core\Entity\Site\Node;
|
||||
use App\Repository\Entity\Analytic\NodeViewRepository;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
use App\Core\Entity\EntityInterface;
|
||||
use App\Core\Entity\Site\Node;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
|
||||
/**
|
||||
* @ORM\Entity(repositoryClass=ViewRepository::class)
|
||||
* @ORM\Table(name="analytic_referer")
|
||||
*/
|
||||
#[ORM\Table(name: 'analytic_referer')]
|
||||
#[ORM\Entity(repositoryClass: ViewRepository::class)]
|
||||
class Referer implements EntityInterface
|
||||
{
|
||||
/**
|
||||
* @ORM\Id
|
||||
* @ORM\GeneratedValue
|
||||
* @ORM\Column(type="integer")
|
||||
*/
|
||||
#[ORM\Id]
|
||||
#[ORM\GeneratedValue]
|
||||
#[ORM\Column(type: 'integer')]
|
||||
protected $id;
|
||||
|
||||
/**
|
||||
* @ORM\ManyToOne(targetEntity=Node::class, inversedBy="analyticReferers")
|
||||
* @ORM\JoinColumn(nullable=false, onDelete="CASCADE")
|
||||
*/
|
||||
#[ORM\ManyToOne(targetEntity: Node::class, inversedBy: 'analyticReferers')]
|
||||
#[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
|
||||
protected $node;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255)]
|
||||
protected $uri;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="integer", options={"default"=0})
|
||||
*/
|
||||
#[ORM\Column(type: 'integer', options: ['default' => 0])]
|
||||
protected $views = 0;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="date")
|
||||
*/
|
||||
#[ORM\Column(type: 'date')]
|
||||
protected $date;
|
||||
|
||||
public function getId(): ?int
|
||||
|
|
|
@ -2,53 +2,36 @@
|
|||
|
||||
namespace App\Core\Entity\Analytic;
|
||||
|
||||
use App\Core\Entity\Site\Node;
|
||||
use App\Repository\Entity\Analytic\NodeViewRepository;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
use App\Core\Entity\EntityInterface;
|
||||
use App\Core\Entity\Site\Node;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
|
||||
/**
|
||||
* @ORM\Entity(repositoryClass=ViewRepository::class)
|
||||
* @ORM\Table(name="analytic_view")
|
||||
*/
|
||||
#[ORM\Table(name: 'analytic_view')]
|
||||
#[ORM\Entity(repositoryClass: ViewRepository::class)]
|
||||
class View implements EntityInterface
|
||||
{
|
||||
/**
|
||||
* @ORM\Id
|
||||
* @ORM\GeneratedValue
|
||||
* @ORM\Column(type="integer")
|
||||
*/
|
||||
#[ORM\Id]
|
||||
#[ORM\GeneratedValue]
|
||||
#[ORM\Column(type: 'integer')]
|
||||
protected $id;
|
||||
|
||||
/**
|
||||
* @ORM\ManyToOne(targetEntity=Node::class, inversedBy="analyticViews")
|
||||
* @ORM\JoinColumn(nullable=false, onDelete="CASCADE")
|
||||
*/
|
||||
#[ORM\ManyToOne(targetEntity: Node::class, inversedBy: 'analyticViews')]
|
||||
#[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
|
||||
protected $node;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255)]
|
||||
protected $path;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="integer", options={"default"=0})
|
||||
*/
|
||||
#[ORM\Column(type: 'integer', options: ['default' => 0])]
|
||||
protected $views = 0;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="integer", options={"default"=0})
|
||||
*/
|
||||
#[ORM\Column(type: 'integer', options: ['default' => 0])]
|
||||
protected $desktopViews = 0;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="integer", options={"default"=0})
|
||||
*/
|
||||
#[ORM\Column(type: 'integer', options: ['default' => 0])]
|
||||
protected $mobileViews = 0;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="date")
|
||||
*/
|
||||
#[ORM\Column(type: 'date')]
|
||||
protected $date;
|
||||
|
||||
public function getId(): ?int
|
||||
|
|
|
@ -5,21 +5,15 @@ namespace App\Core\Entity;
|
|||
use App\Repository\Entity\FileInformationRepository;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
|
||||
/**
|
||||
* @ORM\Entity(repositoryClass=FileInformationRepository::class)
|
||||
*/
|
||||
#[ORM\Entity(repositoryClass: FileInformationRepository::class)]
|
||||
class FileInformation implements EntityInterface
|
||||
{
|
||||
/**
|
||||
* @ORM\Id
|
||||
* @ORM\GeneratedValue(strategy="NONE")
|
||||
* @ORM\Column(type="string", length=96, unique=true)
|
||||
*/
|
||||
#[ORM\Id]
|
||||
#[ORM\GeneratedValue(strategy: 'NONE')]
|
||||
#[ORM\Column(type: 'string', length: 96, unique: true)]
|
||||
protected $id;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="text", nullable=true)
|
||||
*/
|
||||
#[ORM\Column(type: 'text', nullable: true)]
|
||||
protected $attributes;
|
||||
|
||||
public function getId(): ?string
|
||||
|
|
|
@ -6,42 +6,28 @@ use App\Core\Entity\Site\Navigation;
|
|||
use App\Core\Repository\NavigationSettingRepository;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
|
||||
/**
|
||||
* @ORM\Entity(repositoryClass=NavigationSettingRepository::class)
|
||||
*/
|
||||
#[ORM\Entity(repositoryClass: NavigationSettingRepository::class)]
|
||||
class NavigationSetting implements EntityInterface
|
||||
{
|
||||
/**
|
||||
* @ORM\Id
|
||||
* @ORM\GeneratedValue
|
||||
* @ORM\Column(type="integer")
|
||||
*/
|
||||
#[ORM\Id]
|
||||
#[ORM\GeneratedValue]
|
||||
#[ORM\Column(type: 'integer')]
|
||||
protected $id;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255)]
|
||||
protected $section;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255)]
|
||||
protected $label;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255)]
|
||||
protected $code;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="text", nullable=true)
|
||||
*/
|
||||
#[ORM\Column(type: 'text', nullable: true)]
|
||||
protected $value;
|
||||
|
||||
/**
|
||||
* @ORM\ManyToOne(targetEntity=Navigation::class, inversedBy="navigationSettings")
|
||||
* @ORM\JoinColumn(nullable=false, onDelete="CASCADE")
|
||||
*/
|
||||
#[ORM\ManyToOne(targetEntity: Navigation::class, inversedBy: 'navigationSettings')]
|
||||
#[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
|
||||
protected $navigation;
|
||||
|
||||
public function getId(): ?int
|
||||
|
|
|
@ -5,71 +5,45 @@ namespace App\Core\Entity;
|
|||
use App\Core\Repository\RedirectRepository;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
|
||||
/**
|
||||
* @ORM\Entity(repositoryClass=RedirectRepository::class)
|
||||
*/
|
||||
#[ORM\Entity(repositoryClass: RedirectRepository::class)]
|
||||
class Redirect implements EntityInterface
|
||||
{
|
||||
/**
|
||||
* @ORM\Id
|
||||
* @ORM\GeneratedValue
|
||||
* @ORM\Column(type="integer")
|
||||
*/
|
||||
#[ORM\Id]
|
||||
#[ORM\GeneratedValue]
|
||||
#[ORM\Column(type: 'integer')]
|
||||
protected $id;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=5)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 5)]
|
||||
protected $scheme;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255)]
|
||||
protected $domain;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=6)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 6)]
|
||||
protected $domainType;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255)]
|
||||
protected $rule;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=6)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 6)]
|
||||
protected $ruleType;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255)]
|
||||
protected $location;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="integer")
|
||||
*/
|
||||
#[ORM\Column(type: 'integer')]
|
||||
protected $redirectCode;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255)]
|
||||
protected $label;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="integer", nullable=true)
|
||||
*/
|
||||
#[ORM\Column(type: 'integer', nullable: true)]
|
||||
protected $sortOrder;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="boolean")
|
||||
*/
|
||||
#[ORM\Column(type: 'boolean')]
|
||||
protected $isEnabled;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="boolean")
|
||||
*/
|
||||
#[ORM\Column(type: 'boolean')]
|
||||
protected $reuseQueryString;
|
||||
|
||||
public function getId(): ?int
|
||||
|
|
|
@ -5,36 +5,24 @@ namespace App\Core\Entity;
|
|||
use App\Core\Repository\SettingRepository;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
|
||||
/**
|
||||
* @ORM\Entity(repositoryClass=SettingRepository::class)
|
||||
*/
|
||||
#[ORM\Entity(repositoryClass: SettingRepository::class)]
|
||||
class Setting implements EntityInterface
|
||||
{
|
||||
/**
|
||||
* @ORM\Id
|
||||
* @ORM\GeneratedValue
|
||||
* @ORM\Column(type="integer")
|
||||
*/
|
||||
#[ORM\Id]
|
||||
#[ORM\GeneratedValue]
|
||||
#[ORM\Column(type: 'integer')]
|
||||
protected $id;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255)]
|
||||
protected $section;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255)]
|
||||
protected $label;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255)]
|
||||
protected $code;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="text", nullable=true)
|
||||
*/
|
||||
#[ORM\Column(type: 'text', nullable: true)]
|
||||
protected $value;
|
||||
|
||||
public function getId(): ?int
|
||||
|
|
|
@ -9,46 +9,32 @@ use Doctrine\Common\Collections\ArrayCollection;
|
|||
use Doctrine\Common\Collections\Collection;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
|
||||
/**
|
||||
* @ORM\Entity(repositoryClass=MenuRepository::class)
|
||||
* @ORM\HasLifecycleCallbacks
|
||||
*/
|
||||
#[ORM\Entity(repositoryClass: MenuRepository::class)]
|
||||
#[ORM\HasLifecycleCallbacks]
|
||||
class Menu implements EntityInterface
|
||||
{
|
||||
use Timestampable;
|
||||
|
||||
/**
|
||||
* @ORM\Id
|
||||
* @ORM\GeneratedValue
|
||||
* @ORM\Column(type="integer")
|
||||
*/
|
||||
#[ORM\Id]
|
||||
#[ORM\GeneratedValue]
|
||||
#[ORM\Column(type: 'integer')]
|
||||
protected $id;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255)]
|
||||
protected $label;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255)]
|
||||
protected $code;
|
||||
|
||||
/**
|
||||
* @ORM\ManyToOne(targetEntity=Navigation::class, inversedBy="menus")
|
||||
* @ORM\JoinColumn(nullable=false, onDelete="CASCADE")
|
||||
*/
|
||||
#[ORM\ManyToOne(targetEntity: Navigation::class, inversedBy: 'menus')]
|
||||
#[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
|
||||
protected $navigation;
|
||||
|
||||
/**
|
||||
* @ORM\OneToMany(targetEntity=Node::class, mappedBy="menu", orphanRemoval=true, cascade={"remove", "persist"})
|
||||
*/
|
||||
#[ORM\OneToMany(targetEntity: Node::class, mappedBy: 'menu', orphanRemoval: true, cascade: ['remove', 'persist'])]
|
||||
protected $nodes;
|
||||
|
||||
/**
|
||||
* @ORM\OneToOne(targetEntity=Node::class, cascade={"persist"})
|
||||
* @ORM\JoinColumn(onDelete="CASCADE")
|
||||
*/
|
||||
#[ORM\OneToOne(targetEntity: Node::class, cascade: ['persist'])]
|
||||
#[ORM\JoinColumn(onDelete: 'CASCADE')]
|
||||
protected $rootNode;
|
||||
|
||||
public function __construct()
|
||||
|
|
|
@ -10,64 +10,45 @@ use Doctrine\Common\Collections\ArrayCollection;
|
|||
use Doctrine\Common\Collections\Collection;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
|
||||
/**
|
||||
* @ORM\Entity(repositoryClass=NavigationRepository::class)
|
||||
* @ORM\HasLifecycleCallbacks
|
||||
*/
|
||||
#[ORM\Entity(repositoryClass: NavigationRepository::class)]
|
||||
#[ORM\HasLifecycleCallbacks]
|
||||
class Navigation implements EntityInterface
|
||||
{
|
||||
use Timestampable;
|
||||
|
||||
/**
|
||||
* @ORM\Id
|
||||
* @ORM\GeneratedValue
|
||||
* @ORM\Column(type="integer")
|
||||
*/
|
||||
#[ORM\Id]
|
||||
#[ORM\GeneratedValue]
|
||||
#[ORM\Column(type: 'integer')]
|
||||
protected $id;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255)]
|
||||
protected $label;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255)]
|
||||
protected $code;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255)]
|
||||
protected $domain;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="boolean", options={"default"=0})
|
||||
*/
|
||||
#[ORM\Column(type: 'boolean', options: ['default' => 0])]
|
||||
protected $forceDomain = false;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="text", nullable=true)
|
||||
*/
|
||||
#[ORM\Column(type: 'text', nullable: true)]
|
||||
protected $additionalDomains = '[]';
|
||||
|
||||
/**
|
||||
* @ORM\OneToMany(targetEntity=Menu::class, mappedBy="navigation")
|
||||
*/
|
||||
#[ORM\OneToMany(targetEntity: Menu::class, mappedBy: 'navigation')]
|
||||
protected $menus;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=10)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 10)]
|
||||
protected $locale = 'en';
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="integer", nullable=true)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 7, nullable: true)]
|
||||
protected $color;
|
||||
|
||||
#[ORM\Column(type: 'integer', nullable: true)]
|
||||
protected $sortOrder;
|
||||
|
||||
/**
|
||||
* @ORM\OneToMany(targetEntity=NavigationSetting::class, mappedBy="navigation", orphanRemoval=true)
|
||||
*/
|
||||
#[ORM\OneToMany(targetEntity: NavigationSetting::class, mappedBy: 'navigation', orphanRemoval: true)]
|
||||
protected $navigationSettings;
|
||||
|
||||
public function __construct()
|
||||
|
@ -86,7 +67,7 @@ class Navigation implements EntityInterface
|
|||
return $this->label;
|
||||
}
|
||||
|
||||
public function setLabel(string $label): self
|
||||
public function setLabel(?string $label): self
|
||||
{
|
||||
$this->label = $label;
|
||||
|
||||
|
@ -240,4 +221,35 @@ class Navigation implements EntityInterface
|
|||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function matchDomain(string $domain): bool
|
||||
{
|
||||
if ($domain === $this->getDomain()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
foreach ($this->getAdditionalDomains() as $additionalDomain) {
|
||||
if ('domain' === $additionalDomain['type'] && $additionalDomain['domain'] === $domain) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if ('regexp' === $additionalDomain['type'] && preg_match('#'.$additionalDomain['domain'].'#', $domain) > 0) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public function setColor(string $color): self
|
||||
{
|
||||
$this->color = $color;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getColor(): ?string
|
||||
{
|
||||
return $this->color;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -16,156 +16,120 @@ use function Symfony\Component\String\u;
|
|||
|
||||
/**
|
||||
* @Gedmo\Tree(type="nested")
|
||||
* @ORM\HasLifecycleCallbacks
|
||||
* @ORM\Entity(repositoryClass=NodeRepository::class)
|
||||
*/
|
||||
#[ORM\HasLifecycleCallbacks]
|
||||
#[ORM\Entity(repositoryClass: NodeRepository::class)]
|
||||
class Node implements EntityInterface
|
||||
{
|
||||
use Timestampable;
|
||||
|
||||
/**
|
||||
* @ORM\Id
|
||||
* @ORM\GeneratedValue
|
||||
* @ORM\Column(type="integer")
|
||||
*/
|
||||
#[ORM\Id]
|
||||
#[ORM\GeneratedValue]
|
||||
#[ORM\Column(type: 'integer')]
|
||||
protected $id;
|
||||
|
||||
/**
|
||||
* @ORM\ManyToOne(targetEntity=Menu::class, inversedBy="nodes", cascade={"persist", "remove"})
|
||||
* @ORM\JoinColumn(nullable=false, onDelete="CASCADE")
|
||||
*/
|
||||
#[ORM\ManyToOne(targetEntity: Menu::class, inversedBy: 'nodes', cascade: ['persist', 'remove'])]
|
||||
#[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
|
||||
protected $menu;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255, nullable=true)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255, nullable: true)]
|
||||
protected $label;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255, nullable=true)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255, nullable: true)]
|
||||
protected $url;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="boolean", options={"default"=0})
|
||||
*/
|
||||
#[ORM\Column(type: 'boolean', options: ['default' => 0])]
|
||||
protected $disableUrl = false;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="boolean", options={"default"=0})
|
||||
*/
|
||||
#[ORM\Column(type: 'boolean', options: ['default' => 0])]
|
||||
protected $isVisible = false;
|
||||
|
||||
/**
|
||||
* @Gedmo\TreeLeft
|
||||
* @ORM\Column(type="integer")
|
||||
*/
|
||||
#[ORM\Column(type: 'integer')]
|
||||
protected $treeLeft;
|
||||
|
||||
/**
|
||||
* @Gedmo\TreeLevel
|
||||
* @ORM\Column(type="integer")
|
||||
*/
|
||||
#[ORM\Column(type: 'integer')]
|
||||
protected $treeLevel;
|
||||
|
||||
/**
|
||||
* @Gedmo\TreeRight
|
||||
* @ORM\Column(type="integer")
|
||||
*/
|
||||
#[ORM\Column(type: 'integer')]
|
||||
protected $treeRight;
|
||||
|
||||
/**
|
||||
* @Gedmo\TreeRoot
|
||||
* @ORM\ManyToOne(targetEntity="Node")
|
||||
* @ORM\JoinColumn(referencedColumnName="id", onDelete="CASCADE")
|
||||
*/
|
||||
#[ORM\ManyToOne(targetEntity: 'Node')]
|
||||
#[ORM\JoinColumn(referencedColumnName: 'id', onDelete: 'CASCADE')]
|
||||
protected $treeRoot;
|
||||
|
||||
/**
|
||||
* @Gedmo\TreeParent
|
||||
* @ORM\ManyToOne(targetEntity="Node", inversedBy="children")
|
||||
* @ORM\JoinColumn(referencedColumnName="id", onDelete="CASCADE")
|
||||
*/
|
||||
#[ORM\ManyToOne(targetEntity: 'Node', inversedBy: 'children')]
|
||||
#[ORM\JoinColumn(referencedColumnName: 'id', onDelete: 'CASCADE')]
|
||||
protected $parent;
|
||||
|
||||
/**
|
||||
* @ORM\OneToMany(targetEntity="Node", mappedBy="parent")
|
||||
* @ORM\OrderBy({"treeLeft"="ASC"})
|
||||
*/
|
||||
#[ORM\OneToMany(targetEntity: 'Node', mappedBy: 'parent')]
|
||||
#[ORM\OrderBy(['treeLeft' => 'ASC'])]
|
||||
protected $children;
|
||||
|
||||
/**
|
||||
* @ORM\ManyToOne(targetEntity=Page::class, inversedBy="nodes", cascade={"persist"})
|
||||
* @ORM\JoinColumn(nullable=true, onDelete="SET NULL")
|
||||
*/
|
||||
#[ORM\ManyToOne(targetEntity: Page::class, inversedBy: 'nodes', cascade: ['persist'])]
|
||||
#[ORM\JoinColumn(nullable: true, onDelete: 'SET NULL')]
|
||||
protected $page;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255, nullable=true)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255, nullable: true)]
|
||||
protected $code;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="array", nullable=true)
|
||||
*/
|
||||
#[ORM\Column(type: 'array', nullable: true)]
|
||||
protected $parameters = [];
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="array", nullable=true)
|
||||
*/
|
||||
#[ORM\Column(type: 'array', nullable: true)]
|
||||
protected $attributes = [];
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255, nullable=true)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255, nullable: true)]
|
||||
protected $controller;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="array", nullable=true)
|
||||
*/
|
||||
#[ORM\Column(type: 'array', nullable: true)]
|
||||
protected $sitemapParameters = [];
|
||||
|
||||
/**
|
||||
* @ORM\ManyToOne(targetEntity=Node::class, inversedBy="aliasNodes")
|
||||
* @ORM\JoinColumn(nullable=true, onDelete="SET NULL")
|
||||
*/
|
||||
#[ORM\ManyToOne(targetEntity: Node::class, inversedBy: 'aliasNodes')]
|
||||
#[ORM\JoinColumn(nullable: true, onDelete: 'SET NULL')]
|
||||
protected $aliasNode;
|
||||
|
||||
/**
|
||||
* @ORM\OneToMany(targetEntity=Node::class, mappedBy="aliasNode")
|
||||
*/
|
||||
#[ORM\OneToMany(targetEntity: Node::class, mappedBy: 'aliasNode')]
|
||||
protected $aliasNodes;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255, nullable=true)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255, nullable: true)]
|
||||
protected $contentType;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="boolean", options={"default"=0})
|
||||
*/
|
||||
#[ORM\Column(type: 'boolean', options: ['default' => 0])]
|
||||
protected $enableAnalytics = false;
|
||||
|
||||
/**
|
||||
* @ORM\OneToMany(targetEntity=View::class, mappedBy="node")
|
||||
*/
|
||||
#[ORM\OneToMany(targetEntity: View::class, mappedBy: 'node')]
|
||||
protected $analyticViews;
|
||||
|
||||
/**
|
||||
* @ORM\OneToMany(targetEntity=Referer::class, mappedBy="node")
|
||||
*/
|
||||
#[ORM\OneToMany(targetEntity: Referer::class, mappedBy: 'node')]
|
||||
protected $analyticReferers;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="array", nullable=true)
|
||||
*/
|
||||
#[ORM\Column(type: 'array', nullable: true)]
|
||||
private $securityRoles = [];
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=3, nullable=true)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 3, nullable: true)]
|
||||
private $securityOperator = 'or';
|
||||
|
||||
#[ORM\Column(type: 'boolean', options: ['default' => 0])]
|
||||
private $hasAbTest = false;
|
||||
|
||||
#[ORM\Column(type: 'string', length: 255, nullable: true)]
|
||||
private $abTestCode;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->children = new ArrayCollection();
|
||||
|
@ -673,4 +637,28 @@ class Node implements EntityInterface
|
|||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getHasAbTest(): ?bool
|
||||
{
|
||||
return $this->hasAbTest;
|
||||
}
|
||||
|
||||
public function setHasAbTest(bool $hasAbTest): self
|
||||
{
|
||||
$this->hasAbTest = $hasAbTest;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getAbTestCode(): ?string
|
||||
{
|
||||
return $this->abTestCode;
|
||||
}
|
||||
|
||||
public function setAbTestCode(?string $abTestCode): self
|
||||
{
|
||||
$this->abTestCode = $abTestCode;
|
||||
|
||||
return $this;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,37 +6,27 @@ use App\Core\Doctrine\Timestampable;
|
|||
use App\Core\Repository\Site\Page\BlockRepository;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
|
||||
/**
|
||||
* @ORM\Entity(repositoryClass=BlockRepository::class)
|
||||
* @ORM\DiscriminatorColumn(name="class_key", type="string")
|
||||
* @ORM\InheritanceType("SINGLE_TABLE")
|
||||
* @ORM\HasLifecycleCallbacks
|
||||
*/
|
||||
#[ORM\Entity(repositoryClass: BlockRepository::class)]
|
||||
#[ORM\DiscriminatorColumn(name: 'class_key', type: 'string')]
|
||||
#[ORM\InheritanceType('SINGLE_TABLE')]
|
||||
#[ORM\HasLifecycleCallbacks]
|
||||
class Block
|
||||
{
|
||||
use Timestampable;
|
||||
|
||||
/**
|
||||
* @ORM\Id
|
||||
* @ORM\GeneratedValue
|
||||
* @ORM\Column(type="integer")
|
||||
*/
|
||||
#[ORM\Id]
|
||||
#[ORM\GeneratedValue]
|
||||
#[ORM\Column(type: 'integer')]
|
||||
protected $id;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255)]
|
||||
protected $name;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="text", nullable=true)
|
||||
*/
|
||||
#[ORM\Column(type: 'text', nullable: true)]
|
||||
protected $value;
|
||||
|
||||
/**
|
||||
* @ORM\ManyToOne(targetEntity=Page::class, inversedBy="blocks")
|
||||
* @ORM\JoinColumn(onDelete="CASCADE")
|
||||
*/
|
||||
#[ORM\ManyToOne(targetEntity: Page::class, inversedBy: 'blocks')]
|
||||
#[ORM\JoinColumn(onDelete: 'CASCADE')]
|
||||
protected $page;
|
||||
|
||||
public function getId(): ?int
|
||||
|
|
20
src/core/Entity/Site/Page/BuilderBlock.php
Normal file
20
src/core/Entity/Site/Page/BuilderBlock.php
Normal file
|
@ -0,0 +1,20 @@
|
|||
<?php
|
||||
|
||||
namespace App\Core\Entity\Site\Page;
|
||||
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
|
||||
#[ORM\Entity]
|
||||
class BuilderBlock extends JsonBlock
|
||||
{
|
||||
public function getValue()
|
||||
{
|
||||
$value = parent::getValue();
|
||||
|
||||
if (is_string($value)) {
|
||||
return json_decode($value, true);
|
||||
}
|
||||
|
||||
return [];
|
||||
}
|
||||
}
|
|
@ -4,18 +4,7 @@ namespace App\Core\Entity\Site\Page;
|
|||
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
|
||||
/**
|
||||
* @ORM\Entity
|
||||
*/
|
||||
class ChoiceBlock extends Block
|
||||
#[ORM\Entity]
|
||||
class ChoiceBlock extends JsonBlock
|
||||
{
|
||||
public function getValue()
|
||||
{
|
||||
return json_decode(parent::getValue(), true);
|
||||
}
|
||||
|
||||
public function setValue($value): self
|
||||
{
|
||||
return parent::setValue(json_encode($value));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,9 +4,7 @@ namespace App\Core\Entity\Site\Page;
|
|||
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
|
||||
/**
|
||||
* @ORM\Entity
|
||||
*/
|
||||
#[ORM\Entity]
|
||||
class CollectionBlock extends Block
|
||||
{
|
||||
public function getValue()
|
||||
|
|
|
@ -6,9 +6,7 @@ use App\Core\File\FileAttribute;
|
|||
use Doctrine\ORM\Mapping as ORM;
|
||||
use Symfony\Component\HttpFoundation\File\File;
|
||||
|
||||
/**
|
||||
* @ORM\Entity
|
||||
*/
|
||||
#[ORM\Entity]
|
||||
class FileBlock extends Block
|
||||
{
|
||||
public function getValue()
|
||||
|
|
19
src/core/Entity/Site/Page/JsonBlock.php
Normal file
19
src/core/Entity/Site/Page/JsonBlock.php
Normal file
|
@ -0,0 +1,19 @@
|
|||
<?php
|
||||
|
||||
namespace App\Core\Entity\Site\Page;
|
||||
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
|
||||
#[ORM\Entity]
|
||||
class JsonBlock extends Block
|
||||
{
|
||||
public function getValue()
|
||||
{
|
||||
return json_decode(parent::getValue(), true);
|
||||
}
|
||||
|
||||
public function setValue($value): self
|
||||
{
|
||||
return parent::setValue(json_encode($value));
|
||||
}
|
||||
}
|
|
@ -5,74 +5,51 @@ namespace App\Core\Entity\Site\Page;
|
|||
use App\Core\Doctrine\Timestampable;
|
||||
use App\Core\Entity\EntityInterface;
|
||||
use App\Core\Entity\Site\Node;
|
||||
use App\Core\File\FileAttribute;
|
||||
use App\Core\Repository\Site\Page\PageRepository;
|
||||
use Doctrine\Common\Collections\ArrayCollection;
|
||||
use Doctrine\Common\Collections\Collection;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
use Symfony\Component\Form\FormBuilderInterface;
|
||||
use Symfony\Component\HttpFoundation\File\File;
|
||||
use App\Core\File\FileAttribute;
|
||||
|
||||
/**
|
||||
* @ORM\Entity(repositoryClass=PageRepository::class)
|
||||
* @ORM\DiscriminatorColumn(name="class_key", type="string")
|
||||
* @ORM\InheritanceType("SINGLE_TABLE")
|
||||
* @ORM\HasLifecycleCallbacks
|
||||
*/
|
||||
#[ORM\Entity(repositoryClass: PageRepository::class)]
|
||||
#[ORM\DiscriminatorColumn(name: 'class_key', type: 'string')]
|
||||
#[ORM\InheritanceType('SINGLE_TABLE')]
|
||||
#[ORM\HasLifecycleCallbacks]
|
||||
class Page implements EntityInterface
|
||||
{
|
||||
use Timestampable;
|
||||
|
||||
/**
|
||||
* @ORM\Id
|
||||
* @ORM\GeneratedValue
|
||||
* @ORM\Column(type="integer")
|
||||
*/
|
||||
#[ORM\Id]
|
||||
#[ORM\GeneratedValue]
|
||||
#[ORM\Column(type: 'integer')]
|
||||
protected $id;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255)]
|
||||
protected $name;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255, nullable=true)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255, nullable: true)]
|
||||
protected $template;
|
||||
|
||||
/**
|
||||
* @ORM\OneToMany(targetEntity=Block::class, mappedBy="page", cascade={"persist"})
|
||||
*/
|
||||
#[ORM\OneToMany(targetEntity: Block::class, mappedBy: 'page', cascade: ['persist'])]
|
||||
protected $blocks;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255, nullable=true)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255, nullable: true)]
|
||||
protected $metaTitle;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255, nullable=true)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255, nullable: true)]
|
||||
protected $metaDescription;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255, nullable=true)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255, nullable: true)]
|
||||
protected $ogTitle;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255, nullable=true)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255, nullable: true)]
|
||||
protected $ogDescription;
|
||||
|
||||
/**
|
||||
* @ORM\Column(type="string", length=255, nullable=true)
|
||||
*/
|
||||
#[ORM\Column(type: 'string', length: 255, nullable: true)]
|
||||
protected $ogImage;
|
||||
|
||||
/**
|
||||
* @ORM\OneToMany(targetEntity=Node::class, mappedBy="page")
|
||||
*/
|
||||
#[ORM\OneToMany(targetEntity: Node::class, mappedBy: 'page')]
|
||||
protected $nodes;
|
||||
|
||||
public function __construct()
|
||||
|
@ -111,7 +88,7 @@ class Page implements EntityInterface
|
|||
}
|
||||
|
||||
/**
|
||||
* @return Collection|Block[]
|
||||
* @return Block[]|Collection
|
||||
*/
|
||||
public function getBlocks(): Collection
|
||||
{
|
||||
|
|
|
@ -4,9 +4,7 @@ namespace App\Core\Entity\Site\Page;
|
|||
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
|
||||
/**
|
||||
* @ORM\Entity
|
||||
*/
|
||||
#[ORM\Entity]
|
||||
class TextBlock extends Block
|
||||
{
|
||||
}
|
||||
|
|
26
src/core/Event/Ab/AbTestEvent.php
Normal file
26
src/core/Event/Ab/AbTestEvent.php
Normal file
|
@ -0,0 +1,26 @@
|
|||
<?php
|
||||
|
||||
namespace App\Core\Event\Ab;
|
||||
|
||||
use App\Core\Ab\AbTest;
|
||||
use Symfony\Contracts\EventDispatcher\Event;
|
||||
|
||||
/**
|
||||
* class AbTestEvent.
|
||||
*
|
||||
* @author Simon Vieille <simon@deblan.fr>
|
||||
*/
|
||||
class AbTestEvent extends Event
|
||||
{
|
||||
public const INIT_EVENT = 'ab_test.init';
|
||||
public const RUN_EVENT = 'ab_test.run';
|
||||
|
||||
public function __construct(protected AbTest $test)
|
||||
{
|
||||
}
|
||||
|
||||
public function getTest(): AbTest
|
||||
{
|
||||
return $this->test;
|
||||
}
|
||||
}
|
|
@ -12,16 +12,13 @@ use Symfony\Contracts\EventDispatcher\Event;
|
|||
*/
|
||||
class PasswordRequestEvent extends Event
|
||||
{
|
||||
const EVENT = 'account_event.password_request';
|
||||
public const EVENT = 'account_event.password_request';
|
||||
|
||||
protected User $user;
|
||||
|
||||
public function __construct(User $user)
|
||||
public function __construct(protected User $user)
|
||||
{
|
||||
$this->user = $user;
|
||||
}
|
||||
|
||||
public function getUser(): USer
|
||||
public function getUser(): User
|
||||
{
|
||||
return $this->user;
|
||||
}
|
||||
|
|
|
@ -12,18 +12,15 @@ use Symfony\Contracts\EventDispatcher\Event;
|
|||
*/
|
||||
class EntityManagerEvent extends Event
|
||||
{
|
||||
const CREATE_EVENT = 'entity_manager_event.create';
|
||||
const UPDATE_EVENT = 'entity_manager_event.update';
|
||||
const DELETE_EVENT = 'entity_manager_event.delete';
|
||||
const PRE_CREATE_EVENT = 'entity_manager_event.pre_create';
|
||||
const PRE_UPDATE_EVENT = 'entity_manager_event.pre_update';
|
||||
const PRE_DELETE_EVENT = 'entity_manager_event.pre_delete';
|
||||
public const CREATE_EVENT = 'entity_manager_event.create';
|
||||
public const UPDATE_EVENT = 'entity_manager_event.update';
|
||||
public const DELETE_EVENT = 'entity_manager_event.delete';
|
||||
public const PRE_CREATE_EVENT = 'entity_manager_event.pre_create';
|
||||
public const PRE_UPDATE_EVENT = 'entity_manager_event.pre_update';
|
||||
public const PRE_DELETE_EVENT = 'entity_manager_event.pre_delete';
|
||||
|
||||
protected EntityInterface $entity;
|
||||
|
||||
public function __construct(EntityInterface $entity)
|
||||
public function __construct(protected EntityInterface $entity)
|
||||
{
|
||||
$this->entity = $entity;
|
||||
}
|
||||
|
||||
public function getEntity(): EntityInterface
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
namespace App\Core\Event\Page;
|
||||
|
||||
use Symfony\Contracts\EventDispatcher\Event;
|
||||
use App\Core\Entity\Site\Page\Page;
|
||||
use Symfony\Contracts\EventDispatcher\Event;
|
||||
|
||||
/**
|
||||
* class PageEditEvent.
|
||||
|
@ -12,14 +12,12 @@ use App\Core\Entity\Site\Page\Page;
|
|||
*/
|
||||
class PageEditEvent extends Event
|
||||
{
|
||||
const FORM_INIT_EVENT = 'page_edit_event.form_init';
|
||||
public const FORM_INIT_EVENT = 'page_edit_event.form_init';
|
||||
|
||||
protected Page $page;
|
||||
protected array $pageBuilderOptions = [];
|
||||
|
||||
public function __construct(Page $page)
|
||||
public function __construct(protected Page $page)
|
||||
{
|
||||
$this->page = $page;
|
||||
}
|
||||
|
||||
public function getPage()
|
||||
|
|
|
@ -11,14 +11,11 @@ use Symfony\Contracts\EventDispatcher\Event;
|
|||
*/
|
||||
class NavigationSettingEvent extends Event
|
||||
{
|
||||
const INIT_EVENT = 'navigation_setting_event.init';
|
||||
const FORM_INIT_EVENT = 'navigation_setting_event.form_init';
|
||||
public const INIT_EVENT = 'navigation_setting_event.init';
|
||||
public const FORM_INIT_EVENT = 'navigation_setting_event.form_init';
|
||||
|
||||
protected $data;
|
||||
|
||||
public function __construct($data = null)
|
||||
public function __construct(protected $data = null)
|
||||
{
|
||||
$this->data = $data;
|
||||
}
|
||||
|
||||
public function getData()
|
||||
|
|
|
@ -11,14 +11,11 @@ use Symfony\Contracts\EventDispatcher\Event;
|
|||
*/
|
||||
class SettingEvent extends Event
|
||||
{
|
||||
const INIT_EVENT = 'setting_event.init';
|
||||
const FORM_INIT_EVENT = 'setting_event.form_init';
|
||||
public const INIT_EVENT = 'setting_event.init';
|
||||
public const FORM_INIT_EVENT = 'setting_event.form_init';
|
||||
|
||||
protected $data;
|
||||
|
||||
public function __construct($data = null)
|
||||
public function __construct(protected $data = null)
|
||||
{
|
||||
$this->data = $data;
|
||||
}
|
||||
|
||||
public function getData()
|
||||
|
|
|
@ -11,7 +11,7 @@ use Symfony\Contracts\EventDispatcher\Event;
|
|||
*/
|
||||
class TaskInitEvent extends Event
|
||||
{
|
||||
const INIT_EVENT = 'task_event.init';
|
||||
public const INIT_EVENT = 'task_event.init';
|
||||
|
||||
protected array $tasks = [];
|
||||
|
||||
|
|
|
@ -14,17 +14,13 @@ use Symfony\Contracts\EventDispatcher\Event;
|
|||
*/
|
||||
class TaskRunRequestedEvent extends Event
|
||||
{
|
||||
const RUN_REQUEST_EVENT = 'task_event.run_request';
|
||||
public const RUN_REQUEST_EVENT = 'task_event.run_request';
|
||||
|
||||
protected string $task;
|
||||
protected InputBag $parameters;
|
||||
protected BufferedOutput $output;
|
||||
|
||||
public function __construct(string $task, InputBag $parameters, BufferedOutput $output)
|
||||
{
|
||||
$this->task = $task;
|
||||
$this->parameters = $parameters;
|
||||
$this->output = $output;
|
||||
public function __construct(
|
||||
protected string $task,
|
||||
protected InputBag $parameters,
|
||||
protected BufferedOutput $output
|
||||
) {
|
||||
}
|
||||
|
||||
public function getTask(): string
|
||||
|
|
102
src/core/EventListener/AbListener.php
Normal file
102
src/core/EventListener/AbListener.php
Normal file
|
@ -0,0 +1,102 @@
|
|||
<?php
|
||||
|
||||
namespace App\Core\EventListener;
|
||||
|
||||
use App\Core\Ab\AbContainer;
|
||||
use App\Core\Ab\AbTest;
|
||||
use App\Core\Entity\Site\Node;
|
||||
use App\Core\Event\Ab\AbTestEvent;
|
||||
use App\Core\Site\SiteRequest;
|
||||
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
||||
use Symfony\Component\HttpFoundation\Cookie;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\HttpKernel\Event\RequestEvent;
|
||||
use Symfony\Component\HttpKernel\Event\ResponseEvent;
|
||||
|
||||
/**
|
||||
* class AbListener.
|
||||
*
|
||||
* @author Simon Vieille <simon@deblan.fr>
|
||||
*/
|
||||
class AbListener
|
||||
{
|
||||
protected ?Node $node;
|
||||
|
||||
public function __construct(
|
||||
protected AbContainer $container,
|
||||
protected EventDispatcherInterface $eventDispatcher,
|
||||
protected SiteRequest $siteRequest
|
||||
) {
|
||||
}
|
||||
|
||||
public function onKernelRequest(RequestEvent $event)
|
||||
{
|
||||
$this->node = $this->siteRequest->getNode();
|
||||
|
||||
if (!$this->supports($event->getRequest())) {
|
||||
return;
|
||||
}
|
||||
|
||||
$request = $event->getRequest();
|
||||
$cookieName = md5($this->getCookieName());
|
||||
$cookieValue = $event->getRequest()->cookies->get($cookieName);
|
||||
|
||||
$abTest = new AbTest($this->getAbTestCode());
|
||||
$event = new AbTestEvent($abTest);
|
||||
$this->container->add($abTest);
|
||||
|
||||
$this->eventDispatcher->dispatch($event, AbTestEvent::INIT_EVENT);
|
||||
|
||||
if (!$abTest->isValidVariation($cookieValue)) {
|
||||
$abTest->run();
|
||||
$result = $abTest->getResult();
|
||||
|
||||
$attributes = array_merge($request->attributes->get('ab_test_cookies', []), [
|
||||
$cookieName => ['value' => $result, 'duration' => $abTest->getDuration()],
|
||||
]);
|
||||
|
||||
$request->attributes->set('ab_test_cookies', $attributes);
|
||||
|
||||
$this->eventDispatcher->dispatch($event, AbTestEvent::RUN_EVENT);
|
||||
} else {
|
||||
$abTest->setResult($cookieValue);
|
||||
}
|
||||
}
|
||||
|
||||
public function onKernelResponse(ResponseEvent $event)
|
||||
{
|
||||
$cookies = $event->getRequest()->attributes->get('ab_test_cookies', []);
|
||||
|
||||
foreach ($cookies as $name => $value) {
|
||||
$cookie = Cookie::create($name, $value['value'], time() + $value['duration']);
|
||||
$event->getResponse()->headers->setCookie($cookie);
|
||||
}
|
||||
}
|
||||
|
||||
protected function getCookieName(): string
|
||||
{
|
||||
return 'ab_test_'.$this->getAbTestCode();
|
||||
}
|
||||
|
||||
protected function getAbTestCode(): string
|
||||
{
|
||||
return $this->node->getAbTestCode();
|
||||
}
|
||||
|
||||
protected function supports(Request $request): bool
|
||||
{
|
||||
if (!$this->node) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!$this->node->getHasAbTest()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!$this->node->getAbTestCode()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
|
@ -23,30 +23,18 @@ use Symfony\Component\HttpKernel\Event\RequestEvent;
|
|||
*/
|
||||
class AnalyticListener
|
||||
{
|
||||
protected NodeRepository $nodeRepository;
|
||||
protected ViewRepositoryQuery $viewRepositoryQuery;
|
||||
protected ViewFactory $viewFactory;
|
||||
protected RefererRepositoryQuery $refererRepositoryQuery;
|
||||
protected RefererFactory $refererFactory;
|
||||
protected EntityManager $manager;
|
||||
protected DeviceDetector $deviceDetector;
|
||||
protected Request $request;
|
||||
protected Node $node;
|
||||
|
||||
public function __construct(
|
||||
NodeRepository $nodeRepository,
|
||||
ViewRepositoryQuery $viewRepositoryQuery,
|
||||
ViewFactory $viewFactory,
|
||||
RefererRepositoryQuery $refererRepositoryQuery,
|
||||
RefererFactory $refererFactory,
|
||||
EntityManager $manager
|
||||
protected NodeRepository $nodeRepository,
|
||||
protected ViewRepositoryQuery $viewRepositoryQuery,
|
||||
protected ViewFactory $viewFactory,
|
||||
protected RefererRepositoryQuery $refererRepositoryQuery,
|
||||
protected RefererFactory $refererFactory,
|
||||
protected EntityManager $manager
|
||||
) {
|
||||
$this->nodeRepository = $nodeRepository;
|
||||
$this->viewRepositoryQuery = $viewRepositoryQuery;
|
||||
$this->viewFactory = $viewFactory;
|
||||
$this->refererRepositoryQuery = $refererRepositoryQuery;
|
||||
$this->refererFactory = $refererFactory;
|
||||
$this->manager = $manager;
|
||||
$this->createDeviceDetector();
|
||||
}
|
||||
|
||||
|
|
|
@ -3,11 +3,10 @@
|
|||
namespace App\Core\EventListener;
|
||||
|
||||
use App\Core\Repository\RedirectRepositoryQuery;
|
||||
use App\Core\Router\RedirectBuilder;
|
||||
use App\Core\Router\RedirectMatcher;
|
||||
use Symfony\Component\HttpFoundation\RedirectResponse;
|
||||
use Symfony\Component\HttpKernel\Event\ExceptionEvent;
|
||||
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
||||
use App\Core\Router\RedirectBuilder;
|
||||
|
||||
/**
|
||||
* class RedirectListener.
|
||||
|
@ -16,15 +15,11 @@ use App\Core\Router\RedirectBuilder;
|
|||
*/
|
||||
class RedirectListener
|
||||
{
|
||||
protected RedirectMatcher $matcher;
|
||||
protected RedirectBuilder $builder;
|
||||
protected RedirectRepositoryQuery $repository;
|
||||
|
||||
public function __construct(RedirectMatcher $matcher, RedirectBuilder $builder, RedirectRepositoryQuery $repository)
|
||||
{
|
||||
$this->matcher = $matcher;
|
||||
$this->builder = $builder;
|
||||
$this->repository = $repository;
|
||||
public function __construct(
|
||||
protected RedirectMatcher $matcher,
|
||||
protected RedirectBuilder $builder,
|
||||
protected RedirectRepositoryQuery $repository
|
||||
) {
|
||||
}
|
||||
|
||||
public function onKernelException(ExceptionEvent $event)
|
||||
|
@ -37,7 +32,7 @@ class RedirectListener
|
|||
|
||||
$redirects = $this->repository
|
||||
->orderBy('.sortOrder')
|
||||
->where('.isEnabled=1')
|
||||
->where('.isEnabled=true')
|
||||
->find()
|
||||
;
|
||||
|
||||
|
|
32
src/core/EventSubscriber/AbEventSubscriber.php
Normal file
32
src/core/EventSubscriber/AbEventSubscriber.php
Normal file
|
@ -0,0 +1,32 @@
|
|||
<?php
|
||||
|
||||
namespace App\Core\EventSubscriber;
|
||||
|
||||
use App\Core\Event\Ab\AbTestEvent;
|
||||
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
|
||||
|
||||
/**
|
||||
* class AbEventSubscriber.
|
||||
*
|
||||
* @author Simon Vieille <simon@deblan.fr>
|
||||
*/
|
||||
abstract class AbEventSubscriber implements EventSubscriberInterface
|
||||
{
|
||||
protected static int $priority = 0;
|
||||
|
||||
public static function getSubscribedEvents()
|
||||
{
|
||||
return [
|
||||
AbTestEvent::INIT_EVENT => ['onInit', self::$priority],
|
||||
AbTestEvent::RUN_EVENT => ['onRun', self::$priority],
|
||||
];
|
||||
}
|
||||
|
||||
public function onInit(AbTestEvent $event)
|
||||
{
|
||||
}
|
||||
|
||||
public function onRun(AbTestEvent $event)
|
||||
{
|
||||
}
|
||||
}
|
|
@ -17,24 +17,13 @@ use Symfony\Contracts\Translation\TranslatorInterface;
|
|||
*/
|
||||
class PasswordRequestEventSubscriber implements EventSubscriberInterface
|
||||
{
|
||||
protected MailNotifier $notifier;
|
||||
protected UrlGeneratorInterface $urlGenerator;
|
||||
protected EntityManager $entityManager;
|
||||
protected TokenGeneratorInterface $tokenGenerator;
|
||||
protected TranslatorInterface $translator;
|
||||
|
||||
public function __construct(
|
||||
MailNotifier $notifier,
|
||||
UrlGeneratorInterface $urlGenerator,
|
||||
EntityManager $entityManager,
|
||||
TokenGeneratorInterface $tokenGenerator,
|
||||
TranslatorInterface $translator
|
||||
protected MailNotifier $notifier,
|
||||
protected UrlGeneratorInterface $urlGenerator,
|
||||
protected EntityManager $entityManager,
|
||||
protected TokenGeneratorInterface $tokenGenerator,
|
||||
protected TranslatorInterface $translator
|
||||
) {
|
||||
$this->notifier = $notifier;
|
||||
$this->urlGenerator = $urlGenerator;
|
||||
$this->entityManager = $entityManager;
|
||||
$this->tokenGenerator = $tokenGenerator;
|
||||
$this->translator = $translator;
|
||||
}
|
||||
|
||||
public static function getSubscribedEvents()
|
||||
|
|
|
@ -16,12 +16,12 @@ use Symfony\Component\Security\Core\Exception\AccessDeniedException;
|
|||
*/
|
||||
class RequestSecurityEventSubscriber implements EventSubscriberInterface
|
||||
{
|
||||
protected NodeRepository $nodeRepository;
|
||||
protected AuthorizationChecker $authorizationChecker;
|
||||
|
||||
public function __construct(NodeRepository $nodeRepository, ContainerInterface $container)
|
||||
{
|
||||
$this->nodeRepository = $nodeRepository;
|
||||
public function __construct(
|
||||
protected NodeRepository $nodeRepository,
|
||||
ContainerInterface $container
|
||||
) {
|
||||
$this->authorizationChecker = $container->get('security.authorization_checker');
|
||||
}
|
||||
|
||||
|
|
|
@ -4,18 +4,15 @@ namespace App\Core\EventSubscriber\Site;
|
|||
|
||||
use App\Core\Site\SiteRequest;
|
||||
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
|
||||
use Symfony\Component\HttpKernel\KernelEvents;
|
||||
use Symfony\Component\HttpKernel\Event\ResponseEvent;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\HttpKernel\Event\ResponseEvent;
|
||||
use Symfony\Component\HttpKernel\KernelEvents;
|
||||
use function Symfony\Component\String\u;
|
||||
|
||||
class ForcedDomainEventSubscriber implements EventSubscriberInterface
|
||||
{
|
||||
protected SiteRequest $siteRequest;
|
||||
|
||||
public function __construct(SiteRequest $siteRequest)
|
||||
public function __construct(protected SiteRequest $siteRequest)
|
||||
{
|
||||
$this->siteRequest = $siteRequest;
|
||||
}
|
||||
|
||||
public function onKernelResponse(ResponseEvent $event)
|
||||
|
@ -38,7 +35,8 @@ class ForcedDomainEventSubscriber implements EventSubscriberInterface
|
|||
->replace(
|
||||
'://'.$this->siteRequest->getDomain(),
|
||||
'://'.$navigation->getDomain()
|
||||
);
|
||||
)
|
||||
;
|
||||
|
||||
$event->getResponse()->headers->set('Location', $uri);
|
||||
$event->getResponse()->setStatusCode(Response::HTTP_MOVED_PERMANENTLY);
|
||||
|
|
|
@ -20,27 +20,14 @@ use Symfony\Contracts\Translation\TranslatorInterface;
|
|||
*/
|
||||
class MenuEventSubscriber extends EntityManagerEventSubscriber
|
||||
{
|
||||
protected NodeFactory $nodeFactory;
|
||||
protected NodeRepository $nodeRepository;
|
||||
protected EntityManager $entityManager;
|
||||
protected CodeSlugify $slugify;
|
||||
protected SymfonyCacheManager $cacheManager;
|
||||
protected TranslatorInterface $translation;
|
||||
|
||||
public function __construct(
|
||||
NodeFactory $nodeFactory,
|
||||
NodeRepository $nodeRepository,
|
||||
EntityManager $entityManager,
|
||||
CodeSlugify $slugify,
|
||||
SymfonyCacheManager $cacheManager,
|
||||
TranslatorInterface $translator
|
||||
protected NodeFactory $nodeFactory,
|
||||
protected NodeRepository $nodeRepository,
|
||||
protected EntityManager $entityManager,
|
||||
protected CodeSlugify $slugify,
|
||||
protected SymfonyCacheManager $cacheManager,
|
||||
protected TranslatorInterface $translator
|
||||
) {
|
||||
$this->nodeFactory = $nodeFactory;
|
||||
$this->nodeRepository = $nodeRepository;
|
||||
$this->entityManager = $entityManager;
|
||||
$this->slugify = $slugify;
|
||||
$this->cacheManager = $cacheManager;
|
||||
$this->translator = $translator;
|
||||
}
|
||||
|
||||
public function supports(EntityInterface $entity): bool
|
||||
|
|
|
@ -17,11 +17,9 @@ use App\Core\Slugify\CodeSlugify;
|
|||
class NavigationEventSubscriber extends EntityManagerEventSubscriber
|
||||
{
|
||||
public function __construct(
|
||||
EntityManager $entityManager,
|
||||
CodeSlugify $slugify
|
||||
protected EntityManager $entityManager,
|
||||
protected CodeSlugify $slugify
|
||||
) {
|
||||
$this->entityManager = $entityManager;
|
||||
$this->slugify = $slugify;
|
||||
}
|
||||
|
||||
public function supports(EntityInterface $entity): bool
|
||||
|
|
|
@ -12,7 +12,6 @@ use App\Core\Repository\Site\NodeRepository;
|
|||
use App\Core\Slugify\CodeSlugify;
|
||||
use App\Core\Slugify\RouteParameterSlugify;
|
||||
use App\Core\Slugify\Slugify;
|
||||
use Symfony\Component\HttpKernel\KernelInterface;
|
||||
use function Symfony\Component\String\u;
|
||||
|
||||
/**
|
||||
|
@ -22,27 +21,14 @@ use function Symfony\Component\String\u;
|
|||
*/
|
||||
class NodeEventSubscriber extends EntityManagerEventSubscriber
|
||||
{
|
||||
protected NodeFactory $nodeFactory;
|
||||
protected EntityManager $entityManager;
|
||||
protected KernelInterface $kernel;
|
||||
protected Slugify $slugify;
|
||||
protected CodeSlugify $codeSlugify;
|
||||
protected RouteParameterSlugify $routeParameterSlugify;
|
||||
|
||||
public function __construct(
|
||||
NodeFactory $nodeFactory,
|
||||
NodeRepository $nodeRepository,
|
||||
EntityManager $entityManager,
|
||||
Slugify $slugify,
|
||||
CodeSlugify $codeSlugify,
|
||||
RouteParameterSlugify $routeParameterSlugify
|
||||
protected NodeFactory $nodeFactory,
|
||||
protected NodeRepository $nodeRepository,
|
||||
protected EntityManager $entityManager,
|
||||
protected Slugify $slugify,
|
||||
protected CodeSlugify $codeSlugify,
|
||||
protected RouteParameterSlugify $routeParameterSlugify
|
||||
) {
|
||||
$this->nodeFactory = $nodeFactory;
|
||||
$this->nodeRepository = $nodeRepository;
|
||||
$this->entityManager = $entityManager;
|
||||
$this->slugify = $slugify;
|
||||
$this->codeSlugify = $codeSlugify;
|
||||
$this->routeParameterSlugify = $routeParameterSlugify;
|
||||
}
|
||||
|
||||
public function supports(EntityInterface $entity): bool
|
||||
|
@ -63,7 +49,7 @@ class NodeEventSubscriber extends EntityManagerEventSubscriber
|
|||
|
||||
$node = $event->getEntity();
|
||||
|
||||
$node->setCode($this->codeSlugify->slugify($node->getCode()));
|
||||
$node->setCode($this->codeSlugify->slugify($node->getCode() ?? ''));
|
||||
|
||||
if ($node->getDisableUrl()) {
|
||||
$node->setUrl(null);
|
||||
|
|
|
@ -17,11 +17,8 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
|
|||
*/
|
||||
class BlockEventSubscriber extends EntityManagerEventSubscriber
|
||||
{
|
||||
protected FileUploadHandler $fileUpload;
|
||||
|
||||
public function __construct(FileUploadHandler $fileUpload)
|
||||
public function __construct(protected FileUploadHandler $fileUpload)
|
||||
{
|
||||
$this->fileUpload = $fileUpload;
|
||||
}
|
||||
|
||||
public function supports(EntityInterface $entity): bool
|
||||
|
|
|
@ -16,11 +16,8 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
|
|||
*/
|
||||
class PageEventSubscriber extends EntityManagerEventSubscriber
|
||||
{
|
||||
protected FileUploadHandler $fileUpload;
|
||||
|
||||
public function __construct(FileUploadHandler $fileUpload)
|
||||
public function __construct(protected FileUploadHandler $fileUpload)
|
||||
{
|
||||
$this->fileUpload = $fileUpload;
|
||||
}
|
||||
|
||||
public function supports(EntityInterface $entity): bool
|
||||
|
|
|
@ -18,13 +18,10 @@ use Symfony\Component\HttpKernel\KernelInterface;
|
|||
*/
|
||||
class SiteEventSubscriber extends EntityManagerEventSubscriber
|
||||
{
|
||||
protected KernelInterface $kernel;
|
||||
protected SymfonyCacheManager $cacheManager;
|
||||
|
||||
public function __construct(KernelInterface $kernel, SymfonyCacheManager $cacheManager)
|
||||
{
|
||||
$this->kernel = $kernel;
|
||||
$this->cacheManager = $cacheManager;
|
||||
public function __construct(
|
||||
protected KernelInterface $kernel,
|
||||
protected SymfonyCacheManager $cacheManager
|
||||
) {
|
||||
}
|
||||
|
||||
public function supports(EntityInterface $entity): bool
|
||||
|
|
|
@ -13,11 +13,8 @@ use App\Core\Event\Task\TaskRunRequestedEvent;
|
|||
*/
|
||||
class CacheCleanTaskEventSubscriber extends TaskEventSubscriber
|
||||
{
|
||||
protected SymfonyCacheManager $cacheManager;
|
||||
|
||||
public function __construct(SymfonyCacheManager $cacheManager)
|
||||
public function __construct(protected SymfonyCacheManager $cacheManager)
|
||||
{
|
||||
$this->cacheManager = $cacheManager;
|
||||
}
|
||||
|
||||
public function onInit(TaskInitEvent $event)
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
namespace App\Core\Factory;
|
||||
|
||||
use App\Core\Factory\FactoryInterface;
|
||||
use App\Core\Entity\Redirect as Entity;
|
||||
|
||||
class RedirectFactory implements FactoryInterface
|
||||
|
|
|
@ -23,22 +23,15 @@ class FsFileManager
|
|||
protected string $path;
|
||||
protected string $pathUri;
|
||||
protected array $pathLocked;
|
||||
protected FileUploadHandler $uploadHandler;
|
||||
protected FileInformationFactory $fileInformationFactory;
|
||||
protected FileInformationRepositoryQuery $fileInformationRepositoryQuery;
|
||||
|
||||
public function __construct(
|
||||
ParameterBagInterface $params,
|
||||
FileUploadHandler $uploadHandler,
|
||||
FileInformationFactory $fileInformationFactory,
|
||||
FileInformationRepositoryQuery $fileInformationRepositoryQuery
|
||||
protected FileUploadHandler $uploadHandler,
|
||||
protected FileInformationFactory $fileInformationFactory,
|
||||
protected FileInformationRepositoryQuery $fileInformationRepositoryQuery
|
||||
) {
|
||||
$config = $params->get('core')['file_manager'];
|
||||
|
||||
$this->uploadHandler = $uploadHandler;
|
||||
$this->fileInformationFactory = $fileInformationFactory;
|
||||
$this->fileInformationRepositoryQuery = $fileInformationRepositoryQuery;
|
||||
|
||||
$this->mimes = $config['mimes'];
|
||||
$this->path = $config['path'];
|
||||
$this->pathUri = $this->normalizePath($config['path_uri']);
|
||||
|
@ -91,12 +84,16 @@ class FsFileManager
|
|||
$this->applySort($finder, $options['sort'] ?? 'name', $options['sort_direction'] ?? 'asc');
|
||||
|
||||
foreach ($finder as $file) {
|
||||
$splInfo = $this->getSplInfo($directory.'/'.$file->getBasename());
|
||||
|
||||
$data['files'][] = [
|
||||
'basename' => $file->getBasename(),
|
||||
'path' => $directory,
|
||||
'webPath' => $this->pathUri.'/'.$directory.'/'.$file->getBasename(),
|
||||
'locked' => $this->isLocked($directory.'/'.$file->getBasename()),
|
||||
'mime' => mime_content_type($file->getRealPath()),
|
||||
'size' => $splInfo ? $splInfo->getSize() : null,
|
||||
'updated_at' => $splInfo ? date('Y-m-d H:i', $splInfo->getMTime()) : null,
|
||||
];
|
||||
}
|
||||
|
||||
|
@ -297,14 +294,16 @@ class FsFileManager
|
|||
|
||||
protected function applySort(Finder $finder, string $sort, string $direction)
|
||||
{
|
||||
if ('name' === $sort) {
|
||||
$finder->sortByName();
|
||||
} elseif ('modification_date' === $sort) {
|
||||
$finder->sortByModifiedTime();
|
||||
}
|
||||
$sorts = [
|
||||
'name' => 'sortByName',
|
||||
'type' => 'sortByType',
|
||||
'updated_at' => 'sortByModifiedTime',
|
||||
];
|
||||
|
||||
if ('desc' === $direction) {
|
||||
$finder->reverseSorting();
|
||||
$finder->{$sorts[$sort]}()->reverseSorting();
|
||||
} else {
|
||||
$finder->{$sorts[$sort]}();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -6,7 +6,6 @@ use Symfony\Component\Form\AbstractType;
|
|||
use Symfony\Component\Form\Extension\Core\Type\TextType;
|
||||
use Symfony\Component\Form\FormInterface;
|
||||
use Symfony\Component\Form\FormView;
|
||||
use Symfony\Component\Form\Extension\Core\Type\HiddenType;
|
||||
|
||||
class FilePickerType extends AbstractType
|
||||
{
|
||||
|
|
|
@ -11,6 +11,15 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
|
|||
*/
|
||||
class FileUploadHandler
|
||||
{
|
||||
protected $filenameGenerator;
|
||||
|
||||
public function setFilenameGenerator(callable $filenameGenerator): self
|
||||
{
|
||||
$this->filenameGenerator = $filenameGenerator;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function handleForm(?UploadedFile $uploadedFile, string $path, ?callable $afterUploadCallback = null, bool $keepOriginalFilename = false): void
|
||||
{
|
||||
if (null === $uploadedFile) {
|
||||
|
@ -21,9 +30,11 @@ class FileUploadHandler
|
|||
|
||||
if ($keepOriginalFilename) {
|
||||
$filename = $originalFilename.'.'.$uploadedFile->guessExtension();
|
||||
} else {
|
||||
} elseif (!is_callable($this->filenameGenerator)) {
|
||||
$safeFilename = transliterator_transliterate('Any-Latin; Latin-ASCII; [^A-Za-z0-9_] remove; Lower()', $originalFilename);
|
||||
$filename = date('Ymd-his').$safeFilename.'.'.$uploadedFile->guessExtension();
|
||||
} else {
|
||||
$filename = call_user_func($this->filenameGenerator, $uploadedFile);
|
||||
}
|
||||
|
||||
$uploadedFile->move($path, $filename);
|
||||
|
|
|
@ -2,13 +2,11 @@
|
|||
|
||||
namespace App\Core\Form\Filter;
|
||||
|
||||
use App\Core\Entity\Redirect;
|
||||
use Symfony\Component\Form\AbstractType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\TextType;
|
||||
use Symfony\Component\Form\FormBuilderInterface;
|
||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||
use Symfony\Component\Validator\Constraints\NotBlank;
|
||||
|
||||
class RedirectFilterType extends AbstractType
|
||||
{
|
||||
|
|
|
@ -4,12 +4,12 @@ namespace App\Core\Form;
|
|||
|
||||
use App\Core\Entity\Redirect;
|
||||
use Symfony\Component\Form\AbstractType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\TextType;
|
||||
use Symfony\Component\Form\FormBuilderInterface;
|
||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||
use Symfony\Component\Validator\Constraints\NotBlank;
|
||||
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
|
||||
|
||||
class RedirectType extends AbstractType
|
||||
{
|
||||
|
|
|
@ -7,6 +7,7 @@ use Symfony\Component\Form\AbstractType;
|
|||
use Symfony\Component\Form\Extension\Core\Type\TextType;
|
||||
use Symfony\Component\Form\FormBuilderInterface;
|
||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||
use Symfony\Component\Validator\Constraints\Length;
|
||||
use Symfony\Component\Validator\Constraints\NotBlank;
|
||||
|
||||
class MenuType extends AbstractType
|
||||
|
@ -23,6 +24,7 @@ class MenuType extends AbstractType
|
|||
],
|
||||
'constraints' => [
|
||||
new NotBlank(),
|
||||
new Length(max: 255),
|
||||
],
|
||||
]
|
||||
);
|
||||
|
@ -37,6 +39,7 @@ class MenuType extends AbstractType
|
|||
],
|
||||
'constraints' => [
|
||||
new NotBlank(),
|
||||
new Length(max: 255),
|
||||
],
|
||||
]
|
||||
);
|
||||
|
|
|
@ -7,6 +7,7 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
|
|||
use Symfony\Component\Form\Extension\Core\Type\TextType;
|
||||
use Symfony\Component\Form\FormBuilderInterface;
|
||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||
use Symfony\Component\Validator\Constraints\Length;
|
||||
use Symfony\Component\Validator\Constraints\NotBlank;
|
||||
|
||||
class NavigationAdditionalDomainType extends AbstractType
|
||||
|
@ -24,6 +25,7 @@ class NavigationAdditionalDomainType extends AbstractType
|
|||
],
|
||||
'constraints' => [
|
||||
new NotBlank(),
|
||||
new Length(max: 255),
|
||||
],
|
||||
]
|
||||
);
|
||||
|
|
|
@ -6,6 +6,7 @@ use App\Core\Entity\Site\Navigation;
|
|||
use Symfony\Component\Form\AbstractType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\CollectionType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\ColorType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\TextType;
|
||||
use Symfony\Component\Form\FormBuilderInterface;
|
||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||
|
@ -26,6 +27,7 @@ class NavigationType extends AbstractType
|
|||
],
|
||||
'constraints' => [
|
||||
new NotBlank(),
|
||||
new Length(max: 255),
|
||||
],
|
||||
]
|
||||
);
|
||||
|
@ -38,6 +40,21 @@ class NavigationType extends AbstractType
|
|||
'required' => true,
|
||||
'attr' => [
|
||||
],
|
||||
'constraints' => [
|
||||
new NotBlank(),
|
||||
new Length(max: 255),
|
||||
],
|
||||
]
|
||||
);
|
||||
|
||||
$builder->add(
|
||||
'color',
|
||||
ColorType::class,
|
||||
[
|
||||
'label' => 'Color',
|
||||
'required' => true,
|
||||
'attr' => [
|
||||
],
|
||||
'constraints' => [
|
||||
new NotBlank(),
|
||||
],
|
||||
|
@ -54,6 +71,7 @@ class NavigationType extends AbstractType
|
|||
],
|
||||
'constraints' => [
|
||||
new NotBlank(),
|
||||
new Length(max: 255),
|
||||
],
|
||||
]
|
||||
);
|
||||
|
@ -94,7 +112,7 @@ class NavigationType extends AbstractType
|
|||
],
|
||||
'constraints' => [
|
||||
new NotBlank(),
|
||||
new Length(['min' => 2, 'max' => 10]),
|
||||
new Length(min: 2, max: 10),
|
||||
],
|
||||
]
|
||||
);
|
||||
|
|
|
@ -13,6 +13,7 @@ use Symfony\Component\Form\Extension\Core\Type\CollectionType;
|
|||
use Symfony\Component\Form\Extension\Core\Type\TextType;
|
||||
use Symfony\Component\Form\FormBuilderInterface;
|
||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||
use Symfony\Component\Validator\Constraints\Length;
|
||||
use Symfony\Component\Validator\Constraints\NotBlank;
|
||||
|
||||
class NodeType extends AbstractType
|
||||
|
@ -29,6 +30,7 @@ class NodeType extends AbstractType
|
|||
],
|
||||
'constraints' => [
|
||||
new NotBlank(),
|
||||
new Length(max: 255),
|
||||
],
|
||||
]
|
||||
);
|
||||
|
@ -43,6 +45,7 @@ class NodeType extends AbstractType
|
|||
'attr' => [
|
||||
],
|
||||
'constraints' => [
|
||||
new Length(max: 255),
|
||||
],
|
||||
]
|
||||
);
|
||||
|
@ -82,6 +85,7 @@ class NodeType extends AbstractType
|
|||
'attr' => [
|
||||
],
|
||||
'constraints' => [
|
||||
new Length(max: 255),
|
||||
],
|
||||
]
|
||||
);
|
||||
|
@ -116,6 +120,9 @@ class NodeType extends AbstractType
|
|||
|
||||
return $choices;
|
||||
}),
|
||||
'constraints' => [
|
||||
new Length(max: 255),
|
||||
],
|
||||
]
|
||||
);
|
||||
|
||||
|
@ -154,6 +161,37 @@ class NodeType extends AbstractType
|
|||
);
|
||||
}
|
||||
|
||||
$builder->add(
|
||||
'hasAbTest',
|
||||
CheckboxType::class,
|
||||
[
|
||||
'label' => 'Enable A/B Testing',
|
||||
'required' => false,
|
||||
]
|
||||
);
|
||||
|
||||
$builder->add(
|
||||
'abTestCode',
|
||||
TextType::class,
|
||||
[
|
||||
'label' => 'Code',
|
||||
'required' => $builder->getData()->getHasAbTest(),
|
||||
]
|
||||
);
|
||||
|
||||
$builder->add(
|
||||
'securityOperator',
|
||||
ChoiceType::class,
|
||||
[
|
||||
'label' => 'Condition',
|
||||
'required' => true,
|
||||
'choices' => [
|
||||
'At least one role' => 'or',
|
||||
'All roles' => 'and',
|
||||
],
|
||||
]
|
||||
);
|
||||
|
||||
$actions = [
|
||||
'New page' => 'new',
|
||||
'Use an existing page' => 'existing',
|
||||
|
|
32
src/core/Form/Site/Page/BuilderBlockType.php
Normal file
32
src/core/Form/Site/Page/BuilderBlockType.php
Normal file
|
@ -0,0 +1,32 @@
|
|||
<?php
|
||||
|
||||
namespace App\Core\Form\Site\Page;
|
||||
|
||||
use App\Core\Entity\Site\Page\BuilderBlock;
|
||||
use App\Core\Form\Type\BuilderType;
|
||||
use Symfony\Component\Form\AbstractType;
|
||||
use Symfony\Component\Form\FormBuilderInterface;
|
||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||
|
||||
class BuilderBlockType extends AbstractType
|
||||
{
|
||||
public function buildForm(FormBuilderInterface $builder, array $options)
|
||||
{
|
||||
$builder->add(
|
||||
'value',
|
||||
BuilderType::class,
|
||||
array_merge([
|
||||
'required' => false,
|
||||
'label' => false,
|
||||
], $options['options']),
|
||||
);
|
||||
}
|
||||
|
||||
public function configureOptions(OptionsResolver $resolver)
|
||||
{
|
||||
$resolver->setDefaults([
|
||||
'data_class' => BuilderBlock::class,
|
||||
'options' => [],
|
||||
]);
|
||||
}
|
||||
}
|
|
@ -5,6 +5,8 @@ namespace App\Core\Form\Site\Page;
|
|||
use App\Core\Entity\Site\Page\FileBlock;
|
||||
use Symfony\Component\Form\Extension\Core\Type\FileType;
|
||||
use Symfony\Component\Form\FormBuilderInterface;
|
||||
use Symfony\Component\Form\FormInterface;
|
||||
use Symfony\Component\Form\FormView;
|
||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||
|
||||
class FileBlockType extends TextBlockType
|
||||
|
@ -21,11 +23,21 @@ class FileBlockType extends TextBlockType
|
|||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function buildView(FormView $view, FormInterface $form, array $options)
|
||||
{
|
||||
$view->vars = array_replace($view->vars, [
|
||||
'file_type' => $options['file_type'],
|
||||
]);
|
||||
}
|
||||
|
||||
public function configureOptions(OptionsResolver $resolver)
|
||||
{
|
||||
$resolver->setDefaults([
|
||||
'data_class' => FileBlock::class,
|
||||
'block_prefix' => 'file_block',
|
||||
'file_type' => 'auto',
|
||||
'options' => [],
|
||||
]);
|
||||
}
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue