Merge pull request 'Implement a caching mechanism' (#26) from feature/cache into master

Reviewed-on: #26

.gitignore

@@ -1,5 +1,5 @@
 /vendor/
 .idea
-database.sqlite
+*.sqlite
 var/cache/
 .env.local

Dockerfile

@@ -1,7 +1,8 @@
 FROM php:8.3-cli
 
 WORKDIR /usr/src/app
-
+ENV PHP_MEMORY_LIMIT=1500M
+RUN echo "memory_limit=1500M" > /usr/local/etc/php/conf.d/memory-limit.ini
 RUN apt-get update && apt-get install -y \
     git \
     unzip \

README.md

@@ -17,10 +17,17 @@
 3. Refresh cache on production by removing cache directory: `rm -rf var/cache`
 4. Start and build image in one go with command: `docker compose up -d --build --force-recreate`
 
+## Bonus 
+
+### Install composer package
+
+1. Run `bin/composer require vendor/package-name`
+
+
 ## Running Cron
 
 For now only way of running `app:scrape` command on schedule is to use host crontab.
-1. Run `crontab -e` command to edit host crontab job file
+1. Run `crontab -e` command to edit a host crontab job file
 2. Add a new line with e.g. line like this `0 1 * * * cd /var/project/directory/ && docker compose exec php-app php console.php app:scrape`
 3. Save and exit file editor. Cron will execute `app:scrape` once per day.
 

bin/cacheclean

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+bin/cli rm -rf var/cache

bin/composer

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

composer.json

@@ -11,7 +11,9 @@
         "symfony/twig-bundle": "^7.1",
         "symfony/dotenv": "^7.1",
         "twig/intl-extra": "^3.13",
-        "twig/extra-bundle": "^3.13"
+        "twig/extra-bundle": "^3.13",
+        "symfony/cache": "^7.2",
+        "twig/cache-extra": "^3.21"
     },
     "autoload": {
         "psr-4": {

console.php

@@ -2,18 +2,16 @@
 
 include_once 'vendor/autoload.php';
 
-use Krzysiej\RyobiCrawler\Command\Migrate;
-use Krzysiej\RyobiCrawler\Command\ScrapeWebsite;
-
-use Symfony\Component\Console\Application;
+use Krzysiej\RyobiCrawler\Kernel;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
 
 if (php_sapi_name() !== 'cli') {
     header('Location: browser.php');
     echo 'Execute this script in cli only';
     exit;
 }
-
-$application = new Application('Ryobi website scraper application', '1.1.1');
-$application->add(new ScrapeWebsite());
-$application->add(new Migrate());
+$kernel = new Kernel('dev', true);
+$application = new Application($kernel);
+$application->setName('Ryobi website scraper application');
+$application->setVersion('1.2.0');
 $application->run();

index.php

@@ -1,46 +1,11 @@
 <?php
 
-use Krzysiej\RyobiCrawler\Twig\AppExtension;
-use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Krzysiej\RyobiCrawler\Kernel;
 use Symfony\Component\Dotenv\Dotenv;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Kernel as BaseKernel;
-use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 
 require 'vendor/autoload.php';
 
-class Kernel extends BaseKernel
-{
-    use MicroKernelTrait;
-
-    public function registerBundles(): iterable
-    {
-        return [
-            new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
-            new Symfony\Bundle\TwigBundle\TwigBundle(),
-            new Twig\Extra\TwigExtraBundle\TwigExtraBundle(),
-        ];
-    }
-
-    protected function configureContainer(ContainerConfigurator $container): void
-    {
-        $container->extension('framework', [
-            'secret' => 'S0ME_SECRET'
-        ]);
-        $container->services()
-            ->load('Krzysiej\\RyobiCrawler\\Controller\\', __DIR__.'/src/Controller/*')
-            ->autowire()
-            ->autoconfigure()
-        ;
-        $container->services()->set(AppExtension::class)->tag('twig.extension');
-    }
-
-    protected function configureRoutes(RoutingConfigurator $routes): void
-    {
-        $routes->import(__DIR__.'/src/Controller/', 'attribute');
-    }
-}
 (new Dotenv())->bootEnv(__DIR__.'/.env');
 
 $kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']);

src/Command/CacheWarmCommand.php

@@ -0,0 +1,84 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Krzysiej\RyobiCrawler\Command;
+
+use Symfony\Component\Console\Helper\ProgressBar;
+use Symfony\Component\HttpFoundation\Request;
+use Illuminate\Database\Capsule\Manager as Capsule;
+use Krzysiej\RyobiCrawler\Models\Product;
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Twig\Environment;
+
+#[AsCommand(name: 'app:cache:warm-twig', description: '')]
+class CacheWarmCommand extends Command
+{
+    public function __construct(
+        private Environment $twig,
+        private RequestStack $requestStack,
+        private FilesystemAdapter $cache,
+    ) {
+        parent::__construct();
+    }
+
+    public function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $this->cache->clear();
+
+        $capsule = new Capsule;
+        $capsule->addConnection([
+            'driver' => 'sqlite',
+            'database' => __DIR__ . '/../../database.sqlite',
+        ]);
+        $capsule->setAsGlobal();
+        $capsule->bootEloquent();
+
+        $progress = new ProgressBar($output);
+        $progress->start();
+        $products = Product::with([
+            'price' => fn($query) => $query->orderBy('created_at', 'desc'),
+            'stock' => fn($query) => $query->orderBy('created_at', 'desc'),
+        ])->get();
+        $progress->setMaxSteps(count($products));
+
+        $request = Request::create('/cache-warm');
+        $this->requestStack->push($request);
+
+        foreach ($products as $product) {
+            $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();
+            $this->twig->render('product.html.twig', [
+                'product' => $product,
+                'price_list' => $this->prepareChartData($priceDates, $priceList),
+                'stock_list' => $this->prepareChartData($stockDates, $stockList),
+                'price_dates' => implode("','", $priceDates),
+            ]);
+            $progress->advance();
+        }
+
+        $progress->finish();
+        $output->writeln('');
+        $output->writeln('DONE');
+
+        return Command::SUCCESS;
+    }
+
+    private function prepareChartData($set1, $set2): string
+    {
+        $data = [];
+        foreach ($set1 as $key => $value) {
+            $data[] = ['x' => $value, 'y' => $set2[$key]];
+        }
+        $stringData = json_encode($data);
+
+        return str_replace(['"x"', '"y"'], ['x', 'y'], $stringData);
+    }
+}

src/Command/ScrapeWebsite.php

@@ -40,7 +40,6 @@ class ScrapeWebsite extends Command
         $products = $this->getProducts();
         $progress->setMaxSteps(count($products));
         foreach ($products as $product) {
-            //dd($product);
             $this->saveProduct($product);
             $progress->advance();
         }
@@ -91,6 +90,7 @@ class ScrapeWebsite extends Command
         $productModel->variantCode = $product->variantCode;
         $productModel->modelCode = $product->modelCode;
         $productModel->url = $product->url;
+        $productModel->touch('updated_at');
         $productModel->save();
         $priceExists = $productModel->price()->whereRaw("strftime('%Y-%m-%d', created_at) = ?", [date('Y-m-d')])->exists();
 

src/Controller/BaseController.php

@@ -2,9 +2,8 @@
 
 namespace Krzysiej\RyobiCrawler\Controller;
 
-use Illuminate\Database\Eloquent\Builder;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Twig\Environment;
 use Illuminate\Database\Capsule\Manager as Capsule;
 
@@ -12,26 +11,11 @@ class BaseController extends AbstractController
 {
     protected Environment $twig;
 
-    public function __construct()
+    public function __construct(protected FilesystemAdapter $cache)
     {
         $capsule = new Capsule;
         $capsule->addConnection(['driver' => 'sqlite', 'database' => __DIR__ . '/../../database.sqlite']);
         $capsule->setAsGlobal();
         $capsule->bootEloquent();
     }
-
-    protected function handleOrderProducts(Builder $builder, Request $request): Builder
-    {
-        $builder->orderByDesc('starred')->orderByDesc('created_by');
-        if ($request->query->get('order')) {
-            $orderField = $request->query->get('order');
-            $direction = 'desc';
-            if (str_starts_with($orderField, '-')) {
-                $direction = 'asc';
-            }
-            $builder->orderBy($request->query->get('order'), $direction);
-        }
-
-        return $builder;
-    }
 }

src/Controller/CategoryController.php

@@ -11,6 +11,10 @@ final class CategoryController extends BaseController
     #[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]);
+        }
+
         $products = Product::with('price')
             ->selectRaw('products.*')
             ->distinct('products.id')
