Display big category tree on route /category/ without parameter

Co-authored-by: Krzysiej <[email protected]>
Co-committed-by: Krzysiej <[email protected]>

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.3-cli
+FROM php:8.4-cli
 
 WORKDIR /usr/src/app
 ENV PHP_MEMORY_LIMIT=1500M

bin/cachewarmup

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+bin/cli php console.php app:cache:warm-twig

bin/composer

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-[ -z "$1" ] && echo "Please specify a Composer command (ex. install)" && exit
+[ -z "$1" ] && bin/cli composer list && exit
 bin/cli composer "$@"

bin/update

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 echo "Updating project"
 git pull origin master
-bin/cli rm -rf var/cache
+bin/cacheclean
+bin/composer install --no-dev
 echo "Project updated"

src/Command/CacheWarmCommand.php

@@ -16,7 +16,7 @@ use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Twig\Environment;
 
-#[AsCommand(name: 'app:cache:warm-twig', description: '')]
+#[AsCommand(name: 'app:cache:warm-twig', description: 'Warmup twig cache')]
 class CacheWarmCommand extends Command
 {
     public function __construct(

src/Command/Migrate.php

@@ -6,11 +6,13 @@ namespace Krzysiej\RyobiCrawler\Command;
 
 use Illuminate\Database\Capsule\Manager as Capsule;
 use Illuminate\Database\Schema\Blueprint;
+use Krzysiej\RyobiCrawler\Models\Country;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use function Symfony\Component\Clock\now;
 
 #[AsCommand(name: 'app:migrate', description: 'Create database and rum migrations')]
 class Migrate extends Command
@@ -24,11 +26,10 @@ class Migrate extends Command
 
     public function execute(InputInterface $input, OutputInterface $output): int
     {
-        if (true === $input->hasOption(self::RECREATE_OPTION)) {
+        if ($input->getOption(self::RECREATE_OPTION)) {
             unlink(__DIR__ . '/../../database.sqlite');
-            //sleep(5);
-        }
             touch(__DIR__ . '/../../database.sqlite');
+        }
         $capsule = new Capsule;
         $capsule->addConnection([
             'driver' => 'sqlite',
@@ -39,6 +40,9 @@ class Migrate extends Command
         $this->createProductsTable();
         $this->createPricesTable();
         $this->createStocksTable();
+        $this->addColumns();
+        $this->createCountriesTable();
+        $this->index();
 
         return Command::SUCCESS;
     }
@@ -77,6 +81,51 @@ class Migrate extends Command
         }
     }
 
+    public function createCountriesTable(): void
+    {
+        if (!Capsule::schema()->hasTable('countries')) {
+            Capsule::schema()->create('countries', function (Blueprint $table) {
+                $table->increments('id');
+                $table->text('countryName');
+                $table->text('productsUrl');
+                $table->text('cultureCode');
+                $table->text('currency');
+                $table->text('locale');
+                $table->timestamps();
+            });
+        }
+        if (Capsule::schema()->hasTable('countries') && !Country::where('countryName', 'Poland')->exists()) {
+            $id = Capsule::table('countries')->insertGetId(
+                [
+                    'countryName' => 'Poland',
+                    'productsUrl' => 'https://pl.ryobitools.eu/api/product-listing/get-products',
+                    'cultureCode' => 'pl-PL',
+                    'currency' => 'PLN',
+                    'locale' => 'pl',
+                    'created_at' => now(),
+                    'updated_at' => now(),
+                ]);
+        }
+        if (Capsule::schema()->hasTable('countries') && !Country::where('countryName', 'UK')->exists()) {
+            Capsule::table('countries')->insert([
+                    'countryName' => 'UK',
+                    'productsUrl' => 'https://uk.ryobitools.eu/api/product-listing/get-products',
+                    'cultureCode' => 'en-GB',
+                    'currency' => 'GBP',
+                    'locale' => 'en',
+                    'created_at' => now(),
+                    'updated_at' => now(),
+                ]
+            );
+        }
+
+        if (!Capsule::schema()->hasColumn('products', 'country_id')) {
+            Capsule::schema()->table('products', function (Blueprint $table) use ($id) {
+                $table->foreignId('country_id')->default($id)->references('id')->on('countries');
+            });
+        }
+    }
+
     public function createStocksTable(): void
     {
         if (!Capsule::schema()->hasTable('stocks')) {
@@ -94,4 +143,57 @@ class Migrate extends Command
             });
         }
     }
+
+    public function addColumns(): void
+    {
+        if (!Capsule::schema()->hasColumn('products', 'priceCurrent')) {
+            Capsule::schema()->table('products', function (Blueprint $table) {
+                $table->float('priceCurrent')->default(0);
+            });
+        }
+
+        if (!Capsule::schema()->hasColumn('products', 'priceLowest')) {
+            Capsule::schema()->table('products', function (Blueprint $table) {
+                $table->float('priceLowest')->default(0);
+            });
+        }
+
+        if (!Capsule::schema()->hasColumn('products', 'productStandardPrice')) {
+            Capsule::schema()->table('products', function (Blueprint $table) {
+                $table->float('productStandardPrice')->default(0);
+            });
+        }
+
+        if (!Capsule::schema()->hasColumn('products', 'lowestProductPrice30Days')) {
+            Capsule::schema()->table('products', function (Blueprint $table) {
+                $table->float('lowestProductPrice30Days')->default(0);
+            });
+        }
+
+        if (!Capsule::schema()->hasColumn('products', 'lastSeen')) {
+            Capsule::schema()->table('products', function (Blueprint $table) {
+                $table->date('lastSeen')->nullable();
+            });
+        }
+
+        if (!Capsule::schema()->hasColumn('products', 'stock')) {
+            Capsule::schema()->table('products', function (Blueprint $table) {
+                $table->integer('stock')->nullable();
+            });
+        }
+    }
+
+    public function index(): void
+    {
+        if (!count(Capsule::select('SELECT name FROM sqlite_master WHERE type = "index" and name = "products_skuid_country_id_unique"'))) {
+            Capsule::schema()->table('products', function (Blueprint $table) {
+                $table->integer('skuID')->unique(false)->change();
+                $table->unique(['skuID', 'country_id']);
+            });
+        }
+
+        Capsule::schema()->table('products', function (Blueprint $table) {
+            $table->foreign('id')->references('product_id')->on('stocks');
+        });
+    }
 }

src/Command/ScrapeWebsite.php

@@ -7,6 +7,7 @@ namespace Krzysiej\RyobiCrawler\Command;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Database\Capsule\Manager as Capsule;
+use Krzysiej\RyobiCrawler\Models\Country;
 use Krzysiej\RyobiCrawler\Models\Price;
 use Krzysiej\RyobiCrawler\Models\Product;
 use Krzysiej\RyobiCrawler\Models\Stock;
