From 70cef70bf495f9d2cff3beba4bf4ca07c0661a2c Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Thu, 27 Jul 2023 18:32:55 +0200 Subject: [PATCH 01/84] update murph --- src/Controller/UserAdminController.php | 79 +++++++++++++++++++ templates/_form.html.twig | 1 + templates/_show.html.twig | 1 + .../admin/user_admin/UserAdminController.php | 79 +++++++++++++++++++ templates/admin/user_admin/_form.html.twig | 1 + templates/admin/user_admin/_show.html.twig | 1 + 6 files changed, 162 insertions(+) create mode 100644 src/Controller/UserAdminController.php create mode 100644 templates/_form.html.twig create mode 100644 templates/_show.html.twig create mode 100644 templates/admin/user_admin/UserAdminController.php create mode 100644 templates/admin/user_admin/_form.html.twig create mode 100644 templates/admin/user_admin/_show.html.twig diff --git a/src/Controller/UserAdminController.php b/src/Controller/UserAdminController.php new file mode 100644 index 0000000..9970f51 --- /dev/null +++ b/src/Controller/UserAdminController.php @@ -0,0 +1,79 @@ + '\d+'])] + public function index(RepositoryQuery $query, Request $request, Session $session, int $page = 1): Response + { + return parent::index($query, $request, $session, $page); + } + + #[Route(path: '/admin/user/new', name: 'admin_user_new', methods: ['GET', 'POST'])] + public function new(Factory $factory, EntityManager $entityManager, Request $request, TokenGenerator $tokenGenerator): Response + { + return parent::new($factory, $entityManager, $request, $tokenGenerator); + } + + #[Route(path: '/admin/user/show/{entity}', name: 'admin_user_show', methods: ['GET'])] + public function show(Entity $entity): Response + { + return parent::show($entity); + } + + #[Route(path: '/admin/user/filter', name: 'admin_user_filter', methods: ['GET'])] + public function filter(Session $session): Response + { + return parent::filter($session); + } + + #[Route(path: '/admin/user/edit/{entity}', name: 'admin_user_edit', methods: ['GET', 'POST'])] + public function edit(Entity $entity, EntityManager $entityManager, Request $request): Response + { + return parent::edit($entity, $entityManager, $request); + } + + #[Route(path: '/admin/user/inline_edit/{entity}/{context}/{label}', name: 'admin_user_inline_edit', methods: ['GET', 'POST'])] + public function inlineEdit(string $context, string $label, Entity $entity, EntityManager $entityManager, Request $request): Response + { + return parent::inlineEdit($context, $label, $entity, $entityManager, $request); + } + + #[Route(path: '/admin/user/delete/{entity}', name: 'admin_user_delete', methods: ['DELETE', 'POST'])] + public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response + { + return parent::delete($entity, $entityManager, $request); + } + + #[Route(path: '/admin/user/resetting_request/{entity}', name: 'admin_user_resetting_request', methods: ['POST'])] + public function requestResetting(Entity $entity, EventDispatcherInterface $eventDispatcher, Request $request): Response + { + return parent::requestResetting($entity, $eventDispatcher, $request); + } + + protected function getConfiguration(): CrudConfiguration + { + if ($this->configuration) { + return $this->configuration; + } + + return parent::getConfiguration() + ->setView('form', 'admin/user_admin/_form.html.twig') + ->setView('show_entity', 'admin/user_admin/_show.html.twig') + ; + } +} diff --git a/templates/_form.html.twig b/templates/_form.html.twig new file mode 100644 index 0000000..ed04750 --- /dev/null +++ b/templates/_form.html.twig @@ -0,0 +1 @@ +{{ include('@Core/user/user_admin/_form.html.twig') }} diff --git a/templates/_show.html.twig b/templates/_show.html.twig new file mode 100644 index 0000000..806f07d --- /dev/null +++ b/templates/_show.html.twig @@ -0,0 +1 @@ +{{ include('@Core/user/user_admin/_show.html.twig') }} diff --git a/templates/admin/user_admin/UserAdminController.php b/templates/admin/user_admin/UserAdminController.php new file mode 100644 index 0000000..9970f51 --- /dev/null +++ b/templates/admin/user_admin/UserAdminController.php @@ -0,0 +1,79 @@ + '\d+'])] + public function index(RepositoryQuery $query, Request $request, Session $session, int $page = 1): Response + { + return parent::index($query, $request, $session, $page); + } + + #[Route(path: '/admin/user/new', name: 'admin_user_new', methods: ['GET', 'POST'])] + public function new(Factory $factory, EntityManager $entityManager, Request $request, TokenGenerator $tokenGenerator): Response + { + return parent::new($factory, $entityManager, $request, $tokenGenerator); + } + + #[Route(path: '/admin/user/show/{entity}', name: 'admin_user_show', methods: ['GET'])] + public function show(Entity $entity): Response + { + return parent::show($entity); + } + + #[Route(path: '/admin/user/filter', name: 'admin_user_filter', methods: ['GET'])] + public function filter(Session $session): Response + { + return parent::filter($session); + } + + #[Route(path: '/admin/user/edit/{entity}', name: 'admin_user_edit', methods: ['GET', 'POST'])] + public function edit(Entity $entity, EntityManager $entityManager, Request $request): Response + { + return parent::edit($entity, $entityManager, $request); + } + + #[Route(path: '/admin/user/inline_edit/{entity}/{context}/{label}', name: 'admin_user_inline_edit', methods: ['GET', 'POST'])] + public function inlineEdit(string $context, string $label, Entity $entity, EntityManager $entityManager, Request $request): Response + { + return parent::inlineEdit($context, $label, $entity, $entityManager, $request); + } + + #[Route(path: '/admin/user/delete/{entity}', name: 'admin_user_delete', methods: ['DELETE', 'POST'])] + public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response + { + return parent::delete($entity, $entityManager, $request); + } + + #[Route(path: '/admin/user/resetting_request/{entity}', name: 'admin_user_resetting_request', methods: ['POST'])] + public function requestResetting(Entity $entity, EventDispatcherInterface $eventDispatcher, Request $request): Response + { + return parent::requestResetting($entity, $eventDispatcher, $request); + } + + protected function getConfiguration(): CrudConfiguration + { + if ($this->configuration) { + return $this->configuration; + } + + return parent::getConfiguration() + ->setView('form', 'admin/user_admin/_form.html.twig') + ->setView('show_entity', 'admin/user_admin/_show.html.twig') + ; + } +} diff --git a/templates/admin/user_admin/_form.html.twig b/templates/admin/user_admin/_form.html.twig new file mode 100644 index 0000000..ed04750 --- /dev/null +++ b/templates/admin/user_admin/_form.html.twig @@ -0,0 +1 @@ +{{ include('@Core/user/user_admin/_form.html.twig') }} diff --git a/templates/admin/user_admin/_show.html.twig b/templates/admin/user_admin/_show.html.twig new file mode 100644 index 0000000..806f07d --- /dev/null +++ b/templates/admin/user_admin/_show.html.twig @@ -0,0 +1 @@ +{{ include('@Core/user/user_admin/_show.html.twig') }} From 53aa16951e08e55669d1d7e90f2f64fa296220e2 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 30 Jul 2023 16:58:26 +0200 Subject: [PATCH 02/84] fix liip add constraints --- config/packages/liip_imagine.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/packages/liip_imagine.yaml b/config/packages/liip_imagine.yaml index e3cd592..157b0a7 100644 --- a/config/packages/liip_imagine.yaml +++ b/config/packages/liip_imagine.yaml @@ -13,18 +13,21 @@ liip_imagine: max: [600, 600] crop: size: [600, 270] + start: [0, 0] project_preview_filter: filters: downscale: max: [600, 600] crop: size: [600, 270] + start: [0, 0] post_preview_filter: filters: downscale: max: [600, 600] crop: size: [600, 300] + start: [0, 0] site_avatar: filters: downscale: From fccf54ed5a718837aabe15577e66181052129b4e Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 30 Jul 2023 16:58:31 +0200 Subject: [PATCH 03/84] fix liip add constraints --- src/Form/Blog/PostType.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Form/Blog/PostType.php b/src/Form/Blog/PostType.php index 5661886..fc312a4 100644 --- a/src/Form/Blog/PostType.php +++ b/src/Form/Blog/PostType.php @@ -172,6 +172,7 @@ class PostType extends AbstractType 'attr' => [ ], 'constraints' => [ + new Image(), ], ] ); From dedf105f063fbdf6f13c49df0e4faac67f65d3ea Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Tue, 15 Aug 2023 11:02:27 +0200 Subject: [PATCH 04/84] update footer setting type --- assets/css/app.scss | 23 +++++++++++++++++++ .../SettingEventSubscriber.php | 18 ++++++++++++++- templates/module/_navigation.html.twig | 2 +- 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/assets/css/app.scss b/assets/css/app.scss index adb21dc..2b79812 100644 --- a/assets/css/app.scss +++ b/assets/css/app.scss @@ -1287,6 +1287,29 @@ $links: ( } } +// @keyframes avatarlogo { +// 0% { +// -webkit-mask: linear-gradient(135deg,#000c 40%,#000,#000c 60%) 100% 100%/250% 250%; +// } +// 40% { +// -webkit-mask-position: 0 0; +// } +// 90% { +// -webkit-mask: linear-gradient(135deg,#000c 40%,#000,#000c 60%) 100% 100%/250% 250%; +// } +// 100% { +// -webkit-mask: linear-gradient(135deg,#000c 40%,#000,#000c 60%) 100% 100%/250% 250%; +// } +// } +// +// .avatar-logo { +// img, svg { +// _animation-name: avatarlogo; +// animation-duration: 7s; +// animation-iteration-count: infinite; +// } +// } + @media (prefers-color-scheme: dark) { .bg-box { background: #343c53; diff --git a/src/EventSubscriber/SettingEventSubscriber.php b/src/EventSubscriber/SettingEventSubscriber.php index c80235f..164585d 100644 --- a/src/EventSubscriber/SettingEventSubscriber.php +++ b/src/EventSubscriber/SettingEventSubscriber.php @@ -9,6 +9,7 @@ use Symfony\Component\Form\Extension\Core\Type\EmailType; use Symfony\Component\Form\Extension\Core\Type\TextareaType; use Symfony\Component\Form\Extension\Core\Type\TextType; use App\Core\Form\FileManager\FilePickerType; +use App\Core\Form\Type\TinymceTextareaType; /** * class SettingEventSubscriber. @@ -93,7 +94,7 @@ class SettingEventSubscriber extends EventSubscriber ); } - if (in_array($entity->getCode(), ['blog_footer', 'post_author_description'])) { + if (in_array($entity->getCode(), ['post_author_description'])) { $event->setOption('view', 'large'); $builder->add( @@ -107,5 +108,20 @@ class SettingEventSubscriber extends EventSubscriber ] ); } + + if (in_array($entity->getCode(), ['blog_footer'])) { + $event->setOption('view', 'large'); + + $builder->add( + 'value', + TinymceTextareaType::class, + [ + 'label' => $entity->getLabel(), + 'attr' => [ + 'rows' => 20, + ], + ] + ); + } } } diff --git a/templates/module/_navigation.html.twig b/templates/module/_navigation.html.twig index 1ea0c86..45fb604 100644 --- a/templates/module/_navigation.html.twig +++ b/templates/module/_navigation.html.twig @@ -5,7 +5,7 @@