@@ -19,6 +23,7 @@ final class CategoryController extends BaseController
             ->orderByDesc('starred')
             ->orderByDesc('created_by')
             ->get();
-        return $this->render('productList.html.twig', ['products' => $products]);
+
+        return $this->render('productList.html.twig', ['products' => $products, 'listType' => 'category_'.$category]);
     }
 }

src/Controller/DiscontinuedController.php

@@ -0,0 +1,27 @@
+<?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 DiscontinuedController extends BaseController
+{
+    #[Route('/discontinued', name: 'app_discontinued')]
+    public function __invoke(): Response
+    {
+        if($this->cache->getItem('list_discontinued')->isHit()) {
+            return $this->render('productList.html.twig', ['listType' => 'discontinued']);
+        }
+
+        $products = Product::where('updated_at', '<', now()->format('Y-m-d'))
+            ->orderByDesc('starred')
+            ->orderByDesc('created_by')
+            ->with(['currentPrice'])
+            ->get();
+        return $this->render('productList.html.twig', ['products' => $products, 'listType' => 'discontinued']);
+    }
+}

src/Controller/IndexController.php

@@ -3,17 +3,22 @@
 namespace Krzysiej\RyobiCrawler\Controller;
 
 use Krzysiej\RyobiCrawler\Models\Product;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
 
 final class IndexController extends BaseController
 {
     #[Route('/', name: 'app_home')]
-    public function __invoke(Request $request): Response
+    public function __invoke(): Response
     {
-        $products = Product::with(['currentStock', 'price', 'currentPrice']);
-        $products = $this->handleOrderProducts($products, $request)->get();
-        return $this->render('productList.html.twig', ['products' => $products]);
+        if($this->cache->getItem('list_all')->isHit()) {
+            return $this->render('productList.html.twig', ['listType' => 'all']);
+        }
+        $products = Product::with(['currentStock', 'price'])
+            ->orderByDesc('starred')
+            ->orderByDesc('created_by')
+            ->get();
+
+        return $this->render('productList.html.twig', ['products' => $products, 'listType' => 'all']);
     }
 }