@@ -21,47 +22,73 @@ class ScrapeWebsite extends Command
 {
     private Client $client;
 
+    public function __construct(protected Capsule $database)
+    {
+        parent::__construct();
+    }
+
     protected function configure(): void
     {
-        $capsule = new Capsule;
-        $capsule->addConnection([
-            'driver' => 'sqlite',
-            'database' => __DIR__ . '/../../database.sqlite',
-        ]);
-        $capsule->setAsGlobal();
-        $capsule->bootEloquent();
         $this->client = new Client();
     }
 
     public function execute(InputInterface $input, OutputInterface $output): int
     {
+        $output->writeln('Scrape products');
         $progress = new ProgressBar($output);
+        $countries = Country::all();
+        foreach($countries as $country) {
+            $output->writeln('Country name: ' . $country->countryName."\n");
             $progress->start();
-        $products = $this->getProducts();
+            $products = $this->getProducts($country);
             $progress->setMaxSteps(count($products));
             foreach ($products as $product) {
-            $this->saveProduct($product);
+                $this->saveProduct($product, $country);
                 $progress->advance();
             }
             $progress->finish();
             $output->writeln('');
-        $output->writeln('DONE');
+            $output->writeln('Scrape products - DONE');
+            $output->writeln('');
+        }
+
+        $output->writeln('Update prices');
+        $products = Product::all();
+        $progress->setMaxSteps(count($products));
+        $progress->start();
+        foreach($products as $product) {
+            $newestPrice = $product->newestPrice;
+            $currentStock = $product->currentStock;
+            $product->priceCurrent = $newestPrice->price;
+            $product->productStandardPrice = $newestPrice->productStandardPrice;
+            $product->lowestProductPrice30Days = $newestPrice->lowestProductPrice30Days;
+            $product->priceLowest = $product->lowestPrice->price;
+            $product->lastSeen = $newestPrice->created_at->format('Y-m-d');
+            $product->stock = $currentStock->stock;
+            $product->save(['timestamps' => false]);
+            $progress->advance();
+        }
+        $progress->finish();
+        $output->writeln('');
+        $output->writeln('Update prices - DONE');
+        $output->writeln('COMMAND - DONE');
 
         return Command::SUCCESS;
     }
 
-    private function getProducts(): array
+    private function getProducts(Country $country): array
     {
         $products = [];
         $page = 0;
+
         do {
             try {
-                $res = $this->client->request('POST', 'https://pl.ryobitools.eu/api/product-listing/get-products', [
+                $res = $this->client->request('POST', $country->productsUrl, [
                     'form_params' => [
                         "includePreviousPages" => false,
                         "pageIndex" => $page,
                         "pageSize" => 100,
-                        "cultureCode" => "pl-PL",
+                        "cultureCode" => $country->cultureCode,
                     ]
                 ]);
                 $responseObject = json_decode($res->getBody()->getContents());
@@ -76,21 +103,23 @@ class ScrapeWebsite extends Command
         return $products;
     }
 
-    private function saveProduct(\stdClass $product): void
+    private function saveProduct(\stdClass $product, Country $country): void
     {
         /** @var Product $productModel */
-        $productModel = Product::firstOrNew(['skuID' => $product->skuID]);
+        $productModel = Product::firstOrNew(['skuID' => $product->skuID, 'country_id' => $country->id]);
 
         $productModel->skuID = $product->skuID;
         $productModel->name = $product->name;
         $productModel->availableQuantity = $product->availableQuantity;
-        $productModel->categories = $product->categories;
+        $productModel->categories = str_replace(['/', '  '], '', $product->categories);
         $productModel->image = $product->image;
         $productModel->subTitle = $product->subTitle;
         $productModel->variantCode = $product->variantCode;
         $productModel->modelCode = $product->modelCode;
         $productModel->url = $product->url;
+        $productModel->lastSeen = date("Y-m-d");
         $productModel->touch('updated_at');
+        $productModel->country()->associate($country);
         $productModel->save();
         $priceExists = $productModel->price()->whereRaw("strftime('%Y-%m-%d', created_at) = ?", [date('Y-m-d')])->exists();
 

src/Controller/BaseController.php

@@ -11,11 +11,7 @@ class BaseController extends AbstractController
 {
     protected Environment $twig;
 
-    public function __construct(protected FilesystemAdapter $cache)
+    public function __construct(protected FilesystemAdapter $cache, protected Capsule $database)
     {
-        $capsule = new Capsule;
-        $capsule->addConnection(['driver' => 'sqlite', 'database' => __DIR__ . '/../../database.sqlite']);
-        $capsule->setAsGlobal();
-        $capsule->bootEloquent();
     }
 }

src/Controller/CategoryController.php

@@ -8,22 +8,43 @@ use Symfony\Component\Routing\Attribute\Route;
 
 final class CategoryController extends BaseController
 {
-    #[Route('/category/{category}', name: 'app_category')]
-    public function __invoke(string $category): Response
+    #[Route('/category/{category?}',  name: 'app_category')]
+    public function __invoke(?string $category): Response
     {
         if($this->cache->getItem('list_category_'.$category)->isHit()) {
             return $this->render('productList.html.twig', ['listType' => 'category_'.$category]);
         }
 
+        /** @var Product[] $products */
         $products = Product::with(['price', 'lowestPrice'])
             ->selectRaw('products.*')
             ->distinct('products.id')
+            ->when(!is_null($category) , fn ($q) => $q->whereRaw('json_each.value = ?', [$category]))
             ->fromRaw('products, json_each(products.categories)')
-            ->whereRaw('json_each.value = ?', [$category])
             ->orderByDesc('starred')
             ->orderByDesc('created_by')
             ->get();
 
-        return $this->render('productList.html.twig', ['products' => $products, 'listType' => 'category_'.$category]);
+        $categoriesTree = [];
+
+        foreach ($products as $product) {
+            $categoriesTree = $this->addToTree($product->categories, $categoriesTree);
+        }
+
+        return $this->render('productList.html.twig', ['products' => $products, 'listType' => 'category_' . $category, 'category' => $category, 'categoryTree' => $categoriesTree]);
+    }
+
+    private function addToTree(array $categories, mixed $categoriesTree)
+    {
+        $tmp = &$categoriesTree;
+        foreach ($categories as $category) {
+            if (empty($tmp[$category])) {
+                $tmp[$category] = ['count' => 0];
+            }
+            $tmp = &$tmp[$category];
+            $tmp['count']++;
+        }
+
+        return $categoriesTree;
     }
 }

src/Controller/DiscontinuedController.php

@@ -17,10 +17,9 @@ final class DiscontinuedController extends BaseController
             return $this->render('productList.html.twig', ['listType' => 'discontinued']);
         }
 
-        $products = Product::where('updated_at', '<', now()->format('Y-m-d'))
+        $products = Product::where('lastSeen', '<', now()->format('Y-m-d'))
             ->orderByDesc('starred')
             ->orderByDesc('created_by')
-            ->with(['currentPrice', 'lowestPrice'])
             ->get();
         return $this->render('productList.html.twig', ['products' => $products, 'listType' => 'discontinued']);
     }

src/Controller/IndexController.php

@@ -14,7 +14,7 @@ final class IndexController extends BaseController
         if ($this->cache->getItem('list_all')->isHit()) {
             return $this->render('productList.html.twig', ['listType' => 'all']);
         }
-        $products = Product::with(['currentStock', 'price', 'lowestPrice'])
+        $products = Product::with(['currentStock'])
             ->orderByDesc('starred')
             ->orderByDesc('created_by')
             ->get();

src/Controller/LowestPriceController.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Krzysiej\RyobiCrawler\Controller;
+
+use Krzysiej\RyobiCrawler\Models\Product;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Attribute\Route;
+use function Symfony\Component\Clock\now;
+
+final class LowestPriceController extends BaseController
+{
+    #[Route('/lowest-price', name: 'app_lowest_price', methods: ['GET'])]
+    public function __invoke(): Response
+    {
+        $listType = 'lowest_price';
+        if($this->cache->getItem('lowest_price')->isHit()) {
+            return $this->render('productList.html.twig', ['listType' => $listType]);
+        }
+
+        $products = Product::whereRaw('priceCurrent = priceLowest')
+            ->whereRaw('lastSeen = "'.now()->format('Y-m-d').'"')
+            ->whereRaw('priceCurrent < productStandardPrice')
+            ->orderByDesc('starred')
+            ->orderByDesc('created_by')
+            ->with(['currentPrice', 'lowestPrice'])
+            ->get();
+        return $this->render('productList.html.twig', ['products' => $products, 'listType' => $listType]);
+    }
+}

src/Controller/NewController.php

@@ -2,7 +2,6 @@
 
 namespace Krzysiej\RyobiCrawler\Controller;
 
-use Illuminate\Database\Eloquent\Builder;
 use Krzysiej\RyobiCrawler\Models\Product;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
@@ -17,11 +16,11 @@ final class NewController extends BaseController
         if($this->cache->getItem('list_new')->isHit()) {
             return $this->render('productList.html.twig', ['listType' => 'new']);
         }
-
-        $products = Product::where('created_at', '>', now()->modify('-30 days')->format('Y-m-d'))
+        $date = now()->modify('-30 days')->format('Y-m-d');
+        $products = Product::where('created_at', '>', $date)
+            ->with(['country', 'stock'])
             ->orderByDesc('starred')
             ->orderByDesc('created_by')
-            ->with(['currentPrice', 'lowestPrice'])
             ->get();
         return $this->render('productList.html.twig', ['products' => $products, 'listType' => 'new']);
     }

src/Controller/ProductController.php

@@ -3,7 +3,6 @@
 namespace Krzysiej\RyobiCrawler\Controller;
 
 use Krzysiej\RyobiCrawler\Models\Product;
-use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
 use Twig\Error\LoaderError;
@@ -20,7 +19,7 @@ final class ProductController extends BaseController
     #[Route('/product/{productId<\d+>}', name: 'app_product')]
     public function __invoke(int $productId): Response
     {
-        if($this->cache->getItem('product'.$productId)->isHit()) {
+        if ($this->cache->getItem('product' . $productId)->isHit()) {
             return $this->render('product.html.twig', ['product' => ['id' => $productId]]);
         }
 
@@ -31,26 +30,34 @@ final class ProductController extends BaseController
         if (null === $product) {
             throw $this->createNotFoundException('Product not found');
         }
-        $priceList = $product->price()->pluck('price');
-        $stockList = $product->stock()->pluck('stock');
-        $priceDates = $product->price()->pluck('created_at')->map(fn($date) => $date->format('Y-m-d'))->toArray();
-        $stockDates = $product->stock()->pluck('created_at')->map(fn($date) => $date->format('Y-m-d'))->toArray();
-
+        $priceList = $product->price()->pluck('price', 'created_at')->mapWithKeys(fn($price, $createdAt) => [explode(' ', $createdAt)[0] => $price])->toArray();
+        $stockList = $product->stock()->pluck('stock', 'created_at')->mapWithKeys(fn($stock, $createdAt) => [explode(' ', $createdAt)[0] => $stock])->toArray();
         return $this->render('product.html.twig', [
             'product' => $product,
-            'price_list' => $this->prepareChartData($priceDates, $priceList),
-            'stock_list' => $this->prepareChartData($stockDates, $stockList),
-            'price_dates' => implode("','", $priceDates),
+            'price_list' => $this->prepareChartData($priceList),
+            'stock_list' => $this->prepareChartData($stockList),
+            'price_dates' => implode("','", $this->dateRange(array_key_first($priceList), array_key_last($priceList))),
         ]);
     }
 
-    private function prepareChartData($set1, $set2): string
+    private function prepareChartData($set1): string
     {
-        $data = [];
-        foreach ($set1 as $key => $value) {
-            $data[] = ['x' => $value, 'y' => $set2[$key]];
-        }
+        $dates = $this->dateRange(array_key_first($set1), array_key_last($set1));
+        $data = array_map(fn($date) => ['x' => $date, 'y' => $set1[$date] ?? null], $dates);
         $stringData = json_encode($data);
+
         return str_replace(['"x"', '"y"'], ['x', 'y'], $stringData);
     }
+
+    private function dateRange($dateStart, $dateEnd): array
+    {
+        $from = new \DateTime($dateStart);
+        $to = new \DateTime($dateEnd);
+        $range = [];
+        for ($date = clone $from; $date < $to; $date->modify('+1 day')) {
+            $range[] = $date->format('Y-m-d');
+        }
+
+        return $range;
+    }
 }

src/Controller/PromosController.php

@@ -2,7 +2,6 @@
 
 namespace Krzysiej\RyobiCrawler\Controller;
 
-use Illuminate\Database\Eloquent\Builder;
 use Krzysiej\RyobiCrawler\Models\Product;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
@@ -16,7 +15,7 @@ final class PromosController extends BaseController
             return $this->render('productList.html.twig', ['listType' => 'promos']);
         }
 
-        $products = Product::whereHas('currentPrice', fn(Builder $query) => $query->whereColumn('price', '<', 'productStandardPrice'))
+        $products = Product::whereRaw('priceCurrent < productStandardPrice')
             ->orderByDesc('starred')
             ->orderByDesc('created_by')
             ->with(['currentPrice', 'lowestPrice'])

src/Controller/SearchController.php

@@ -17,6 +17,6 @@ final class SearchController extends BaseController
             ->orWhere([['name', 'like', "%$search%"]])
             ->orWhere([['subTitle', 'like', "%$search%"]])->get();
 
-        return $this->render('productList.html.twig', ['products' => $products ?? [], 'search' => $search]);
+        return $this->render('productList.html.twig', ['products' => $products ?? [], 'search' => $search, 'listType' => 'search_'.$search]);
     }
 }

