composer.json

@@ -10,7 +10,9 @@
         "symfony/http-kernel": "^7.1",
         "symfony/framework-bundle": "^7.1",
         "symfony/twig-bundle": "^7.1",
-        "symfony/dotenv": "^7.1"
+        "symfony/dotenv": "^7.1",
+        "twig/intl-extra": "^3.13",
+        "twig/extra-bundle": "^3.13"
     },
     "autoload": {
         "psr-4": {

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f2dfc64ddf11dc6a94b37f7eac9ffc0f",
+    "content-hash": "4eef5feb5e2635d7fb7c69c8ed01a84c",
     "packages": [
         {
             "name": "brick/math",
@@ -2949,6 +2949,92 @@
             ],
             "time": "2024-09-21T06:09:21+00:00"
         },
+        {
+            "name": "symfony/intl",
+            "version": "v7.1.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/intl.git",
+                "reference": "e56b243fc0afa5a12bd11dace4002ada5a7d99f8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/intl/zipball/e56b243fc0afa5a12bd11dace4002ada5a7d99f8",
+                "reference": "e56b243fc0afa5a12bd11dace4002ada5a7d99f8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3"
+            },
+            "conflict": {
+                "symfony/string": "<7.1"
+            },
+            "require-dev": {
+                "symfony/filesystem": "^6.4|^7.0",
+                "symfony/var-exporter": "^6.4|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Intl\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/",
+                    "/Resources/data/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                },
+                {
+                    "name": "Eriksen Costa",
+                    "email": "eriksen.costa@infranology.com.br"
+                },
+                {
+                    "name": "Igor Wiedler",
+                    "email": "igor@wiedler.ch"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides access to the localization data of the ICU library",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "i18n",
+                "icu",
+                "internationalization",
+                "intl",
+                "l10n",
+                "localization"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/intl/tree/v7.1.8"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-11-08T15:46:42+00:00"
+        },
         {
             "name": "symfony/polyfill-ctype",
             "version": "v1.31.0",
@@ -4194,6 +4280,144 @@
             ],
             "time": "2024-06-28T08:00:31+00:00"
         },
+        {
+            "name": "twig/extra-bundle",
+            "version": "v3.13.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/twigphp/twig-extra-bundle.git",
+                "reference": "21a9a7aa9f79d4493bb6fed4eb2794339f9551f5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/twigphp/twig-extra-bundle/zipball/21a9a7aa9f79d4493bb6fed4eb2794339f9551f5",
+                "reference": "21a9a7aa9f79d4493bb6fed4eb2794339f9551f5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0.2",
+                "symfony/framework-bundle": "^5.4|^6.4|^7.0",
+                "symfony/twig-bundle": "^5.4|^6.4|^7.0",
+                "twig/twig": "^3.0|^4.0"
+            },
+            "require-dev": {
+                "league/commonmark": "^1.0|^2.0",
+                "symfony/phpunit-bridge": "^6.4|^7.0",
+                "twig/cache-extra": "^3.0",
+                "twig/cssinliner-extra": "^3.0",
+                "twig/html-extra": "^3.0",
+                "twig/inky-extra": "^3.0",
+                "twig/intl-extra": "^3.0",
+                "twig/markdown-extra": "^3.0",
+                "twig/string-extra": "^3.0"
+            },
+            "type": "symfony-bundle",
+            "autoload": {
+                "psr-4": {
+                    "Twig\\Extra\\TwigExtraBundle\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
+                }
+            ],
+            "description": "A Symfony bundle for extra Twig extensions",
+            "homepage": "https://twig.symfony.com",
+            "keywords": [
+                "bundle",
+                "extra",
+                "twig"
+            ],
+            "support": {
+                "source": "https://github.com/twigphp/twig-extra-bundle/tree/v3.13.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/twig/twig",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-01T20:39:12+00:00"
+        },
+        {
+            "name": "twig/intl-extra",
+            "version": "v3.13.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/twigphp/intl-extra.git",
+                "reference": "1b8d78c5db08bdc61015fd55009d2e84b3aa7e38"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/twigphp/intl-extra/zipball/1b8d78c5db08bdc61015fd55009d2e84b3aa7e38",
+                "reference": "1b8d78c5db08bdc61015fd55009d2e84b3aa7e38",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0.2",
+                "symfony/intl": "^5.4|^6.4|^7.0",
+                "twig/twig": "^3.13|^4.0"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "^6.4|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Twig\\Extra\\Intl\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
+                }
+            ],
+            "description": "A Twig extension for Intl",
+            "homepage": "https://twig.symfony.com",
+            "keywords": [
+                "intl",
+                "twig"
+            ],
+            "support": {
+                "source": "https://github.com/twigphp/intl-extra/tree/v3.13.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/twig/twig",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-03T13:08:40+00:00"
+        },
         {
             "name": "twig/twig",
             "version": "v3.14.0",

index.php

@@ -1,5 +1,6 @@
 <?php
 
+use Krzysiej\RyobiCrawler\Twig\AppExtension;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symfony\Component\Dotenv\Dotenv;
@@ -17,7 +18,8 @@ class Kernel extends BaseKernel
     {
         return [
             new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
-            new Symfony\Bundle\TwigBundle\TwigBundle()
+            new Symfony\Bundle\TwigBundle\TwigBundle(),
+            new Twig\Extra\TwigExtraBundle\TwigExtraBundle(),
         ];
     }
 
@@ -31,6 +33,7 @@ class Kernel extends BaseKernel
             ->autowire()
             ->autoconfigure()
         ;
+        $container->services()->set(AppExtension::class)->tag('twig.extension');
     }
 
     protected function configureRoutes(RoutingConfigurator $routes): void

index_old.php

@@ -1,48 +0,0 @@
-<?php
-
-include_once 'vendor/autoload.php';
-
-use Krzysiej\RyobiCrawler\Controller\CategoryController;
-use Krzysiej\RyobiCrawler\Controller\IndexController;
-use Krzysiej\RyobiCrawler\Controller\ProductController;
-use Krzysiej\RyobiCrawler\Controller\PromosController;
-use Krzysiej\RyobiCrawler\Controller\SearchController;
-use Krzysiej\RyobiCrawler\Controller\StarController;
-use Symfony\Component\Routing\Matcher\UrlMatcher;
-use Symfony\Component\Routing\RequestContext;
-use Symfony\Component\Routing\Route;
-use Symfony\Component\Routing\RouteCollection;
-
-if (!file_exists('database.sqlite')) {
-    exit('Database file <code>database.sqlite</code> missing. Run docker compose <blockquote>docker compose exec php-app php index.php app:migrate</blockquote> to create it.');
-}
-$productRoute = new Route('/product/{product_id<\d+>}', ['_controller' => ProductController::class]);
-$searchRoute = new Route('/?search={search_term}', ['_controller' => SearchController::class]);
-$categoryRoute = new Route('/category/{category_name}', ['_controller' => CategoryController::class]);
-$starRoute = new Route('/star/{product_id}', ['_controller' => StarController::class]);
-$promosRoute = new Route('/promos', ['_controller' => PromosController::class]);
-$indexRoute = new Route('/', ['_controller' => IndexController::class]);
-$routes = new RouteCollection();
-
-$routes->add('product_show', $productRoute);
-$routes->add('search_show', $searchRoute);
-$routes->add('category_show', $categoryRoute);
-$routes->add('start_show', $starRoute);
-$routes->add('promos_show', $promosRoute);
-$routes->add('index_show', $indexRoute);
-
-$context = new RequestContext();
-$matcher = new UrlMatcher($routes, $context);
-try {
-    $parameters = $matcher->match($_SERVER['REQUEST_URI']);
-} catch (Exception $e) {
-    die($e->getMessage());
-}
-
-match ($parameters['_controller']) {
-    SearchController::class => (new $parameters['_controller']())($parameters['search_term']),
-    CategoryController::class => (new $parameters['_controller']())($parameters['category_name']),
-    ProductController::class, StarController::class => (new $parameters['_controller']())($parameters['product_id']),
-    PromosController::class, IndexController::class => (new $parameters['_controller']())(),
-    default => throw new Exception('Route not found')
-};

src/Controller/ProductController.php

@@ -2,7 +2,6 @@
 
 namespace Krzysiej\RyobiCrawler\Controller;
 
-use Illuminate\Support\ItemNotFoundException;
 use Krzysiej\RyobiCrawler\Models\Product;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
@@ -21,7 +20,8 @@ final class ProductController extends BaseController
     public function __invoke(int $productId): Response
     {
         $product = Product::with([
-            'price' => fn($query) => $query->orderBy('created_at', 'desc')
+            'price' => fn($query) => $query->orderBy('created_at', 'desc'),
+            'stock' => fn($query) => $query->orderBy('created_at', 'desc'),
         ])->find($productId);
 
         if(null === $product) {

src/Twig/AppExtension.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Krzysiej\RyobiCrawler\Twig;
+
+use Illuminate\Database\Eloquent\Builder;
+use Krzysiej\RyobiCrawler\Models\Product;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFunction;
+
+class AppExtension extends AbstractExtension
+{
+    public function getFunctions()
+    {
+        return [
+            new TwigFunction('promosCount', [$this, 'promosCount']),
+        ];
+    }
+
+    public function promosCount(): int
+    {
+        return Product::whereHas('currentPrice', fn(Builder $query) => $query->whereColumn('price', '<', 'productStandardPrice'))->with(['currentPrice'])->count();
+    }
+}

templates/product.html.twig

@@ -6,7 +6,7 @@
             <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_home') }}/product/{{ product.id }}' class="text-decoration-none">{{ product.name }}</a></td>
+            <td><a href='{{ path('app_product', {'productId': product.id}) }}' class="text-decoration-none">{{ product.name }}</a></td>
             <td>{{ product.subTitle }}</td>
             <td>
                 <ul class='nav'>
@@ -36,9 +36,9 @@
                     </thead>
                     {% for price in product.price %}
                         <tr>
-                            <td>{{ price.price }}</td>
-                            <td>{{ price.lowestProductPrice30Days }}</td>
-                            <td>{{ price.productStandardPrice }}</td>
+                            <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>
                         </tr>
                     {% endfor %}

templates/productList.html.twig

@@ -28,8 +28,8 @@
                     </ul>
                 </td>
                 <td class="align-middle"><a href='https://pl.ryobitools.eu/{{ product.url }}'>link</a></td>
-                <td class="align-middle">{{ product.price.last.price }}</td>
-                <td class="align-middle">{% if product.price.last.price != product.price.last.productStandardPrice %}<span class="text-decoration-line-through text-warning">{{ product.price.last.productStandardPrice }}</span> <span class="text-success">{{ ((1 - product.price.last.price / product.price.last.productStandardPrice)*100)|number_format(0) }}%</span>{% else %}{% endif %}</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="text-decoration-line-through text-warning">{{ product.price.last.productStandardPrice | format_currency('PLN', {}, 'pl') }}</span>&nbsp;<span class="text-success">{{ ((1 - product.price.last.price / product.price.last.productStandardPrice)*100)|number_format(0) }}%</span>{% else %}{% endif %}</td>
             </tr>
         {% endfor %}
     </table>

templates/template.html.twig

@@ -19,7 +19,7 @@
         <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</a>
+                    <a class="nav-link active" aria-current="page" href="{{ path('app_promos') }}">Promos ({{ promosCount() }})</a>
                 </li>
             </ul>
             <form class="d-flex col-lg-6 col-sm-8" role="search" action="{{ path('app_search') }}">