src/Controller/NewController.php

@@ -7,18 +7,22 @@ use Krzysiej\RyobiCrawler\Models\Product;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
 
+use function Symfony\Component\Clock\now;
+
 final class NewController extends BaseController
 {
     #[Route('/new', name: 'app_new')]
     public function __invoke(): Response
     {
-        $date = (new \DateTime())->modify('-30 days')->format('Y-m-d');
-        $products = Product::where('created_at', '>', $date)
+        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'))
             ->orderByDesc('starred')
-            ->orderByDesc('name')
             ->orderByDesc('created_by')
             ->with(['currentPrice'])
             ->get();
-        return $this->render('productList.html.twig', ['products' => $products]);
+        return $this->render('productList.html.twig', ['products' => $products, 'listType' => 'new']);
     }
 }

src/Controller/ProductController.php

@@ -3,6 +3,7 @@
 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;
@@ -19,6 +20,10 @@ 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()) {
+            return $this->render('product.html.twig', ['product' => ['id' => $productId]]);
+        }
+
         $product = Product::with([
             'price' => fn($query) => $query->orderBy('created_at', 'desc'),
             'stock' => fn($query) => $query->orderBy('created_at', 'desc'),

src/Controller/PromosController.php

@@ -12,11 +12,15 @@ final class PromosController extends BaseController
     #[Route('/promos', name: 'app_promos')]
     public function __invoke(): Response
     {
+        if($this->cache->getItem('list_promos')->isHit()) {
+            return $this->render('productList.html.twig', ['listType' => 'promos']);
+        }
+
         $products = Product::whereHas('currentPrice', fn(Builder $query) => $query->whereColumn('price', '<', 'productStandardPrice'))
             ->orderByDesc('starred')
             ->orderByDesc('created_by')
             ->with(['currentPrice'])
             ->get();
-        return $this->render('productList.html.twig', ['products' => $products]);
+        return $this->render('productList.html.twig', ['products' => $products, 'listType' => 'promos']);
     }
 }

src/Kernel.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace Krzysiej\RyobiCrawler;
+
+use Krzysiej\RyobiCrawler\Twig\AppExtension;
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
+use Symfony\Bundle\TwigBundle\TwigBundle;
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\HttpKernel\Kernel as BaseKernel;
+use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+use Twig\Extra\Cache\CacheExtension;
+use Twig\Extra\Cache\CacheRuntime;
+use Twig\Extra\TwigExtraBundle\TwigExtraBundle;
+
+class Kernel extends BaseKernel
+{
+    use MicroKernelTrait;
+
+    public function registerBundles(): iterable
+    {
+        return [
+            new FrameworkBundle(),
+            new TwigBundle(),
+            new TwigExtraBundle(),
+        ];
+    }
+
+    protected function configureContainer(ContainerConfigurator $container): void
+    {
+        $container->extension('framework', [
+            'secret' => 'S0ME_SECRET'
+        ]);
+        $services = $container->services()->defaults()->autowire()->autoconfigure();
+        $services->load('Krzysiej\\RyobiCrawler\\Controller\\', __DIR__ . '/Controller/*');
+        $services->load('Krzysiej\\RyobiCrawler\\Command\\', __DIR__ . '/Command/*')->tag('console.command');
+        $services->set('twig.extension.cache', AppExtension::class)->tag('twig.extension');
+        $services->set(CacheExtension::class)->tag('twig.extension');
+        $services->set(FilesystemAdapter::class)->args([
+                '',      // namespace
+                0,       // default lifetime
+                __DIR__ . '/../var/cache/twig_blocks'  // custom path
+            ]);
+        $services->set('twig.runtime.cache', CacheRuntime::class)->args([new Reference(FilesystemAdapter::class)])->tag('twig.runtime');
+    }
+
+    protected function configureRoutes(RoutingConfigurator $routes): void
+    {
+        $routes->import(__DIR__ . '/Controller/', 'attribute');
+    }
+}

src/Models/Product.php

@@ -7,6 +7,8 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 
+use function Symfony\Component\Clock\now;
+
 /**
  * @property integer $skuID
  * @property string $name
@@ -66,9 +68,12 @@ class Product extends Model
         );
     }
 
-    public function isnew(): bool
+    public function isDiscontinued(): bool
     {
-        $newDate = (new \DateTime())->modify('-30 days')->format('Y-m-d');
-        return $this->created_at->format('Y-m-d') > $newDate;
+        return $this->updated_at->format('Y-m-d') < now()->format('Y-m-d');
+    }
+    public function isNew(): bool
+    {
+        return $this->created_at->format('Y-m-d') > now()->modify('-30 days')->format('Y-m-d');
     }
 }

src/Twig/AppExtension.php

@@ -11,13 +11,17 @@ use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
 use Twig\TwigFunction;
 
+use function Symfony\Component\Clock\now;
+
 class AppExtension extends AbstractExtension
 {
     public function getFunctions(): array
     {
         return [
             new TwigFunction('promosCount', [$this, 'promosCount']),
+            new TwigFunction('allCount', [$this, 'allCount']),
             new TwigFunction('newCount', [$this, 'newCount']),
+            new TwigFunction('discontinuedCount', [$this, 'discontinuedCount']),
         ];
     }
 
@@ -27,16 +31,24 @@ class AppExtension extends AbstractExtension
             new TwigFilter('findByCreatedAtDate', [$this, 'findByCreatedAtDate']),
         ];
     }
+    public function allCount(): int
+    {
+        return Product::count();
+    }
 
     public function promosCount(): int
     {
-        return Product::whereHas('currentPrice', fn(Builder $query) => $query->whereColumn('price', '<', 'productStandardPrice'))->with(['currentPrice'])->count();
+        return Product::whereHas('currentPrice', fn(Builder $query) => $query->whereColumn('price', '<', 'productStandardPrice'))->count();
     }
 
     public function newCount(): int
     {
-        $date = (new \DateTime())->modify('-30 days')->format('Y-m-d');
-        return Product::where('created_at', '>', $date)->count();
+        return Product::where('created_at', '>', now()->modify('-30 days')->format('Y-m-d'))->count();
+    }
+
+    public function discontinuedCount(): int
+    {
+        return Product::where('updated_at', '<', now()->format('Y-m-d'))->count();
     }
 
     public function findByCreatedAtDate(Collection $items, string $date): Stock|Price|null

templates/js/script.js

@@ -0,0 +1,4 @@
+(function() {
+    const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]')
+    const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl))
+})();

templates/product.html.twig

@@ -1,57 +1,61 @@
 {% extends "template.html.twig" %}
 
 {% block content %}
-    <table class='table table-hover'>
-        <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 %}★{% else %} ☆ {% endif %}</a></td>
-            <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>
-            </td>
-            <td>
-                <nav aria-label="breadcrumb" style="--bs-breadcrumb-divider: '>';" >
-                    <ol class="breadcrumb">
-                        {% 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>
-                        {%  endfor %}
-                    </ol>
-                </nav>
-            </td>
-            <td><a href='https://pl.ryobitools.eu/{{ product.url }}'>link</a></td>
-        </tr>
-        <tr>
-            <td colspan="5">
-                <div style="width: 800px;">
-                    <canvas id="price"></canvas>
-                </div>
-            </td>
-        </tr>
-        <tr>
-            <td colspan="5">
-                <table class='table table-hover table-sm mb-0'>
-                    <thead>
-                    <tr>
-                        <th>price</th>
-                        <th>lowest product price in 30 days</th>
-                        <th colspan='2'>standard price</th>
-                        <th>Stock</th>
-                    </tr>
-                    </thead>
-                    {% for price in product.price %}
+{% cache 'product' ~ product.id %}
+    <div class="table-responsive">
+        <table class='table table-hover'>
+            <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 %}★{% else %} ☆ {% endif %}</a></td>
+                <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>
+                </td>
+                <td>
+                    <nav aria-label="breadcrumb" style="--bs-breadcrumb-divider: '>';">
+                        <ol class="breadcrumb">
+                            {% 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>
+                            {% endfor %}
+                        </ol>
+                    </nav>
+                </td>
+                <td><a href='https://pl.ryobitools.eu/{{ product.url }}'>link</a></td>
+            </tr>
+            <tr>
+                <td colspan="5">
+                    <div style="width: 800px;">
+                        <canvas id="price"></canvas>
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="5">
+                    <table class='table table-hover table-sm mb-0'>
+                        <thead>
                         <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.created_at }}</td>
-                            <td>{{ (product.stock | findByCreatedAtDate(price.created_at | slice(0,10))).stock ?? '' }}</td>
+                            <th>price</th>
+                            <th>lowest product price in 30 days</th>
+                            <th colspan='2'>standard price</th>
+                            <th>Stock</th>
                         </tr>
-                    {% endfor %}
-                </table>
-            </td>
-        </tr>
-    </table>
+                        </thead>
+                        {% 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.created_at }}</td>
+                                <td>{{ (product.stock | findByCreatedAtDate(price.created_at | slice(0,10))).stock ?? '' }}</td>
+                            </tr>
+                        {% endfor %}
+                    </table>
+                </td>
+            </tr>
+        </table>
+    </div>
     <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
 
     <script>
@@ -126,5 +130,6 @@
             }
         });
     </script>
+{% endcache %}
 {% endblock %}
 

templates/productList.html.twig

@@ -1,16 +1,17 @@
 {% extends "template.html.twig" %}
 
 {% block content %}
-    {{ app.request.get('order') }}
+{% cache 'list_' ~ listType %}
+<div class="table-responsive">
     <table class='table table-hover'>
         <thead>
         <tr>
             <th></th>
             <th></th>
-            <th><a href="{{ path( app.request.get('_route') , {'order': app.request.get('order') is same as('-name')?'name':'-name'|default('-name')}) }}">Name</a></th>
+            <th>Name</th>
             <th>Categories</th>
             <th></th>
-            <th><a href="{{ path( app.request.get('_route') , {'order': app.request.get('order') is same as('-price')?'price':'-price'|default('-price')}) }}">Price</a></th>
+            <th>Price</th>
             <th></th>
         </tr>
         </thead>
@@ -26,7 +27,10 @@
                     {% else %}
                         <span class="badge text-bg-warning">out of stock</span>
                     {% endif %}
-                    {% if product.isnew() %}
+                    {% if product.isDiscontinued() %}
+                        <span class="badge text-bg-secondary"  data-bs-toggle="tooltip" data-bs-title="Last update: {{ product.updated_at }}">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>
@@ -42,10 +46,17 @@
                 </td>
                 <td class="align-middle"><a href='https://pl.ryobitools.eu/{{ product.url }}'>link</a></td>
                 <td class="align-middle">{{ product.price.last.price | format_currency('PLN', {}, 'pl') }}</td>
-                <td class="align-middle">{% if product.price.last.price != product.price.last.productStandardPrice %}<span
-                            class="badge text-bg-warning text-decoration-line-through">{{ product.price.last.productStandardPrice | format_currency('PLN', {}, 'pl') }}</span>&nbsp;<span
-                            class="badge text-bg-success">{{ ((1 - product.price.last.price / product.price.last.productStandardPrice)*100)|number_format(0) }}%</span>{% else %}{% endif %}</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>
+                        {% endif %}
+                    </div>
+                </td>
             </tr>
         {% endfor %}
     </table>
+</div>
+{% endcache %}
 {% endblock %}

templates/template.html.twig

@@ -5,8 +5,8 @@
     <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>Ryobi crawler</title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH"
-          crossorigin="anonymous"/>
+    <link href="/templates/css/bootstrap.min.css" rel="stylesheet" />
+    <script src="/templates/js/script.js" defer></script>
 </head>
 <body>
 <nav class="navbar navbar-expand-lg sticky-top bg-body-tertiary border-bottom border-secondary border-1">
@@ -18,16 +18,26 @@
         </button>
         <div class="collapse navbar-collapse" id="navbarNav">
             <ul class="navbar-nav me-auto mb-2 mb-lg-0">
-                <li class="nav-item">
-                    <a class="nav-link active" 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 active" aria-current="page" href="{{ path('app_new') }}">New in last 30 days <span class="badge text-bg-secondary">{{ newCount() }}</span></a>
-                </li>
+                {% cache "menu_count" %}
+                    <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_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>
+                    <li class="nav-item">
+                        <a class="nav-link {% if app.request.pathinfo == path('app_discontinued') %}active shadow-sm bg-body rounded{% endif %}" aria-current="page" href="{{ path('app_discontinued') }}">Discontinued <span class="badge text-bg-secondary">{{ discontinuedCount() }}</span></a>
+                    </li>
+                {% endcache %}
             </ul>
-            <form class="d-flex col-lg-6 col-sm-8" role="search" action="{{ path('app_search') }}">
-                <input class="form-control me-2" type="search" name="search" placeholder="Search term eg. 36v or RCS18X" value="{{ search|default('') }}" aria-label="Search">
+
+            <form class="form-floating d-flex col-lg-6 col-sm-8" role="search" action="{{ path('app_search') }}">
+                <input class="form-control me-2 form-control-sm" type="search" id="floatingInputValue" name="search" placeholder="Search term eg. 36v or RCS18X" value="{{ search|default('') }}">
                 <button class="btn btn-outline-success" type="submit">Search</button>
+                <label for="floatingInputValue">Search term eg. 36v or RCS18X</label>
             </form>
         </div>
     </div>