src/Controller/StarController.php

@@ -12,7 +12,18 @@ final class StarController extends BaseController
     #[Route('/star/{productId<\d+>}', name: 'app_star')]
     public function __invoke(int $productId, Request $request): Response
     {
+        $this->cache->deleteItems(['list_all', 'list_promos', 'list_new', 'list_discontinued']);
+        $referer = $request->headers->get('referer');
+        if (str_contains($referer, '/category/')) {
+            preg_match('#/category/(.*)#i', $referer, $matches);
+            $this->cache->deleteItem('list_category_'.urldecode($matches[1]));
+        }
+        if (str_contains($referer, '/search?search=')) {
+            preg_match('#/search\?search=(.*)#i', $referer, $matches);
+            $this->cache->deleteItem('list_search_'.urldecode($matches[1]));
+        }
+
         Product::find($productId)->toggleStarred()->save();
-        return $this->redirect($request->headers->get('referer'));
+        return $this->redirect($referer);
     }
 }

src/DatabaseFactory.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Krzysiej\RyobiCrawler;
+
+use Illuminate\Database\Capsule\Manager as Capsule;
+class DatabaseFactory
+{
+    public static function create(Capsule $capsule): void
+    {
+        $capsule->addConnection(['driver' => 'sqlite', 'database' => __DIR__ . '/../database.sqlite']);
+        $capsule->setAsGlobal();
+        $capsule->bootEloquent();
+    }
+}

src/Kernel.php

@@ -2,6 +2,7 @@
 
 namespace Krzysiej\RyobiCrawler;
 
+use Illuminate\Database\Capsule\Manager;
 use Krzysiej\RyobiCrawler\Twig\AppExtension;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
@@ -34,8 +35,9 @@ class Kernel extends BaseKernel
             'secret' => 'S0ME_SECRET'
         ]);
         $services = $container->services()->defaults()->autowire()->autoconfigure();
+        $services->set(Manager::class)->configurator([DatabaseFactory::class, 'create']);
         $services->load('Krzysiej\\RyobiCrawler\\', __DIR__ )
