From 3c90d2c5d800ca943e4cc38a0d12015dcb471eea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hyacinthe=20Compaor=C3=A9?=
 <131278191+compaoreh338@users.noreply.github.com>
Date: Fri, 19 Sep 2025 17:35:03 +0000
Subject: [PATCH 01/11] FEAT: v12

---
 Classes/Controller/GalleryController.php     | 25 ++++++++++----------
 Classes/Persistence/Matcher.php              |  7 +++---
 Classes/ViewHelpers/ImageStackViewHelper.php | 20 +++++++++++++++-
 Classes/ViewHelpers/LoadAssetsViewHelper.php | 24 +++++++++++--------
 composer.json                                |  2 +-
 ext_localconf.php                            |  2 +-
 ext_tables.php                               |  2 +-
 7 files changed, 51 insertions(+), 31 deletions(-)

diff --git a/Classes/Controller/GalleryController.php b/Classes/Controller/GalleryController.php
index 2b18bb97..c7358cbb 100644
--- a/Classes/Controller/GalleryController.php
+++ b/Classes/Controller/GalleryController.php
@@ -32,13 +32,11 @@
 class GalleryController extends ActionController
 {
     protected ImageGalleryRepository $galleryRepository;
-
     protected DemandFactory $demandFactory;
-
     protected OrderFactory $orderFactory;
+    protected CategoryRepository $categoryRepository;
 
     protected array $configuration = array();
-
     protected $settings = [];
 
     protected array $allowedColumns = [
@@ -48,11 +46,16 @@ class GalleryController extends ActionController
         'uid',
     ];
 
-    public function initializeAction(): void
-    {
-        $this->galleryRepository = GeneralUtility::makeInstance(ImageGalleryRepository::class);
-        $this->orderFactory = GeneralUtility::makeInstance(OrderFactory::class);
-        $this->demandFactory = GeneralUtility::makeInstance(DemandFactory::class);
+    public function __construct(
+        ImageGalleryRepository $galleryRepository,
+        DemandFactory $demandFactory,
+        OrderFactory $orderFactory,
+        CategoryRepository $categoryRepository
+    ) {
+        $this->galleryRepository = $galleryRepository;
+        $this->demandFactory = $demandFactory;
+        $this->orderFactory = $orderFactory;
+        $this->categoryRepository = $categoryRepository;
     }
 
     /**
@@ -68,7 +71,7 @@ public function listAction()
 
         $images = $this->galleryRepository->findByDemand($this->getDemand(), (array)$this->getOrderings(),0,0);
         $identifiers = GeneralUtility::trimExplode(',', $this->settings['categories'], TRUE);
-        $categories = $this->getCategoryRepository()->findByIdentifiers($identifiers);
+        $categories = $this->categoryRepository->findByIdentifiers($identifiers);
         // Assign template variables
         $this->view->assign('settings', $this->settings);
         $this->view->assign('data', $this->configurationManager->getcontentObject()->data);
@@ -83,10 +86,6 @@ protected function getOrderings(): \Fab\NaturalGallery\Persistence\Order
 
     }
 
-    protected function getCategoryRepository(): CategoryRepository
-    {
-        return GeneralUtility::makeInstance(CategoryRepository::class);
-    }
 
     protected function getDemand(): array
     {
diff --git a/Classes/Persistence/Matcher.php b/Classes/Persistence/Matcher.php
index 24e80f21..f2d6bb34 100644
--- a/Classes/Persistence/Matcher.php
+++ b/Classes/Persistence/Matcher.php
@@ -265,13 +265,12 @@ public function getIn(): array
     /**
      * @param $fieldNameAndPath
      * @param $operand
-     * @param bool $addWildCard
      * @return $this
      */
-    public function like($fieldNameAndPath, $operand, bool $addWildCard = true): self
+    public function like($fieldNameAndPath, $operand): self
     {
-        $wildCardSymbol = $addWildCard ? '%' : '';
-        $this->like[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $wildCardSymbol . $operand . $wildCardSymbol];
+        // Add wildcards by default for LIKE queries
+        $this->like[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => '%' . $operand . '%'];
         return $this;
     }
 
diff --git a/Classes/ViewHelpers/ImageStackViewHelper.php b/Classes/ViewHelpers/ImageStackViewHelper.php
index 928adb0a..90b8609a 100644
--- a/Classes/ViewHelpers/ImageStackViewHelper.php
+++ b/Classes/ViewHelpers/ImageStackViewHelper.php
@@ -20,6 +20,8 @@
 use TYPO3\CMS\Core\Resource\ProcessedFile;
 use TYPO3\CMS\Core\Resource\ResourceFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Core\Site\SiteFinder;
+use TYPO3\CMS\Core\Context\Context;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 /**
@@ -60,7 +62,7 @@ public function render(): string
                         },$metadataCategories);
                     }
 
-                    $baseUrl = GeneralUtility::getIndpEnv('TYPO3_SITE_URL');
+                    $baseUrl = $this->getSiteUrl();
                     $item = [
                         'thumbnail' => $baseUrl . $thumbnailFile->getPublicUrl(),
                         'enlarged' => $baseUrl . $enlargedFile->getPublicUrl(),
@@ -112,4 +114,20 @@ public function getSettings()
     {
         return $this->templateVariableContainer->get('settings');
     }
+
+    /**
+     * Get the site URL
+     * @return string
+     */
+    protected function getSiteUrl(): string
+    {
+        $siteFinder = GeneralUtility::makeInstance(SiteFinder::class);
+        
+        // Get current page ID from context or fallback to 1
+        $context = GeneralUtility::makeInstance(Context::class);
+        $pageId = $context->getPropertyFromAspect('frontend.page', 'id', 1);
+        
+        $site = $siteFinder->getSiteByPageId($pageId);
+        return (string)$site->getBase();
+    }
 }
diff --git a/Classes/ViewHelpers/LoadAssetsViewHelper.php b/Classes/ViewHelpers/LoadAssetsViewHelper.php
index 84fd4fb4..0cad6d00 100644
--- a/Classes/ViewHelpers/LoadAssetsViewHelper.php
+++ b/Classes/ViewHelpers/LoadAssetsViewHelper.php
@@ -28,6 +28,18 @@
  */
 class LoadAssetsViewHelper extends AbstractViewHelper
 {
+    /**
+     * @var PageRenderer
+     */
+    protected PageRenderer $pageRenderer;
+
+    /**
+     * @param PageRenderer $pageRenderer
+     */
+    public function __construct(PageRenderer $pageRenderer)
+    {
+        $this->pageRenderer = $pageRenderer;
+    }
 
     /**
      * @return void
@@ -78,9 +90,9 @@ protected function loadByCorePageRender(array $asset): void
         $fileNameAndPath = PathUtility::stripPathSitePrefix($fileNameAndPath);
 
         if ($asset['type'] === 'js') {
-            $this->getPageRenderer()->addJsFooterFile($fileNameAndPath);
+            $this->pageRenderer->addJsFooterFile($fileNameAndPath);
         } elseif ($asset['type'] === 'css') {
-            $this->getPageRenderer()->addCssFile($fileNameAndPath);
+            $this->pageRenderer->addCssFile($fileNameAndPath);
         }
     }
 
@@ -125,14 +137,6 @@ protected function resolveFileForApplicationContext(array $asset): string
         return $resolvedFile;
     }
 
-    /**
-     * @return PageRenderer
-     */
-    protected function getPageRenderer(): PageRenderer
-    {
-        return GeneralUtility::makeInstance(PageRenderer::class);
-    }
-
     /**
      * Returns an instance of the Frontend object.
      *
diff --git a/composer.json b/composer.json
index 4824d873..f65ebb9b 100644
--- a/composer.json
+++ b/composer.json
@@ -27,6 +27,6 @@
     }
   },
   "require": {
-    "typo3/cms-core": "^11.5"
+    "typo3/cms-core": "^11.5 | ^12"
   }
 }
diff --git a/ext_localconf.php b/ext_localconf.php
index 9f1a08e2..163a0518 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -2,7 +2,7 @@
 
 use Fab\NaturalGallery\Controller\GalleryController;
 
-defined('TYPO3_MODE') or die();
+defined('TYPO3') or die();
 
 call_user_func(
     function () {
diff --git a/ext_tables.php b/ext_tables.php
index 99e5a011..fa8d6037 100644
--- a/ext_tables.php
+++ b/ext_tables.php
@@ -1,5 +1,5 @@
 <?php
-if (!defined('TYPO3_MODE')) {
+if (!defined('TYPO3')) {
     die ('Access denied.');
 }
 

From 05f15ad19936684b54afe43e55ab118557746234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hyacinthe=20Compaor=C3=A9?=
 <131278191+compaoreh338@users.noreply.github.com>
Date: Mon, 22 Sep 2025 10:07:38 +0000
Subject: [PATCH 02/11] fixup! FEAT: v12

---
 composer.json  | 2 +-
 ext_emconf.php | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index f65ebb9b..7018d477 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
     }
   },
   "replace": {
-    "fab/natural_gallery": "self.version"
+    "fab/natural-gallery": "self.version"
   },
   "extra": {
     "typo3/cms": {
diff --git a/ext_emconf.php b/ext_emconf.php
index 6ca3c064..45932676 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -1,5 +1,7 @@
 <?php
 
+$_EXTKEY = 'natural_gallery';
+
 $EM_CONF[$_EXTKEY] = [
     'title' => 'Natural Gallery',
     'description' => 'A lazy load, infinite scroll and natural layout list gallery',

From 952daaba43842a23c87e0fbf5de74415afe048e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hyacinthe=20Compaor=C3=A9?=
 <131278191+compaoreh338@users.noreply.github.com>
Date: Mon, 22 Sep 2025 10:11:47 +0000
Subject: [PATCH 03/11] fixup! fixup! FEAT: v12

---
 Classes/Controller/GalleryController.php      |  7 +--
 .../Domain/Repository/CategoryRepository.php  | 13 +++--
 .../Repository/ImageGalleryRepository.php     | 47 ++++---------------
 Classes/ViewHelpers/ImageStackViewHelper.php  |  5 +-
 Configuration/TCA/Overrides/tt_content.php    |  3 ++
 composer.json                                 |  2 +-
 ext_emconf.php                                |  2 +-
 ext_localconf.php                             |  2 +-
 ext_tables.php                                |  6 ---
 9 files changed, 31 insertions(+), 56 deletions(-)
 create mode 100644 Configuration/TCA/Overrides/tt_content.php

diff --git a/Classes/Controller/GalleryController.php b/Classes/Controller/GalleryController.php
index c7358cbb..79651210 100644
--- a/Classes/Controller/GalleryController.php
+++ b/Classes/Controller/GalleryController.php
@@ -61,12 +61,12 @@ public function __construct(
     /**
      * @return void|string
      */
-    public function listAction()
+    public function listAction(): \Psr\Http\Message\ResponseInterface
     {
 
 
         if (!isset($this->settings['imagesPerRow'])) {
-            return '<strong style="color: red">Please save your plugin settings in the BE beforehand.</strong>';
+            return $this->htmlResponse('<strong style="color: red">Please save your plugin settings in the BE beforehand.</strong>');
         }
 
         $images = $this->galleryRepository->findByDemand($this->getDemand(), (array)$this->getOrderings(),0,0);
@@ -74,9 +74,10 @@ public function listAction()
         $categories = $this->categoryRepository->findByIdentifiers($identifiers);
         // Assign template variables
         $this->view->assign('settings', $this->settings);
-        $this->view->assign('data', $this->configurationManager->getcontentObject()->data);
+        $this->view->assign('data', $this->request->getAttribute('currentContentObject')->data);
         $this->view->assign('images', $images);
         $this->view->assign('categories', $categories);
+        return $this->htmlResponse();
     }
 
     protected function getOrderings(): \Fab\NaturalGallery\Persistence\Order
diff --git a/Classes/Domain/Repository/CategoryRepository.php b/Classes/Domain/Repository/CategoryRepository.php
index f6e3ab21..6412aabe 100644
--- a/Classes/Domain/Repository/CategoryRepository.php
+++ b/Classes/Domain/Repository/CategoryRepository.php
@@ -35,6 +35,9 @@ class CategoryRepository
      * Initialize Repository
      */
     protected string $tableName = 'sys_category';
+    public function __construct(private \TYPO3\CMS\Core\Database\ConnectionPool $connectionPool)
+    {
+    }
 
     /**
      * @throws Exception
@@ -58,7 +61,7 @@ public function findByIdentifiers(array $identifiers): array|QueryResultInterfac
 
     public function findFileCategories($uid): array
     {
-        $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('sys_file_metadata');
+        $queryBuilder = $this->connectionPool->getQueryBuilderForTable('sys_file_metadata');
         $queryBuilder->getRestrictions()->removeAll();
         $results = [];
         if ($uid){
@@ -72,9 +75,9 @@ public function findFileCategories($uid): array
                     $queryBuilder->expr()->eq('sys_category.uid', 'sys_category_record_mm.uid_local')
                 )
                 ->where(
-                    $queryBuilder->expr()->eq('sys_category_record_mm.uid_foreign', $queryBuilder->createNamedParameter($uid, \PDO::PARAM_INT)),
-                    $queryBuilder->expr()->eq('sys_category_record_mm.tablenames', $queryBuilder->createNamedParameter('sys_file_metadata', \PDO::PARAM_STR)) ,
-                    $queryBuilder->expr()->eq('sys_category_record_mm.fieldname', $queryBuilder->createNamedParameter('categories', \PDO::PARAM_STR))
+                    $queryBuilder->expr()->eq('sys_category_record_mm.uid_foreign', $queryBuilder->createNamedParameter($uid, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)),
+                    $queryBuilder->expr()->eq('sys_category_record_mm.tablenames', $queryBuilder->createNamedParameter('sys_file_metadata', \TYPO3\CMS\Core\Database\Connection::PARAM_STR)) ,
+                    $queryBuilder->expr()->eq('sys_category_record_mm.fieldname', $queryBuilder->createNamedParameter('categories', \TYPO3\CMS\Core\Database\Connection::PARAM_STR))
                 );
             $results = $query->execute()->fetchAllAssociative();
 
@@ -86,7 +89,7 @@ public function findFileCategories($uid): array
     protected function getQueryBuilder(): QueryBuilder
     {
         /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+        $connectionPool = $this->connectionPool;
         return $connectionPool->getQueryBuilderForTable($this->tableName);
     }
 }
diff --git a/Classes/Domain/Repository/ImageGalleryRepository.php b/Classes/Domain/Repository/ImageGalleryRepository.php
index eefb2743..6af5f3cf 100644
--- a/Classes/Domain/Repository/ImageGalleryRepository.php
+++ b/Classes/Domain/Repository/ImageGalleryRepository.php
@@ -17,6 +17,9 @@ class ImageGalleryRepository
     protected string $tableName = 'sys_file';
 
     protected array $settings;
+    public function __construct(private \TYPO3\CMS\Core\Database\ConnectionPool $connectionPool)
+    {
+    }
 
     public function getDefaultData(string $field):string
     {
@@ -102,60 +105,28 @@ public function findByDemand(array|Matcher $demand = [], array $orderings = [],
                 'sys_file',
                 'sys_file_metadata',
                 'sys_file_metadata',
-                $queryBuilder->expr()->andX(
-                    $queryBuilder->expr()->eq('sys_file.uid', 'sys_file_metadata.file'),
-                    $queryBuilder->expr()->lte('sys_file_metadata.t3ver_state', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)),
-                    $queryBuilder->expr()->eq('sys_file_metadata.t3ver_wsid', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)),
-                    $queryBuilder->expr()->orX(
-                        $queryBuilder->expr()->eq('sys_file_metadata.t3ver_oid', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)),
-                        $queryBuilder->expr()->eq('sys_file_metadata.t3ver_state', $queryBuilder->createNamedParameter(4, \PDO::PARAM_INT))
-                    ),
-                    $queryBuilder->expr()->in('sys_file_metadata.sys_language_uid', [0, -1])
-                )
+                $queryBuilder->expr()->and($queryBuilder->expr()->eq('sys_file.uid', 'sys_file_metadata.file'), $queryBuilder->expr()->lte('sys_file_metadata.t3ver_state', $queryBuilder->createNamedParameter(0, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)), $queryBuilder->expr()->eq('sys_file_metadata.t3ver_wsid', $queryBuilder->createNamedParameter(0, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)), $queryBuilder->expr()->or($queryBuilder->expr()->eq('sys_file_metadata.t3ver_oid', $queryBuilder->createNamedParameter(0, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)), $queryBuilder->expr()->eq('sys_file_metadata.t3ver_state', $queryBuilder->createNamedParameter(4, \TYPO3\CMS\Core\Database\Connection::PARAM_INT))), $queryBuilder->expr()->in('sys_file_metadata.sys_language_uid', [0, -1]))
             )
             ->leftJoin(
                 'sys_file_metadata',
                 'sys_category_record_mm',
                 'sys_category_record_mm0',
-                $queryBuilder->expr()->andX(
-                    $queryBuilder->expr()->eq('sys_file_metadata.uid', 'sys_category_record_mm0.uid_foreign'),
-                    $queryBuilder->expr()->eq('sys_category_record_mm0.tablenames', $queryBuilder->createNamedParameter('sys_file_metadata')),
-                    $queryBuilder->expr()->eq('sys_category_record_mm0.fieldname', $queryBuilder->createNamedParameter('categories'))
-                )
+                $queryBuilder->expr()->and($queryBuilder->expr()->eq('sys_file_metadata.uid', 'sys_category_record_mm0.uid_foreign'), $queryBuilder->expr()->eq('sys_category_record_mm0.tablenames', $queryBuilder->createNamedParameter('sys_file_metadata')), $queryBuilder->expr()->eq('sys_category_record_mm0.fieldname', $queryBuilder->createNamedParameter('categories')))
             )
             ->leftJoin(
                 'sys_category_record_mm0',
                 'sys_category',
                 'sys_category0',
-                $queryBuilder->expr()->andX(
-                    $queryBuilder->expr()->eq('sys_category_record_mm0.uid_local', 'sys_category0.uid'),
-                    $queryBuilder->expr()->eq('sys_category0.deleted', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)),
-                    $queryBuilder->expr()->lte('sys_category0.t3ver_state', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)),
-                    $queryBuilder->expr()->eq('sys_category0.t3ver_wsid', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)),
-                    $queryBuilder->expr()->orX(
-                        $queryBuilder->expr()->eq('sys_category0.t3ver_oid', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)),
-                        $queryBuilder->expr()->eq('sys_category0.t3ver_state', $queryBuilder->createNamedParameter(4, \PDO::PARAM_INT))
-                    ),
-                    $queryBuilder->expr()->eq('sys_category0.hidden', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)),
-                    $queryBuilder->expr()->lte('sys_category0.starttime', $queryBuilder->createNamedParameter($timestamp, \PDO::PARAM_INT)),
-                    $queryBuilder->expr()->orX(
-                        $queryBuilder->expr()->eq('sys_category0.endtime', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)),
-                        $queryBuilder->expr()->gt('sys_category0.endtime', $queryBuilder->createNamedParameter($timestamp, \PDO::PARAM_INT))
-                    ),
-                    $queryBuilder->expr()->in('sys_category0.sys_language_uid', [0, -1])
-                )
+                $queryBuilder->expr()->and($queryBuilder->expr()->eq('sys_category_record_mm0.uid_local', 'sys_category0.uid'), $queryBuilder->expr()->eq('sys_category0.deleted', $queryBuilder->createNamedParameter(0, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)), $queryBuilder->expr()->lte('sys_category0.t3ver_state', $queryBuilder->createNamedParameter(0, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)), $queryBuilder->expr()->eq('sys_category0.t3ver_wsid', $queryBuilder->createNamedParameter(0, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)), $queryBuilder->expr()->or($queryBuilder->expr()->eq('sys_category0.t3ver_oid', $queryBuilder->createNamedParameter(0, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)), $queryBuilder->expr()->eq('sys_category0.t3ver_state', $queryBuilder->createNamedParameter(4, \TYPO3\CMS\Core\Database\Connection::PARAM_INT))), $queryBuilder->expr()->eq('sys_category0.hidden', $queryBuilder->createNamedParameter(0, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)), $queryBuilder->expr()->lte('sys_category0.starttime', $queryBuilder->createNamedParameter($timestamp, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)), $queryBuilder->expr()->or($queryBuilder->expr()->eq('sys_category0.endtime', $queryBuilder->createNamedParameter(0, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)), $queryBuilder->expr()->gt('sys_category0.endtime', $queryBuilder->createNamedParameter($timestamp, \TYPO3\CMS\Core\Database\Connection::PARAM_INT))), $queryBuilder->expr()->in('sys_category0.sys_language_uid', [0, -1]))
             )
             ->where(
-                $queryBuilder->expr()->andX(
-                    $queryBuilder->expr()->eq('sys_file.type', $queryBuilder->createNamedParameter(2, \PDO::PARAM_INT)),
-                    $queryBuilder->expr()->in('sys_file.uid', (array)$uids)
-                )
+                $queryBuilder->expr()->and($queryBuilder->expr()->eq('sys_file.type', $queryBuilder->createNamedParameter(2, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)), $queryBuilder->expr()->in('sys_file.uid', (array)$uids))
             )
 
             ->orderBy('sys_file.name', 'ASC');
         if ($categoryConditions) {
             $queryBuilder->andWhere(
-                $queryBuilder->expr()->eq('sys_category0.uid', $queryBuilder->createNamedParameter((int)$categoryConditions, \PDO::PARAM_INT))
+                $queryBuilder->expr()->eq('sys_category0.uid', $queryBuilder->createNamedParameter((int)$categoryConditions, \TYPO3\CMS\Core\Database\Connection::PARAM_INT))
             );
         }
 
@@ -215,7 +186,7 @@ public function findByUids(array $uids): array
     protected function getQueryBuilder(): QueryBuilder
     {
         /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+        $connectionPool = $this->connectionPool;
         return $connectionPool->getQueryBuilderForTable($this->tableName);
     }
 
diff --git a/Classes/ViewHelpers/ImageStackViewHelper.php b/Classes/ViewHelpers/ImageStackViewHelper.php
index 90b8609a..9d6e0ded 100644
--- a/Classes/ViewHelpers/ImageStackViewHelper.php
+++ b/Classes/ViewHelpers/ImageStackViewHelper.php
@@ -30,6 +30,9 @@
 class ImageStackViewHelper extends AbstractViewHelper
 {
 
+    public function __construct(private \TYPO3\CMS\Core\Context\Context $context)
+    {
+    }
     /**
      * @return string
      */
@@ -124,7 +127,7 @@ protected function getSiteUrl(): string
         $siteFinder = GeneralUtility::makeInstance(SiteFinder::class);
         
         // Get current page ID from context or fallback to 1
-        $context = GeneralUtility::makeInstance(Context::class);
+        $context = $this->context;
         $pageId = $context->getPropertyFromAspect('frontend.page', 'id', 1);
         
         $site = $siteFinder->getSiteByPageId($pageId);
diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
new file mode 100644
index 00000000..11bef81a
--- /dev/null
+++ b/Configuration/TCA/Overrides/tt_content.php
@@ -0,0 +1,3 @@
+<?php
+
+\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin('Fab.natural_gallery', 'Pi1', 'Natural Gallery');
diff --git a/composer.json b/composer.json
index 7018d477..deea0807 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
   },
   "extra": {
     "typo3/cms": {
-      "extension-key": "natural_gallery"
+      "extension-key": "fab.natural_gallery"
     }
   },
   "require": {
diff --git a/ext_emconf.php b/ext_emconf.php
index 45932676..056a591a 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -1,6 +1,6 @@
 <?php
 
-$_EXTKEY = 'natural_gallery';
+$_EXTKEY = 'fab.natural_gallery';
 
 $EM_CONF[$_EXTKEY] = [
     'title' => 'Natural Gallery',
diff --git a/ext_localconf.php b/ext_localconf.php
index 163a0518..5c0f35ac 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -8,7 +8,7 @@
     function () {
 
         \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-            'Fab.natural_gallery',
+            'NaturalGallery',
             'Pi1',
             [
                 GalleryController::class => 'list',
diff --git a/ext_tables.php b/ext_tables.php
index fa8d6037..bf50b48e 100644
--- a/ext_tables.php
+++ b/ext_tables.php
@@ -3,12 +3,6 @@
     die ('Access denied.');
 }
 
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'Fab.natural_gallery',
-    'Pi1',
-    'Natural Gallery'
-);
-
 $extensionName = \TYPO3\CMS\Core\Utility\GeneralUtility::underscoredToUpperCamelCase('natural_gallery');
 $pluginSignature = strtolower($extensionName) . '_pi1';
 

From f0aef34f086f5935577848b10374bcfba0d1cb9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hyacinthe=20Compaor=C3=A9?=
 <131278191+compaoreh338@users.noreply.github.com>
Date: Mon, 22 Sep 2025 10:29:34 +0000
Subject: [PATCH 04/11] fixup! fixup! fixup! FEAT: v12

---
 Configuration/Services.yaml                   | 15 +++++++++++++++
 Configuration/TCA/Overrides/tt_content.php    |  2 +-
 Resources/Private/Templates/Gallery/List.html |  4 ++--
 composer.json                                 |  5 +----
 ext_emconf.php                                |  2 --
 ext_localconf.php                             |  2 +-
 6 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
index 2b8a2ef6..77961f20 100644
--- a/Configuration/Services.yaml
+++ b/Configuration/Services.yaml
@@ -3,3 +3,18 @@ services:
     autowire: true
     autoconfigure: true
     public: false
+
+  Fab\NaturalGallery\Controller\:
+    resource: '../Classes/Controller/'
+    tags: ['controller.service_arguments']
+
+  Fab\NaturalGallery\Domain\Repository\:
+    resource: '../Classes/Domain/Repository/'
+    tags: ['tx_extbase.persistence.repository']
+
+  Fab\NaturalGallery\Persistence\:
+    resource: '../Classes/Persistence/'
+
+  Fab\NaturalGallery\ViewHelpers\:
+    resource: '../Classes/ViewHelpers/'
+    tags: ['typo3.fluid.viewhelper']
diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
index 11bef81a..288eab82 100644
--- a/Configuration/TCA/Overrides/tt_content.php
+++ b/Configuration/TCA/Overrides/tt_content.php
@@ -1,3 +1,3 @@
 <?php
 
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin('Fab.natural_gallery', 'Pi1', 'Natural Gallery');
+\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin('natural_gallery', 'Pi1', 'Natural Gallery');
diff --git a/Resources/Private/Templates/Gallery/List.html b/Resources/Private/Templates/Gallery/List.html
index 21710a85..0a61e6c1 100644
--- a/Resources/Private/Templates/Gallery/List.html
+++ b/Resources/Private/Templates/Gallery/List.html
@@ -17,13 +17,13 @@
 			</f:if>
 		</f:if>
 
-		<div id="gallery-{v:content.info(field:'uid')}"></div>
+		<div id="gallery-{v:content.info(field:'uid', contentUid: data.uid)}"></div>
 
 		<script type="text/javascript">
 
             window.naturalGalleries = window.naturalGalleries || [];
             var naturalGallery = {
-                id: 'gallery-<v:content.info field="uid"></v:content.info>'
+                id: 'gallery-<v:content.info field="uid" contentUid="{data.uid}"></v:content.info>'
             };
 
             //@off
diff --git a/composer.json b/composer.json
index deea0807..95f6dde3 100644
--- a/composer.json
+++ b/composer.json
@@ -18,12 +18,9 @@
       "Fab\\NaturalGallery\\": "Classes/"
     }
   },
-  "replace": {
-    "fab/natural-gallery": "self.version"
-  },
   "extra": {
     "typo3/cms": {
-      "extension-key": "fab.natural_gallery"
+      "extension-key": "natural_gallery"
     }
   },
   "require": {
diff --git a/ext_emconf.php b/ext_emconf.php
index 056a591a..3cedaa69 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -1,6 +1,5 @@
 <?php
 
-$_EXTKEY = 'fab.natural_gallery';
 
 $EM_CONF[$_EXTKEY] = [
     'title' => 'Natural Gallery',
@@ -10,4 +9,3 @@
     'author_company' => 'Ecodev',
     'state' => 'stable',
 ];
-
diff --git a/ext_localconf.php b/ext_localconf.php
index 5c0f35ac..4e8f5ebc 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -8,7 +8,7 @@
     function () {
 
         \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-            'NaturalGallery',
+            'natural_gallery',
             'Pi1',
             [
                 GalleryController::class => 'list',

From a916fbf6d2caa3f7635ae24e3583b2dd159a8083 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hyacinthe=20Compaor=C3=A9?=
 <131278191+compaoreh338@users.noreply.github.com>
Date: Wed, 24 Sep 2025 11:14:54 +0000
Subject: [PATCH 05/11] fixup! fixup! fixup! fixup! FEAT: v12

---
 Classes/ViewHelpers/ImageStackViewHelper.php  |  69 +-
 Configuration/Services.yaml                   |  16 +
 Resources/Private/Templates/Gallery/List.html |   5 +-
 .../StyleSheets/natural-gallery.full.css      | 663 +-----------------
 4 files changed, 81 insertions(+), 672 deletions(-)

diff --git a/Classes/ViewHelpers/ImageStackViewHelper.php b/Classes/ViewHelpers/ImageStackViewHelper.php
index 9d6e0ded..f8104b25 100644
--- a/Classes/ViewHelpers/ImageStackViewHelper.php
+++ b/Classes/ViewHelpers/ImageStackViewHelper.php
@@ -30,8 +30,10 @@
 class ImageStackViewHelper extends AbstractViewHelper
 {
 
-    public function __construct(private \TYPO3\CMS\Core\Context\Context $context)
-    {
+    public function __construct(
+        private \TYPO3\CMS\Core\Context\Context $context,
+        private CategoryRepository $categoryRepository
+    ) {
     }
     /**
      * @return string
@@ -54,8 +56,7 @@ public function render(): string
                     $enlargedFile = $this->createProcessedFile($file, 'enlargedImageMaximumWidth', 'enlargedImageMaximumHeight');
                     $categories = [];
 
-                    $categoryRepository = GeneralUtility::makeInstance(CategoryRepository::class);
-                    $metadataCategories = $categoryRepository->findFileCategories($file->getMetaData()['uid']);
+                    $metadataCategories = $this->categoryRepository->findFileCategories($file->getMetaData()['uid']);
                     if ($metadataCategories && is_array($metadataCategories)) {
                         $categories = array_map(function ($cat) {
                             return [
@@ -126,11 +127,61 @@ protected function getSiteUrl(): string
     {
         $siteFinder = GeneralUtility::makeInstance(SiteFinder::class);
         
-        // Get current page ID from context or fallback to 1
-        $context = $this->context;
-        $pageId = $context->getPropertyFromAspect('frontend.page', 'id', 1);
+        // Try to get current page ID from different sources
+        $pageId = $this->getCurrentPageId();
         
-        $site = $siteFinder->getSiteByPageId($pageId);
-        return (string)$site->getBase();
+        try {
+            $site = $siteFinder->getSiteByPageId($pageId);
+            return (string)$site->getBase();
+        } catch (\Exception $e) {
+            // Fallback to default site or root page
+            try {
+                $sites = $siteFinder->getAllSites();
+                if (!empty($sites)) {
+                    $defaultSite = reset($sites);
+                    return (string)$defaultSite->getBase();
+                }
+            } catch (\Exception $e) {
+                // Ultimate fallback
+                return '/';
+            }
+        }
+        
+        return '/';
+    }
+
+    /**
+     * Get current page ID from various sources
+     * @return int
+     */
+    protected function getCurrentPageId(): int
+    {
+        // Try to get from context first
+        try {
+            if ($this->context->hasAspect('frontend.page')) {
+                return $this->context->getPropertyFromAspect('frontend.page', 'id', 1);
+            }
+        } catch (\Exception $e) {
+            // Context aspect not available, try other methods
+        }
+
+        // Try to get from TSFE (TypoScript Frontend Controller)
+        if (isset($GLOBALS['TSFE']) && $GLOBALS['TSFE'] instanceof \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController) {
+            return $GLOBALS['TSFE']->id;
+        }
+
+        // Try to get from request
+        if (isset($GLOBALS['TYPO3_REQUEST'])) {
+            $request = $GLOBALS['TYPO3_REQUEST'];
+            if ($request->getAttribute('routing')) {
+                $pageArguments = $request->getAttribute('routing');
+                if ($pageArguments instanceof \TYPO3\CMS\Core\Routing\PageArguments) {
+                    return $pageArguments->getPageId();
+                }
+            }
+        }
+
+        // Fallback to root page
+        return 1;
     }
 }
diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
index 77961f20..d68d2b70 100644
--- a/Configuration/Services.yaml
+++ b/Configuration/Services.yaml
@@ -12,9 +12,25 @@ services:
     resource: '../Classes/Domain/Repository/'
     tags: ['tx_extbase.persistence.repository']
 
+  Fab\NaturalGallery\Domain\Repository\CategoryRepository:
+    arguments:
+      $connectionPool: '@TYPO3\CMS\Core\Database\ConnectionPool'
+
+  Fab\NaturalGallery\Domain\Repository\ImageGalleryRepository:
+    arguments:
+      $connectionPool: '@TYPO3\CMS\Core\Database\ConnectionPool'
+
   Fab\NaturalGallery\Persistence\:
     resource: '../Classes/Persistence/'
 
   Fab\NaturalGallery\ViewHelpers\:
     resource: '../Classes/ViewHelpers/'
     tags: ['typo3.fluid.viewhelper']
+
+  Fab\NaturalGallery\ViewHelpers\ImageStackViewHelper:
+    arguments:
+      $categoryRepository: '@Fab\NaturalGallery\Domain\Repository\CategoryRepository'
+
+  Fab\NaturalGallery\ViewHelpers\LoadAssetsViewHelper:
+    arguments:
+      $pageRenderer: '@TYPO3\CMS\Core\Page\PageRenderer'
diff --git a/Resources/Private/Templates/Gallery/List.html b/Resources/Private/Templates/Gallery/List.html
index 0a61e6c1..8c2421dd 100644
--- a/Resources/Private/Templates/Gallery/List.html
+++ b/Resources/Private/Templates/Gallery/List.html
@@ -6,6 +6,10 @@
 	<f:layout name="Default"/>
 
 	<f:section name="main">
+		<f:asset.script identifier="natural-gallery-js" src="EXT:natural_gallery/Resources/Public/JavaScript/natural-gallery.full.js"/>
+		<f:asset.css identifier="natural-gallery-main-css" src="EXT:natural_gallery/Resources/Public/StyleSheets/natural-gallery.full.css"/>
+		<f:asset.css identifier="natural-gallery-theme-css" src="EXT:natural_gallery/Resources/Public/StyleSheets/natural.css"/>
+
 
 		<f:if condition="{gallery:isIconsPartialAlreadyLoaded()}">
 			<f:render section="Icons" partial="Icons"/>
@@ -55,7 +59,6 @@
 			window.naturalGalleries.push(naturalGallery);
 		</script>
 
-		<gallery:loadAssets/>
 
 	</f:section>
 
diff --git a/Resources/Public/StyleSheets/natural-gallery.full.css b/Resources/Public/StyleSheets/natural-gallery.full.css
index 90f85a80..90f6332b 100644
--- a/Resources/Public/StyleSheets/natural-gallery.full.css
+++ b/Resources/Public/StyleSheets/natural-gallery.full.css
@@ -1,662 +1 @@
-/*! PhotoSwipe main CSS by Dmitry Semenov | photoswipe.com | MIT license */
-/*
-	Styles for basic PhotoSwipe functionality (sliding area, open/close transitions)
-*/
-/* pswp = photoswipe */
-.pswp {
-  display: none;
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  left: 0;
-  top: 0;
-  overflow: hidden;
-  -ms-touch-action: none;
-  touch-action: none;
-  z-index: 1500;
-  -webkit-text-size-adjust: 100%;
-  /* create separate layer, to avoid paint on window.onscroll in webkit/blink */
-  -webkit-backface-visibility: hidden;
-  outline: none; }
-  .pswp * {
-    -webkit-box-sizing: border-box;
-            box-sizing: border-box; }
-  .pswp img {
-    max-width: none; }
-
-/* style is added when JS option showHideOpacity is set to true */
-.pswp--animate_opacity {
-  /* 0.001, because opacity:0 doesn't trigger Paint action, which causes lag at start of transition */
-  opacity: 0.001;
-  will-change: opacity;
-  /* for open/close transition */
-  -webkit-transition: opacity 333ms cubic-bezier(0.4, 0, 0.22, 1);
-          transition: opacity 333ms cubic-bezier(0.4, 0, 0.22, 1); }
-
-.pswp--open {
-  display: block; }
-
-.pswp--zoom-allowed .pswp__img {
-  /* autoprefixer: off */
-  cursor: -webkit-zoom-in;
-  cursor: -moz-zoom-in;
-  cursor: zoom-in; }
-
-.pswp--zoomed-in .pswp__img {
-  /* autoprefixer: off */
-  cursor: -webkit-grab;
-  cursor: -moz-grab;
-  cursor: grab; }
-
-.pswp--dragging .pswp__img {
-  /* autoprefixer: off */
-  cursor: -webkit-grabbing;
-  cursor: -moz-grabbing;
-  cursor: grabbing; }
-
-/*
-	Background is added as a separate element.
-	As animating opacity is much faster than animating rgba() background-color.
-*/
-.pswp__bg {
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  background: #000;
-  opacity: 0;
-  -webkit-transform: translateZ(0);
-          transform: translateZ(0);
-  -webkit-backface-visibility: hidden;
-  will-change: opacity; }
-
-.pswp__scroll-wrap {
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  overflow: hidden; }
-
-.pswp__container,
-.pswp__zoom-wrap {
-  -ms-touch-action: none;
-  touch-action: none;
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0; }
-
-/* Prevent selection and tap highlights */
-.pswp__container,
-.pswp__img {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-      user-select: none;
-  -webkit-tap-highlight-color: transparent;
-  -webkit-touch-callout: none; }
-
-.pswp__zoom-wrap {
-  position: absolute;
-  width: 100%;
-  -webkit-transform-origin: left top;
-  -ms-transform-origin: left top;
-  transform-origin: left top;
-  /* for open/close transition */
-  -webkit-transition: -webkit-transform 333ms cubic-bezier(0.4, 0, 0.22, 1);
-          transition: transform 333ms cubic-bezier(0.4, 0, 0.22, 1); }
-
-.pswp__bg {
-  will-change: opacity;
-  /* for open/close transition */
-  -webkit-transition: opacity 333ms cubic-bezier(0.4, 0, 0.22, 1);
-          transition: opacity 333ms cubic-bezier(0.4, 0, 0.22, 1); }
-
-.pswp--animated-in .pswp__bg,
-.pswp--animated-in .pswp__zoom-wrap {
-  -webkit-transition: none;
-  transition: none; }
-
-.pswp__container,
-.pswp__zoom-wrap {
-  -webkit-backface-visibility: hidden; }
-
-.pswp__item {
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
-  overflow: hidden; }
-
-.pswp__img {
-  position: absolute;
-  width: auto;
-  height: auto;
-  top: 0;
-  left: 0; }
-
-/*
-	stretched thumbnail or div placeholder element (see below)
-	style is added to avoid flickering in webkit/blink when layers overlap
-*/
-.pswp__img--placeholder {
-  -webkit-backface-visibility: hidden; }
-
-/*
-	div element that matches size of large image
-	large image loads on top of it
-*/
-.pswp__img--placeholder--blank {
-  background: #222; }
-
-.pswp--ie .pswp__img {
-  width: 100% !important;
-  height: auto !important;
-  left: 0;
-  top: 0; }
-
-/*
-	Error message appears when image is not loaded
-	(JS option errorMsg controls markup)
-*/
-.pswp__error-msg {
-  position: absolute;
-  left: 0;
-  top: 50%;
-  width: 100%;
-  text-align: center;
-  font-size: 14px;
-  line-height: 16px;
-  margin-top: -8px;
-  color: #CCC; }
-
-.pswp__error-msg a {
-  color: #CCC;
-  text-decoration: underline; }
-/*! PhotoSwipe Default UI CSS by Dmitry Semenov | photoswipe.com | MIT license */
-/*
-
-	Contents:
-
-	1. Buttons
-	2. Share modal and links
-	3. Index indicator ("1 of X" counter)
-	4. Caption
-	5. Loading indicator
-	6. Additional styles (root element, top bar, idle state, hidden state, etc.)
-
-*/
-/*
-	
-	1. Buttons
-
- */
-/* <button> css reset */
-.pswp__button {
-  width: 44px;
-  height: 44px;
-  position: relative;
-  background: none;
-  cursor: pointer;
-  overflow: visible;
-  -webkit-appearance: none;
-  display: block;
-  border: 0;
-  padding: 0;
-  margin: 0;
-  float: right;
-  opacity: 0.75;
-  -webkit-transition: opacity 0.2s;
-          transition: opacity 0.2s;
-  -webkit-box-shadow: none;
-          box-shadow: none; }
-  .pswp__button:focus, .pswp__button:hover {
-    opacity: 1; }
-  .pswp__button:active {
-    outline: none;
-    opacity: 0.9; }
-  .pswp__button::-moz-focus-inner {
-    padding: 0;
-    border: 0; }
-
-/* pswp__ui--over-close class it added when mouse is over element that should close gallery */
-.pswp__ui--over-close .pswp__button--close {
-  opacity: 1; }
-
-.pswp__button,
-.pswp__button--arrow--left:before,
-.pswp__button--arrow--right:before {
-  background: url(images/default-skin.png) 0 0 no-repeat;
-  background-size: 264px 88px;
-  width: 44px;
-  height: 44px; }
-
-@media (-webkit-min-device-pixel-ratio: 1.1), (-webkit-min-device-pixel-ratio: 1.09375), (min-resolution: 105dpi), (min-resolution: 1.1dppx) {
-  /* Serve SVG sprite if browser supports SVG and resolution is more than 105dpi */
-  .pswp--svg .pswp__button,
-  .pswp--svg .pswp__button--arrow--left:before,
-  .pswp--svg .pswp__button--arrow--right:before {
-    background-image: url(images/default-skin.svg); }
-  .pswp--svg .pswp__button--arrow--left,
-  .pswp--svg .pswp__button--arrow--right {
-    background: none; } }
-
-.pswp__button--close {
-  background-position: 0 -44px; }
-
-.pswp__button--share {
-  background-position: -44px -44px; }
-
-.pswp__button--fs {
-  display: none; }
-
-.pswp--supports-fs .pswp__button--fs {
-  display: block; }
-
-.pswp--fs .pswp__button--fs {
-  background-position: -44px 0; }
-
-.pswp__button--zoom {
-  display: none;
-  background-position: -88px 0; }
-
-.pswp--zoom-allowed .pswp__button--zoom {
-  display: block; }
-
-.pswp--zoomed-in .pswp__button--zoom {
-  background-position: -132px 0; }
-
-/* no arrows on touch screens */
-.pswp--touch .pswp__button--arrow--left,
-.pswp--touch .pswp__button--arrow--right {
-  visibility: hidden; }
-
-/*
-	Arrow buttons hit area
-	(icon is added to :before pseudo-element)
-*/
-.pswp__button--arrow--left,
-.pswp__button--arrow--right {
-  background: none;
-  top: 50%;
-  margin-top: -50px;
-  width: 70px;
-  height: 100px;
-  position: absolute; }
-
-.pswp__button--arrow--left {
-  left: 0; }
-
-.pswp__button--arrow--right {
-  right: 0; }
-
-.pswp__button--arrow--left:before,
-.pswp__button--arrow--right:before {
-  content: '';
-  top: 35px;
-  background-color: rgba(0, 0, 0, 0.3);
-  height: 30px;
-  width: 32px;
-  position: absolute; }
-
-.pswp__button--arrow--left:before {
-  left: 6px;
-  background-position: -138px -44px; }
-
-.pswp__button--arrow--right:before {
-  right: 6px;
-  background-position: -94px -44px; }
-
-/*
-
-	2. Share modal/popup and links
-
- */
-.pswp__counter,
-.pswp__share-modal {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-      user-select: none; }
-
-.pswp__share-modal {
-  display: block;
-  background: rgba(0, 0, 0, 0.5);
-  width: 100%;
-  height: 100%;
-  top: 0;
-  left: 0;
-  padding: 10px;
-  position: absolute;
-  z-index: 1600;
-  opacity: 0;
-  -webkit-transition: opacity 0.25s ease-out;
-          transition: opacity 0.25s ease-out;
-  -webkit-backface-visibility: hidden;
-  will-change: opacity; }
-
-.pswp__share-modal--hidden {
-  display: none; }
-
-.pswp__share-tooltip {
-  z-index: 1620;
-  position: absolute;
-  background: #FFF;
-  top: 56px;
-  border-radius: 2px;
-  display: block;
-  width: auto;
-  right: 44px;
-  -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25);
-          box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25);
-  -webkit-transform: translateY(6px);
-      -ms-transform: translateY(6px);
-          transform: translateY(6px);
-  -webkit-transition: -webkit-transform 0.25s;
-          transition: transform 0.25s;
-  -webkit-backface-visibility: hidden;
-  will-change: transform; }
-  .pswp__share-tooltip a {
-    display: block;
-    padding: 8px 12px;
-    color: #000;
-    text-decoration: none;
-    font-size: 14px;
-    line-height: 18px; }
-    .pswp__share-tooltip a:hover {
-      text-decoration: none;
-      color: #000; }
-    .pswp__share-tooltip a:first-child {
-      /* round corners on the first/last list item */
-      border-radius: 2px 2px 0 0; }
-    .pswp__share-tooltip a:last-child {
-      border-radius: 0 0 2px 2px; }
-
-.pswp__share-modal--fade-in {
-  opacity: 1; }
-  .pswp__share-modal--fade-in .pswp__share-tooltip {
-    -webkit-transform: translateY(0);
-        -ms-transform: translateY(0);
-            transform: translateY(0); }
-
-/* increase size of share links on touch devices */
-.pswp--touch .pswp__share-tooltip a {
-  padding: 16px 12px; }
-
-a.pswp__share--facebook:before {
-  content: '';
-  display: block;
-  width: 0;
-  height: 0;
-  position: absolute;
-  top: -12px;
-  right: 15px;
-  border: 6px solid transparent;
-  border-bottom-color: #FFF;
-  -webkit-pointer-events: none;
-  -moz-pointer-events: none;
-  pointer-events: none; }
-
-a.pswp__share--facebook:hover {
-  background: #3E5C9A;
-  color: #FFF; }
-  a.pswp__share--facebook:hover:before {
-    border-bottom-color: #3E5C9A; }
-
-a.pswp__share--twitter:hover {
-  background: #55ACEE;
-  color: #FFF; }
-
-a.pswp__share--pinterest:hover {
-  background: #CCC;
-  color: #CE272D; }
-
-a.pswp__share--download:hover {
-  background: #DDD; }
-
-/*
-
-	3. Index indicator ("1 of X" counter)
-
- */
-.pswp__counter {
-  position: absolute;
-  left: 0;
-  top: 0;
-  height: 44px;
-  font-size: 13px;
-  line-height: 44px;
-  color: #FFF;
-  opacity: 0.75;
-  padding: 0 10px; }
-
-/*
-	
-	4. Caption
-
- */
-.pswp__caption {
-  position: absolute;
-  left: 0;
-  bottom: 0;
-  width: 100%;
-  min-height: 44px; }
-  .pswp__caption small {
-    font-size: 11px;
-    color: #BBB; }
-
-.pswp__caption__center {
-  text-align: left;
-  max-width: 420px;
-  margin: 0 auto;
-  font-size: 13px;
-  padding: 10px;
-  line-height: 20px;
-  color: #CCC; }
-
-.pswp__caption--empty {
-  display: none; }
-
-/* Fake caption element, used to calculate height of next/prev image */
-.pswp__caption--fake {
-  visibility: hidden; }
-
-/*
-
-	5. Loading indicator (preloader)
-
-	You can play with it here - http://codepen.io/dimsemenov/pen/yyBWoR
-
- */
-.pswp__preloader {
-  width: 44px;
-  height: 44px;
-  position: absolute;
-  top: 0;
-  left: 50%;
-  margin-left: -22px;
-  opacity: 0;
-  -webkit-transition: opacity 0.25s ease-out;
-          transition: opacity 0.25s ease-out;
-  will-change: opacity;
-  direction: ltr; }
-
-.pswp__preloader__icn {
-  width: 20px;
-  height: 20px;
-  margin: 12px; }
-
-.pswp__preloader--active {
-  opacity: 1; }
-  .pswp__preloader--active .pswp__preloader__icn {
-    /* We use .gif in browsers that don't support CSS animation */
-    background: url(images/preloader.gif) 0 0 no-repeat; }
-
-.pswp--css_animation .pswp__preloader--active {
-  opacity: 1; }
-  .pswp--css_animation .pswp__preloader--active .pswp__preloader__icn {
-    -webkit-animation: clockwise 500ms linear infinite;
-            animation: clockwise 500ms linear infinite; }
-  .pswp--css_animation .pswp__preloader--active .pswp__preloader__donut {
-    -webkit-animation: donut-rotate 1000ms cubic-bezier(0.4, 0, 0.22, 1) infinite;
-            animation: donut-rotate 1000ms cubic-bezier(0.4, 0, 0.22, 1) infinite; }
-
-.pswp--css_animation .pswp__preloader__icn {
-  background: none;
-  opacity: 0.75;
-  width: 14px;
-  height: 14px;
-  position: absolute;
-  left: 15px;
-  top: 15px;
-  margin: 0; }
-
-.pswp--css_animation .pswp__preloader__cut {
-  /* 
-			The idea of animating inner circle is based on Polymer ("material") loading indicator 
-			 by Keanu Lee https://blog.keanulee.com/2014/10/20/the-tale-of-three-spinners.html
-		*/
-  position: relative;
-  width: 7px;
-  height: 14px;
-  overflow: hidden; }
-
-.pswp--css_animation .pswp__preloader__donut {
-  -webkit-box-sizing: border-box;
-          box-sizing: border-box;
-  width: 14px;
-  height: 14px;
-  border: 2px solid #FFF;
-  border-radius: 50%;
-  border-left-color: transparent;
-  border-bottom-color: transparent;
-  position: absolute;
-  top: 0;
-  left: 0;
-  background: none;
-  margin: 0; }
-
-@media screen and (max-width: 1024px) {
-  .pswp__preloader {
-    position: relative;
-    left: auto;
-    top: auto;
-    margin: 0;
-    float: right; } }
-
-@-webkit-keyframes clockwise {
-  0% {
-    -webkit-transform: rotate(0deg);
-            transform: rotate(0deg); }
-  100% {
-    -webkit-transform: rotate(360deg);
-            transform: rotate(360deg); } }
-
-@keyframes clockwise {
-  0% {
-    -webkit-transform: rotate(0deg);
-            transform: rotate(0deg); }
-  100% {
-    -webkit-transform: rotate(360deg);
-            transform: rotate(360deg); } }
-
-@-webkit-keyframes donut-rotate {
-  0% {
-    -webkit-transform: rotate(0);
-            transform: rotate(0); }
-  50% {
-    -webkit-transform: rotate(-140deg);
-            transform: rotate(-140deg); }
-  100% {
-    -webkit-transform: rotate(0);
-            transform: rotate(0); } }
-
-@keyframes donut-rotate {
-  0% {
-    -webkit-transform: rotate(0);
-            transform: rotate(0); }
-  50% {
-    -webkit-transform: rotate(-140deg);
-            transform: rotate(-140deg); }
-  100% {
-    -webkit-transform: rotate(0);
-            transform: rotate(0); } }
-
-/*
-	
-	6. Additional styles
-
- */
-/* root element of UI */
-.pswp__ui {
-  -webkit-font-smoothing: auto;
-  visibility: visible;
-  opacity: 1;
-  z-index: 1550; }
-
-/* top black bar with buttons and "1 of X" indicator */
-.pswp__top-bar {
-  position: absolute;
-  left: 0;
-  top: 0;
-  height: 44px;
-  width: 100%; }
-
-.pswp__caption,
-.pswp__top-bar,
-.pswp--has_mouse .pswp__button--arrow--left,
-.pswp--has_mouse .pswp__button--arrow--right {
-  -webkit-backface-visibility: hidden;
-  will-change: opacity;
-  -webkit-transition: opacity 333ms cubic-bezier(0.4, 0, 0.22, 1);
-          transition: opacity 333ms cubic-bezier(0.4, 0, 0.22, 1); }
-
-/* pswp--has_mouse class is added only when two subsequent mousemove events occur */
-.pswp--has_mouse .pswp__button--arrow--left,
-.pswp--has_mouse .pswp__button--arrow--right {
-  visibility: visible; }
-
-.pswp__top-bar,
-.pswp__caption {
-  background-color: rgba(0, 0, 0, 0.5); }
-
-/* pswp__ui--fit class is added when main image "fits" between top bar and bottom bar (caption) */
-.pswp__ui--fit .pswp__top-bar,
-.pswp__ui--fit .pswp__caption {
-  background-color: rgba(0, 0, 0, 0.3); }
-
-/* pswp__ui--idle class is added when mouse isn't moving for several seconds (JS option timeToIdle) */
-.pswp__ui--idle .pswp__top-bar {
-  opacity: 0; }
-
-.pswp__ui--idle .pswp__button--arrow--left,
-.pswp__ui--idle .pswp__button--arrow--right {
-  opacity: 0; }
-
-/*
-	pswp__ui--hidden class is added when controls are hidden
-	e.g. when user taps to toggle visibility of controls
-*/
-.pswp__ui--hidden .pswp__top-bar,
-.pswp__ui--hidden .pswp__caption,
-.pswp__ui--hidden .pswp__button--arrow--left,
-.pswp__ui--hidden .pswp__button--arrow--right {
-  /* Force paint & create composition layer for controls. */
-  opacity: 0.001; }
-
-/* pswp__ui--one-slide class is added when there is just one item in gallery */
-.pswp__ui--one-slide .pswp__button--arrow--left,
-.pswp__ui--one-slide .pswp__button--arrow--right,
-.pswp__ui--one-slide .pswp__counter {
-  display: none; }
-
-.pswp__element--disabled {
-  display: none !important; }
-
-.pswp--minimal--dark .pswp__top-bar {
-  background: none; }
-.pswp{z-index:9999999}.pswp .pswp__caption__center{text-align:center}.natural-gallery{position:relative;margin-top:2em}.natural-gallery *,.natural-gallery *::after,.natural-gallery *::before{box-sizing:border-box;margin:0;padding:0}.natural-gallery iframe{position:absolute;width:100%;height:0;top:0;left:0;background-color:transparent;border:0}.natural-gallery .natural-gallery-body{padding:0;margin:0}.natural-gallery .natural-gallery-body::after{content:'';display:block;clear:both}.natural-gallery .natural-gallery-body[href]{cursor:pointer}.natural-gallery .natural-gallery-body .natural-gallery-noresults{margin:3em auto 2em;width:100px;height:100px;text-align:center;font-weight:bold;font-size:15px;color:#888888}.natural-gallery .natural-gallery-body .natural-gallery-thumbnail img{box-shadow:3px 3px 5px #999999;text-align:center;will-change:opacity}.natural-gallery .natural-gallery-body .figure{position:relative;display:block;float:left;overflow:hidden;margin:0}.natural-gallery .natural-gallery-body .figure:hover .title.hover,.natural-gallery .natural-gallery-body .figure:hover .title.hover{-webkit-transform:translateY(0%);transform:translateY(0%)}.natural-gallery .natural-gallery-body .figure.loading::before{content:"";position:absolute;z-index:990;top:50%;left:50%;width:700px;height:700px;margin-left:-350px;margin-top:-350px;border-radius:50%;-webkit-transform:scale(0, 0);transform:scale(0, 0);opacity:0.3;-webkit-animation-name:loading;animation-name:loading;-webkit-animation-duration:2s;animation-duration:2s;-webkit-animation-delay:0.2s;animation-delay:0.2s;-webkit-animation-iteration-count:1;animation-iteration-count:1;-webkit-animation-fill-mode:forwards;animation-fill-mode:forwards;-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out;will-change:width, height, opacity}.natural-gallery .natural-gallery-body .figure.loaded.visible>.image{opacity:1;transition:1s ease-out opacity, 1s ease-out transform}.natural-gallery .natural-gallery-body .figure .image{display:block;position:relative;z-index:100;opacity:0;background-repeat:no-repeat;background-position:center center;background-size:cover}.natural-gallery .natural-gallery-body .figure[href] .title{cursor:pointer;margin:10px;box-shadow:0 2px 5px rgba(0,0,0,0.5);border-radius:4px;text-decoration:none}.natural-gallery .natural-gallery-body .figure .title{position:absolute;bottom:0;left:0;right:0;z-index:1100;background:rgba(0,0,0,0.6);text-align:center;color:white;font-size:14px;line-height:2em;font-weight:normal;padding:10px;transition:.2s ease all;overflow:hidden;white-space:normal}.natural-gallery .natural-gallery-body .figure .title[href]:hover{margin-bottom:12px;box-shadow:0 3px 6px rgba(0,0,0,0.5)}.natural-gallery .natural-gallery-body .figure .title.hover{padding:10px;-webkit-transform:translateY(calc(100% + 10px));transform:translateY(calc(100% + 10px))}.natural-gallery .natural-gallery-body .link{cursor:pointer}.natural-gallery .natural-gallery-body .button{cursor:pointer;margin:10px;box-shadow:0 2px 5px rgba(0,0,0,0.5);border-radius:4px;text-decoration:none}.natural-gallery .natural-gallery-body .zoomable{cursor:pointer}.natural-gallery .natural-gallery-body .image.zoomable:hover,.natural-gallery .natural-gallery-body .zoomable:hover .image{-webkit-transform:rotate(2deg) scale(1.4);transform:rotate(2deg) scale(1.4)}.natural-gallery .natural-gallery-header{margin:0 0 10px 0}.natural-gallery .natural-gallery-header::after{content:'';display:block;clear:both}.natural-gallery .natural-gallery-header .natural-gallery-searchTerm>svg{width:1.4em;height:1.4em;top:0.4em}.natural-gallery .natural-gallery-header .natural-gallery-searchTerm input{border:none;background:none}.natural-gallery .natural-gallery-header .natural-gallery-categories input[type=checkbox]{display:none}.natural-gallery .natural-gallery-header .natural-gallery-categories label{position:relative;cursor:pointer}.natural-gallery .natural-gallery-header .natural-gallery-categories .label{margin-left:1.5em;margin-right:5px}.natural-gallery .natural-gallery-header .sectionContainer{margin-top:30px;position:relative}.natural-gallery .natural-gallery-header .natural-gallery-searchTerm,.natural-gallery .natural-gallery-header .natural-gallery-categories label,.natural-gallery .natural-gallery-header .natural-gallery-categories{float:left;margin-right:5px}.natural-gallery .natural-gallery-header .natural-gallery-searchTerm>svg,.natural-gallery .natural-gallery-header .natural-gallery-categories .label>svg,.natural-gallery .natural-gallery-header .natural-gallery-images>svg{content:"";float:left;position:absolute;left:5px;font-size:16px;background-repeat:no-repeat}.natural-gallery .natural-gallery-header .natural-gallery-categories .label>svg,.natural-gallery .natural-gallery-header .natural-gallery-images>svg{width:1.2em;height:1.2em;top:0.5em}.natural-gallery .natural-gallery-header .natural-gallery-searchTerm input,.natural-gallery .natural-gallery-header .natural-gallery-searchTerm .sectionName,.natural-gallery .natural-gallery-header .natural-gallery-categories .label,.natural-gallery .natural-gallery-header .natural-gallery-images{display:block;padding:9px 5px 6px;font-size:16px;line-height:1.3em;height:35px}.natural-gallery .natural-gallery-header .natural-gallery-images{float:right;margin-right:0;margin-left:5px;padding-left:2em}.natural-gallery .natural-gallery-header .natural-gallery-searchTerm input,.natural-gallery .natural-gallery-header .natural-gallery-categories .label{font-weight:normal}.natural-gallery .natural-gallery-header .natural-gallery-searchTerm input{width:300px;padding-left:2em}.natural-gallery .natural-gallery-header .natural-gallery-searchTerm input:focus{outline:none}.natural-gallery .natural-gallery-header .sectionName,.natural-gallery .natural-gallery-header .natural-gallery-categories label{margin-bottom:0}.natural-gallery .natural-gallery-header .sectionName{left:5px;top:0;margin-left:1.5em;font-size:16px;font-weight:normal;position:absolute;pointer-events:none;transition:0.2s ease all}.natural-gallery .natural-gallery-header .natural-gallery-images .sectionName,.natural-gallery .natural-gallery-header .natural-gallery-categories .sectionName,.natural-gallery .natural-gallery-header .natural-gallery-searchTerm:hover .sectionName,.natural-gallery .natural-gallery-header .natural-gallery-searchTerm input:focus ~ .sectionName,.natural-gallery .natural-gallery-header .natural-gallery-searchTerm input:valid ~ .sectionName{top:-2.2em;font-size:14px !important;line-height:1em;padding:0;margin:1.2em 0 0 0}.natural-gallery .natural-gallery-header .natural-gallery-categories .sectionName:last-child{display:none}.natural-gallery .natural-gallery-header .natural-gallery-searchTerm,.natural-gallery .natural-gallery-header .natural-gallery-categories label,.natural-gallery .natural-gallery-header .natural-gallery-images{border:none;border-bottom-width:1px;border-bottom-style:solid}.natural-gallery .natural-gallery-header .bar{position:relative;display:block}.natural-gallery .natural-gallery-header .bar::before,.natural-gallery .natural-gallery-header .bar::after{content:'';height:3px;width:0;bottom:-2px;position:absolute;transition:0.2s ease all}.natural-gallery .natural-gallery-header .bar::before{left:50%}.natural-gallery .natural-gallery-header .bar::after{right:50%}.natural-gallery .natural-gallery-header .natural-gallery-searchTerm input:focus ~ .bar::before,.natural-gallery .natural-gallery-header .natural-gallery-searchTerm input:focus ~ .bar::after,.natural-gallery .natural-gallery-header .natural-gallery-searchTerm input:valid ~ .bar::before,.natural-gallery .natural-gallery-header .natural-gallery-searchTerm input:valid ~ .bar::after,.natural-gallery .natural-gallery-header .natural-gallery-categories input[type=checkbox]:checked ~ .bar::before,.natural-gallery .natural-gallery-header .natural-gallery-categories input[type=checkbox]:checked ~ .bar::after{width:50%}.natural-gallery .natural-gallery-next{display:block;margin:10px auto;text-align:center;height:30px}.natural-gallery .natural-gallery-next svg{cursor:pointer;font-size:16px;height:inherit}.natural-gallery .natural-gallery-next::after{content:'';display:block;clear:both}@-webkit-keyframes loading{0%{-webkit-transform:scale(0, 0);transform:scale(0, 0);opacity:0.3}100%{-webkit-transform:scale(1, 1);transform:scale(1, 1);opacity:0.05}}@keyframes loading{0%{-webkit-transform:scale(0, 0);transform:scale(0, 0);opacity:0.3}100%{-webkit-transform:scale(1, 1);transform:scale(1, 1);opacity:0.05}}
\ No newline at end of file
+/*! PhotoSwipe main CSS by Dmitry Semenov | photoswipe.com | MIT license */.pswp{display:none;position:absolute;width:100%;height:100%;left:0;top:0;overflow:hidden;-ms-touch-action:none;touch-action:none;z-index:1500;-webkit-text-size-adjust:100%;-webkit-backface-visibility:hidden;outline:none}.pswp *{-webkit-box-sizing:border-box;box-sizing:border-box}.pswp img{max-width:none}.pswp--animate_opacity{opacity:.001;will-change:opacity;-webkit-transition:opacity 333ms cubic-bezier(.4,0,.22,1);transition:opacity 333ms cubic-bezier(.4,0,.22,1)}.pswp--open{display:block}.pswp--zoom-allowed .pswp__img{cursor:-webkit-zoom-in;cursor:-moz-zoom-in;cursor:zoom-in}.pswp--zoomed-in .pswp__img{cursor:-webkit-grab;cursor:-moz-grab;cursor:grab}.pswp--dragging .pswp__img{cursor:-webkit-grabbing;cursor:-moz-grabbing;cursor:grabbing}.pswp__bg{background:#000;opacity:0;-webkit-transform:translateZ(0);transform:translateZ(0);-webkit-backface-visibility:hidden}.pswp__bg,.pswp__scroll-wrap{position:absolute;left:0;top:0;width:100%;height:100%}.pswp__scroll-wrap{overflow:hidden}.pswp__container,.pswp__zoom-wrap{-ms-touch-action:none;touch-action:none;position:absolute;left:0;right:0;top:0;bottom:0}.pswp__container,.pswp__img{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-tap-highlight-color:transparent;-webkit-touch-callout:none}.pswp__zoom-wrap{position:absolute;width:100%;-webkit-transform-origin:left top;-ms-transform-origin:left top;transform-origin:left top;-webkit-transition:-webkit-transform 333ms cubic-bezier(.4,0,.22,1);transition:transform 333ms cubic-bezier(.4,0,.22,1)}.pswp__bg{will-change:opacity;-webkit-transition:opacity 333ms cubic-bezier(.4,0,.22,1);transition:opacity 333ms cubic-bezier(.4,0,.22,1)}.pswp--animated-in .pswp__bg,.pswp--animated-in .pswp__zoom-wrap{-webkit-transition:none;transition:none}.pswp__container,.pswp__zoom-wrap{-webkit-backface-visibility:hidden}.pswp__item{right:0;bottom:0;overflow:hidden}.pswp__img,.pswp__item{position:absolute;left:0;top:0}.pswp__img{width:auto;height:auto}.pswp__img--placeholder{-webkit-backface-visibility:hidden}.pswp__img--placeholder--blank{background:#222}.pswp--ie .pswp__img{width:100%!important;height:auto!important;left:0;top:0}.pswp__error-msg{position:absolute;left:0;top:50%;width:100%;text-align:center;font-size:14px;line-height:16px;margin-top:-8px;color:#ccc}.pswp__error-msg a{color:#ccc;text-decoration:underline}/*! PhotoSwipe Default UI CSS by Dmitry Semenov | photoswipe.com | MIT license */.pswp__button{width:44px;height:44px;position:relative;background:none;cursor:pointer;overflow:visible;-webkit-appearance:none;display:block;border:0;padding:0;margin:0;float:right;opacity:.75;-webkit-transition:opacity .2s;transition:opacity .2s;-webkit-box-shadow:none;box-shadow:none}.pswp__button:focus,.pswp__button:hover{opacity:1}.pswp__button:active{outline:none;opacity:.9}.pswp__button::-moz-focus-inner{padding:0;border:0}.pswp__ui--over-close .pswp__button--close{opacity:1}.pswp__button,.pswp__button--arrow--left:before,.pswp__button--arrow--right:before{background:url(images/default-skin.png) 0 0 no-repeat;background-size:264px 88px;width:44px;height:44px}@media (-webkit-min-device-pixel-ratio:1.1),(-webkit-min-device-pixel-ratio:1.09375),(min-resolution:1.1dppx),(min-resolution:105dpi){.pswp--svg .pswp__button,.pswp--svg .pswp__button--arrow--left:before,.pswp--svg .pswp__button--arrow--right:before{background-image:url(images/default-skin.svg)}.pswp--svg .pswp__button--arrow--left,.pswp--svg .pswp__button--arrow--right{background:none}}.pswp__button--close{background-position:0 -44px}.pswp__button--share{background-position:-44px -44px}.pswp__button--fs{display:none}.pswp--supports-fs .pswp__button--fs{display:block}.pswp--fs .pswp__button--fs{background-position:-44px 0}.pswp__button--zoom{display:none;background-position:-88px 0}.pswp--zoom-allowed .pswp__button--zoom{display:block}.pswp--zoomed-in .pswp__button--zoom{background-position:-132px 0}.pswp--touch .pswp__button--arrow--left,.pswp--touch .pswp__button--arrow--right{visibility:hidden}.pswp__button--arrow--left,.pswp__button--arrow--right{background:none;top:50%;margin-top:-50px;width:70px;height:100px;position:absolute}.pswp__button--arrow--left{left:0}.pswp__button--arrow--right{right:0}.pswp__button--arrow--left:before,.pswp__button--arrow--right:before{content:"";top:35px;background-color:rgba(0,0,0,.3);height:30px;width:32px;position:absolute}.pswp__button--arrow--left:before{left:6px;background-position:-138px -44px}.pswp__button--arrow--right:before{right:6px;background-position:-94px -44px}.pswp__counter,.pswp__share-modal{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.pswp__share-modal{display:block;background:rgba(0,0,0,.5);width:100%;height:100%;top:0;left:0;padding:10px;position:absolute;z-index:1600;opacity:0;-webkit-transition:opacity .25s ease-out;transition:opacity .25s ease-out;-webkit-backface-visibility:hidden;will-change:opacity}.pswp__share-modal--hidden{display:none}.pswp__share-tooltip{z-index:1620;position:absolute;background:#fff;top:56px;border-radius:2px;display:block;width:auto;right:44px;-webkit-box-shadow:0 2px 5px rgba(0,0,0,.25);box-shadow:0 2px 5px rgba(0,0,0,.25);-webkit-transform:translateY(6px);-ms-transform:translateY(6px);transform:translateY(6px);-webkit-transition:-webkit-transform .25s;transition:transform .25s;-webkit-backface-visibility:hidden;will-change:transform}.pswp__share-tooltip a{display:block;padding:8px 12px;font-size:14px;line-height:18px}.pswp__share-tooltip a,.pswp__share-tooltip a:hover{color:#000;text-decoration:none}.pswp__share-tooltip a:first-child{border-radius:2px 2px 0 0}.pswp__share-tooltip a:last-child{border-radius:0 0 2px 2px}.pswp__share-modal--fade-in{opacity:1}.pswp__share-modal--fade-in .pswp__share-tooltip{-webkit-transform:translateY(0);-ms-transform:translateY(0);transform:translateY(0)}.pswp--touch .pswp__share-tooltip a{padding:16px 12px}a.pswp__share--facebook:before{content:"";display:block;width:0;height:0;position:absolute;top:-12px;right:15px;border:6px solid transparent;border-bottom-color:#fff;-webkit-pointer-events:none;-moz-pointer-events:none;pointer-events:none}a.pswp__share--facebook:hover{background:#3e5c9a;color:#fff}a.pswp__share--facebook:hover:before{border-bottom-color:#3e5c9a}a.pswp__share--twitter:hover{background:#55acee;color:#fff}a.pswp__share--pinterest:hover{background:#ccc;color:#ce272d}a.pswp__share--download:hover{background:#ddd}.pswp__counter{position:absolute;left:0;top:0;height:44px;font-size:13px;line-height:44px;color:#fff;opacity:.75;padding:0 10px}.pswp__caption{position:absolute;left:0;bottom:0;width:100%;min-height:44px}.pswp__caption small{font-size:11px;color:#bbb}.pswp__caption__center{text-align:left;max-width:420px;margin:0 auto;font-size:13px;padding:10px;line-height:20px;color:#ccc}.pswp__caption--empty{display:none}.pswp__caption--fake{visibility:hidden}.pswp__preloader{width:44px;height:44px;position:absolute;top:0;left:50%;margin-left:-22px;opacity:0;-webkit-transition:opacity .25s ease-out;transition:opacity .25s ease-out;will-change:opacity;direction:ltr}.pswp__preloader__icn{width:20px;height:20px;margin:12px}.pswp__preloader--active{opacity:1}.pswp__preloader--active .pswp__preloader__icn{background:url(images/preloader.gif) 0 0 no-repeat}.pswp--css_animation .pswp__preloader--active{opacity:1}.pswp--css_animation .pswp__preloader--active .pswp__preloader__icn{-webkit-animation:clockwise .5s linear infinite;animation:clockwise .5s linear infinite}.pswp--css_animation .pswp__preloader--active .pswp__preloader__donut{-webkit-animation:donut-rotate 1s cubic-bezier(.4,0,.22,1) infinite;animation:donut-rotate 1s cubic-bezier(.4,0,.22,1) infinite}.pswp--css_animation .pswp__preloader__icn{background:none;opacity:.75;width:14px;height:14px;position:absolute;left:15px;top:15px;margin:0}.pswp--css_animation .pswp__preloader__cut{position:relative;width:7px;height:14px;overflow:hidden}.pswp--css_animation .pswp__preloader__donut{-webkit-box-sizing:border-box;box-sizing:border-box;width:14px;height:14px;border:2px solid #fff;border-radius:50%;border-left-color:transparent;border-bottom-color:transparent;position:absolute;top:0;left:0;background:none;margin:0}@media screen and (max-width:1024px){.pswp__preloader{position:relative;left:auto;top:auto;margin:0;float:right}}@-webkit-keyframes clockwise{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes clockwise{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@-webkit-keyframes donut-rotate{0%{-webkit-transform:rotate(0);transform:rotate(0)}50%{-webkit-transform:rotate(-140deg);transform:rotate(-140deg)}to{-webkit-transform:rotate(0);transform:rotate(0)}}@keyframes donut-rotate{0%{-webkit-transform:rotate(0);transform:rotate(0)}50%{-webkit-transform:rotate(-140deg);transform:rotate(-140deg)}to{-webkit-transform:rotate(0);transform:rotate(0)}}.pswp__ui{-webkit-font-smoothing:auto;visibility:visible;opacity:1;z-index:1550}.pswp__top-bar{position:absolute;left:0;top:0;height:44px;width:100%}.pswp--has_mouse .pswp__button--arrow--left,.pswp--has_mouse .pswp__button--arrow--right,.pswp__caption,.pswp__top-bar{-webkit-backface-visibility:hidden;will-change:opacity;-webkit-transition:opacity 333ms cubic-bezier(.4,0,.22,1);transition:opacity 333ms cubic-bezier(.4,0,.22,1)}.pswp--has_mouse .pswp__button--arrow--left,.pswp--has_mouse .pswp__button--arrow--right{visibility:visible}.pswp__caption,.pswp__top-bar{background-color:rgba(0,0,0,.5)}.pswp__ui--fit .pswp__caption,.pswp__ui--fit .pswp__top-bar{background-color:rgba(0,0,0,.3)}.pswp__ui--idle .pswp__button--arrow--left,.pswp__ui--idle .pswp__button--arrow--right,.pswp__ui--idle .pswp__top-bar{opacity:0}.pswp__ui--hidden .pswp__button--arrow--left,.pswp__ui--hidden .pswp__button--arrow--right,.pswp__ui--hidden .pswp__caption,.pswp__ui--hidden .pswp__top-bar{opacity:.001}.pswp__ui--one-slide .pswp__button--arrow--left,.pswp__ui--one-slide .pswp__button--arrow--right,.pswp__ui--one-slide .pswp__counter{display:none}.pswp__element--disabled{display:none!important}.pswp--minimal--dark .pswp__top-bar{background:none}.pswp{z-index:9999999}.pswp .pswp__caption__center{text-align:center}.natural-gallery{position:relative;margin-top:2em}.natural-gallery *,.natural-gallery :after,.natural-gallery :before{box-sizing:border-box;margin:0;padding:0}.natural-gallery iframe{position:absolute;width:100%;height:0;top:0;left:0;background-color:transparent;border:0}.natural-gallery .natural-gallery-body{padding:0;margin:0}.natural-gallery .natural-gallery-body:after{content:"";display:block;clear:both}.natural-gallery .natural-gallery-body[href]{cursor:pointer}.natural-gallery .natural-gallery-body .natural-gallery-noresults{margin:3em auto 2em;width:100px;height:100px;text-align:center;font-weight:700;font-size:15px;color:#888}.natural-gallery .natural-gallery-body .natural-gallery-thumbnail img{box-shadow:3px 3px 5px #999;text-align:center;will-change:opacity}.natural-gallery .natural-gallery-body .figure{position:relative;display:block;float:left;overflow:hidden;margin:0}.natural-gallery .natural-gallery-body .figure:hover .title.hover{-webkit-transform:translateY(0);transform:translateY(0)}.natural-gallery .natural-gallery-body .figure.loading:before{content:"";position:absolute;z-index:990;top:50%;left:50%;width:700px;height:700px;margin-left:-350px;margin-top:-350px;border-radius:50%;-webkit-transform:scale(0);transform:scale(0);opacity:.3;-webkit-animation-name:loading;animation-name:loading;-webkit-animation-duration:2s;animation-duration:2s;-webkit-animation-delay:.2s;animation-delay:.2s;-webkit-animation-iteration-count:1;animation-iteration-count:1;-webkit-animation-fill-mode:forwards;animation-fill-mode:forwards;-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out;will-change:width,height,opacity}.natural-gallery .natural-gallery-body .figure.loaded.visible>.image{opacity:1;transition:opacity 1s ease-out,transform 1s ease-out}.natural-gallery .natural-gallery-body .figure .image{display:block;position:relative;z-index:100;opacity:0;background-repeat:no-repeat;background-position:50%;background-size:cover}.natural-gallery .natural-gallery-body .figure[href] .title{cursor:pointer;margin:10px;box-shadow:0 2px 5px rgba(0,0,0,.5);border-radius:4px;text-decoration:none}.natural-gallery .natural-gallery-body .figure .title{position:absolute;bottom:0;left:0;right:0;z-index:1100;background:rgba(0,0,0,.6);text-align:center;color:#fff;font-size:14px;line-height:2em;font-weight:400;padding:10px;transition:all .2s ease;overflow:hidden;white-space:normal}.natural-gallery .natural-gallery-body .figure .title[href]:hover{margin-bottom:12px;box-shadow:0 3px 6px rgba(0,0,0,.5)}.natural-gallery .natural-gallery-body .figure .title.hover{padding:10px;-webkit-transform:translateY(calc(100% + 10px));transform:translateY(calc(100% + 10px))}.natural-gallery .natural-gallery-body .link{cursor:pointer}.natural-gallery .natural-gallery-body .button{cursor:pointer;margin:10px;box-shadow:0 2px 5px rgba(0,0,0,.5);border-radius:4px;text-decoration:none}.natural-gallery .natural-gallery-body .zoomable{cursor:pointer}.natural-gallery .natural-gallery-body .image.zoomable:hover,.natural-gallery .natural-gallery-body .zoomable:hover .image{-webkit-transform:rotate(2deg) scale(1.4);transform:rotate(2deg) scale(1.4)}.natural-gallery .natural-gallery-header{margin:0 0 10px}.natural-gallery .natural-gallery-header:after{content:"";display:block;clear:both}.natural-gallery .natural-gallery-header .natural-gallery-searchTerm>svg{width:1.4em;height:1.4em;top:.4em}.natural-gallery .natural-gallery-header .natural-gallery-searchTerm input{border:none;background:none}.natural-gallery .natural-gallery-header .natural-gallery-categories input[type=checkbox]{display:none}.natural-gallery .natural-gallery-header .natural-gallery-categories label{position:relative;cursor:pointer}.natural-gallery .natural-gallery-header .natural-gallery-categories .label{margin-left:1.5em;margin-right:5px}.natural-gallery .natural-gallery-header .sectionContainer{margin-top:30px;position:relative}.natural-gallery .natural-gallery-header .natural-gallery-categories,.natural-gallery .natural-gallery-header .natural-gallery-categories label,.natural-gallery .natural-gallery-header .natural-gallery-searchTerm{float:left;margin-right:5px}.natural-gallery .natural-gallery-header .natural-gallery-categories .label>svg,.natural-gallery .natural-gallery-header .natural-gallery-images>svg,.natural-gallery .natural-gallery-header .natural-gallery-searchTerm>svg{content:"";float:left;position:absolute;left:5px;font-size:16px;background-repeat:no-repeat}.natural-gallery .natural-gallery-header .natural-gallery-categories .label>svg,.natural-gallery .natural-gallery-header .natural-gallery-images>svg{width:1.2em;height:1.2em;top:.5em}.natural-gallery .natural-gallery-header .natural-gallery-categories .label,.natural-gallery .natural-gallery-header .natural-gallery-images,.natural-gallery .natural-gallery-header .natural-gallery-searchTerm .sectionName,.natural-gallery .natural-gallery-header .natural-gallery-searchTerm input{display:block;padding:9px 5px 6px;font-size:16px;line-height:1.3em;height:35px}.natural-gallery .natural-gallery-header .natural-gallery-images{float:right;margin-right:0;margin-left:5px;padding-left:2em}.natural-gallery .natural-gallery-header .natural-gallery-categories .label,.natural-gallery .natural-gallery-header .natural-gallery-searchTerm input{font-weight:400}.natural-gallery .natural-gallery-header .natural-gallery-searchTerm input{width:300px;padding-left:2em}.natural-gallery .natural-gallery-header .natural-gallery-searchTerm input:focus{outline:none}.natural-gallery .natural-gallery-header .natural-gallery-categories label,.natural-gallery .natural-gallery-header .sectionName{margin-bottom:0}.natural-gallery .natural-gallery-header .sectionName{left:5px;top:0;margin-left:1.5em;font-size:16px;font-weight:400;position:absolute;pointer-events:none;transition:all .2s ease}.natural-gallery .natural-gallery-header .natural-gallery-categories .sectionName,.natural-gallery .natural-gallery-header .natural-gallery-images .sectionName,.natural-gallery .natural-gallery-header .natural-gallery-searchTerm:hover .sectionName,.natural-gallery .natural-gallery-header .natural-gallery-searchTerm input:focus~.sectionName,.natural-gallery .natural-gallery-header .natural-gallery-searchTerm input:valid~.sectionName{top:-2.2em;font-size:14px!important;line-height:1em;padding:0;margin:1.2em 0 0}.natural-gallery .natural-gallery-header .natural-gallery-categories .sectionName:last-child{display:none}.natural-gallery .natural-gallery-header .natural-gallery-categories label,.natural-gallery .natural-gallery-header .natural-gallery-images,.natural-gallery .natural-gallery-header .natural-gallery-searchTerm{border:none;border-bottom-width:1px;border-bottom-style:solid}.natural-gallery .natural-gallery-header .bar{position:relative;display:block}.natural-gallery .natural-gallery-header .bar:after,.natural-gallery .natural-gallery-header .bar:before{content:"";height:3px;width:0;bottom:-2px;position:absolute;transition:all .2s ease}.natural-gallery .natural-gallery-header .bar:before{left:50%}.natural-gallery .natural-gallery-header .bar:after{right:50%}.natural-gallery .natural-gallery-header .natural-gallery-categories input[type=checkbox]:checked~.bar:after,.natural-gallery .natural-gallery-header .natural-gallery-categories input[type=checkbox]:checked~.bar:before,.natural-gallery .natural-gallery-header .natural-gallery-searchTerm input:focus~.bar:after,.natural-gallery .natural-gallery-header .natural-gallery-searchTerm input:focus~.bar:before,.natural-gallery .natural-gallery-header .natural-gallery-searchTerm input:valid~.bar:after,.natural-gallery .natural-gallery-header .natural-gallery-searchTerm input:valid~.bar:before{width:50%}.natural-gallery .natural-gallery-next{display:block;margin:10px auto;text-align:center;height:30px}.natural-gallery .natural-gallery-next svg{cursor:pointer;font-size:16px;height:inherit}.natural-gallery .natural-gallery-next:after{content:"";display:block;clear:both}@-webkit-keyframes loading{0%{-webkit-transform:scale(0);transform:scale(0);opacity:.3}to{-webkit-transform:scale(1);transform:scale(1);opacity:.05}}@keyframes loading{0%{-webkit-transform:scale(0);transform:scale(0);opacity:.3}to{-webkit-transform:scale(1);transform:scale(1);opacity:.05}}
\ No newline at end of file

From 7751eee19aed93728cf281d2ef32658df8607f4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hyacinthe=20Compaor=C3=A9?=
 <131278191+compaoreh338@users.noreply.github.com>
Date: Thu, 25 Sep 2025 10:10:45 +0000
Subject: [PATCH 06/11] fixup! fixup! fixup! fixup! fixup! FEAT: v12

---
 Resources/Private/Templates/Gallery/List.html | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Resources/Private/Templates/Gallery/List.html b/Resources/Private/Templates/Gallery/List.html
index 8c2421dd..640459e4 100644
--- a/Resources/Private/Templates/Gallery/List.html
+++ b/Resources/Private/Templates/Gallery/List.html
@@ -10,6 +10,9 @@
 		<f:asset.css identifier="natural-gallery-main-css" src="EXT:natural_gallery/Resources/Public/StyleSheets/natural-gallery.full.css"/>
 		<f:asset.css identifier="natural-gallery-theme-css" src="EXT:natural_gallery/Resources/Public/StyleSheets/natural.css"/>
 
+		<link rel="stylesheet" href="{f:uri.resource(path:'StyleSheets/natural-gallery.full.css', extensionName:'natural_gallery')}" type="text/css" />
+		<link rel="stylesheet" href="{f:uri.resource(path:'StyleSheets/natural.css', extensionName:'natural_gallery')}" type="text/css" />
+
 
 		<f:if condition="{gallery:isIconsPartialAlreadyLoaded()}">
 			<f:render section="Icons" partial="Icons"/>
@@ -57,6 +60,16 @@
             naturalGallery.options.labelImages = '<f:translate key="labelImages" />';
 
 			window.naturalGalleries.push(naturalGallery);
+
+			document.addEventListener('DOMContentLoaded', function() {
+				if (window.NaturalGallery && naturalGallery.images && naturalGallery.images.length > 0) {
+					new window.NaturalGallery.default(naturalGallery.options, naturalGallery.id);
+					var gallery = new window.NaturalGallery.default(naturalGallery.options, naturalGallery.id);
+					gallery.addItems(naturalGallery.images);
+				} else {
+					console.warn('NaturalGallery not found or no images to display');
+				}
+			});
 		</script>
 
 

From 67427817f53447e8e89ce36fe95be51b32a31ff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hyacinthe=20Compaor=C3=A9?=
 <131278191+compaoreh338@users.noreply.github.com>
Date: Thu, 25 Sep 2025 11:28:40 +0000
Subject: [PATCH 07/11] fixup! fixup! fixup! fixup! fixup! fixup! FEAT: v12

---
 .../Domain/Repository/CategoryRepository.php  | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/Classes/Domain/Repository/CategoryRepository.php b/Classes/Domain/Repository/CategoryRepository.php
index 6412aabe..4fc4dbc8 100644
--- a/Classes/Domain/Repository/CategoryRepository.php
+++ b/Classes/Domain/Repository/CategoryRepository.php
@@ -45,18 +45,20 @@ public function __construct(private \TYPO3\CMS\Core\Database\ConnectionPool $con
      */
     public function findByIdentifiers(array $identifiers): array|QueryResultInterface
     {
-        $result = null;
-        if (!empty($identifiers)) {
-            $queryBuilder = $this->getQueryBuilder();
-            $queryBuilder->getRestrictions()->removeAll();
-            $queryBuilder->select('*')
-                ->from($this->tableName)
-                ->where(
-                    $queryBuilder->expr()->in('uid', $identifiers)
-                );
-            $result = $queryBuilder->execute()->fetchAllAssociative();
+        if (empty($identifiers)) {
+            return [];
         }
-        return $result;
+        
+        $queryBuilder = $this->getQueryBuilder();
+        $queryBuilder->getRestrictions()->removeAll();
+        $queryBuilder->select('*')
+            ->from($this->tableName)
+            ->where(
+                $queryBuilder->expr()->in('uid', $identifiers)
+            );
+        $result = $queryBuilder->execute()->fetchAllAssociative();
+        
+        return $result ?? [];
     }
 
     public function findFileCategories($uid): array

From 15a9df9b3b31d01a5864deb4839d95ed2efd2230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hyacinthe=20Compaor=C3=A9?=
 <131278191+compaoreh338@users.noreply.github.com>
Date: Thu, 25 Sep 2025 15:31:03 +0000
Subject: [PATCH 08/11] fixup! fixup! fixup! fixup! fixup! fixup! fixup! FEAT:
 v12

---
 Classes/Controller/GalleryController.php      | 13 ++--
 .../Domain/Repository/CategoryRepository.php  |  2 -
 Classes/ViewHelpers/ImageStackViewHelper.php  | 71 +------------------
 3 files changed, 10 insertions(+), 76 deletions(-)

diff --git a/Classes/Controller/GalleryController.php b/Classes/Controller/GalleryController.php
index 79651210..0b9a4c51 100644
--- a/Classes/Controller/GalleryController.php
+++ b/Classes/Controller/GalleryController.php
@@ -72,11 +72,14 @@ public function listAction(): \Psr\Http\Message\ResponseInterface
         $images = $this->galleryRepository->findByDemand($this->getDemand(), (array)$this->getOrderings(),0,0);
         $identifiers = GeneralUtility::trimExplode(',', $this->settings['categories'], TRUE);
         $categories = $this->categoryRepository->findByIdentifiers($identifiers);
-        // Assign template variables
-        $this->view->assign('settings', $this->settings);
-        $this->view->assign('data', $this->request->getAttribute('currentContentObject')->data);
-        $this->view->assign('images', $images);
-        $this->view->assign('categories', $categories);
+        $this->view->assignMultiple([
+            'settings' => $this->settings,
+            'data' => $this->request->getAttribute('currentContentObject')->data,
+            'images' => $images,
+            'categories' => $categories,
+        ]);
+
+
         return $this->htmlResponse();
     }
 
diff --git a/Classes/Domain/Repository/CategoryRepository.php b/Classes/Domain/Repository/CategoryRepository.php
index 4fc4dbc8..e7a1100b 100644
--- a/Classes/Domain/Repository/CategoryRepository.php
+++ b/Classes/Domain/Repository/CategoryRepository.php
@@ -50,7 +50,6 @@ public function findByIdentifiers(array $identifiers): array|QueryResultInterfac
         }
         
         $queryBuilder = $this->getQueryBuilder();
-        $queryBuilder->getRestrictions()->removeAll();
         $queryBuilder->select('*')
             ->from($this->tableName)
             ->where(
@@ -64,7 +63,6 @@ public function findByIdentifiers(array $identifiers): array|QueryResultInterfac
     public function findFileCategories($uid): array
     {
         $queryBuilder = $this->connectionPool->getQueryBuilderForTable('sys_file_metadata');
-        $queryBuilder->getRestrictions()->removeAll();
         $results = [];
         if ($uid){
             $query = $queryBuilder
diff --git a/Classes/ViewHelpers/ImageStackViewHelper.php b/Classes/ViewHelpers/ImageStackViewHelper.php
index f8104b25..2626459a 100644
--- a/Classes/ViewHelpers/ImageStackViewHelper.php
+++ b/Classes/ViewHelpers/ImageStackViewHelper.php
@@ -66,7 +66,7 @@ public function render(): string
                         },$metadataCategories);
                     }
 
-                    $baseUrl = $this->getSiteUrl();
+                    $baseUrl =   $baseUrl = GeneralUtility::getIndpEnv('TYPO3_SITE_URL');
                     $item = [
                         'thumbnail' => $baseUrl . $thumbnailFile->getPublicUrl(),
                         'enlarged' => $baseUrl . $enlargedFile->getPublicUrl(),
@@ -109,8 +109,7 @@ public function createProcessedFile(File $file, $widthFormat, $heightFormat): Fi
 
         return $file;
     }
-
-
+    
     /**
      * @throws array
      */
@@ -118,70 +117,4 @@ public function getSettings()
     {
         return $this->templateVariableContainer->get('settings');
     }
-
-    /**
-     * Get the site URL
-     * @return string
-     */
-    protected function getSiteUrl(): string
-    {
-        $siteFinder = GeneralUtility::makeInstance(SiteFinder::class);
-        
-        // Try to get current page ID from different sources
-        $pageId = $this->getCurrentPageId();
-        
-        try {
-            $site = $siteFinder->getSiteByPageId($pageId);
-            return (string)$site->getBase();
-        } catch (\Exception $e) {
-            // Fallback to default site or root page
-            try {
-                $sites = $siteFinder->getAllSites();
-                if (!empty($sites)) {
-                    $defaultSite = reset($sites);
-                    return (string)$defaultSite->getBase();
-                }
-            } catch (\Exception $e) {
-                // Ultimate fallback
-                return '/';
-            }
-        }
-        
-        return '/';
-    }
-
-    /**
-     * Get current page ID from various sources
-     * @return int
-     */
-    protected function getCurrentPageId(): int
-    {
-        // Try to get from context first
-        try {
-            if ($this->context->hasAspect('frontend.page')) {
-                return $this->context->getPropertyFromAspect('frontend.page', 'id', 1);
-            }
-        } catch (\Exception $e) {
-            // Context aspect not available, try other methods
-        }
-
-        // Try to get from TSFE (TypoScript Frontend Controller)
-        if (isset($GLOBALS['TSFE']) && $GLOBALS['TSFE'] instanceof \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController) {
-            return $GLOBALS['TSFE']->id;
-        }
-
-        // Try to get from request
-        if (isset($GLOBALS['TYPO3_REQUEST'])) {
-            $request = $GLOBALS['TYPO3_REQUEST'];
-            if ($request->getAttribute('routing')) {
-                $pageArguments = $request->getAttribute('routing');
-                if ($pageArguments instanceof \TYPO3\CMS\Core\Routing\PageArguments) {
-                    return $pageArguments->getPageId();
-                }
-            }
-        }
-
-        // Fallback to root page
-        return 1;
-    }
 }

From 28a523507b8ab65b581fc32fa8a2ccd40634cd27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hyacinthe=20Compaor=C3=A9?=
 <131278191+compaoreh338@users.noreply.github.com>
Date: Thu, 25 Sep 2025 15:44:28 +0000
Subject: [PATCH 09/11] fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup!
 FEAT: v12

---
 Classes/Controller/GalleryController.php      |  2 --
 .../Domain/Repository/CategoryRepository.php  | 15 ++++----
 Classes/Utility/PartialLoadingRegister.php    | 15 ++------
 ...stractIsPartialAlreadyLoadedViewHelper.php |  8 ++++-
 Configuration/Services.yaml                   | 35 ++++---------------
 Resources/Private/Templates/Gallery/List.html |  2 --
 6 files changed, 25 insertions(+), 52 deletions(-)

diff --git a/Classes/Controller/GalleryController.php b/Classes/Controller/GalleryController.php
index 0b9a4c51..19300872 100644
--- a/Classes/Controller/GalleryController.php
+++ b/Classes/Controller/GalleryController.php
@@ -98,6 +98,4 @@ protected function getDemand(): array
             'identifiers' => GeneralUtility::trimExplode(',', $this->settings['categories'], TRUE)
         ];
     }
-
-
 }
diff --git a/Classes/Domain/Repository/CategoryRepository.php b/Classes/Domain/Repository/CategoryRepository.php
index e7a1100b..ac9215c8 100644
--- a/Classes/Domain/Repository/CategoryRepository.php
+++ b/Classes/Domain/Repository/CategoryRepository.php
@@ -35,8 +35,12 @@ class CategoryRepository
      * Initialize Repository
      */
     protected string $tableName = 'sys_category';
-    public function __construct(private \TYPO3\CMS\Core\Database\ConnectionPool $connectionPool)
+
+    protected ConnectionPool $connectionPool;
+    
+    public function __construct(ConnectionPool $connectionPool)
     {
+        $this->connectionPool = $connectionPool;
     }
 
     /**
@@ -48,7 +52,7 @@ public function findByIdentifiers(array $identifiers): array|QueryResultInterfac
         if (empty($identifiers)) {
             return [];
         }
-        
+
         $queryBuilder = $this->getQueryBuilder();
         $queryBuilder->select('*')
             ->from($this->tableName)
@@ -56,7 +60,7 @@ public function findByIdentifiers(array $identifiers): array|QueryResultInterfac
                 $queryBuilder->expr()->in('uid', $identifiers)
             );
         $result = $queryBuilder->execute()->fetchAllAssociative();
-        
+
         return $result ?? [];
     }
 
@@ -88,8 +92,7 @@ public function findFileCategories($uid): array
 
     protected function getQueryBuilder(): QueryBuilder
     {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = $this->connectionPool;
-        return $connectionPool->getQueryBuilderForTable($this->tableName);
+
+        return   $this->connectionPool->getQueryBuilderForTable($this->tableName);
     }
 }
diff --git a/Classes/Utility/PartialLoadingRegister.php b/Classes/Utility/PartialLoadingRegister.php
index b79d0aae..7eaed708 100644
--- a/Classes/Utility/PartialLoadingRegister.php
+++ b/Classes/Utility/PartialLoadingRegister.php
@@ -25,22 +25,11 @@ class PartialLoadingRegister extends AbstractViewHelper
 
     protected static array $registry = [];
 
-    protected static ?PartialLoadingRegister $_instance = null;
-
-    public static function getInstance(): ?PartialLoadingRegister
-    {
-        if (is_null(self::$_instance)) {
-            self::$_instance = new PartialLoadingRegister();
-        }
-
-        return self::$_instance;
-    }
-
-    private function __construct()
+    public function __construct()
     {
     }
 
-    private function register($name): void
+    public function register($name): void
     {
         self::$registry[$name] = true;
     }
diff --git a/Classes/ViewHelpers/AbstractIsPartialAlreadyLoadedViewHelper.php b/Classes/ViewHelpers/AbstractIsPartialAlreadyLoadedViewHelper.php
index 3eca74e6..d0345c29 100644
--- a/Classes/ViewHelpers/AbstractIsPartialAlreadyLoadedViewHelper.php
+++ b/Classes/ViewHelpers/AbstractIsPartialAlreadyLoadedViewHelper.php
@@ -26,13 +26,19 @@
  */
 class AbstractIsPartialAlreadyLoadedViewHelper extends AbstractViewHelper
 {
+    protected PartialLoadingRegister $partialLoadingRegister;
+
+    public function __construct(PartialLoadingRegister $partialLoadingRegister)
+    {
+        $this->partialLoadingRegister = $partialLoadingRegister;
+    }
 
     /**
      * @return bool
      */
     public function render(): bool
     {
-        return  !PartialLoadingRegister::getInstance()->usePartial($this->name);
+        return !$this->partialLoadingRegister->usePartial($this->name);
     }
 
 }
diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
index d68d2b70..ebc6b839 100644
--- a/Configuration/Services.yaml
+++ b/Configuration/Services.yaml
@@ -2,35 +2,14 @@ services:
   _defaults:
     autowire: true
     autoconfigure: true
-    public: false
+    public: true
 
-  Fab\NaturalGallery\Controller\:
-    resource: '../Classes/Controller/'
-    tags: ['controller.service_arguments']
+  Fab\NaturalGallery\:
+    resource: '../Classes/*'
+    exclude: '../Classes/Domain/Model/*'
 
-  Fab\NaturalGallery\Domain\Repository\:
-    resource: '../Classes/Domain/Repository/'
-    tags: ['tx_extbase.persistence.repository']
+  Fab\NaturalGallery\Controller\GalleryController:
+    public: true
 
   Fab\NaturalGallery\Domain\Repository\CategoryRepository:
-    arguments:
-      $connectionPool: '@TYPO3\CMS\Core\Database\ConnectionPool'
-
-  Fab\NaturalGallery\Domain\Repository\ImageGalleryRepository:
-    arguments:
-      $connectionPool: '@TYPO3\CMS\Core\Database\ConnectionPool'
-
-  Fab\NaturalGallery\Persistence\:
-    resource: '../Classes/Persistence/'
-
-  Fab\NaturalGallery\ViewHelpers\:
-    resource: '../Classes/ViewHelpers/'
-    tags: ['typo3.fluid.viewhelper']
-
-  Fab\NaturalGallery\ViewHelpers\ImageStackViewHelper:
-    arguments:
-      $categoryRepository: '@Fab\NaturalGallery\Domain\Repository\CategoryRepository'
-
-  Fab\NaturalGallery\ViewHelpers\LoadAssetsViewHelper:
-    arguments:
-      $pageRenderer: '@TYPO3\CMS\Core\Page\PageRenderer'
+    public: true
diff --git a/Resources/Private/Templates/Gallery/List.html b/Resources/Private/Templates/Gallery/List.html
index 640459e4..73301f58 100644
--- a/Resources/Private/Templates/Gallery/List.html
+++ b/Resources/Private/Templates/Gallery/List.html
@@ -7,8 +7,6 @@
 
 	<f:section name="main">
 		<f:asset.script identifier="natural-gallery-js" src="EXT:natural_gallery/Resources/Public/JavaScript/natural-gallery.full.js"/>
-		<f:asset.css identifier="natural-gallery-main-css" src="EXT:natural_gallery/Resources/Public/StyleSheets/natural-gallery.full.css"/>
-		<f:asset.css identifier="natural-gallery-theme-css" src="EXT:natural_gallery/Resources/Public/StyleSheets/natural.css"/>
 
 		<link rel="stylesheet" href="{f:uri.resource(path:'StyleSheets/natural-gallery.full.css', extensionName:'natural_gallery')}" type="text/css" />
 		<link rel="stylesheet" href="{f:uri.resource(path:'StyleSheets/natural.css', extensionName:'natural_gallery')}" type="text/css" />

From 8357a9e30a6c5119aa8edca5771e6780f10f8c86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hyacinthe=20Compaor=C3=A9?=
 <131278191+compaoreh338@users.noreply.github.com>
Date: Thu, 25 Sep 2025 15:49:57 +0000
Subject: [PATCH 10/11] fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup!
 fixup! FEAT: v12

---
 .../Domain/Repository/CategoryRepository.php  | 18 ++---
 .../Repository/ImageGalleryRepository.php     | 72 +++++++++++--------
 2 files changed, 53 insertions(+), 37 deletions(-)

diff --git a/Classes/Domain/Repository/CategoryRepository.php b/Classes/Domain/Repository/CategoryRepository.php
index ac9215c8..789130d1 100644
--- a/Classes/Domain/Repository/CategoryRepository.php
+++ b/Classes/Domain/Repository/CategoryRepository.php
@@ -59,31 +59,31 @@ public function findByIdentifiers(array $identifiers): array|QueryResultInterfac
             ->where(
                 $queryBuilder->expr()->in('uid', $identifiers)
             );
-        $result = $queryBuilder->execute()->fetchAllAssociative();
+        $result = $queryBuilder->executeQuery()->fetchAllAssociative();
 
         return $result ?? [];
     }
 
     public function findFileCategories($uid): array
     {
-        $queryBuilder = $this->connectionPool->getQueryBuilderForTable('sys_file_metadata');
+        $queryBuilder = $this->connectionPool->getQueryBuilderForTable('sys_category');
         $results = [];
         if ($uid){
             $query = $queryBuilder
                 ->select('sys_category.uid', 'sys_category.title')
                 ->from('sys_category')
-                ->leftJoin(
+                ->join(
                     'sys_category',
                     'sys_category_record_mm',
-                    'sys_category_record_mm',
-                    $queryBuilder->expr()->eq('sys_category.uid', 'sys_category_record_mm.uid_local')
+                    'mm',
+                    'sys_category.uid = mm.uid_local'
                 )
                 ->where(
-                    $queryBuilder->expr()->eq('sys_category_record_mm.uid_foreign', $queryBuilder->createNamedParameter($uid, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)),
-                    $queryBuilder->expr()->eq('sys_category_record_mm.tablenames', $queryBuilder->createNamedParameter('sys_file_metadata', \TYPO3\CMS\Core\Database\Connection::PARAM_STR)) ,
-                    $queryBuilder->expr()->eq('sys_category_record_mm.fieldname', $queryBuilder->createNamedParameter('categories', \TYPO3\CMS\Core\Database\Connection::PARAM_STR))
+                    $queryBuilder->expr()->eq('mm.uid_foreign', $queryBuilder->createNamedParameter($uid, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)),
+                    $queryBuilder->expr()->eq('mm.tablenames', $queryBuilder->createNamedParameter('sys_file_metadata')),
+                    $queryBuilder->expr()->eq('mm.fieldname', $queryBuilder->createNamedParameter('categories'))
                 );
-            $results = $query->execute()->fetchAllAssociative();
+            $results = $query->executeQuery()->fetchAllAssociative();
 
         }
 
diff --git a/Classes/Domain/Repository/ImageGalleryRepository.php b/Classes/Domain/Repository/ImageGalleryRepository.php
index 6af5f3cf..cbf738e9 100644
--- a/Classes/Domain/Repository/ImageGalleryRepository.php
+++ b/Classes/Domain/Repository/ImageGalleryRepository.php
@@ -33,12 +33,10 @@ public function findByUid(int $uid): array
             ->select('*')
             ->from($this->tableName)
             ->where(
-                $this->getQueryBuilder()
-                    ->expr()
-                    ->eq('uid', $this->getQueryBuilder()->expr()->literal($uid)),
+                $query->expr()->eq('uid', $uid)
             );
 
-        $messages = $query->execute()->fetchOne();
+        $messages = $query->executeQuery()->fetchOne();
 
         return is_array($messages) ? $messages : [];
     }
@@ -53,30 +51,30 @@ public function findByCategories(array $categories): array
         $queryBuilder = $this->getQueryBuilder();
         $queryBuilder->select('*')
             ->from($this->tableName)
-            ->innerJoin(
+            ->join(
                 'sys_file',
                 'sys_file_metadata',
-                'sys_file_metadata',
-                'sys_file.uid = sys_file_metadata.file'
+                'metadata',
+                'sys_file.uid = metadata.file'
             )
-            ->innerJoin(
-                'sys_file_metadata',
+            ->join(
+                'metadata',
                 'sys_category_record_mm',
-                'sys_category_record_mm',
-                'sys_category_record_mm.uid_foreign = sys_file_metadata.uid AND tablenames = "sys_file_metadata" AND fieldname = "categories"'
+                'mm',
+                'mm.uid_foreign = metadata.uid AND mm.tablenames = "sys_file_metadata" AND mm.fieldname = "categories"'
             );
 
         if (!empty($categories)) {
             $queryBuilder->where(
-                $queryBuilder->expr()->in('sys_category_record_mm.uid_local', $categories)
+                $queryBuilder->expr()->in('mm.uid_local', $categories)
             );
         }
 
-        $queryBuilder->addOrderBy('sys_file_metadata.year', 'DESC')
-            ->addOrderBy('sys_file_metadata.title', 'ASC');
+        $queryBuilder->addOrderBy('metadata.year', 'DESC')
+            ->addOrderBy('metadata.title', 'ASC');
 
         return $queryBuilder
-            ->execute()
+            ->executeQuery()
             ->fetchAllAssociative();
 
     }
@@ -96,37 +94,55 @@ public function findByDemand(array|Matcher $demand = [], array $orderings = [],
                 $uids = array_map('intval', $inConditions[0]['operand']);
             }
         }
+        
         $timestamp = time();
         $queryBuilder = $this->getQueryBuilder();
+        
         $queryBuilder
             ->select('sys_file.*')
             ->from('sys_file')
             ->leftJoin(
                 'sys_file',
                 'sys_file_metadata',
-                'sys_file_metadata',
-                $queryBuilder->expr()->and($queryBuilder->expr()->eq('sys_file.uid', 'sys_file_metadata.file'), $queryBuilder->expr()->lte('sys_file_metadata.t3ver_state', $queryBuilder->createNamedParameter(0, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)), $queryBuilder->expr()->eq('sys_file_metadata.t3ver_wsid', $queryBuilder->createNamedParameter(0, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)), $queryBuilder->expr()->or($queryBuilder->expr()->eq('sys_file_metadata.t3ver_oid', $queryBuilder->createNamedParameter(0, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)), $queryBuilder->expr()->eq('sys_file_metadata.t3ver_state', $queryBuilder->createNamedParameter(4, \TYPO3\CMS\Core\Database\Connection::PARAM_INT))), $queryBuilder->expr()->in('sys_file_metadata.sys_language_uid', [0, -1]))
+                'metadata',
+                'sys_file.uid = metadata.file'
             )
             ->leftJoin(
-                'sys_file_metadata',
+                'metadata',
                 'sys_category_record_mm',
-                'sys_category_record_mm0',
-                $queryBuilder->expr()->and($queryBuilder->expr()->eq('sys_file_metadata.uid', 'sys_category_record_mm0.uid_foreign'), $queryBuilder->expr()->eq('sys_category_record_mm0.tablenames', $queryBuilder->createNamedParameter('sys_file_metadata')), $queryBuilder->expr()->eq('sys_category_record_mm0.fieldname', $queryBuilder->createNamedParameter('categories')))
+                'mm',
+                'metadata.uid = mm.uid_foreign AND mm.tablenames = "sys_file_metadata" AND mm.fieldname = "categories"'
             )
             ->leftJoin(
-                'sys_category_record_mm0',
+                'mm',
                 'sys_category',
-                'sys_category0',
-                $queryBuilder->expr()->and($queryBuilder->expr()->eq('sys_category_record_mm0.uid_local', 'sys_category0.uid'), $queryBuilder->expr()->eq('sys_category0.deleted', $queryBuilder->createNamedParameter(0, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)), $queryBuilder->expr()->lte('sys_category0.t3ver_state', $queryBuilder->createNamedParameter(0, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)), $queryBuilder->expr()->eq('sys_category0.t3ver_wsid', $queryBuilder->createNamedParameter(0, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)), $queryBuilder->expr()->or($queryBuilder->expr()->eq('sys_category0.t3ver_oid', $queryBuilder->createNamedParameter(0, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)), $queryBuilder->expr()->eq('sys_category0.t3ver_state', $queryBuilder->createNamedParameter(4, \TYPO3\CMS\Core\Database\Connection::PARAM_INT))), $queryBuilder->expr()->eq('sys_category0.hidden', $queryBuilder->createNamedParameter(0, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)), $queryBuilder->expr()->lte('sys_category0.starttime', $queryBuilder->createNamedParameter($timestamp, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)), $queryBuilder->expr()->or($queryBuilder->expr()->eq('sys_category0.endtime', $queryBuilder->createNamedParameter(0, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)), $queryBuilder->expr()->gt('sys_category0.endtime', $queryBuilder->createNamedParameter($timestamp, \TYPO3\CMS\Core\Database\Connection::PARAM_INT))), $queryBuilder->expr()->in('sys_category0.sys_language_uid', [0, -1]))
+                'category',
+                'mm.uid_local = category.uid'
             )
             ->where(
-                $queryBuilder->expr()->and($queryBuilder->expr()->eq('sys_file.type', $queryBuilder->createNamedParameter(2, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)), $queryBuilder->expr()->in('sys_file.uid', (array)$uids))
+                $queryBuilder->expr()->eq('sys_file.type', 2),
+                $queryBuilder->expr()->in('sys_file.uid', (array)$uids),
+                // Metadata conditions
+                $queryBuilder->expr()->lte('metadata.t3ver_state', 0),
+                $queryBuilder->expr()->eq('metadata.t3ver_wsid', 0),
+                $queryBuilder->expr()->in('metadata.sys_language_uid', [0, -1]),
+                // Category conditions
+                $queryBuilder->expr()->eq('category.deleted', 0),
+                $queryBuilder->expr()->lte('category.t3ver_state', 0),
+                $queryBuilder->expr()->eq('category.t3ver_wsid', 0),
+                $queryBuilder->expr()->eq('category.hidden', 0),
+                $queryBuilder->expr()->lte('category.starttime', $timestamp),
+                $queryBuilder->expr()->or(
+                    $queryBuilder->expr()->eq('category.endtime', 0),
+                    $queryBuilder->expr()->gt('category.endtime', $timestamp)
+                ),
+                $queryBuilder->expr()->in('category.sys_language_uid', [0, -1])
             )
-
             ->orderBy('sys_file.name', 'ASC');
+
         if ($categoryConditions) {
             $queryBuilder->andWhere(
-                $queryBuilder->expr()->eq('sys_category0.uid', $queryBuilder->createNamedParameter((int)$categoryConditions, \TYPO3\CMS\Core\Database\Connection::PARAM_INT))
+                $queryBuilder->expr()->eq('category.uid', (int)$categoryConditions)
             );
         }
 
@@ -178,9 +194,9 @@ public function findByUids(array $uids): array
         $query
             ->select('*')
             ->from($this->tableName)
-            ->where($this->getQueryBuilder()->expr()->in('uid', $uids));
+            ->where($query->expr()->in('uid', $uids));
 
-        return $query->execute()->fetchAllAssociative();
+        return $query->executeQuery()->fetchAllAssociative();
     }
 
     protected function getQueryBuilder(): QueryBuilder

From eec669c0fd2ab388e9aeaa30b01326c39422582e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hyacinthe=20Compaor=C3=A9?=
 <131278191+compaoreh338@users.noreply.github.com>
Date: Mon, 29 Sep 2025 17:14:41 +0000
Subject: [PATCH 11/11] FIX: improvements

---
 .../Repository/ImageGalleryRepository.php     |  19 +--
 Classes/ViewHelpers/LoadAssetsViewHelper.php  | 150 ------------------
 2 files changed, 2 insertions(+), 167 deletions(-)
 delete mode 100644 Classes/ViewHelpers/LoadAssetsViewHelper.php

diff --git a/Classes/Domain/Repository/ImageGalleryRepository.php b/Classes/Domain/Repository/ImageGalleryRepository.php
index cbf738e9..78f061bc 100644
--- a/Classes/Domain/Repository/ImageGalleryRepository.php
+++ b/Classes/Domain/Repository/ImageGalleryRepository.php
@@ -94,10 +94,10 @@ public function findByDemand(array|Matcher $demand = [], array $orderings = [],
                 $uids = array_map('intval', $inConditions[0]['operand']);
             }
         }
-        
+
         $timestamp = time();
         $queryBuilder = $this->getQueryBuilder();
-        
+
         $queryBuilder
             ->select('sys_file.*')
             ->from('sys_file')
@@ -122,21 +122,6 @@ public function findByDemand(array|Matcher $demand = [], array $orderings = [],
             ->where(
                 $queryBuilder->expr()->eq('sys_file.type', 2),
                 $queryBuilder->expr()->in('sys_file.uid', (array)$uids),
-                // Metadata conditions
-                $queryBuilder->expr()->lte('metadata.t3ver_state', 0),
-                $queryBuilder->expr()->eq('metadata.t3ver_wsid', 0),
-                $queryBuilder->expr()->in('metadata.sys_language_uid', [0, -1]),
-                // Category conditions
-                $queryBuilder->expr()->eq('category.deleted', 0),
-                $queryBuilder->expr()->lte('category.t3ver_state', 0),
-                $queryBuilder->expr()->eq('category.t3ver_wsid', 0),
-                $queryBuilder->expr()->eq('category.hidden', 0),
-                $queryBuilder->expr()->lte('category.starttime', $timestamp),
-                $queryBuilder->expr()->or(
-                    $queryBuilder->expr()->eq('category.endtime', 0),
-                    $queryBuilder->expr()->gt('category.endtime', $timestamp)
-                ),
-                $queryBuilder->expr()->in('category.sys_language_uid', [0, -1])
             )
             ->orderBy('sys_file.name', 'ASC');
 
diff --git a/Classes/ViewHelpers/LoadAssetsViewHelper.php b/Classes/ViewHelpers/LoadAssetsViewHelper.php
deleted file mode 100644
index 0cad6d00..00000000
--- a/Classes/ViewHelpers/LoadAssetsViewHelper.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-namespace Fab\NaturalGallery\ViewHelpers;
-
-/**
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-use FluidTYPO3\Vhs\Asset;
-use TYPO3\CMS\Core\Core\Environment;
-use TYPO3\CMS\Core\Page\PageRenderer;
-use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\PathUtility;
-use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
-use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-
-/**
- * View helper to load a JavaScript file
- */
-class LoadAssetsViewHelper extends AbstractViewHelper
-{
-    /**
-     * @var PageRenderer
-     */
-    protected PageRenderer $pageRenderer;
-
-    /**
-     * @param PageRenderer $pageRenderer
-     */
-    public function __construct(PageRenderer $pageRenderer)
-    {
-        $this->pageRenderer = $pageRenderer;
-    }
-
-    /**
-     * @return void
-     */
-    public function render(): void
-    {
-        $settings = $this->templateVariableContainer->get('settings');
-
-        if ($settings['asset']) {
-            foreach ($settings['asset'] as $assetName => $asset) {
-                if ($this->shouldLoadByVhs($settings)) {
-                    $asset['name'] = $assetName;
-                    $this->loadByVhs($asset);
-
-                } else {
-                    $this->loadByCorePageRender($asset);
-                }
-            }
-        }
-    }
-
-    /**
-     * @param array $asset
-     * @return void
-     */
-    protected function loadByVhs(array $asset): void
-    {
-
-        if (Environment::getContext()->isDevelopment()) {
-            $developmentFile = $this->getDevelopmentFile($asset);
-            if ($developmentFile) {
-                $asset['path'] = str_replace('.min.', '.', $asset['path']);
-            }
-        }
-        Asset::createFromSettings($asset);
-    }
-
-    /**
-     * @param array $asset
-     * @return void
-     */
-    protected function loadByCorePageRender(array $asset): void
-    {
-
-        $file = $this->resolveFileForApplicationContext($asset);
-
-        $fileNameAndPath = GeneralUtility::getFileAbsFileName($file);
-        $fileNameAndPath = PathUtility::stripPathSitePrefix($fileNameAndPath);
-
-        if ($asset['type'] === 'js') {
-            $this->pageRenderer->addJsFooterFile($fileNameAndPath);
-        } elseif ($asset['type'] === 'css') {
-            $this->pageRenderer->addCssFile($fileNameAndPath);
-        }
-    }
-
-    /**
-     * @param array $settings
-     * @return bool
-     */
-    protected function shouldLoadByVhs(array $settings): bool
-    {
-        return ExtensionManagementUtility::isLoaded('vhs') && $settings['loadAssetWithVhsIfAvailable'];
-    }
-
-    /**
-     * @param array $asset
-     * @return string|NULL
-     */
-    protected function getDevelopmentFile(array $asset): ?string
-    {
-        $possibleDevelopmentFile = str_replace('.min.', '.', $asset['path']);
-        $developmentFile = GeneralUtility::getFileAbsFileName($possibleDevelopmentFile);
-        if (!file_exists($developmentFile)) {
-            $developmentFile = NULL;
-        }
-        return $developmentFile;
-    }
-
-    /**
-     * @param array $asset
-     * @return string
-     */
-    protected function resolveFileForApplicationContext(array $asset): string
-    {
-        $resolvedFile = $asset['path']; // default value
-
-        // check if there is a non minimized file for context Development
-        if (Environment::getContext()->isDevelopment()) {
-            $developmentFile = $this->getDevelopmentFile($asset);
-            if ($developmentFile) {
-                $resolvedFile = $developmentFile;
-            }
-        }
-        return $resolvedFile;
-    }
-
-    /**
-     * Returns an instance of the Frontend object.
-     *
-     * @return TypoScriptFrontendController
-     */
-    protected function getFrontendObject(): TypoScriptFrontendController
-    {
-        return $GLOBALS['TSFE'];
-    }
-
-}