From e674690b3c82fdd042736fe9090229e3d6172dcb Mon Sep 17 00:00:00 2001 From: Antoine Leclaire <104761460+Ate-lcr@users.noreply.github.com> Date: Fri, 13 Jan 2023 14:41:41 +0100 Subject: [PATCH 01/24] Refactorisation PageController.php --- Controller/PageController.php | 244 -------------------- Http/Action/Page/CreatePageAction.php | 45 ++++ Http/Action/Page/CreateUniquePageAction.php | 53 +++++ Http/Action/Page/DeletePageAction.php | 39 ++++ Http/Action/Page/EditPageAction.php | 53 +++++ Http/Action/Page/IndexPageAction.php | 34 +++ Http/Action/Page/StatusPageAction.php | 20 ++ Http/Form/Page/FormFactory.php | 31 +++ Repository/PageRepository.php | 19 ++ Resources/config/routing.yml | 24 +- Resources/config/services.yml | 4 + 11 files changed, 320 insertions(+), 246 deletions(-) delete mode 100644 Controller/PageController.php create mode 100644 Http/Action/Page/CreatePageAction.php create mode 100644 Http/Action/Page/CreateUniquePageAction.php create mode 100644 Http/Action/Page/DeletePageAction.php create mode 100644 Http/Action/Page/EditPageAction.php create mode 100644 Http/Action/Page/IndexPageAction.php create mode 100644 Http/Action/Page/StatusPageAction.php create mode 100644 Http/Form/Page/FormFactory.php diff --git a/Controller/PageController.php b/Controller/PageController.php deleted file mode 100644 index c72ff51..0000000 --- a/Controller/PageController.php +++ /dev/null @@ -1,244 +0,0 @@ -parameterBag = $parameterBag; - $this->formFactory = $formFactory; - - $entities = $parameterBag->get('aropixel_page.entities'); - $forms = $parameterBag->get('aropixel_page.forms'); - - $this->model = $entities[PageInterface::class]; -// $this->form = $forms[PageInterface::class]; - } - - - /** - * @Route("/{type}/list", name="aropixel_page_index", methods={"GET","POST"}) - */ - public function index(PageRepository $pageRepository, $type): Response - { - // - $pages = $pageRepository->findBy(['type' => $type], ['title' => 'ASC']); - - // - $delete_forms = array(); - foreach ($pages as $entity) { - $deleteForm = $this->createDeleteForm($entity); - $delete_forms[$entity->getId()] = $deleteForm->createView(); - } - - // - return $this->render('@AropixelPage/index.html.twig', [ - 'type' => $type, - 'pages' => $pages, - 'delete_forms' => $delete_forms, - ]); - } - - - /** - * @Route("/{type}/page", name="aropixel_page", methods={"GET","POST"}) - */ - public function page(Request $request, $type): Response - { - $em = $this->getDoctrine()->getManager(); - $page = $em->getRepository($this->model)->findOneBy(['type' => $type]); - - if (!$page) { - - /** @var PageInterface $page */ - $page = new $this->model(); - $page->setStatus(Publishable::STATUS_ONLINE); - $page->setType($type); - - } - - $form = $this->formFactory->createForm($page); - $form->handleRequest($request); - - if ($form->isSubmitted() && $form->isValid()) { - - $em = $this->getDoctrine()->getManager(); - $em->persist($page); - $em->flush(); - - $this->addFlash('notice', 'La page a bien été enregistrée.'); - return $this->redirectToRoute('aropixel_page', array('type' => $type)); - } - - - return $this->render($this->getTemplatePath().'/'.$type.'/form.html.twig', [ - 'page' => $page, - 'form' => $form->createView(), - ]); - } - - - /** - * @Route("/{type}/new", name="aropixel_page_new", methods={"GET","POST"}) - */ - public function new(Request $request, $type): Response - { - /** @var PageInterface $page */ - $page = new $this->model(); - $page->setType($type); - - $form = $this->formFactory->createForm($page); - $form->handleRequest($request); - - if ($form->isSubmitted() && $form->isValid()) { - - $em = $this->getDoctrine()->getManager(); - $em->persist($page); - $em->flush(); - - $this->addFlash('notice', 'La page a bien été enregistrée.'); - return $this->redirectToRoute('aropixel_page_edit', array('type' => $page->getType(), 'id' => $page->getId())); - } - - - return $this->render($this->getTemplatePath().'/'.$type.'/form.html.twig', [ - 'page' => $page, - 'form' => $form->createView(), - ]); - } - - - /** - * @Route("/{type}/{id}/edit", name="aropixel_page_edit", methods={"GET","POST"}) - */ - public function edit(Request $request, $id): Response - { - - $em = $this->getDoctrine()->getManager(); - $page = $em->getRepository($this->model)->find($id); - if (!$page) { - throw $this->createNotFoundException(); - } - - $auth_checker = $this->get('security.authorization_checker'); - $isRoleAdmin = $auth_checker->isGranted('ROLE_HYPER_ADMIN'); - - $deleteForm = $this->createDeleteForm($page); - $form = $this->formFactory->createForm($page); - $form->handleRequest($request); - - if ($form->isSubmitted() && $form->isValid()) { - - $this->addFlash('notice', 'La page a bien été enregistrée.'); - $this->getDoctrine()->getManager()->flush(); - - return $this->redirectToRoute('aropixel_page_edit', array('type' => $page->getType(), 'id' => $page->getId())); - - } - - return $this->render($this->getTemplatePath().'/'.$page->getType().'/form.html.twig', [ - 'page' => $page, - 'form' => $form->createView(), - 'delete_form' => ((!$page->getType() == 'default' || $isRoleAdmin) ? $deleteForm->createView() : false) - ]); - } - - - /** - * @Route("/{id}/status", name="aropixel_page_status", methods={"GET"}) - */ - public function status(Page $page, Status $status) - { - return $status->changeStatus($page); - - } - - - /** - * @Route("/{id}", name="aropixel_page_delete", methods={"DELETE"}) - */ - public function delete(Request $request, $id): Response - { - - /** @var Page $page */ - $em = $this->getDoctrine()->getManager(); - $page = $em->getRepository($this->model)->find($id); - $type = $page->getType(); - if (!$page) { - throw $this->createNotFoundException(); - } - - $titre = $page->getTitle(); - $form = $this->createDeleteForm($page); - $form->handleRequest($request); - - if ($form->isSubmitted() && $form->isValid()) { - - $em = $this->getDoctrine()->getManager(); - $em->remove($page); - $em->flush(); - - $this->get('session')->getFlashBag()->add('notice', 'La page "'.$titre.'" a bien été supprimé.'); - } - - return $this->redirectToRoute('aropixel_page_index', ['type' => $type]); - } - - /** - * Creates a form to delete the entity. - * @return FormInterface The form - */ - private function createDeleteForm(Page $page) - { - return $this->createFormBuilder() - ->setAction($this->generateUrl('aropixel_page_delete', array('id' => $page->getId()))) - ->setMethod('DELETE') - ->getForm() - ; - } - - private function getTemplatePath() - { - $formsConfig = $this->getParameter('aropixel_page.forms'); - return $formsConfig['template_path']; - } -} diff --git a/Http/Action/Page/CreatePageAction.php b/Http/Action/Page/CreatePageAction.php new file mode 100644 index 0000000..e5b4e62 --- /dev/null +++ b/Http/Action/Page/CreatePageAction.php @@ -0,0 +1,45 @@ +model(); + $page->setType($type); + + $form = $this->factory->createForm($page); + $form->handleRequest($this->request->getMainRequest()); + + if ($form->isSubmitted() && $form->isValid()) { + $this->pageRepository->add($page, true); + + $this->addFlash('notice', 'La page a bien été enregistrée.'); + return $this->redirectToRoute('aropixel_page_edit', array('type' => $page->getType(), 'id' => $page->getId())); + } + + return $this->render($this->formFactory->getTemplatePath().'/'.$type.'/form.html.twig', [ + 'page' => $page, + 'form' => $form->createView(), + ]); + } +} \ No newline at end of file diff --git a/Http/Action/Page/CreateUniquePageAction.php b/Http/Action/Page/CreateUniquePageAction.php new file mode 100644 index 0000000..c8bb5b0 --- /dev/null +++ b/Http/Action/Page/CreateUniquePageAction.php @@ -0,0 +1,53 @@ +pageRepository->findOneBy(['type' => $type]); + + if (!$page) { + /** @var PageInterface $page */ + $page = new $this->model(); + $page->setStatus(Publishable::STATUS_ONLINE); + $page->setType($type); + } + + $form = $this->factory->createForm($page); + $form->handleRequest($this->request->getMainRequest()); + + if ($form->isSubmitted() && $form->isValid()) { + $this->pageRepository->add($page, true); + + $this->addFlash('notice', 'La page a bien été enregistrée.'); + return $this->redirectToRoute('aropixel_page', array('type' => $page->getType(), 'id' => $page->getId())); + } + + return $this->render($this->formFactory->getTemplatePath().'/'.$type.'/form.html.twig', [ + 'page' => $page, + 'form' => $form->createView(), + ]); + + } +} \ No newline at end of file diff --git a/Http/Action/Page/DeletePageAction.php b/Http/Action/Page/DeletePageAction.php new file mode 100644 index 0000000..22b92a9 --- /dev/null +++ b/Http/Action/Page/DeletePageAction.php @@ -0,0 +1,39 @@ +pageRepository->find($id); + $type = $page->getType(); + $title = $page->getTitle(); + + $form = $this->formFactory->createDeleteForm($page); + $form->handleRequest($this->request->getMainRequest()); + + if ($form->isSubmitted() && $form->isValid()) { + $this->pageRepository->remove($page, true); + + $this->addFlash('notice', 'La page "'.$title.'" a bien été supprimé.'); + } + + return $this->redirectToRoute('aropixel_page_index', ['type' => $type]); + + } +} \ No newline at end of file diff --git a/Http/Action/Page/EditPageAction.php b/Http/Action/Page/EditPageAction.php new file mode 100644 index 0000000..f8add7f --- /dev/null +++ b/Http/Action/Page/EditPageAction.php @@ -0,0 +1,53 @@ +pageRepository->find($id); + + if (!$page) { + throw $this->createNotFoundException(); + } + + $isRoleAdmin = $this->security->isGranted('ROLE_HYPER_ADMIN'); + + $deleteForm = $this->formFactory->createDeleteForm($page); + $form = $this->factory->createForm($page); + $form->handleRequest($this->request->getMainRequest()); + + if ($form->isSubmitted() && $form->isValid()) { + $this->pageRepository->add($page, true); + + $this->addFlash('notice', 'La page a bien été enregistrée.'); + return $this->redirectToRoute('aropixel_page_edit', array('type' => $page->getType(), 'id' => $page->getId())); + } + return $this->render($this->formFactory->getTemplatePath().'/'.$page->getType().'/form.html.twig', [ + 'page' => $page, + 'form' => $form->createView(), + 'delete_form' => ((!$page->getType() == 'default' || $isRoleAdmin) ? $deleteForm->createView() : false) + ]); + + + + } +} \ No newline at end of file diff --git a/Http/Action/Page/IndexPageAction.php b/Http/Action/Page/IndexPageAction.php new file mode 100644 index 0000000..1bc87ff --- /dev/null +++ b/Http/Action/Page/IndexPageAction.php @@ -0,0 +1,34 @@ +pageRepository->findBy(['type' => $type], ['title' => 'ASC']); + + $delete_forms = array(); + foreach ($pages as $page) { + $deleteForm = $this->formFactory->createDeleteForm($page); + $delete_forms[$page->getId()] = $deleteForm->createView(); + } + + return $this->render('@AropixelPage/index.html.twig', [ + 'type' => $type, + 'pages' => $pages, + 'delete_forms' => $delete_forms, + ]); + } + +} \ No newline at end of file diff --git a/Http/Action/Page/StatusPageAction.php b/Http/Action/Page/StatusPageAction.php new file mode 100644 index 0000000..d350eb5 --- /dev/null +++ b/Http/Action/Page/StatusPageAction.php @@ -0,0 +1,20 @@ +status->changeStatus($page); + } + +} \ No newline at end of file diff --git a/Http/Form/Page/FormFactory.php b/Http/Form/Page/FormFactory.php new file mode 100644 index 0000000..df63389 --- /dev/null +++ b/Http/Form/Page/FormFactory.php @@ -0,0 +1,31 @@ +createFormBuilder() + ->setAction($this->generateUrl('aropixel_page_delete', array('id' => $page->getId()))) + ->setMethod('DELETE') + ->getForm() + ; + } + + public function getTemplatePath() + { + $formsConfig = $this->getParameter('aropixel_page.forms'); + return $formsConfig['template_path']; + } + + + +} \ No newline at end of file diff --git a/Repository/PageRepository.php b/Repository/PageRepository.php index 116986f..aebb828 100644 --- a/Repository/PageRepository.php +++ b/Repository/PageRepository.php @@ -51,6 +51,25 @@ public function findPages($type) ; } + public function add(Page $page, bool $flush = false): void + { + $this->getEntityManager()->persist($page); + + if ($flush) { + $this->getEntityManager()->flush(); + } + } + + public function remove(Page $page, bool $flush = false) : void + { + $this->getEntityManager()->remove($page); + + if ($flush) { + $this->getEntityManager()->flush(); + } + } + + /* public function findOneBySomeField($value): ?Page diff --git a/Resources/config/routing.yml b/Resources/config/routing.yml index 9b69398..cb60fa0 100644 --- a/Resources/config/routing.yml +++ b/Resources/config/routing.yml @@ -1,3 +1,23 @@ +aropixel_page_index: + path: /page/{type}/list + controller: Aropixel\PageBundle\Http\Action\Page\IndexPageAction + +aropixel_page_new: + path: /page/{type}/new + controller: Aropixel\PageBundle\Http\Action\Page\CreatePageAction + +aropixel_page_edit: + path: /page/{type}/{id}/edit + controller: Aropixel\PageBundle\Http\Action\Page\EditPageAction + +aropixel_page_delete: + path: /page/{id} + controller: Aropixel\PageBundle\Http\Action\Page\DeletePageAction + aropixel_page: - resource: "@AropixelPageBundle/Controller/PageController.php" - type: annotation + path: /page/{type}/page + controller: Aropixel\PageBundle\Http\Action\Page\CreateUniquePageAction + +aropixel_page_status: + path: /page/{id}/status + controller: Aropixel\PageBundle\Http\Action\Page\StatusPageAction diff --git a/Resources/config/services.yml b/Resources/config/services.yml index 2da187f..16ea3ee 100644 --- a/Resources/config/services.yml +++ b/Resources/config/services.yml @@ -26,6 +26,10 @@ services: resource: '../../Controller' tags: ['controller.service_arguments'] + Aropixel\PageBundle\Http\: + resource: '../../Http' + tags: [ 'controller.service_arguments' ] + aropixel.page.form.default: class: '%aropixel_page.form.default%' arguments: ['@security.authorization_checker', '@Aropixel\PageBundle\Form\DataMapper\PageFieldDataMapper', '@parameter_bag', '%aropixel_page.entities%'] From b6846ea6ef3d481d7eb0e83125f9ad3761ec6e3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Gomez=20Caballe?= Date: Tue, 24 Jan 2023 18:01:11 +0100 Subject: [PATCH 02/24] New form structure --- Resources/config/services.yml | 5 ---- Resources/views/base.html.twig | 12 +-------- Resources/views/default/form.html.twig | 37 +++++++------------------- Resources/views/index.html.twig | 2 +- 4 files changed, 12 insertions(+), 44 deletions(-) diff --git a/Resources/config/services.yml b/Resources/config/services.yml index 16ea3ee..9169ce6 100644 --- a/Resources/config/services.yml +++ b/Resources/config/services.yml @@ -20,11 +20,6 @@ services: Aropixel\PageBundle\Form\FormFactoryInterface: '@aropixel.page.form.factory' - # controllers are imported separately to make sure services can be injected - # as action arguments even if you don't extend any base controller class - Aropixel\PageBundle\Controller\: - resource: '../../Controller' - tags: ['controller.service_arguments'] Aropixel\PageBundle\Http\: resource: '../../Http' diff --git a/Resources/views/base.html.twig b/Resources/views/base.html.twig index b3196cb..233b5c5 100644 --- a/Resources/views/base.html.twig +++ b/Resources/views/base.html.twig @@ -1,17 +1,7 @@ {% extends '@AropixelAdmin/Form/base.html.twig' %} {% block header_title %}Pages{% endblock %} -{% block header_breadcrumb %} - {# #} -{% endblock %} +{% block header_breadcrumb %}{% endblock %} diff --git a/Resources/views/default/form.html.twig b/Resources/views/default/form.html.twig index c0d7f61..b490d0a 100644 --- a/Resources/views/default/form.html.twig +++ b/Resources/views/default/form.html.twig @@ -1,33 +1,19 @@ {% extends '@AropixelPage/base.html.twig' %} -{% block header_title %}Pages{% endblock %} -{% block header_breadcrumb %} -{# #} +{% block header_title %}Pages Créer une nouvelle page{% endblock %} +{% block header_breadcrumb %}{% endblock %} + +{% block tabbable %} +
  • Contenu
    • +
  • Référencement
    • {% endblock %} {% block mainPanel %} -
    - -
    - - -
    -
    +
    -
    +
    @@ -42,16 +28,14 @@
    -
    +
    -
    +
    {{ form_row(form.metaTitle) }} - {{ form_row(form.metaDescription) }} - {{ form_row(form.metaKeywords) }}
    @@ -60,7 +44,6 @@
    -
    diff --git a/Resources/views/index.html.twig b/Resources/views/index.html.twig index 363b5d2..e87f417 100644 --- a/Resources/views/index.html.twig +++ b/Resources/views/index.html.twig @@ -1,6 +1,6 @@ {% extends '@AropixelAdmin/List/datatable.html.twig' %} -{% block header_title %}Pages{% endblock %} +{% block header_title %}Pages Administrez les pages de votre site{% endblock %} {% block header_breadcrumb %}
    • Accueil
      • From 2426047b3d758ddd360b484f16185869e0d56fd8 Mon Sep 17 00:00:00 2001 From: Cecile Salon Date: Thu, 26 Jan 2023 13:08:11 +0100 Subject: [PATCH 03/24] Add tabbableCollapsed class + change action btn --- Resources/views/default/form.html.twig | 5 ++--- Resources/views/index.html.twig | 18 +++++++----------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/Resources/views/default/form.html.twig b/Resources/views/default/form.html.twig index b490d0a..453e2c8 100644 --- a/Resources/views/default/form.html.twig +++ b/Resources/views/default/form.html.twig @@ -3,6 +3,8 @@ {% block header_title %}Pages Créer une nouvelle page{% endblock %} {% block header_breadcrumb %}{% endblock %} +{% set tabbableCollapsed = true %} + {% block tabbable %}
    • Contenu
    • Référencement
      • @@ -10,7 +12,6 @@ {% block mainPanel %} -
      @@ -45,6 +46,4 @@
      - - {% endblock %} diff --git a/Resources/views/index.html.twig b/Resources/views/index.html.twig index e87f417..0c8123e 100644 --- a/Resources/views/index.html.twig +++ b/Resources/views/index.html.twig @@ -45,18 +45,14 @@ {{ page.title }} {{ page.createdAt|date('d/m/Y') }} -
      - - Modifier - - +
      + + + + + {{ form(delete_forms[page.id]) }} -
      From dea856c728386ae164e5fcfcee5b888bacb664b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Gomez=20Caballe?= Date: Thu, 26 Jan 2023 18:02:28 +0100 Subject: [PATCH 04/24] Ajout breadcrumb --- Resources/views/default/form.html.twig | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Resources/views/default/form.html.twig b/Resources/views/default/form.html.twig index 453e2c8..26cd862 100644 --- a/Resources/views/default/form.html.twig +++ b/Resources/views/default/form.html.twig @@ -1,9 +1,18 @@ {% extends '@AropixelPage/base.html.twig' %} -{% block header_title %}Pages Créer une nouvelle page{% endblock %} -{% block header_breadcrumb %}{% endblock %} +{% block header_title %}Pages{% endblock %} +{% block header_breadcrumb %} +
        +
      • Accueil
        • +
      • Pages
        • + {% if page and page.id %} +
      • Modifier
        • + {% else %} +
      • Création
        • + {% endif %} +
      +{% endblock %} -{% set tabbableCollapsed = true %} {% block tabbable %}
    • Contenu
      • From ee6b9ff3062ccda5fa89090f60e31f4501142d5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Gomez=20Caballe?= Date: Fri, 27 Jan 2023 16:13:50 +0100 Subject: [PATCH 05/24] Permalien en champs texte --- Form/Type/AbstractPageType.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Form/Type/AbstractPageType.php b/Form/Type/AbstractPageType.php index be71d13..2e36d7b 100644 --- a/Form/Type/AbstractPageType.php +++ b/Form/Type/AbstractPageType.php @@ -60,7 +60,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) if ($builder->getData() && $builder->getData()->getType()=='default') { $builder ->add('title', TextType::class, array('label' => 'Titre de la page')) - ->add('slug', HiddenType::class) + ->add('slug', TextType::class, array('label' => 'Permalien')) ; } From 09e7ee30359d4928c9c93d1941d7606577681d4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Gomez=20Caballe?= Date: Sat, 28 Jan 2023 17:56:42 +0100 Subject: [PATCH 06/24] Modification gitignore --- .gitignore | 97 --------------------------------------------- .idea/php.xml | 15 +++++++ .idea/workspace.xml | 30 +++++--------- 3 files changed, 25 insertions(+), 117 deletions(-) diff --git a/.gitignore b/.gitignore index e1aa53e..f0cd01d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,101 +1,4 @@ -.idea/* - -# Created by https://www.toptal.com/developers/gitignore/api/phpstorm+all,symfony -# Edit at https://www.toptal.com/developers/gitignore?templates=phpstorm+all,symfony - -### PhpStorm+all ### -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - -# User-specific stuff -.idea/**/workspace.xml -.idea/**/tasks.xml -.idea/**/usage.statistics.xml -.idea/**/dictionaries -.idea/**/shelf - -# AWS User-specific -.idea/**/aws.xml - -# Generated files -.idea/**/contentModel.xml - -# Sensitive or high-churn files -.idea/**/dataSources/ -.idea/**/dataSources.ids -.idea/**/dataSources.local.xml -.idea/**/sqlDataSources.xml -.idea/**/dynamic.xml -.idea/**/uiDesigner.xml -.idea/**/dbnavigator.xml - -# Gradle -.idea/**/gradle.xml -.idea/**/libraries - -# Gradle and Maven with auto-import -# When using Gradle or Maven with auto-import, you should exclude module files, -# since they will be recreated, and may cause churn. Uncomment if using -# auto-import. -# .idea/artifacts -# .idea/compiler.xml -# .idea/jarRepositories.xml -# .idea/modules.xml -# .idea/*.iml -# .idea/modules -# *.iml -# *.ipr - -# CMake -cmake-build-*/ - -# Mongo Explorer plugin -.idea/**/mongoSettings.xml - -# File-based project format -*.iws - -# IntelliJ -out/ - -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Cursive Clojure plugin -.idea/replstate.xml - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties - -# Editor-based Rest Client -.idea/httpRequests - -# Android studio 3.1+ serialized cache file -.idea/caches/build_file_checksums.ser - -### PhpStorm+all Patch ### -# Ignores the whole .idea folder and all .iml files -# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360 - -.idea/ - -# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023 - -*.iml -modules.xml -.idea/misc.xml -*.ipr - -# Sonarlint plugin -.idea/sonarlint - ### Symfony ### # Cache and logs (Symfony2) /app/cache/* diff --git a/.idea/php.xml b/.idea/php.xml index a71204a..832087e 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -1,5 +1,14 @@ + + + + + + @@ -8,4 +17,10 @@ + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 655e5e9..059e2db 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -30,10 +30,7 @@ - - - - - - $PROJECT_DIR$/../../../movies-rest/composer.json - - - - - - - - - - - - - false - - false - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1587741363361 - - - 1631626399477 - - - - - - - - - - - \ No newline at end of file From 73471aebb89af0b92a66a9a83218648515a57dcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Gomez=20Caballe?= Date: Sat, 28 Jan 2023 17:57:23 +0100 Subject: [PATCH 08/24] Modification gitignore --- .gitignore | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/.gitignore b/.gitignore index f0cd01d..e1aa53e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,101 @@ +.idea/* + +# Created by https://www.toptal.com/developers/gitignore/api/phpstorm+all,symfony +# Edit at https://www.toptal.com/developers/gitignore?templates=phpstorm+all,symfony + +### PhpStorm+all ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### PhpStorm+all Patch ### +# Ignores the whole .idea folder and all .iml files +# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360 + +.idea/ + +# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023 + +*.iml +modules.xml +.idea/misc.xml +*.ipr + +# Sonarlint plugin +.idea/sonarlint + ### Symfony ### # Cache and logs (Symfony2) /app/cache/* From 177ea07ac32d50749cc4bbb9127d8d1bd75d24fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Gomez=20Caballe?= Date: Sun, 29 Jan 2023 21:24:29 +0100 Subject: [PATCH 09/24] Image page in header --- Resources/views/default/form.html.twig | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/views/default/form.html.twig b/Resources/views/default/form.html.twig index 26cd862..40eeee5 100644 --- a/Resources/views/default/form.html.twig +++ b/Resources/views/default/form.html.twig @@ -19,6 +19,14 @@
    • Référencement
      • {% endblock %} +{% block header_image %} + {% set field = form.image.vars.value %} +
      + + +
      +{% endblock %} + {% block mainPanel %}
      From b9cd382dc878bc2438deec7774ee3051450235e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Gomez=20Caballe?= Date: Mon, 30 Jan 2023 17:13:39 +0100 Subject: [PATCH 10/24] Passe le status en hidden --- Entity/Page.php | 3 ++- Form/Type/DefaultPageType.php | 8 +------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Entity/Page.php b/Entity/Page.php index 4ee093b..944f5e1 100644 --- a/Entity/Page.php +++ b/Entity/Page.php @@ -3,6 +3,7 @@ namespace Aropixel\PageBundle\Entity; use Aropixel\AdminBundle\Entity\Publishable; +use Aropixel\AdminBundle\Entity\PublishableTrait; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Symfony\Component\PropertyAccess\PropertyAccess; @@ -100,7 +101,7 @@ class Page implements PageInterface */ protected $fieldValues; - + use PublishableTrait; public function __construct() { diff --git a/Form/Type/DefaultPageType.php b/Form/Type/DefaultPageType.php index 2b4ce94..386053b 100644 --- a/Form/Type/DefaultPageType.php +++ b/Form/Type/DefaultPageType.php @@ -55,13 +55,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'data_value' => 'value', 'library' => self::class ]) - ->add('status', ChoiceType::class, array( - 'choices' => array( - 'Oui' => 'online', - 'Non' => 'offline', - ), - 'expanded' => true - )) + ->add('status', HiddenType::class) ->add('createdAt', DateTimeType::class, array( 'required' => false, 'date_widget' => 'single_text', From b137387c7027f971026d4313095f70c00a56efd7 Mon Sep 17 00:00:00 2001 From: Antoine Leclaire <104761460+Ate-lcr@users.noreply.github.com> Date: Tue, 31 Jan 2023 15:01:00 +0100 Subject: [PATCH 11/24] Translation PageBundle v3 --- Form/Type/AbstractPageType.php | 4 +- Form/Type/DefaultPageType.php | 2 +- Http/Action/Page/DeletePageAction.php | 1 - Resources/translations/messages.fr.xlf | 60 ++++++++++++++++++++++++++ Resources/views/base.html.twig | 4 +- Resources/views/default/form.html.twig | 10 ++--- Resources/views/index.html.twig | 24 +++++------ 7 files changed, 82 insertions(+), 23 deletions(-) create mode 100644 Resources/translations/messages.fr.xlf diff --git a/Form/Type/AbstractPageType.php b/Form/Type/AbstractPageType.php index 2e36d7b..fe068b8 100644 --- a/Form/Type/AbstractPageType.php +++ b/Form/Type/AbstractPageType.php @@ -59,8 +59,8 @@ public function buildForm(FormBuilderInterface $builder, array $options) { if ($builder->getData() && $builder->getData()->getType()=='default') { $builder - ->add('title', TextType::class, array('label' => 'Titre de la page')) - ->add('slug', TextType::class, array('label' => 'Permalien')) + ->add('title', TextType::class, array('label' => 'Title of the page')) + ->add('slug', TextType::class, array('label' => 'Permalink')) ; } diff --git a/Form/Type/DefaultPageType.php b/Form/Type/DefaultPageType.php index 386053b..cff243a 100644 --- a/Form/Type/DefaultPageType.php +++ b/Form/Type/DefaultPageType.php @@ -48,7 +48,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) // parent::buildForm($builder, $options); $builder - ->add('excerpt', null, array('label' => 'Chapeau')) + ->add('excerpt', null, array('label' => 'Header')) ->add('description', TextareaType::class, array('label' => 'Description', 'attr' => array('class' => 'ckeditor'))) ->add('image', ImageType::class, [ 'data_class' => $fieldClass, diff --git a/Http/Action/Page/DeletePageAction.php b/Http/Action/Page/DeletePageAction.php index 22b92a9..0bb2155 100644 --- a/Http/Action/Page/DeletePageAction.php +++ b/Http/Action/Page/DeletePageAction.php @@ -2,7 +2,6 @@ namespace Aropixel\PageBundle\Http\Action\Page; -use Aropixel\PageBundle\Entity\Page; use Aropixel\PageBundle\Http\Form\Page\FormFactory; use Aropixel\PageBundle\Repository\PageRepository; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; diff --git a/Resources/translations/messages.fr.xlf b/Resources/translations/messages.fr.xlf new file mode 100644 index 0000000..67d16b1 --- /dev/null +++ b/Resources/translations/messages.fr.xlf @@ -0,0 +1,60 @@ + + + + + + Manage the pages of your website + Administrez les pages de votre site + + + List of pages + Liste des pages + + + Put offline + Mettre hors-ligne + + + Put online + Mettre en ligne + + + Are you sure you want to put this page + Êtes-vous certain de vouloir mettre cette page + + + Title of the page + Titre de la page + + + Header + Chapeau + + + Content + Contenu + + + SEO + Référencement + + + Set your publication options + Paramétrez vos options de publication + + + Post + Publier + + + Post on + Publier le + + + Until + Jusqu'au + + + + + diff --git a/Resources/views/base.html.twig b/Resources/views/base.html.twig index 233b5c5..7aa7aa0 100644 --- a/Resources/views/base.html.twig +++ b/Resources/views/base.html.twig @@ -8,13 +8,13 @@ {% block header_elements %} {% set baseroute = get_baseroute() %} {% if page and route_exists(baseroute ~ '_index') %} - + {% endif %} {% if app.request.get('_route') != baseroute ~ '_new' and route_exists(baseroute ~ '_new') %} - + diff --git a/Resources/views/default/form.html.twig b/Resources/views/default/form.html.twig index 40eeee5..e77b7c9 100644 --- a/Resources/views/default/form.html.twig +++ b/Resources/views/default/form.html.twig @@ -3,20 +3,20 @@ {% block header_title %}Pages{% endblock %} {% block header_breadcrumb %} {% endblock %} {% block tabbable %} -
    • Contenu
      • -
    • Référencement
      • +
    • {% trans %}Content{% endtrans %}
      • +
    • {% trans %}SEO{% endtrans %}
      • {% endblock %} {% block header_image %} diff --git a/Resources/views/index.html.twig b/Resources/views/index.html.twig index 0c8123e..7026570 100644 --- a/Resources/views/index.html.twig +++ b/Resources/views/index.html.twig @@ -1,9 +1,9 @@ {% extends '@AropixelAdmin/List/datatable.html.twig' %} -{% block header_title %}Pages Administrez les pages de votre site{% endblock %} +{% block header_title %}Pages {% trans %}Manage the pages of your website{% endtrans %}{% endblock %} {% block header_breadcrumb %} {% endblock %} @@ -12,13 +12,13 @@ {% block header_elements %} {% set baseroute = get_baseroute() %} {% if route_exists(baseroute ~ '_new') %} - + {% endif %} {% if route_exists(baseroute ~ '_order') %} - + @@ -26,7 +26,7 @@ {% endblock %} -{% block paneltitle %}Liste des pages{% endblock %} +{% block paneltitle %}{% trans %}List of pages{% endtrans %}{% endblock %} {% block paneldatatable %} @@ -34,9 +34,9 @@ - - - + + + @@ -46,12 +46,12 @@ From 7d224043cf5c77e8d47321f74b73221bef5af48a Mon Sep 17 00:00:00 2001 From: Antoine Leclaire <104761460+Ate-lcr@users.noreply.github.com> Date: Wed, 1 Feb 2023 14:32:10 +0100 Subject: [PATCH 12/24] Refactorisation PostCategoryRepository.php --- Resources/config/routing.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/config/routing.yml b/Resources/config/routing.yml index cb60fa0..bff06ae 100644 --- a/Resources/config/routing.yml +++ b/Resources/config/routing.yml @@ -13,6 +13,7 @@ aropixel_page_edit: aropixel_page_delete: path: /page/{id} controller: Aropixel\PageBundle\Http\Action\Page\DeletePageAction + methods: DELETE aropixel_page: path: /page/{type}/page From 0a136fc67fa1952a19762e342b28985b1afc8e53 Mon Sep 17 00:00:00 2001 From: Antoine Leclaire <104761460+Ate-lcr@users.noreply.github.com> Date: Wed, 1 Feb 2023 15:40:07 +0100 Subject: [PATCH 13/24] Fix traduction PageBundle --- Http/Action/Page/CreatePageAction.php | 7 ++++--- Http/Action/Page/CreateUniquePageAction.php | 4 +++- Http/Action/Page/DeletePageAction.php | 5 +++-- Http/Action/Page/EditPageAction.php | 4 +++- Resources/translations/messages.fr.xlf | 10 +++++++++- Resources/views/index.html.twig | 2 +- 6 files changed, 23 insertions(+), 9 deletions(-) diff --git a/Http/Action/Page/CreatePageAction.php b/Http/Action/Page/CreatePageAction.php index e5b4e62..192f86b 100644 --- a/Http/Action/Page/CreatePageAction.php +++ b/Http/Action/Page/CreatePageAction.php @@ -9,15 +9,16 @@ use Aropixel\PageBundle\Repository\PageRepository; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpFoundation\Response; +use Symfony\Contracts\Translation\TranslatorInterface; class CreatePageAction extends AbstractController { public function __construct( private readonly FormFactory $formFactory, private readonly FormFactoryInterface $factory, - private readonly RequestStack $request, private readonly PageRepository $pageRepository, - + private readonly RequestStack $request, + private readonly TranslatorInterface $translator ){} private string $model = Page::class; @@ -33,7 +34,7 @@ public function __invoke(string $type) : Response if ($form->isSubmitted() && $form->isValid()) { $this->pageRepository->add($page, true); - $this->addFlash('notice', 'La page a bien été enregistrée.'); + $this->addFlash('notice', $this->translator->trans('The page has been successfully saved.')); return $this->redirectToRoute('aropixel_page_edit', array('type' => $page->getType(), 'id' => $page->getId())); } diff --git a/Http/Action/Page/CreateUniquePageAction.php b/Http/Action/Page/CreateUniquePageAction.php index c8bb5b0..e247a7f 100644 --- a/Http/Action/Page/CreateUniquePageAction.php +++ b/Http/Action/Page/CreateUniquePageAction.php @@ -11,6 +11,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpFoundation\Response; +use Symfony\Contracts\Translation\TranslatorInterface; class CreateUniquePageAction extends AbstractController { @@ -19,6 +20,7 @@ public function __construct( private readonly FormFactoryInterface $factory, private readonly PageRepository $pageRepository, private readonly RequestStack $request, + private readonly TranslatorInterface $translator, ){} private string $model = Page::class; @@ -40,7 +42,7 @@ public function __invoke(string $type) : Response if ($form->isSubmitted() && $form->isValid()) { $this->pageRepository->add($page, true); - $this->addFlash('notice', 'La page a bien été enregistrée.'); + $this->addFlash('notice', $this->translator->trans('The page has been successfully saved.')); return $this->redirectToRoute('aropixel_page', array('type' => $page->getType(), 'id' => $page->getId())); } diff --git a/Http/Action/Page/DeletePageAction.php b/Http/Action/Page/DeletePageAction.php index 0bb2155..dac4ea7 100644 --- a/Http/Action/Page/DeletePageAction.php +++ b/Http/Action/Page/DeletePageAction.php @@ -7,6 +7,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpFoundation\Response; +use Symfony\Contracts\Translation\TranslatorInterface; class DeletePageAction extends AbstractController { @@ -14,6 +15,7 @@ public function __construct( private readonly FormFactory $formFactory, private readonly PageRepository $pageRepository, private readonly RequestStack $request, + private readonly TranslatorInterface $translator, ) {} @@ -21,7 +23,6 @@ public function __invoke(int $id) : Response { $page = $this->pageRepository->find($id); $type = $page->getType(); - $title = $page->getTitle(); $form = $this->formFactory->createDeleteForm($page); $form->handleRequest($this->request->getMainRequest()); @@ -29,7 +30,7 @@ public function __invoke(int $id) : Response if ($form->isSubmitted() && $form->isValid()) { $this->pageRepository->remove($page, true); - $this->addFlash('notice', 'La page "'.$title.'" a bien été supprimé.'); + $this->addFlash('notice', $this->translator->trans('The page has been successfully deleted.')); } return $this->redirectToRoute('aropixel_page_index', ['type' => $type]); diff --git a/Http/Action/Page/EditPageAction.php b/Http/Action/Page/EditPageAction.php index f8add7f..e40242d 100644 --- a/Http/Action/Page/EditPageAction.php +++ b/Http/Action/Page/EditPageAction.php @@ -10,6 +10,7 @@ use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpFoundation\Response; +use Symfony\Contracts\Translation\TranslatorInterface; class EditPageAction extends AbstractController { @@ -19,6 +20,7 @@ public function __construct( private readonly PageRepository $pageRepository, private readonly RequestStack $request, private readonly Security $security, + private readonly TranslatorInterface $translator, ){} public function __invoke(int $id) : Response @@ -38,7 +40,7 @@ public function __invoke(int $id) : Response if ($form->isSubmitted() && $form->isValid()) { $this->pageRepository->add($page, true); - $this->addFlash('notice', 'La page a bien été enregistrée.'); + $this->addFlash('notice', $this->translator->trans('The page has been successfully saved.')); return $this->redirectToRoute('aropixel_page_edit', array('type' => $page->getType(), 'id' => $page->getId())); } return $this->render($this->formFactory->getTemplatePath().'/'.$page->getType().'/form.html.twig', [ diff --git a/Resources/translations/messages.fr.xlf b/Resources/translations/messages.fr.xlf index 67d16b1..b2a9cdc 100644 --- a/Resources/translations/messages.fr.xlf +++ b/Resources/translations/messages.fr.xlf @@ -7,7 +7,7 @@ Administrez les pages de votre site - List of pages + Pages list Liste des pages @@ -54,6 +54,14 @@ Until Jusqu'au + + The page has been successfully saved. + La page a bien été enregistrée. + + + The page has been successfully deleted. + La page a bien été supprimée. + diff --git a/Resources/views/index.html.twig b/Resources/views/index.html.twig index 7026570..c3ca94d 100644 --- a/Resources/views/index.html.twig +++ b/Resources/views/index.html.twig @@ -26,7 +26,7 @@ {% endblock %} -{% block paneltitle %}{% trans %}List of pages{% endtrans %}{% endblock %} +{% block paneltitle %}{% trans %}Pages list{% endtrans %}{% endblock %} {% block paneldatatable %} From 9ed02d978db4e4b6b2bc4e4e3e5367763168ace5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Gomez=20Caballe?= Date: Sun, 19 Mar 2023 11:58:19 +0100 Subject: [PATCH 14/24] =?UTF-8?q?Modifie=20la=20d=C3=A9pendance=20admin-bu?= =?UTF-8?q?ndle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c190043..69106f9 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ } }, "require" : { - "aropixel/admin-bundle": "^1.2" + "aropixel/admin-bundle": "dev-feature/v3/boostrap" }, "scripts": { "auto-scripts": { From db42c9169a5d1dcebe1a1af29eab71c71b56cc6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Gomez=20Caballe?= Date: Sun, 19 Mar 2023 15:30:10 +0100 Subject: [PATCH 15/24] Remove readonly property --- Http/Action/Page/CreatePageAction.php | 30 ++++++++++++++----- Http/Action/Page/CreateUniquePageAction.php | 30 ++++++++++++++----- Http/Action/Page/DeletePageAction.php | 26 +++++++++++----- Http/Action/Page/EditPageAction.php | 33 ++++++++++++++++----- Http/Action/Page/IndexPageAction.php | 7 ++--- Http/Action/Page/StatusPageAction.php | 12 ++++++-- 6 files changed, 102 insertions(+), 36 deletions(-) diff --git a/Http/Action/Page/CreatePageAction.php b/Http/Action/Page/CreatePageAction.php index 192f86b..f212210 100644 --- a/Http/Action/Page/CreatePageAction.php +++ b/Http/Action/Page/CreatePageAction.php @@ -13,16 +13,32 @@ class CreatePageAction extends AbstractController { - public function __construct( - private readonly FormFactory $formFactory, - private readonly FormFactoryInterface $factory, - private readonly PageRepository $pageRepository, - private readonly RequestStack $request, - private readonly TranslatorInterface $translator - ){} + private FormFactory $formFactory; + private FormFactoryInterface $factory; + private PageRepository $pageRepository; + private RequestStack $request; + private TranslatorInterface $translator; private string $model = Page::class; + + /** + * @param FormFactory $formFactory + * @param FormFactoryInterface $factory + * @param PageRepository $pageRepository + * @param RequestStack $request + * @param TranslatorInterface $translator + */ + public function __construct(FormFactory $formFactory, FormFactoryInterface $factory, PageRepository $pageRepository, RequestStack $request, TranslatorInterface $translator) + { + $this->formFactory = $formFactory; + $this->factory = $factory; + $this->pageRepository = $pageRepository; + $this->request = $request; + $this->translator = $translator; + } + + public function __invoke(string $type) : Response { $page = new $this->model(); diff --git a/Http/Action/Page/CreateUniquePageAction.php b/Http/Action/Page/CreateUniquePageAction.php index e247a7f..379ff12 100644 --- a/Http/Action/Page/CreateUniquePageAction.php +++ b/Http/Action/Page/CreateUniquePageAction.php @@ -15,16 +15,32 @@ class CreateUniquePageAction extends AbstractController { - public function __construct( - private readonly FormFactory $formFactory, - private readonly FormFactoryInterface $factory, - private readonly PageRepository $pageRepository, - private readonly RequestStack $request, - private readonly TranslatorInterface $translator, - ){} + private FormFactory $formFactory; + private FormFactoryInterface $factory; + private PageRepository $pageRepository; + private RequestStack $request; + private TranslatorInterface $translator; private string $model = Page::class; + + /** + * @param FormFactory $formFactory + * @param FormFactoryInterface $factory + * @param PageRepository $pageRepository + * @param RequestStack $request + * @param TranslatorInterface $translator + */ + public function __construct(FormFactory $formFactory, FormFactoryInterface $factory, PageRepository $pageRepository, RequestStack $request, TranslatorInterface $translator) + { + $this->formFactory = $formFactory; + $this->factory = $factory; + $this->pageRepository = $pageRepository; + $this->request = $request; + $this->translator = $translator; + } + + public function __invoke(string $type) : Response { $page = $this->pageRepository->findOneBy(['type' => $type]); diff --git a/Http/Action/Page/DeletePageAction.php b/Http/Action/Page/DeletePageAction.php index dac4ea7..247592e 100644 --- a/Http/Action/Page/DeletePageAction.php +++ b/Http/Action/Page/DeletePageAction.php @@ -11,13 +11,25 @@ class DeletePageAction extends AbstractController { - public function __construct( - private readonly FormFactory $formFactory, - private readonly PageRepository $pageRepository, - private readonly RequestStack $request, - private readonly TranslatorInterface $translator, - ) - {} + private FormFactory $formFactory; + private PageRepository $pageRepository; + private RequestStack $request; + private TranslatorInterface $translator; + + /** + * @param FormFactory $formFactory + * @param PageRepository $pageRepository + * @param RequestStack $request + * @param TranslatorInterface $translator + */ + public function __construct(FormFactory $formFactory, PageRepository $pageRepository, RequestStack $request, TranslatorInterface $translator) + { + $this->formFactory = $formFactory; + $this->pageRepository = $pageRepository; + $this->request = $request; + $this->translator = $translator; + } + public function __invoke(int $id) : Response { diff --git a/Http/Action/Page/EditPageAction.php b/Http/Action/Page/EditPageAction.php index e40242d..9d485a4 100644 --- a/Http/Action/Page/EditPageAction.php +++ b/Http/Action/Page/EditPageAction.php @@ -14,14 +14,31 @@ class EditPageAction extends AbstractController { - public function __construct( - private readonly FormFactory $formFactory, - private readonly FormFactoryInterface $factory, - private readonly PageRepository $pageRepository, - private readonly RequestStack $request, - private readonly Security $security, - private readonly TranslatorInterface $translator, - ){} + private FormFactory $formFactory; + private FormFactoryInterface $factory; + private PageRepository $pageRepository; + private RequestStack $request; + private Security $security; + private TranslatorInterface $translator; + + /** + * @param FormFactory $formFactory + * @param FormFactoryInterface $factory + * @param PageRepository $pageRepository + * @param RequestStack $request + * @param Security $security + * @param TranslatorInterface $translator + */ + public function __construct(FormFactory $formFactory, FormFactoryInterface $factory, PageRepository $pageRepository, RequestStack $request, Security $security, TranslatorInterface $translator) + { + $this->formFactory = $formFactory; + $this->factory = $factory; + $this->pageRepository = $pageRepository; + $this->request = $request; + $this->security = $security; + $this->translator = $translator; + } + public function __invoke(int $id) : Response { diff --git a/Http/Action/Page/IndexPageAction.php b/Http/Action/Page/IndexPageAction.php index 1bc87ff..003b09d 100644 --- a/Http/Action/Page/IndexPageAction.php +++ b/Http/Action/Page/IndexPageAction.php @@ -9,10 +9,9 @@ class IndexPageAction extends AbstractController { - public function __construct( - private readonly FormFactory $formFactory, - private readonly PageRepository $pageRepository, - ){} + private FormFactory $formFactory; + private PageRepository $pageRepository; + public function __invoke(string $type) : Response { diff --git a/Http/Action/Page/StatusPageAction.php b/Http/Action/Page/StatusPageAction.php index d350eb5..bb51681 100644 --- a/Http/Action/Page/StatusPageAction.php +++ b/Http/Action/Page/StatusPageAction.php @@ -8,9 +8,15 @@ class StatusPageAction { - public function __construct( - private readonly Status $status, - ){} + private Status $status; + + /** + * @param Status $status + */ + public function __construct(Status $status) + { + $this->status = $status; + } public function __invoke(Page $page) : Response { From 5349a867315e7cd74f3fd42d609f461d3a4382c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Gomez=20Caballe?= Date: Sun, 19 Mar 2023 15:49:09 +0100 Subject: [PATCH 16/24] Update PublishableRepository namespace --- Repository/PageRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Repository/PageRepository.php b/Repository/PageRepository.php index aebb828..070bfd2 100644 --- a/Repository/PageRepository.php +++ b/Repository/PageRepository.php @@ -2,7 +2,7 @@ namespace Aropixel\PageBundle\Repository; -use Aropixel\AdminBundle\Repository\PublishableRepository; +use Aropixel\AdminBundle\Infrastructure\Publication\Repository\PublishableRepository; use Aropixel\PageBundle\Entity\Page; use Aropixel\PageBundle\Entity\PageInterface; use Doctrine\Persistence\ManagerRegistry; From 2a62e30c59c3e2bbb3ca5372ec84c0cebe002a22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Gomez=20Caballe?= Date: Sun, 19 Mar 2023 20:32:14 +0100 Subject: [PATCH 17/24] Change Cropper to CropApplier --- EventListener/DoFileCropListener.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/EventListener/DoFileCropListener.php b/EventListener/DoFileCropListener.php index 59955f8..d68bdbb 100644 --- a/EventListener/DoFileCropListener.php +++ b/EventListener/DoFileCropListener.php @@ -2,21 +2,19 @@ namespace Aropixel\PageBundle\EventListener; -use Aropixel\AdminBundle\Entity\CropInterface; use Aropixel\AdminBundle\Entity\ImageInterface; -use Aropixel\AdminBundle\Image\Cropper; +use Aropixel\AdminBundle\Infrastructure\Media\Image\Crop\CropApplier; use Aropixel\PageBundle\Entity\FieldInterface; use Doctrine\ORM\Event\LifecycleEventArgs; class DoFileCropListener { - /** @var Cropper */ - private $cropper; + private CropApplier $cropper; /** */ - public function __construct(Cropper $cropper) + public function __construct(CropApplier $cropper) { $this->cropper = $cropper; } From f8397392b119eb7bdbd8ad2c351ff2197d19ccdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Gomez=20Caballe?= Date: Sun, 19 Mar 2023 20:36:27 +0100 Subject: [PATCH 18/24] Change Cropper to CropApplier --- EventListener/DoFileCropListener.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/EventListener/DoFileCropListener.php b/EventListener/DoFileCropListener.php index d68bdbb..08bb38f 100644 --- a/EventListener/DoFileCropListener.php +++ b/EventListener/DoFileCropListener.php @@ -2,19 +2,19 @@ namespace Aropixel\PageBundle\EventListener; +use Aropixel\AdminBundle\Domain\Media\Image\Crop\CropApplierInterface; use Aropixel\AdminBundle\Entity\ImageInterface; -use Aropixel\AdminBundle\Infrastructure\Media\Image\Crop\CropApplier; use Aropixel\PageBundle\Entity\FieldInterface; use Doctrine\ORM\Event\LifecycleEventArgs; class DoFileCropListener { - private CropApplier $cropper; + private CropApplierInterface $cropper; /** */ - public function __construct(CropApplier $cropper) + public function __construct(CropApplierInterface $cropper) { $this->cropper = $cropper; } From a7e6efda06fadff9aef36fef0febba7081a662d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Gomez=20Caballe?= Date: Sun, 19 Mar 2023 20:40:34 +0100 Subject: [PATCH 19/24] Change Cropper to CropApplier --- Resources/config/services.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/config/services.yml b/Resources/config/services.yml index 9169ce6..ee173b3 100644 --- a/Resources/config/services.yml +++ b/Resources/config/services.yml @@ -40,7 +40,7 @@ services: Aropixel\PageBundle\EventListener\DoFileCropListener: - arguments: ['@Aropixel\AdminBundle\Image\Cropper'] + arguments: ['@Aropixel\AdminBundle\Domain\Media\Image\Crop\CropApplierInterface'] tags: - { name: doctrine.event_listener, event: postPersist } - { name: doctrine.event_listener, event: postUpdate } From 1fe7b44921a1ccf1879816734083bef0849c68a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Gomez=20Caballe?= Date: Sun, 19 Mar 2023 20:51:27 +0100 Subject: [PATCH 20/24] Replace Security 6.0 by AuthorizationChecker --- Http/Action/Page/EditPageAction.php | 11 ++++++----- Http/Action/Page/IndexPageAction.php | 10 ++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Http/Action/Page/EditPageAction.php b/Http/Action/Page/EditPageAction.php index 9d485a4..6814eee 100644 --- a/Http/Action/Page/EditPageAction.php +++ b/Http/Action/Page/EditPageAction.php @@ -10,32 +10,33 @@ use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; use Symfony\Contracts\Translation\TranslatorInterface; class EditPageAction extends AbstractController { + private AuthorizationCheckerInterface $authorizationChecker; private FormFactory $formFactory; private FormFactoryInterface $factory; private PageRepository $pageRepository; private RequestStack $request; - private Security $security; private TranslatorInterface $translator; /** + * @param AuthorizationCheckerInterface $authorizationChecker * @param FormFactory $formFactory * @param FormFactoryInterface $factory * @param PageRepository $pageRepository * @param RequestStack $request - * @param Security $security * @param TranslatorInterface $translator */ - public function __construct(FormFactory $formFactory, FormFactoryInterface $factory, PageRepository $pageRepository, RequestStack $request, Security $security, TranslatorInterface $translator) + public function __construct(AuthorizationCheckerInterface $authorizationChecker, FormFactory $formFactory, FormFactoryInterface $factory, PageRepository $pageRepository, RequestStack $request, TranslatorInterface $translator) { + $this->authorizationChecker = $authorizationChecker; $this->formFactory = $formFactory; $this->factory = $factory; $this->pageRepository = $pageRepository; $this->request = $request; - $this->security = $security; $this->translator = $translator; } @@ -48,7 +49,7 @@ public function __invoke(int $id) : Response throw $this->createNotFoundException(); } - $isRoleAdmin = $this->security->isGranted('ROLE_HYPER_ADMIN'); + $isRoleAdmin = $this->authorizationChecker->isGranted('ROLE_HYPER_ADMIN'); $deleteForm = $this->formFactory->createDeleteForm($page); $form = $this->factory->createForm($page); diff --git a/Http/Action/Page/IndexPageAction.php b/Http/Action/Page/IndexPageAction.php index 003b09d..26697a6 100644 --- a/Http/Action/Page/IndexPageAction.php +++ b/Http/Action/Page/IndexPageAction.php @@ -12,6 +12,16 @@ class IndexPageAction extends AbstractController private FormFactory $formFactory; private PageRepository $pageRepository; + /** + * @param FormFactory $formFactory + * @param PageRepository $pageRepository + */ + public function __construct(FormFactory $formFactory, PageRepository $pageRepository) + { + $this->formFactory = $formFactory; + $this->pageRepository = $pageRepository; + } + public function __invoke(string $type) : Response { From 2613dc44828972c9683caafce7364da6a8aa3b1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Gomez=20Caballe?= Date: Mon, 10 Apr 2023 18:34:51 +0200 Subject: [PATCH 21/24] Bugfix formulaire sans image --- Resources/views/default/form.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/views/default/form.html.twig b/Resources/views/default/form.html.twig index e77b7c9..0e41d42 100644 --- a/Resources/views/default/form.html.twig +++ b/Resources/views/default/form.html.twig @@ -20,7 +20,7 @@ {% endblock %} {% block header_image %} - {% set field = form.image.vars.value %} + {% set field = form.image is defined ? form.image.vars.value : null %}
      From 19cffc850d3b2936f366e3bb74a23f4c802cd8d9 Mon Sep 17 00:00:00 2001 From: Antoine Leclaire <104761460+Ate-lcr@users.noreply.github.com> Date: Wed, 14 Jun 2023 16:15:48 +0200 Subject: [PATCH 22/24] Fix translation --- Resources/translations/messages.fr.xlf | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Resources/translations/messages.fr.xlf b/Resources/translations/messages.fr.xlf index b2a9cdc..8b4f771 100644 --- a/Resources/translations/messages.fr.xlf +++ b/Resources/translations/messages.fr.xlf @@ -62,6 +62,18 @@ The page has been successfully deleted. La page a bien été supprimée. + + Add + Ajouter + + + New + Créer + + + Created on + Date de création + From 6c5659260c01460a1bff5a6c6474011062c1ba69 Mon Sep 17 00:00:00 2001 From: Antoine Leclaire <104761460+Ate-lcr@users.noreply.github.com> Date: Wed, 14 Jun 2023 17:00:40 +0200 Subject: [PATCH 23/24] Minor fixes --- AropixelPageBundle.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/AropixelPageBundle.php b/AropixelPageBundle.php index e1cff62..63e0639 100644 --- a/AropixelPageBundle.php +++ b/AropixelPageBundle.php @@ -2,7 +2,6 @@ namespace Aropixel\PageBundle; -use Aropixel\AdminBundle\DependencyInjection\Compiler\MenuCompilerPass; use Aropixel\PageBundle\DependencyInjection\Compiler\DoctrineTargetEntitiesResolverPass; use Aropixel\PageBundle\DependencyInjection\Compiler\PageFormResolverPass; use Symfony\Component\DependencyInjection\Compiler\PassConfig; @@ -11,7 +10,7 @@ class AropixelPageBundle extends Bundle { - public function build(ContainerBuilder $container) + public function build(ContainerBuilder $container) : void { parent::build($container); $container->addCompilerPass(new PageFormResolverPass()); From 807a21847137c2a6b827009a908f1403e849dec5 Mon Sep 17 00:00:00 2001 From: Antoine Leclaire <104761460+Ate-lcr@users.noreply.github.com> Date: Thu, 15 Jun 2023 12:05:08 +0200 Subject: [PATCH 24/24] Harmonisation css --- Resources/views/default/form.html.twig | 2 ++ Resources/views/index.html.twig | 23 ++++++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Resources/views/default/form.html.twig b/Resources/views/default/form.html.twig index 0e41d42..fbe7973 100644 --- a/Resources/views/default/form.html.twig +++ b/Resources/views/default/form.html.twig @@ -1,4 +1,6 @@ {% extends '@AropixelPage/base.html.twig' %} +{% form_theme form '@AropixelAdmin/Form/layout.html.twig' %} + {% block header_title %}Pages{% endblock %} {% block header_breadcrumb %} diff --git a/Resources/views/index.html.twig b/Resources/views/index.html.twig index c3ca94d..9960af6 100644 --- a/Resources/views/index.html.twig +++ b/Resources/views/index.html.twig @@ -44,15 +44,20 @@
      -
      TitreDateActions{% trans %}Title{% endtrans %}{% trans %}Created on{% endtrans %}Actions
      {{ page.createdAt|date('d/m/Y') }}
      - - + + - + {{ form(delete_forms[page.id]) }}
      {{ page.title }} {{ page.createdAt|date('d/m/Y') }} -
      - - - - - - {{ form(delete_forms[page.id]) }} +
      		+
      + +
      + Modifier + {{ page.status == 'online' ? 'Mettre hors ligne' : 'Mettre en ligne' }} +
      + + Supprimer + + {{ form(delete_forms[page.id]) }} +