-            ->exclude('../src/{Models,Twig,Kernel.php}');
+            ->exclude('../src/{Models,Twig,DatabaseFactory.php,Kernel.php}');
         $services->set('twig.extension.cache', AppExtension::class)->tag('twig.extension');
         $services->set(CacheExtension::class)->tag('twig.extension');
         $services->set(FilesystemAdapter::class)->args([

src/Models/Country.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Krzysiej\RyobiCrawler\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+/**
+ * @property string $countryName
+ * @property string $productsUrl
+ * @property string $cultureCode
+ * @property string $currency
+ * @property string $locale
+ */
+class Country extends Model
+{
+    public $timestamps = true;
+
+    public function products(): HasMany
+    {
+        return $this->hasMany(Product::class);
+    }
+}

src/Models/Product.php

@@ -2,8 +2,10 @@
 
 namespace Krzysiej\RyobiCrawler\Models;
 
+use Carbon\Traits\Date;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 
@@ -20,11 +22,22 @@ use function Symfony\Component\Clock\now;
  * @property string $modelCode
  * @property string $url
  * @property int $starred
+ * @property float $priceCurrent
+ * @property float $priceLowest
+ * @property float $productStandardPrice
+ * @property float $lowestProductPrice30Days
+ * @property Date $lastSeen
+ * @property integer $stock
  */
 class Product extends Model
 {
     public $timestamps = true;
-    public $fillable = ['skuID'];
+    public $fillable = ['skuID', 'country_id'];
+
+    public function country(): BelongsTo
+    {
+        return $this->belongsTo(Country::class);
+    }
 
     public function price(): HasMany
     {
@@ -45,6 +58,10 @@ class Product extends Model
     {
         return $this->hasOne(Price::class)->ofMany('price', 'MIN');
     }
+    public function newestPrice(): HasOne
+    {
+        return $this->hasOne(Price::class)->latest();
+    }
 
     public function stock(): HasMany
     {
@@ -53,9 +70,7 @@ class Product extends Model
 
     public function currentStock(): HasOne
     {
-        return $this->stock()->one()->ofMany()->withDefault(function (Stock $stock) {
-            $stock->stock = 0;
-        });
+        return $this->stock()->one()->ofMany()->withDefault(fn (Stock $stock) => $stock->stock = 0);
     }
 
     public function toggleStarred(): self
@@ -75,7 +90,7 @@ class Product extends Model
 
     public function isDiscontinued(): bool
     {
-        return $this->updated_at->format('Y-m-d') < now()->format('Y-m-d');
+        return $this->lastSeen < now()->format('Y-m-d');
     }
     public function isNew(): bool
     {

src/Twig/AppExtension.php

@@ -2,11 +2,11 @@
 
 namespace Krzysiej\RyobiCrawler\Twig;
 
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Krzysiej\RyobiCrawler\Models\Price;
 use Krzysiej\RyobiCrawler\Models\Product;
 use Krzysiej\RyobiCrawler\Models\Stock;
+use Symfony\Component\Routing\RouterInterface;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
 use Twig\TwigFunction;
@@ -15,6 +15,10 @@ use function Symfony\Component\Clock\now;
 
 class AppExtension extends AbstractExtension
 {
+    public function __construct(public RouterInterface $route)
+    {
+    }
+
     public function getFunctions(): array
     {
         return [
@@ -22,6 +26,8 @@ class AppExtension extends AbstractExtension
             new TwigFunction('allCount', [$this, 'allCount']),
             new TwigFunction('newCount', [$this, 'newCount']),
             new TwigFunction('discontinuedCount', [$this, 'discontinuedCount']),
+            new TwigFunction('lowestPriceCount', [$this, 'lowestPriceCount']),
+            new TwigFunction('renderCategoryTree', [$this, 'renderCategoryTree']),
         ];
     }
 
@@ -31,6 +37,7 @@ class AppExtension extends AbstractExtension
             new TwigFilter('findByCreatedAtDate', [$this, 'findByCreatedAtDate']),
         ];
     }
+
     public function allCount(): int
     {
         return Product::count();
@@ -38,7 +45,7 @@ class AppExtension extends AbstractExtension
 
     public function promosCount(): int
     {
-        return Product::whereHas('currentPrice', fn(Builder $query) => $query->whereColumn('price', '<', 'productStandardPrice'))->count();
+        return Product::whereRaw('priceCurrent < productStandardPrice')->count();
     }
 
     public function newCount(): int
@@ -48,11 +55,43 @@ class AppExtension extends AbstractExtension
 
     public function discontinuedCount(): int
     {
-        return Product::where('updated_at', '<', now()->format('Y-m-d'))->count();
+        return Product::where('lastSeen', '<>', now()->format('Y-m-d'))->count();
+    }
+
+    public function lowestPriceCount(): int
+    {
+        return Product::whereRaw('priceCurrent = priceLowest')
+            ->whereRaw('lastSeen = "' . now()->format('Y-m-d') . '"')
+            ->whereRaw('priceCurrent < productStandardPrice')
+            ->count();
     }
 
     public function findByCreatedAtDate(Collection $items, string $date): Stock|Price|null
     {
         return $items->first(fn($item) => str_starts_with($item->created_at, $date));
     }
+
+    public function renderCategoryTree($categories, $current, $level = 0): string
+    {
+        $tree = '';
+        if ($level == 0) {
+            $tree .= '<ul class="list-group list-group-flush">';
+        }
+        foreach ($categories as $categoryName => $category) {
+            $currentClass = $categoryName == $current ? 'list-group-item-primary' : '';
+            $tree .= '<a class="list-group-item list-group-item-action '.$currentClass.' text-decoration-none ms-' . ($level * 2) . '" href="' . $this->route->generate('app_category', ['category' => $categoryName]) . '">' . $categoryName . ' <span class="badge bg-primary rounded-pill">' . $category['count'] . '</span></a>';
+
+            unset($category['count']);
+            if (is_array($category) && count($category) >= 1) {
+                foreach ($category as $subcategoryName => $subCategory) {
+                    $tree .= $this->renderCategoryTree([$subcategoryName => $subCategory], $current, $level + 1);
+                }
+            }
+        }
+        if ($level == 0) {
+            $tree .= '</ul>';
+        }
+        return $tree;
+
+    }
 }

templates/css/bootstrap.min.css

@@ -1,6 +1,6 @@
 @charset "UTF-8";/*!
- * Bootstrap  v5.3.3 (https://getbootstrap.com/)
- * Copyright 2011-2024 The Bootstrap Authors
+ * Bootstrap  v5.3.8 (https://getbootstrap.com/)
+ * Copyright 2011-2025 The Bootstrap Authors
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
- */:root,[data-bs-theme=light]{--bs-blue:#0d6efd;--bs-indigo:#6610f2;--bs-purple:#6f42c1;--bs-pink:#d63384;--bs-red:#dc3545;--bs-orange:#fd7e14;--bs-yellow:#ffc107;--bs-green:#198754;--bs-teal:#20c997;--bs-cyan:#0dcaf0;--bs-black:#000;--bs-white:#fff;--bs-gray:#6c757d;--bs-gray-dark:#343a40;--bs-gray-100:#f8f9fa;--bs-gray-200:#e9ecef;--bs-gray-300:#dee2e6;--bs-gray-400:#ced4da;--bs-gray-500:#adb5bd;--bs-gray-600:#6c757d;--bs-gray-700:#495057;--bs-gray-800:#343a40;--bs-gray-900:#212529;--bs-primary:#0d6efd;--bs-secondary:#6c757d;--bs-success:#198754;--bs-info:#0dcaf0;--bs-warning:#ffc107;--bs-danger:#dc3545;--bs-light:#f8f9fa;--bs-dark:#212529;--bs-primary-rgb:13,110,253;--bs-secondary-rgb:108,117,125;--bs-success-rgb:25,135,84;--bs-info-rgb:13,202,240;--bs-warning-rgb:255,193,7;--bs-danger-rgb:220,53,69;--bs-light-rgb:248,249,250;--bs-dark-rgb:33,37,41;--bs-primary-text-emphasis:#052c65;--bs-secondary-text-emphasis:#2b2f32;--bs-success-text-emphasis:#0a3622;--bs-info-text-emphasis:#055160;--bs-warning-text-emphasis:#664d03;--bs-danger-text-emphasis:#58151c;--bs-light-text-emphasis:#495057;--bs-dark-text-emphasis:#495057;--bs-primary-bg-subtle:#cfe2ff;--bs-secondary-bg-subtle:#e2e3e5;--bs-success-bg-subtle:#d1e7dd;--bs-info-bg-subtle:#cff4fc;--bs-warning-bg-subtle:#fff3cd;--bs-danger-bg-subtle:#f8d7da;--bs-light-bg-subtle:#fcfcfd;--bs-dark-bg-subtle:#ced4da;--bs-primary-border-subtle:#9ec5fe;--bs-secondary-border-subtle:#c4c8cb;--bs-success-border-subtle:#a3cfbb;--bs-info-border-subtle:#9eeaf9;--bs-warning-border-subtle:#ffe69c;--bs-danger-border-subtle:#f1aeb5;--bs-light-border-subtle:#e9ecef;--bs-dark-border-subtle:#adb5bd;--bs-white-rgb:255,255,255;--bs-black-rgb:0,0,0;--bs-font-sans-serif:system-ui,-apple-system,"Segoe UI",Roboto,"Helvetica Neue","Noto Sans","Liberation Sans",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";--bs-font-monospace:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;--bs-gradient:linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0));--bs-body-font-family:var(--bs-font-sans-serif);--bs-body-font-size:1rem;--bs-body-font-weight:400;--bs-body-line-height:1.5;--bs-body-color:#212529;--bs-body-color-rgb:33,37,41;--bs-body-bg:#fff;--bs-body-bg-rgb:255,255,255;--bs-emphasis-color:#000;--bs-emphasis-color-rgb:0,0,0;--bs-secondary-color:rgba(33, 37, 41, 0.75);--bs-secondary-color-rgb:33,37,41;--bs-secondary-bg:#e9ecef;--bs-secondary-bg-rgb:233,236,239;--bs-tertiary-color:rgba(33, 37, 41, 0.5);--bs-tertiary-color-rgb:33,37,41;--bs-tertiary-bg:#f8f9fa;--bs-tertiary-bg-rgb:248,249,250;--bs-heading-color:inherit;--bs-link-color:#0d6efd;--bs-link-color-rgb:13,110,253;--bs-link-decoration:underline;--bs-link-hover-color:#0a58ca;--bs-link-hover-color-rgb:10,88,202;--bs-code-color:#d63384;--bs-highlight-color:#212529;--bs-highlight-bg:#fff3cd;--bs-border-width:1px;--bs-border-style:solid;--bs-border-color:#dee2e6;--bs-border-color-translucent:rgba(0, 0, 0, 0.175);--bs-border-radius:0.375rem;--bs-border-radius-sm:0.25rem;--bs-border-radius-lg:0.5rem;--bs-border-radius-xl:1rem;--bs-border-radius-xxl:2rem;--bs-border-radius-2xl:var(--bs-border-radius-xxl);--bs-border-radius-pill:50rem;--bs-box-shadow:0 0.5rem 1rem rgba(0, 0, 0, 0.15);--bs-box-shadow-sm:0 0.125rem 0.25rem rgba(0, 0, 0, 0.075);--bs-box-shadow-lg:0 1rem 3rem rgba(0, 0, 0, 0.175);--bs-box-shadow-inset:inset 0 1px 2px rgba(0, 0, 0, 0.075);--bs-focus-ring-width:0.25rem;--bs-focus-ring-opacity:0.25;--bs-focus-ring-color:rgba(13, 110, 253, 0.25);--bs-form-valid-color:#198754;--bs-form-valid-border-color:#198754;--bs-form-invalid-color:#dc3545;--bs-form-invalid-border-color:#dc3545}[data-bs-theme=dark]{color-scheme:dark;--bs-body-color:#dee2e6;--bs-body-color-rgb:222,226,230;--bs-body-bg:#212529;--bs-body-bg-rgb:33,37,41;--bs-emphasis-color:#fff;--bs-emphasis-color-rgb:255,255,255;--bs-secondary-color:rgba(222, 226, 230, 0.75);--bs-secondary-color-rgb:222,226,230;--bs-secondary-bg:#343a40;--bs-secondary-bg-rgb:52,58,64;--bs-tertiary-color:rgba(222, 226, 230, 0.5);--bs-tertiary-color-rgb:222,226,230;--bs-tertiary-bg:#2b3035;--bs-tertiary-bg-rgb:43,48,53;--bs-primary-text-emphasis:#6ea8fe;--bs-secondary-text-emphasis:#a7acb1;--bs-success-text-emphasis:#75b798;--bs-info-text-emphasis:#6edff6;--bs-warning-text-emphasis:#ffda6a;--bs-danger-text-emphasis:#ea868f;--bs-light-text-emphasis:#f8f9fa;--bs-dark-text-emphasis:#dee2e6;--bs-primary-bg-subtle:#031633;--bs-secondary-bg-subtle:#161719;--bs-success-bg-subtle:#051b11;--bs-info-bg-subtle:#032830;--bs-warning-bg-subtle:#332701;--bs-danger-bg-subtle:#2c0b0e;--bs-light-bg-subtle:#343a40;--bs-dark-bg-subtle:#1a1d20;--bs-primary-border-subtle:#084298;--bs-secondary-border-subtle:#41464b;--bs-success-border-subtle:#0f5132;--bs-info-border-subtle:#087990;--bs-warning-border-subtle:#997404;--bs-danger-border-subtle:#842029;--bs-light-border-subtle:#495057;--bs-dark-border-subtle:#343a40;--bs-heading-color:inherLine truncated
+ */:root,[data-bs-theme=light]{--bs-blue:#0d6efd;--bs-indigo:#6610f2;--bs-purple:#6f42c1;--bs-pink:#d63384;--bs-red:#dc3545;--bs-orange:#fd7e14;--bs-yellow:#ffc107;--bs-green:#198754;--bs-teal:#20c997;--bs-cyan:#0dcaf0;--bs-black:#000;--bs-white:#fff;--bs-gray:#6c757d;--bs-gray-dark:#343a40;--bs-gray-100:#f8f9fa;--bs-gray-200:#e9ecef;--bs-gray-300:#dee2e6;--bs-gray-400:#ced4da;--bs-gray-500:#adb5bd;--bs-gray-600:#6c757d;--bs-gray-700:#495057;--bs-gray-800:#343a40;--bs-gray-900:#212529;--bs-primary:#0d6efd;--bs-secondary:#6c757d;--bs-success:#198754;--bs-info:#0dcaf0;--bs-warning:#ffc107;--bs-danger:#dc3545;--bs-light:#f8f9fa;--bs-dark:#212529;--bs-primary-rgb:13,110,253;--bs-secondary-rgb:108,117,125;--bs-success-rgb:25,135,84;--bs-info-rgb:13,202,240;--bs-warning-rgb:255,193,7;--bs-danger-rgb:220,53,69;--bs-light-rgb:248,249,250;--bs-dark-rgb:33,37,41;--bs-primary-text-emphasis:#052c65;--bs-secondary-text-emphasis:#2b2f32;--bs-success-text-emphasis:#0a3622;--bs-info-text-emphasis:#055160;--bs-warning-text-emphasis:#664d03;--bs-danger-text-emphasis:#58151c;--bs-light-text-emphasis:#495057;--bs-dark-text-emphasis:#495057;--bs-primary-bg-subtle:#cfe2ff;--bs-secondary-bg-subtle:#e2e3e5;--bs-success-bg-subtle:#d1e7dd;--bs-info-bg-subtle:#cff4fc;--bs-warning-bg-subtle:#fff3cd;--bs-danger-bg-subtle:#f8d7da;--bs-light-bg-subtle:#fcfcfd;--bs-dark-bg-subtle:#ced4da;--bs-primary-border-subtle:#9ec5fe;--bs-secondary-border-subtle:#c4c8cb;--bs-success-border-subtle:#a3cfbb;--bs-info-border-subtle:#9eeaf9;--bs-warning-border-subtle:#ffe69c;--bs-danger-border-subtle:#f1aeb5;--bs-light-border-subtle:#e9ecef;--bs-dark-border-subtle:#adb5bd;--bs-white-rgb:255,255,255;--bs-black-rgb:0,0,0;--bs-font-sans-serif:system-ui,-apple-system,"Segoe UI",Roboto,"Helvetica Neue","Noto Sans","Liberation Sans",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";--bs-font-monospace:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;--bs-gradient:linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0));--bs-body-font-family:var(--bs-font-sans-serif);--bs-body-font-size:1rem;--bs-body-font-weight:400;--bs-body-line-height:1.5;--bs-body-color:#212529;--bs-body-color-rgb:33,37,41;--bs-body-bg:#fff;--bs-body-bg-rgb:255,255,255;--bs-emphasis-color:#000;--bs-emphasis-color-rgb:0,0,0;--bs-secondary-color:rgba(33, 37, 41, 0.75);--bs-secondary-color-rgb:33,37,41;--bs-secondary-bg:#e9ecef;--bs-secondary-bg-rgb:233,236,239;--bs-tertiary-color:rgba(33, 37, 41, 0.5);--bs-tertiary-color-rgb:33,37,41;--bs-tertiary-bg:#f8f9fa;--bs-tertiary-bg-rgb:248,249,250;--bs-heading-color:inherit;--bs-link-color:#0d6efd;--bs-link-color-rgb:13,110,253;--bs-link-decoration:underline;--bs-link-hover-color:#0a58ca;--bs-link-hover-color-rgb:10,88,202;--bs-code-color:#d63384;--bs-highlight-color:#212529;--bs-highlight-bg:#fff3cd;--bs-border-width:1px;--bs-border-style:solid;--bs-border-color:#dee2e6;--bs-border-color-translucent:rgba(0, 0, 0, 0.175);--bs-border-radius:0.375rem;--bs-border-radius-sm:0.25rem;--bs-border-radius-lg:0.5rem;--bs-border-radius-xl:1rem;--bs-border-radius-xxl:2rem;--bs-border-radius-2xl:var(--bs-border-radius-xxl);--bs-border-radius-pill:50rem;--bs-box-shadow:0 0.5rem 1rem rgba(0, 0, 0, 0.15);--bs-box-shadow-sm:0 0.125rem 0.25rem rgba(0, 0, 0, 0.075);--bs-box-shadow-lg:0 1rem 3rem rgba(0, 0, 0, 0.175);--bs-box-shadow-inset:inset 0 1px 2px rgba(0, 0, 0, 0.075);--bs-focus-ring-width:0.25rem;--bs-focus-ring-opacity:0.25;--bs-focus-ring-color:rgba(13, 110, 253, 0.25);--bs-form-valid-color:#198754;--bs-form-valid-border-color:#198754;--bs-form-invalid-color:#dc3545;--bs-form-invalid-border-color:#dc3545}[data-bs-theme=dark]{color-scheme:dark;--bs-body-color:#dee2e6;--bs-body-color-rgb:222,226,230;--bs-body-bg:#212529;--bs-body-bg-rgb:33,37,41;--bs-emphasis-color:#fff;--bs-emphasis-color-rgb:255,255,255;--bs-secondary-color:rgba(222, 226, 230, 0.75);--bs-secondary-color-rgb:222,226,230;--bs-secondary-bg:#343a40;--bs-secondary-bg-rgb:52,58,64;--bs-tertiary-color:rgba(222, 226, 230, 0.5);--bs-tertiary-color-rgb:222,226,230;--bs-tertiary-bg:#2b3035;--bs-tertiary-bg-rgb:43,48,53;--bs-primary-text-emphasis:#6ea8fe;--bs-secondary-text-emphasis:#a7acb1;--bs-success-text-emphasis:#75b798;--bs-info-text-emphasis:#6edff6;--bs-warning-text-emphasis:#ffda6a;--bs-danger-text-emphasis:#ea868f;--bs-light-text-emphasis:#f8f9fa;--bs-dark-text-emphasis:#dee2e6;--bs-primary-bg-subtle:#031633;--bs-secondary-bg-subtle:#161719;--bs-success-bg-subtle:#051b11;--bs-info-bg-subtle:#032830;--bs-warning-bg-subtle:#332701;--bs-danger-bg-subtle:#2c0b0e;--bs-light-bg-subtle:#343a40;--bs-dark-bg-subtle:#1a1d20;--bs-primary-border-subtle:#084298;--bs-secondary-border-subtle:#41464b;--bs-success-border-subtle:#0f5132;--bs-info-border-subtle:#087990;--bs-warning-border-subtle:#997404;--bs-danger-border-subtle:#842029;--bs-light-border-subtle:#495057;--bs-dark-border-subtle:#343a40;--bs-heading-color:inherLine truncated
 /*# sourceMappingURL=bootstrap.min.css.map */

templates/css/bootstrap.min.css.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../scss/mixins/_banner.scss","../../scss/_root.scss","dist/css/bootstrap.css","../../scss/vendor/_rfs.scss","../../scss/mixins/_color-mode.scss","../../scss/_reboot.scss","../../scss/mixins/_border-radius.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/_containers.scss","../../scss/mixins/_container.scss","../../scss/mixins/_breakpoints.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/_tables.scss","../../scss/mixins/_table-variants.scss","../../scss/forms/_labels.scss","../../scss/forms/_form-text.scss","../../scss/forms/_form-control.scss","../../scss/mixins/_transition.scss","../../scss/mixins/_gradients.scss","../../scss/forms/_form-select.scss","../../scss/forms/_form-check.scss","../../scss/forms/_form-range.scss","../../scss/forms/_floating-labels.scss","../../scss/forms/_input-group.scss","../../scss/mixins/_forms.scss","../../scss/_buttons.scss","../../scss/mixins/_buttons.scss","../../scss/_transitions.scss","../../scss/_dropdown.scss","../../scss/mixins/_caret.scss","../../scss/_button-group.scss","../../scss/_nav.scss","../../scss/_navbar.scss","../../scss/_card.scss","../../scss/_accordion.scss","../../scss/_breadcrumb.scss","../../scss/_pagination.scss","../../scss/mixins/_pagination.scss","../../scss/_badge.scss","../../scss/_alert.scss","../../scss/_progress.scss","../../scss/_list-group.scss","../../scss/_close.scss","../../scss/_toasts.scss","../../scss/_modal.scss","../../scss/mixins/_backdrop.scss","../../scss/_tooltip.scss","../../scss/mixins/_reset-text.scss","../../scss/_popover.scss","../../scss/_carousel.scss","../../scss/mixins/_clearfix.scss","../../scss/_spinners.scss","../../scss/_offcanvas.scss","../../scss/_placeholders.scss","../../scss/helpers/_color-bg.scss","../../scss/helpers/_colored-links.scss","../../scss/helpers/_focus-ring.scss","../../scss/helpers/_icon-link.scss","../../scss/helpers/_ratio.scss","../../scss/helpers/_position.scss","../../scss/helpers/_stacks.scss","../../scss/helpers/_visually-hidden.scss","../../scss/mixins/_visually-hidden.scss","../../scss/helpers/_stretched-link.scss","../../scss/helpers/_text-truncation.scss","../../scss/mixins/_text-truncate.scss","../../scss/helpers/_vr.scss","../../scss/mixins/_utilities.scss","../../scss/utilities/_api.scss"],"names":[],"mappings":"iBACE;;;;ACDF,MCOA,sBDEI,UAAA,QAAA,YAAA,QAAA,YAAA,QAAA,UAAA,QAAA,SAAA,QAAA,YAAA,QAAA,YAAA,QAAA,WAAA,QAAA,UAAA,QAAA,UAAA,QAAA,WAAA,KAAA,WAAA,KAAA,UAAA,QAAA,eAAA,QAIA,cAAA,QAAA,cAAA,QAAA,cAAA,QAAA,cAAA,QAAA,cAAA,QAAA,cAAA,QAAA,cAAA,QAAA,cAAA,QAAA,cAAA,QAIA,aAAA,QAAA,eAAA,QAAA,aAAA,QAAA,UAAA,QAAA,aAAA,QAAA,YAAA,QAAA,WAAA,QAAA,UAAA,QAIA,iBAAA,EAAA,CAAA,GAAA,CAAA,IAAA,mBAAA,GAAA,CAAA,GAAA,CAAA,IAAA,iBAAA,EAAA,CAAA,GAAA,CAAA,GAAA,cAAA,EAAA,CAAA,GAAA,CAAA,IAAA,iBAAA,GAAA,CAAA,GAAA,CAAA,EAAA,gBAAA,GAAA,CAAA,EAAA,CAAA,GAAA,eAAA,GAAA,CAAA,GAAA,CAAA,IAAA,cAAA,EAAA,CAAA,EAAA,CAAA,GAIA,2BAAA,QAAA,6BAAA,QAAA,2BAAA,QAAA,wBAAA,QAAA,2BAAA,QAAA,0BAAA,QAAA,yBAAA,QAAA,wBAAA,QAIA,uBAAA,QAAA,yBAAA,QAAA,uBAAA,QAAA,oBAAA,QAAA,uBAAA,QAAA,sBAAA,QAAA,qBAAA,QAAA,oBAAA,QAIA,2BAAA,QAAA,6BAAA,QAAA,2BAAA,QAAA,wBAAA,QAAA,2BAAA,QAAA,0BAAA,QAAA,yBAAA,QAAA,wBAAA,QAGF,eAAA,GAAA,CAAA,GAAA,CAAA,IACA,eAAA,CAAA,CAAA,CAAA,CAAA,EAMA,qBAAA,SAAA,CAAA,aAAA,CAAA,UAAA,CAAA,MAAA,CAAA,gBAAA,CAAA,WAAA,CAAA,iBAAA,CAAA,KAAA,CAAA,UAAA,CAAA,mBAAA,CAAA,gBAAA,CAAA,iBAAA,CAAA,mBACA,oBAAA,cAAA,CAAA,KAAA,CAAA,MAAA,CAAA,QAAA,CAAA,iBAAA,CAAA,aAAA,CAAA,UACA,cAAA,2EAOA,sBAAA,0BE2OI,oBAAA,KFzOJ,sBAAA,IACA,sBAAA,IAKA,gBAAA,QACA,oBAAA,EAAA,CAAA,EAAA,CAAA,GACA,aAAA,KACA,iBAAA,GAAA,CAAA,GAAA,CAAA,IAEA,oBAAA,KACA,wBAAA,CAAA,CAAA,CAAA,CAAA,EAEA,qBAAA,uBACA,yBAAA,EAAA,CAAA,EAAA,CAAA,GACA,kBAAA,QACA,sBAAA,GAAA,CAAA,GAAA,CAAA,IAEA,oBAAA,sBACA,wBAAA,EAAA,CAAA,EAAA,CAAA,GACA,iBAAA,QACA,qBAAA,GAAA,CAAA,GAAA,CAAA,IAGA,mBAAA,QAEA,gBAAA,QACA,oBAAA,EAAA,CAAA,GAAA,CAAA,IACA,qBAAA,UAEA,sBAAA,QACA,0BAAA,EAAA,CAAA,EAAA,CAAA,IAMA,gBAAA,QACA,qBAAA,QACA,kBAAA,QAGA,kBAAA,IACA,kBAAA,MACA,kBAAA,QACA,8BAAA,qBAEA,mBAAA,SACA,sBAAA,QACA,sBAAA,OACA,sBAAA,KACA,uBAAA,KACA,uBAAA,4BACA,wBAAA,MAGA,gBAAA,EAAA,OAAA,KAAA,oBACA,mBAAA,EAAA,SAAA,QAAA,qBACA,mBAAA,EAAA,KAAA,KAAA,qBACA,sBAAA,MAAA,EAAA,IAAA,IAAA,qBAIA,sBAAA,QACA,wBAAA,KACA,sBAAA,yBAIA,sBAAA,QACA,6BAAA,QACA,wBAAA,QACA,+BAAA,QGhHE,qBHsHA,aAAA,KAGA,gBAAA,QACA,oBAAA,GAAA,CAAA,GAAA,CAAA,IACA,aAAA,QACA,iBAAA,EAAA,CAAA,EAAA,CAAA,GAEA,oBAAA,KACA,wBAAA,GAAA,CAAA,GAAA,CAAA,IAEA,qBAAA,0BACA,yBAAA,GAAA,CAAA,GAAA,CAAA,IACA,kBAAA,QACA,sBAAA,EAAA,CAAA,EAAA,CAAA,GAEA,oBAAA,yBACA,wBAAA,GAAA,CAAA,GAAA,CAAA,IACA,iBAAA,QACA,qBAAA,EAAA,CAAA,EAAA,CAAA,GAGE,2BAAA,QAAA,6BAAA,QAAA,2BAAA,QAAA,wBAAA,QAAA,2BAAA,QAAA,0BAAA,QAAA,yBAAA,QAAA,wBAAA,QAIA,uBAAA,QAAA,yBAAA,QAAA,uBAAA,QAAA,oBAAA,QAAA,uBAAA,QAAA,sBAAA,QAAA,qBAAA,QAAA,oBAAA,QAIA,2BAAA,QAAA,6BAAA,QAAA,2BAAA,QAAA,wBAAA,QAAA,2BAAA,QAAA,0BAAA,QAAA,yBAAA,QAAA,wBAAA,QAGF,mBAAA,QAEA,gBAAA,QACA,sBAAA,QACA,oBAAA,GAAA,CAAA,GAAA,CAAA,IACA,0BAAA,GAAA,CAAA,GAAA,CAAA,IAEALine truncated

templates/js/bootstrap.bundle.min.js

@@ -0,0 +1,7 @@
+/*!
+  * Bootstrap v5.3.8 (https://getbootstrap.com/)
+  * Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+  */
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).bootstrap=e()}(this,function(){"use strict";const t=new Map,e={set(e,i,n){t.has(e)||t.set(e,new Map);const s=t.get(e);s.has(i)||0===s.size?s.set(i,n):console.error(`Bootstrap doesn't allow more than one instance per element. Bound instance: ${Array.from(s.keys())[0]}.`)},get:(e,i)=>t.has(e)&&t.get(e).get(i)||null,remove(e,i){if(!t.has(e))return;const n=t.get(e);n.delete(i),0===n.size&&t.delete(e)}},i="transitionend",n=t=>(t&&window.CSS&&window.CSS.escape&&(t=t.replace(/#([^\s"#']+)/g,(t,e)=>`#${CSS.escape(e)}`)),t),s=t=>null==t?`${t}`:Object.prototype.toString.call(t).match(/\s([a-z]+)/i)[1].toLowerCase(),o=t=>{t.dispatchEvent(new Event(i))},r=t=>!(!t||"object"!=typeof t)&&(void 0!==t.jquery&&(t=t[0]),void 0!==t.nodeType),a=t=>r(t)?t.jquery?t[0]:t:"string"==typeof t&&t.length>0?document.querySelector(n(t)):null,l=t=>{if(!r(t)||0===t.getClientRects().length)return!1;const e="visible"===getComputedStyle(t).getPropertyValue("visibility"),i=t.closest("details:not([open])");if(!i)return e;if(i!==t){const e=t.closest("summary");if(e&&e.parentNode!==i)return!1;if(null===e)return!1}return e},c=t=>!t||t.nodeType!==Node.ELEMENT_NODE||!!t.classList.contains("disabled")||(void 0!==t.disabled?t.disabled:t.hasAttribute("disabled")&&"false"!==t.getAttribute("disabled")),h=t=>{if(!document.documentElement.attachShadow)return null;if("function"==typeof t.getRootNode){const e=t.getRootNode();return e instanceof ShadowRoot?e:null}return t instanceof ShadowRoot?t:t.parentNode?h(t.parentNode):null},d=()=>{},u=t=>{t.offsetHeight},f=()=>window.jQuery&&!document.body.hasAttribute("data-bs-no-jquery")?window.jQuery:null,p=[],m=()=>"rtl"===document.documentElement.dir,g=t=>{var e;e=()=>{const e=f();if(e){const i=t.NAME,n=e.fn[i];e.fn[i]=t.jQueryInterface,e.fn[i].Constructor=t,e.fn[i].noConflict=()=>(e.fn[i]=n,t.jQueryInterface)}},"loading"===document.readyState?(p.length||document.addEventListener("DOMContentLoaded",()=>{for(const t of p)t()}),p.push(e)):e()},_=(t,e=[],i=t)=>"function"==typeof t?t.call(...e):i,b=(t,e,n=!0)=>{if(!n)return void _(t);const s=(t=>{if(!t)return 0;let{transitionDuration:e,transitionDelay:i}=window.getComputedStyle(t);const n=Number.parseFloat(e),s=Number.parseFloat(i);return n||s?(e=e.split(",")[0],i=i.split(",")[0],1e3*(Number.parseFloat(e)+Number.parseFloat(i))):0})(e)+5;let r=!1;const a=({target:n})=>{n===e&&(r=!0,e.removeEventListener(i,a),_(t))};e.addEventListener(i,a),setTimeout(()=>{r||o(e)},s)},v=(t,e,i,n)=>{const s=t.length;let o=t.indexOf(e);return-1===o?!i&&n?t[s-1]:t[0]:(o+=i?1:-1,n&&(o=(o+s)%s),t[Math.max(0,Math.min(o,s-1))])},y=/[^.]*(?=\..*)\.|.*/,w=/\..*/,A=/::\d+$/,E={};let T=1;const C={mouseenter:"mouseover",mouseleave:"mouseout"},O=new Set(["click","dblclick","mouseup","mousedown","contextmenu","mousewheel","DOMMouseScroll","mouseover","mouseout","mousemove","selectstart","selectend","keydown","keypress","keyup","orientationchange","touchstart","touchmove","touchend","touchcancel","pointerdown","pointermove","pointerup","pointerleave","pointercancel","gesturestart","gesturechange","gestureend","focus","blur","change","reset","select","submit","focusin","focusout","load","unload","beforeunload","resize","move","DOMContentLoaded","readystatechange","error","abort","scroll"]);function x(t,e){return e&&`${e}::${T++}`||t.uidEvent||T++}function k(t){const e=x(t);return t.uidEvent=e,E[e]=E[e]||{},E[e]}function L(t,e,i=null){return Object.values(t).find(t=>t.callable===e&&t.delegationSelector===i)}function S(t,e,i){const n="string"==typeof e,s=n?i:e||i;let o=N(t);return O.has(o)||(o=t),[n,s,o]}function D(t,e,i,n,s){if("string"!=typeof e||!t)return;let[o,r,a]=S(e,i,n);if(e in C){const t=t=>function(e){if(!e.relatedTarget||e.relatedTarget!==e.delegateTarget&&!e.delegateTarget.contains(e.relatedTarget))return t.call(this,e)};r=t(r)}const l=k(t),c=l[a]||(l[a]={}),h=L(c,r,o?i:null);if(h)return void(h.oneOff=h.oneOff&&s);const d=x(r,e.replace(y,"")),u=o?function(t,e,i){return function n(s){const o=t.querySelectorAll(e);for(let{target:r}=s;r&&r!==this;r=r.parentNode)for(const a of o)if(a===r)return j(s,{delegateTarget:r}),n.oneOff&&P.off(t,s.type,e,i),i.apply(r,[s])}}(t,i,r):function(t,e){return function i(n){return j(n,{delegateTarget:t}),i.oneOff&&P.off(t,n.type,e),e.apply(t,[n])}}(t,r);u.delegationSelector=o?i:null,u.callable=r,u.oneOff=s,u.uidEvent=d,c[d]=u,t.addEventListener(a,u,o)}function $(t,e,i,n,s){const o=L(e[i],n,s);o&&(t.removeEventListener(i,o,Boolean(s)),delete e[i][o.uidEvent])}function I(t,e,i,n){const s=e[i]||{};for(const[o,r]of Object.entries(s))o.includes(n)&&$(t,e,i,r.callable,r.delegationSelector)}function N(t){return t=t.replace(w,""),C[t]||t}const P={on(t,e,i,n){D(t,e,i,n,!1)},one(t,e,i,n){D(t,e,i,n,!0)},off(t,e,i,n){if("string"!=typeof e||!t)return;const[s,o,r]=S(e,i,n),a=r!==e,l=k(t),c=l[rLine truncated
+//# sourceMappingURL=bootstrap.bundle.min.js.map

templates/js/bootstrap.bundle.min.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["elementMap","Map","Data","set","element","key","instance","has","instanceMap","get","size","console","error","Array","from","keys","remove","delete","TRANSITION_END","parseSelector","selector","window","CSS","escape","replace","match","id","toType","object","Object","prototype","toString","call","toLowerCase","triggerTransitionEnd","dispatchEvent","Event","isElement","jquery","nodeType","getElement","length","document","querySelector","isVisible","getClientRects","elementIsVisible","getComputedStyle","getPropertyValue","closedDetails","closest","summary","parentNode","isDisabled","Node","ELEMENT_NODE","classList","contains","disabled","hasAttribute","getAttribute","findShadowRoot","documentElement","attachShadow","getRootNode","root","ShadowRoot","noop","reflow","offsetHeight","getjQuery","jQuery","body","DOMContentLoadedCallbacks","isRTL","dir","defineJQueryPlugin","plugin","callback","$","name","NAME","JQUERY_NO_CONFLICT","fn","jQueryInterface","Constructor","noConflict","readyState","addEventListener","push","execute","possibleCallback","args","defaultValue","executeAfterTransition","transitionElement","waitForTransition","emulatedDuration","transitionDuration","transitionDelay","floatTransitionDuration","Number","parseFloat","floatTransitionDelay","split","getTransitionDurationFromElement","called","handler","target","removeEventListener","setTimeout","getNextActiveElement","list","activeElement","shouldGetNext","isCycleAllowed","listLength","index","indexOf","Math","max","min","namespaceRegex","stripNameRegex","stripUidRegex","eventRegistry","uidEvent","customEvents","mouseenter","mouseleave","nativeEvents","Set","makeEventUid","uid","getElementEvents","findHandler","events","callable","delegationSelector","values","find","event","normalizeParameters","originalTypeEvent","delegationFunction","isDelegated","typeEvent","getTypeEvent","addHandler","oneOff","wrapFunction","relatedTarget","delegateTarget","this","handlers","previousFunction","domElements","querySelectorAll","domElement","hydrateObj","EventHandler","off","type","apply","bootstrapDelegationHandler","bootstrapHandler","removeHandler","Boolean","removeNamespacedHandlers","namespace","storeElementEvent","handlerKey","entries","includes","on","one","inNamespace","isNamespace","startsWith","elementEvent","slice","keyHandlers","trigger","jQueryEvent","bubbles","nativeDispatch","defaultPrevented","isPropagationStopped","isImmediatePropagationStopped","isDefaultPrevented","evt","cancelable","preventDefault","obj","meta","value","_unused","defineProperty","configurable","normalizeData","JSON","parse","decodeURIComponent","normalizeDataKey","chr","Manipulator","setDataAttribute","setAttribute","removeDataAttribute","removeAttribute","getDataAttributes","attributes","bsKeys","dataset","filter","pureKey","charAt","getDataAttribute","Config","Default","DefaultType","Error","_getConfig","config","_mergeConfigObj","_configAfterMerge","_typeCheckConfig","jsonConfig","constructor","configTypes","property","expectedTypes","valueType","RegExp","test","TypeError","toUpperCase","BaseComponent","super","_element","_config","DATA_KEY","dispose","EVENT_KEY","propertyName","getOwnPropertyNames","_queueCallback","isAnimated","getInstance","getOrCreateInstance","VERSION","eventName","getSelector","hrefAttribute","trim","map","sel","join","SelectorEngine","concat","Element","findOne","children","child","matches","parents","ancestor","prev","previous","previousElementSibling","next","nextElementSibling","focusableChildren","focusables","el","getSelectorFromElement","getElementFromSelector","getMultipleElementsFromSelector","enableDismissTrigger","component","method","clickEvent","tagName","EVENT_CLOSE","EVENT_CLOSED","Alert","close","_destroyElement","each","data","undefined","SELECTOR_DATA_TOGGLE","Button","toggle","button","EVENT_TOUCHSTART","EVENT_TOUCHMOVE","EVENT_TOUCHEND","EVENT_POINTERDOWN","EVENT_POINTERUP","endCallback","leftCallback","rightCallback","Swipe","isSupported","_deltaX","_supportPointerEvents","PointerEvent","_initEvents","_start","_eventIsPointerPenTouch","clientX","touches","_end","_handleSwipe","_move","absDeltaX","abs","direction","add","pointerType","navigator","maxTouchPoints","DATA_API_KEY","ARROW_LEFT_KEY","ARROW_RIGHT_KEY","ORDER_NEXT","ORDER_PREV","DIRECTION_LEFT","DIRECTION_RIGHT","EVENT_SLIDE","EVENT_SLID","EVENT_KEYDOWN","EVENT_MOUSEENTER","EVENT_MOUSELEAVE","EVENT_DRAG_START","EVENT_LOAD_DATA_API","EVENT_CLICK_DATA_API","CLASS_NAME_CAROUSEL","CLASS_NAME_ACTIVE","SELECTOR_ACTIVE","SELECTOR_ITEM","SELECTOR_ACTIVE_ITEM","KEY_TO_DIRECTION","ARROW_LEFT_KEY$1","ARROW_RIGHT_KEY$1","interval","keyboard","pause","ride","touch","wrap","Carousel","_interval","_activeElement","_isSliding","touchTimeout","_swipeHelper","_indicatorsElement","_addEventListeners","cycle","_slide","nextWhenVisible","hidden","_clearInterval","_updateInterval","setInterval","_maybeEnableCycle","to","items","_getItems","activeIndex","_getItemIndex",Line truncated

templates/product.html.twig

@@ -10,7 +10,7 @@
                 <td><img src='{{ product.image }}&width=150' class='border rounded p-1' alt='{{ product.name }}'/></td>
                 <td>
                     <a href='{{ path('app_product', {'productId': product.id}) }}' class="text-decoration-none">{{ product.name }}</a>
-                    <span class="badge text-bg-light">{{ product.subTitle }}</span>
+                    <span class="badge text-bg-light"><a href="{{ path('app_search', {'search': product.subTitle}) }}" class="link-underline link-underline-opacity-0 link-dark">{{ product.subTitle }}</a></span>
                 </td>
                 <td>
                     <nav aria-label="breadcrumb" style="--bs-breadcrumb-divider: '>';">
@@ -42,13 +42,14 @@
                             <th>Stock</th>
                         </tr>
                         </thead>
+                        {% set stock = product.stock().get() %}
                         {% for price in product.price %}
                             <tr>
-                                <td>{{ price.price | format_currency('PLN', {}, 'pl') }}</td>
-                                <td>{{ price.lowestProductPrice30Days | format_currency('PLN', {}, 'pl') }}</td>
-                                <td>{{ price.productStandardPrice | format_currency('PLN', {}, 'pl') }}</td>
+                                <td>{{ price.price | format_currency(product.country.currency, {}, product.country.locale) }}</td>
+                                <td>{{ price.lowestProductPrice30Days | format_currency(product.country.currency, {}, product.country.locale) }}</td>
+                                <td>{{ price.productStandardPrice | format_currency(product.country.currency, {}, product.country.locale) }}</td>
                                 <td>{{ price.created_at }}</td>
-                                <td>{{ (product.stock | findByCreatedAtDate(price.created_at | slice(0,10))).stock ?? '' }}</td>
+                                <td>{{ (stock | findByCreatedAtDate(price.created_at | slice(0,10))).stock ?? '' }}</td>
                             </tr>
                         {% endfor %}
                     </table>
@@ -67,7 +68,7 @@
                 labels: ['{{ price_dates|raw }}'],
                 datasets: [
                     {
-                        label: 'Price (PLN)',
+                        label: 'Price ({{ product.country.currency }})',
                         data: {{ price_list|raw }},
                         yAxisID: 'yPrice',
                         tension: 0.1,
@@ -83,6 +84,7 @@
                 ]
             },
             options: {
+                spanGaps: false,
                 responsive: true,
                 animation: false,
                 scales: {
@@ -98,7 +100,7 @@
                         beginAtZero: true,
                         title: {
                             display: true,
-                            text: 'Price (PLN)'
+                            text: 'Price ({{ product.country.currency }})'
                         },
                         grid: {
                             drawOnChartArea: false

templates/productList.html.twig

@@ -1,8 +1,15 @@
 {% extends "template.html.twig" %}
 
 {% block content %}
-{% cache 'list_' ~ listType %}
-<div class="table-responsive">
+    {% cache 'list_' ~ listType %}
+
+        {% if listType starts with 'category_' %}
+            {{ renderCategoryTree(categoryTree, category) | raw }}
+        {% endif %}
+
+
+        {% if (listType starts with 'category_' and category == null)  or not (listType starts with 'category_') or (listType starts with 'category_' and category is not null)   %}
+            <div class="table-responsive">
                 <table class='table table-hover'>
                     <thead>
                     <tr>
@@ -19,46 +26,65 @@
                     {% for product in products %}
                         <tr>
                             <td class="align-middle font-weight-bold h3"><a class="text-warning text-decoration-none"
-                                                                href="{{ path('app_star', {'productId': product.id}) }}">{% if product.starred == true %}★{% else %} ☆ {% endif %}</a></td>
-                <td class="align-middle" style="width: 120px;"><img src='{{ product.image }}&width=70' class='img-thumbnail' alt='{{ product.name }}'/></td>
+                                                                            href="{{ path('app_star', {'productId': product.id}) }}">{% if product.starred == true %}★{% else %} ☆ {% endif %}</a>
+                            </td>
+                            <td class="align-middle" style="width: 120px;"><img src='{{ product.image }}&width=70'
+                                                                                class='img-thumbnail'
+                                                                                alt='{{ product.name }}'/></td>
                             <td class="align-middle">
-                    <a href='{{ path('app_product', {'productId': product.id}) }}' class="text-decoration-none">{{ product.name }}</a>
-                    {% if product.currentStock.stock > 0 %}
-                        <span class="badge text-bg-light">stock: {{ product.currentStock.stock }}</span>
+                                <a href='{{ path('app_product', {'productId': product.id}) }}'
+                                   class="text-decoration-none">{{ product.name }}</a>
+                                {% if product.stock > 0 %}
+                                    <span class="badge text-bg-light">stock: {{ product.stock }}</span>
                                 {% else %}
                                     <span class="badge text-bg-warning">out of stock</span>
                                 {% endif %}
                                 {% if product.isDiscontinued() %}
-                        <span class="badge text-bg-secondary"  data-bs-toggle="tooltip" data-bs-title="Last update: {{ product.updated_at }}">is discontinued</span>
+                                    <span class="badge text-bg-secondary" data-bs-toggle="tooltip"
+                                          data-bs-title="Last update: {{ product.lastSeen }}">is discontinued</span>
                                 {% endif %}
                                 {% if product.isNew() %}
                                     <span class="badge text-bg-success">is new</span>
                                 {% endif %}
-                    <span class="badge text-bg-light">{{ product.subTitle }}</span>
+                                <span class="badge text-bg-light"><a
+                                            href="{{ path('app_search', {'search': product.subTitle}) }}"
+                                            class="link-underline link-underline-opacity-0 link-dark">{{ product.subTitle }}</a></span>
                             </td>
                             <td class="align-middle">
-                    <nav aria-label="breadcrumb" style="--bs-breadcrumb-divider: '>';" >
-                        <ol class="breadcrumb">
+                                <nav aria-label="breadcrumb" style="--bs-breadcrumb-divider: '>';">
+                                    <ol class="breadcrumb mb-0">
                                         {% for category in product.categories %}
-                                <li class="breadcrumb-item" aria-current="page"><a class="breadcrumb-item text-decoration-none"  href="{{ path('app_category', {'category': category}) }}">{{ category }}</a></li>
+                                            <li class="breadcrumb-item" aria-current="page"><a
+                                                        class="breadcrumb-item text-decoration-none"
+                                                        href="{{ path('app_category', {'category': category}) }}">{{ category }}</a>
+                                            </li>
                                         {% endfor %}
                                     </ol>
                                 </nav>
                             </td>
                             <td class="align-middle"><a href='https://pl.ryobitools.eu/{{ product.url }}'>link</a></td>
-                <td class="align-middle text-end">{% if product.lowestPrice.price != product.price.last.price  %}{{ product.lowestPrice.price | format_currency('PLN', {}, 'pl') }}{% endif %}</td>
-                <td class="align-middle text-end">{{ product.price.last.price | format_currency('PLN', {}, 'pl') }}</td>
+                            <td class="align-middle text-end">
+                                {% if product.isDiscontinued() or product.priceCurrent == product.productStandardPrice %}
+                                {{ product.priceLowest | format_currency(product.country.currency, {}, product.country.locale) }}
+                                {% else %}
+                                {% if product.priceLowest != product.priceCurrent %}{{ product.priceLowest | format_currency(product.country.currency, {}, product.country.locale) }}{% else %}
+                                    <span class="badge text-bg-info">now lowest</span>{% endif %}</td>
+                            {% endif %}
+
+                            <td class="align-middle text-end">{{ product.priceCurrent | format_currency(product.country.currency, {}, product.country.locale) }}</td>
                             <td class="align-middle">
                                 <div class="d-flex flex-row">
-                        {% if product.price.last.price != product.price.last.productStandardPrice %}<span
-                                class="badge text-bg-warning text-decoration-line-through flex-fill">{{ product.price.last.productStandardPrice | format_currency('PLN', {}, 'pl') }}</span>&nbsp;<span
-                                class="badge text-bg-success flex-fill">{{ ((1 - product.price.last.price / product.price.last.productStandardPrice)*100)|number_format(0) }}%</span>
+                                    {% if product.priceCurrent != product.productStandardPrice %}<span
+                                            class="badge text-bg-warning text-decoration-line-through flex-fill">{{ product.productStandardPrice | format_currency(product.country.currency, {}, product.country.locale) }}</span>
+                                        <span
+                                                class="badge text-bg-success flex-fill">{{ ((1 - product.priceCurrent / product.productStandardPrice)*100)|number_format(0) }}%</span>
                                     {% endif %}
                                 </div>
                             </td>
                         </tr>
                     {% endfor %}
                 </table>
-</div>
-{% endcache %}
+            </div>
+        {% endif %}
+    {% endcache %}
 {% endblock %}

templates/template.html.twig

@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en">
+<html lang="en" data-bs-theme="light">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
@@ -18,13 +18,16 @@
         </button>
         <div class="collapse navbar-collapse" id="navbarNav">
             <ul class="navbar-nav me-auto mb-2 mb-lg-0">
-                {% cache "menu_count" %}
+                {% cache "menu_count" ~ listType|default('') %}
                     <li class="nav-item">
                         <a class="nav-link {% if app.request.pathinfo == path('app_home') %}active shadow-sm bg-body rounded{% endif %}" aria-current="page" href="{{ path('app_home') }}">All products <span class="badge text-bg-secondary">{{ allCount() }}</span></a>
                     </li>
                     <li class="nav-item">
                         <a class="nav-link {% if app.request.pathinfo == path('app_promos') %}active shadow-sm bg-body rounded{% endif %}" aria-current="page" href="{{ path('app_promos') }}">Promos <span class="badge text-bg-secondary">{{ promosCount() }}</span></a>
                     </li>
+                    <li class="nav-item">
+                        <a class="nav-link {% if app.request.pathinfo == path('app_lowest_price') %}active shadow-sm bg-body rounded{% endif %}" aria-current="page" href="{{ path('app_lowest_price') }}">Lowest price <span class="badge text-bg-secondary">{{ lowestPriceCount() }}</span></a>
+                    </li>
                     <li class="nav-item">
                         <a class="nav-link {% if app.request.pathinfo == path('app_new') %}active shadow-sm bg-body rounded{% endif %}" aria-current="page" href="{{ path('app_new') }}">New in last 30 days <span class="badge text-bg-secondary">{{ newCount() }}</span></a>
                     </li>
@@ -44,8 +47,7 @@
 
 </nav>
 {% block content %}{% endblock %}
-<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
-
+<script src="/templates/js/bootstrap.bundle.min.js"></script>
 </body>
 </html>