Refactor

biblioverse · Sep 10, 2023 · c5701a2 · c5701a2
1 parent dd082fb
commit c5701a2
Show file tree

Hide file tree

Showing 36 changed files with 664 additions and 625 deletions.
diff --git a/composer.json b/composer.json
@@ -9,6 +9,7 @@
         "ext-exif": "*",
         "ext-iconv": "*",
         "ext-zip": "*",
+        "andanteproject/page-filter-form-bundle": "^1.0",
         "doctrine/annotations": "^2.0",
         "doctrine/doctrine-bundle": "^2.9",
         "doctrine/doctrine-migrations-bundle": "^3.2",

diff --git a/composer.lock b/composer.lock
diff --git a/config/bundles.php b/config/bundles.php
@@ -22,4 +22,5 @@
     Symfony\UX\LiveComponent\LiveComponentBundle::class => ['all' => true],
     Symfony\UX\Autocomplete\AutocompleteBundle::class => ['all' => true],
     Symfony\UX\StimulusBundle\StimulusBundle::class => ['all' => true],
+    Andante\PageFilterFormBundle\AndantePageFilterFormBundle::class => ['all' => true],
 ];
diff --git a/config/packages/security.yaml b/config/packages/security.yaml
@@ -11,8 +11,12 @@ security:
                 property: username
     firewalls:
         dev:
-            pattern: ^/(_(profiler|wdt)|css|images|js)/
+            pattern: ^/(_(profiler|wdt)|css|images|js|media)/
             security: false
+        image_resolver:
+          pattern: ^/media/cache/resolve
+          security:
+            false
         main:
           lazy: true
           provider: app_user_provider

diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml
@@ -3,6 +3,8 @@ twig:
     globals:
         displayMode: "@app.display_mode_subscriber"  #The id of your service
 
+    form_themes: ['bootstrap_5_layout.html.twig']
+
 when@test:
     twig:
         strict_variables: true
diff --git a/src/Command/RenameAuthorCommand.php b/src/Command/RenameAuthorCommand.php
diff --git a/src/Command/RenameSerieCommand.php b/src/Command/RenameSerieCommand.php
diff --git a/src/Controller/AuthorController.php b/src/Controller/AuthorController.php
diff --git a/src/Controller/AutocompleteGroupController.php b/src/Controller/AutocompleteGroupController.php
@@ -27,6 +27,7 @@ public function index(Request $request, BookRepository $bookRepository, string $
             'serie' => $bookRepository->getAllSeries()->getResult(),
             'authors' => $bookRepository->getAllAuthors(),
             'tags' => $bookRepository->getAllTags(),
+            'publisher' => $bookRepository->getAllPublisherss()->getResult(),
             default => [],
         };
 
@@ -41,7 +42,7 @@ public function index(Request $request, BookRepository $bookRepository, string $
             }
             $json['results'][] = ['value' => $item['item'], 'text' => $item['item']];
         }
-        if (!$exactmatch && strlen($query) > 2) {
+        if (!$exactmatch && strlen($query) > 2 && $request->get('create', true) === true) {
             $json['results'][] = ['value' => $query, 'text' => 'New: '.$query];
         }
 

diff --git a/src/Controller/DefaultController.php b/src/Controller/DefaultController.php
@@ -2,68 +2,36 @@
 
 namespace App\Controller;
 
+use Andante\PageFilterFormBundle\PageFilterFormTrait;
+use App\Form\BookFilterType;
 use App\Repository\BookRepository;
 use Knp\Component\Pager\PaginatorInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 
 class DefaultController extends AbstractController
 {
-    #[Route('/{page}', name: 'app_homepage', requirements: ['page' => '\d+'])]
-    public function index(BookRepository $bookRepository, PaginatorInterface $paginator, int $page = 1): Response
-    {
-        $pagination = $paginator->paginate(
-            $bookRepository->getAllBooksQuery(),
-            $page,
-            18
-        );
+    use PageFilterFormTrait;
 
-        return $this->render('default/index.html.twig', [
-            'pagination' => $pagination,
-            'page' => $page,
-        ]);
-    }
-
-    #[Route('/favorites/{page}', name: 'app_favorites', requirements: ['page' => '\d+'])]
-    public function favorites(BookRepository $bookRepository, PaginatorInterface $paginator, int $page = 1): Response
-    {
-        $pagination = $paginator->paginate(
-            $bookRepository->getFavoriteBooksQuery(),
-            $page,
-            18
-        );
-
-        return $this->render('default/index.html.twig', [
-            'pagination' => $pagination, 'page' => $page,
-        ]);
-    }
-
-    #[Route('/finished/{read}/{page}', name: 'app_read', requirements: ['page' => '\d+'])]
-    public function finished(BookRepository $bookRepository, PaginatorInterface $paginator, int $read, int $page = 1): Response
+    #[Route('/{page}', name: 'app_homepage', requirements: ['page' => '\d+'])]
+    public function index(Request $request, BookRepository $bookRepository, PaginatorInterface $paginator, int $page = 1): Response
     {
-        $pagination = $paginator->paginate(
-            $bookRepository->getBooksByReadStatus((bool) $read),
-            $page,
-            18
-        );
+        $qb = $bookRepository->getAllBooksQueryBuilder();
 
-        return $this->render('default/index.html.twig', [
-            'pagination' => $pagination, 'page' => $page,
-        ]);
-    }
+        $form = $this->createAndHandleFilter(BookFilterType::class, $qb, $request);
 
-    #[Route('/unverified/{page}', name: 'app_unverified', requirements: ['page' => '\d+'])]
-    public function unverified(BookRepository $bookRepository, PaginatorInterface $paginator, int $page = 1): Response
-    {
         $pagination = $paginator->paginate(
-            $bookRepository->getUnverifiedBooksQuery(),
+            $qb->getQuery(),
             $page,
             18
         );
 
         return $this->render('default/index.html.twig', [
-            'pagination' => $pagination, 'page' => $page,
+            'pagination' => $pagination,
+            'page' => $page,
+            'form' => $form->createView(),
         ]);
     }
 }