Start working on tailwind instead of bootstrap

2025-05-20 16:31:46 +02:00
35 changed files with 1994 additions and 1009 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 .idea
 *.sqlite
 var/cache/
-.env.local
+.env.local
+/node_modules/
--- a/4
+++ b/4
@@ -7,7 +7,9 @@ RUN apt-get update && apt-get install -y \
    git \
    unzip \
    libicu-dev \
-    libzip-dev
+    libzip-dev \
+    nodejs \
+    npm

 RUN docker-php-ext-install zip intl

--- a/bin/cachewarmup
+++ b/bin/cachewarmup
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-bin/cli php console.php app:cache:warm-twig
--- a/bin/composer
+++ b/bin/composer
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-[ -z "$1" ] && bin/cli composer list && exit
+[ -z "$1" ] && echo "Please specify a Composer command (ex. install)" && exit
 bin/cli composer "$@"
--- a/bin/update
+++ b/bin/update
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 echo "Updating project"
 git pull origin master
-bin/cacheclean
+bin/cli rm -rf var/cache
 echo "Project updated"
--- a/composer.lock
+++ b/composer.lock
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "ryobi-crawler",
+  "version": "1.0.0",
+  "description": "## Project start",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "dev": "npx @tailwindcss/cli -i ./templates/input/style.css -o ./templates/output/style.css --watch"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://git.techtube.pl/krzysiej/ryobi-crawler.git"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@tailwindcss/cli": "^4.1.7",
+    "tailwindcss": "^4.1.7"
+  }
+}
--- a/screenshot1.png
+++ b/screenshot1.png
--- a/src/Command/CacheWarmCommand.php
+++ b/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: 'Warmup twig cache')]
+#[AsCommand(name: 'app:cache:warm-twig', description: '')]
 class CacheWarmCommand extends Command
 {
    public function __construct(
--- a/src/Command/Migrate.php
+++ b/src/Command/Migrate.php
@@ -11,7 +11,6 @@ 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
@@ -25,10 +24,11 @@ class Migrate extends Command

    public function execute(InputInterface $input, OutputInterface $output): int
    {
-        if ($input->getOption(self::RECREATE_OPTION)) {
+        if (true === $input->hasOption(self::RECREATE_OPTION)) {
            unlink(__DIR__ . '/../../database.sqlite');
-            touch(__DIR__ . '/../../database.sqlite');
+            //sleep(5);
        }
+        touch(__DIR__ . '/../../database.sqlite');
        $capsule = new Capsule;
        $capsule->addConnection([
            'driver' => 'sqlite',
@@ -39,9 +39,6 @@ class Migrate extends Command
        $this->createProductsTable();
        $this->createPricesTable();
        $this->createStocksTable();
-        $this->addColumns();
-        $this->createCountriesTable();
-        $this->index();

        return Command::SUCCESS;
    }
@@ -80,47 +77,6 @@ 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();
-            });
-        }
-        $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(),
-            ]);
-        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')) {
@@ -138,57 +94,4 @@ 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');
-        });
-    }
 }
--- a/src/Command/ScrapeWebsite.php
+++ b/src/Command/ScrapeWebsite.php
@@ -7,7 +7,6 @@ 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;
@@ -22,73 +21,47 @@ 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($country);
-            $progress->setMaxSteps(count($products));
-            foreach ($products as $product) {
-                $this->saveProduct($product, $country);
-                $progress->advance();
-            }
-            $progress->finish();
-            $output->writeln('');
-            $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]);
+        $products = $this->getProducts();
+        $progress->setMaxSteps(count($products));
+        foreach ($products as $product) {
+            $this->saveProduct($product);
            $progress->advance();
        }
        $progress->finish();
        $output->writeln('');
-        $output->writeln('Update prices - DONE');
-        $output->writeln('COMMAND - DONE');
+        $output->writeln('DONE');

        return Command::SUCCESS;
    }

-    private function getProducts(Country $country): array
+    private function getProducts(): array
    {
        $products = [];
        $page = 0;
-
        do {
            try {
-                $res = $this->client->request('POST', $country->productsUrl, [
+                $res = $this->client->request('POST', 'https://pl.ryobitools.eu/api/product-listing/get-products', [
                    'form_params' => [
                        "includePreviousPages" => false,
                        "pageIndex" => $page,
                        "pageSize" => 100,
-                        "cultureCode" => $country->cultureCode,
+                        "cultureCode" => "pl-PL",
                    ]
                ]);
                $responseObject = json_decode($res->getBody()->getContents());
@@ -103,10 +76,10 @@ class ScrapeWebsite extends Command
        return $products;
    }

-    private function saveProduct(\stdClass $product, Country $country): void
+    private function saveProduct(\stdClass $product): void
    {
        /** @var Product $productModel */
-        $productModel = Product::firstOrNew(['skuID' => $product->skuID, 'country_id' => $country->id]);
+        $productModel = Product::firstOrNew(['skuID' => $product->skuID]);

        $productModel->skuID = $product->skuID;
        $productModel->name = $product->name;
@@ -117,9 +90,7 @@ class ScrapeWebsite extends Command
        $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();

--- a/src/Controller/BaseController.php
+++ b/src/Controller/BaseController.php
@@ -11,7 +11,11 @@ class BaseController extends AbstractController
 {
    protected Environment $twig;

-    public function __construct(protected FilesystemAdapter $cache, protected Capsule $database)
+    public function __construct(protected FilesystemAdapter $cache)
    {
+        $capsule = new Capsule;
+        $capsule->addConnection(['driver' => 'sqlite', 'database' => __DIR__ . '/../../database.sqlite']);
+        $capsule->setAsGlobal();
+        $capsule->bootEloquent();
    }
 }
--- a/src/Controller/DiscontinuedController.php
+++ b/src/Controller/DiscontinuedController.php
@@ -17,9 +17,10 @@ final class DiscontinuedController extends BaseController
            return $this->render('productList.html.twig', ['listType' => 'discontinued']);
        }

-        $products = Product::where('lastSeen', '<', now()->format('Y-m-d'))
+        $products = Product::where('updated_at', '<', now()->format('Y-m-d'))
            ->orderByDesc('starred')
            ->orderByDesc('created_by')
+            ->with(['currentPrice', 'lowestPrice'])
            ->get();
        return $this->render('productList.html.twig', ['products' => $products, 'listType' => 'discontinued']);
    }
--- a/src/Controller/IndexController.php
+++ b/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'])
+        $products = Product::with(['currentStock', 'price', 'lowestPrice'])
            ->orderByDesc('starred')
            ->orderByDesc('created_by')
            ->get();
--- a/src/Controller/LowestPriceController.php
+++ b/src/Controller/LowestPriceController.php
@@ -1,29 +0,0 @@
-<?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]);
-    }
-}
--- a/src/Controller/NewController.php
+++ b/src/Controller/NewController.php
@@ -2,6 +2,7 @@

 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;
--- a/src/Controller/ProductController.php
+++ b/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,7 +20,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]]);
        }

@@ -30,34 +31,26 @@ final class ProductController extends BaseController
        if (null === $product) {
            throw $this->createNotFoundException('Product not found');
        }
-        $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();
+        $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();
+
        return $this->render('product.html.twig', [
            'product' => $product,
-            'price_list' => $this->prepareChartData($priceList),
-            'stock_list' => $this->prepareChartData($stockList),
-            'price_dates' => implode("','", $this->dateRange(array_key_first($priceList), array_key_last($priceList))),
+            'price_list' => $this->prepareChartData($priceDates, $priceList),
+            'stock_list' => $this->prepareChartData($stockDates, $stockList),
+            'price_dates' => implode("','", $priceDates),
        ]);
    }

-    private function prepareChartData($set1): string
+    private function prepareChartData($set1, $set2): string
    {
-        $dates = $this->dateRange(array_key_first($set1), array_key_last($set1));
-        $data = array_map(fn($date) => ['x' => $date, 'y' => $set1[$date] ?? null], $dates);
+        $data = [];
+        foreach ($set1 as $key => $value) {
+            $data[] = ['x' => $value, 'y' => $set2[$key]];
+        }
        $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;
-    }
 }
--- a/src/Controller/PromosController.php
+++ b/src/Controller/PromosController.php
@@ -2,6 +2,7 @@

 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;
@@ -15,7 +16,7 @@ final class PromosController extends BaseController
            return $this->render('productList.html.twig', ['listType' => 'promos']);
        }

-        $products = Product::whereRaw('priceCurrent < productStandardPrice')
+        $products = Product::whereHas('currentPrice', fn(Builder $query) => $query->whereColumn('price', '<', 'productStandardPrice'))
            ->orderByDesc('starred')
            ->orderByDesc('created_by')
            ->with(['currentPrice', 'lowestPrice'])
--- a/src/Controller/SearchController.php
+++ b/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, 'listType' => 'search_'.$search]);
+        return $this->render('productList.html.twig', ['products' => $products ?? [], 'search' => $search]);
    }
 }
--- a/src/Controller/StarController.php
+++ b/src/Controller/StarController.php
@@ -12,18 +12,7 @@ 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($referer);
+        return $this->redirect($request->headers->get('referer'));
    }
 }
--- a/src/DatabaseFactory.php
+++ b/src/DatabaseFactory.php
@@ -1,14 +0,0 @@
-<?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();
-    }
-}
--- a/src/Kernel.php
+++ b/src/Kernel.php
@@ -2,7 +2,6 @@

 namespace Krzysiej\RyobiCrawler;

-use Illuminate\Database\Capsule\Manager;
 use Krzysiej\RyobiCrawler\Twig\AppExtension;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
@@ -35,9 +34,8 @@ 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,DatabaseFactory.php,Kernel.php}');
+            ->exclude('../src/{Models,Twig,Kernel.php}');
        $services->set('twig.extension.cache', AppExtension::class)->tag('twig.extension');
        $services->set(CacheExtension::class)->tag('twig.extension');
        $services->set(FilesystemAdapter::class)->args([
--- a/src/Models/Country.php
+++ b/src/Models/Country.php
@@ -1,24 +0,0 @@
-<?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);
-    }
-}
--- a/src/Models/Product.php
+++ b/src/Models/Product.php
@@ -2,10 +2,8 @@

 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;

@@ -22,23 +20,12 @@ 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 function country(): BelongsTo
-    {
-        return $this->belongsTo(Country::class);
-    }
-
    public function price(): HasMany
    {
        return $this->hasMany(Price::class);
@@ -58,10 +45,6 @@ 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
    {
@@ -70,7 +53,9 @@ class Product extends Model

    public function currentStock(): HasOne
    {
-        return $this->stock()->one()->ofMany()->withDefault(fn (Stock $stock) => $stock->stock = 0);
+        return $this->stock()->one()->ofMany()->withDefault(function (Stock $stock) {
+            $stock->stock = 0;
+        });
    }

    public function toggleStarred(): self
@@ -90,7 +75,7 @@ class Product extends Model

    public function isDiscontinued(): bool
    {
-        return $this->lastSeen < now()->format('Y-m-d');
+        return $this->updated_at->format('Y-m-d') < now()->format('Y-m-d');
    }
    public function isNew(): bool
    {
--- a/src/Twig/AppExtension.php
+++ b/src/Twig/AppExtension.php
@@ -22,7 +22,6 @@ class AppExtension extends AbstractExtension
            new TwigFunction('allCount', [$this, 'allCount']),
            new TwigFunction('newCount', [$this, 'newCount']),
            new TwigFunction('discontinuedCount', [$this, 'discontinuedCount']),
-            new TwigFunction('lowestPriceCount', [$this, 'lowestPriceCount']),
        ];
    }

@@ -32,7 +31,6 @@ class AppExtension extends AbstractExtension
            new TwigFilter('findByCreatedAtDate', [$this, 'findByCreatedAtDate']),
        ];
    }
-
    public function allCount(): int
    {
        return Product::count();
@@ -40,7 +38,7 @@ class AppExtension extends AbstractExtension

    public function promosCount(): int
    {
-        return Product::whereRaw('priceCurrent < productStandardPrice')->count();
+        return Product::whereHas('currentPrice', fn(Builder $query) => $query->whereColumn('price', '<', 'productStandardPrice'))->count();
    }

    public function newCount(): int
@@ -50,15 +48,7 @@ class AppExtension extends AbstractExtension

    public function discontinuedCount(): int
    {
-        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();
+        return Product::where('updated_at', '<', now()->format('Y-m-d'))->count();
    }

    public function findByCreatedAtDate(Collection $items, string $date): Stock|Price|null
--- a/templates/css/bootstrap.min.css
+++ b/templates/css/bootstrap.min.css
--- a/templates/css/bootstrap.min.css.map
+++ b/templates/css/bootstrap.min.css.map
--- a/templates/input/style.css
+++ b/templates/input/style.css
@@ -0,0 +1 @@
+@import "tailwindcss";
--- a/templates/js/bootstrap.bundle.min.js
+++ b/templates/js/bootstrap.bundle.min.js
--- a/templates/js/bootstrap.bundle.min.js.map
+++ b/templates/js/bootstrap.bundle.min.js.map
--- a/templates/output/style.css
+++ b/templates/output/style.css
@@ -0,0 +1,340 @@
+/*! tailwindcss v4.1.7 | MIT License | https://tailwindcss.com */
+@layer properties;
+@layer theme, base, components, utilities;
+@layer theme {
+  :root, :host {
+    --font-sans: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji",
+      "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+    --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono",
+      "Courier New", monospace;
+    --spacing: 0.25rem;
+    --text-3xl: 1.875rem;
+    --text-3xl--line-height: calc(2.25 / 1.875);
+    --font-weight-bold: 700;
+    --default-font-family: var(--font-sans);
+    --default-mono-font-family: var(--font-mono);
+  }
+}
+@layer base {
+  *, ::after, ::before, ::backdrop, ::file-selector-button {
+    box-sizing: border-box;
+    margin: 0;
+    padding: 0;
+    border: 0 solid;
+  }
+  html, :host {
+    line-height: 1.5;
+    -webkit-text-size-adjust: 100%;
+    tab-size: 4;
+    font-family: var(--default-font-family, ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji");
+    font-feature-settings: var(--default-font-feature-settings, normal);
+    font-variation-settings: var(--default-font-variation-settings, normal);
+    -webkit-tap-highlight-color: transparent;
+  }
+  hr {
+    height: 0;
+    color: inherit;
+    border-top-width: 1px;
+  }
+  abbr:where([title]) {
+    -webkit-text-decoration: underline dotted;
+    text-decoration: underline dotted;
+  }
+  h1, h2, h3, h4, h5, h6 {
+    font-size: inherit;
+    font-weight: inherit;
+  }
+  a {
+    color: inherit;
+    -webkit-text-decoration: inherit;
+    text-decoration: inherit;
+  }
+  b, strong {
+    font-weight: bolder;
+  }
+  code, kbd, samp, pre {
+    font-family: var(--default-mono-font-family, ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace);
+    font-feature-settings: var(--default-mono-font-feature-settings, normal);
+    font-variation-settings: var(--default-mono-font-variation-settings, normal);
+    font-size: 1em;
+  }
+  small {
+    font-size: 80%;
+  }
+  sub, sup {
+    font-size: 75%;
+    line-height: 0;
+    position: relative;
+    vertical-align: baseline;
+  }
+  sub {
+    bottom: -0.25em;
+  }
+  sup {
+    top: -0.5em;
+  }
+  table {
+    text-indent: 0;
+    border-color: inherit;
+    border-collapse: collapse;
+  }
+  :-moz-focusring {
+    outline: auto;
+  }
+  progress {
+    vertical-align: baseline;
+  }
+  summary {
+    display: list-item;
+  }
+  ol, ul, menu {
+    list-style: none;
+  }
+  img, svg, video, canvas, audio, iframe, embed, object {
+    display: block;
+    vertical-align: middle;
+  }
+  img, video {
+    max-width: 100%;
+    height: auto;
+  }
+  button, input, select, optgroup, textarea, ::file-selector-button {
+    font: inherit;
+    font-feature-settings: inherit;
+    font-variation-settings: inherit;
+    letter-spacing: inherit;
+    color: inherit;
+    border-radius: 0;
+    background-color: transparent;
+    opacity: 1;
+  }
+  :where(select:is([multiple], [size])) optgroup {
+    font-weight: bolder;
+  }
+  :where(select:is([multiple], [size])) optgroup option {
+    padding-inline-start: 20px;
+  }
+  ::file-selector-button {
+    margin-inline-end: 4px;
+  }
+  ::placeholder {
+    opacity: 1;
+  }
+  @supports (not (-webkit-appearance: -apple-pay-button))  or (contain-intrinsic-size: 1px) {
+    ::placeholder {
+      color: currentcolor;
+      @supports (color: color-mix(in lab, red, red)) {
+        color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+  }
+  textarea {
+    resize: vertical;
+  }
+  ::-webkit-search-decoration {
+    -webkit-appearance: none;
+  }
+  ::-webkit-date-and-time-value {
+    min-height: 1lh;
+    text-align: inherit;
+  }
+  ::-webkit-datetime-edit {
+    display: inline-flex;
+  }
+  ::-webkit-datetime-edit-fields-wrapper {
+    padding: 0;
+  }
+  ::-webkit-datetime-edit, ::-webkit-datetime-edit-year-field, ::-webkit-datetime-edit-month-field, ::-webkit-datetime-edit-day-field, ::-webkit-datetime-edit-hour-field, ::-webkit-datetime-edit-minute-field, ::-webkit-datetime-edit-second-field, ::-webkit-datetime-edit-millisecond-field, ::-webkit-datetime-edit-meridiem-field {
+    padding-block: 0;
+  }
+  :-moz-ui-invalid {
+    box-shadow: none;
+  }
+  button, input:where([type="button"], [type="reset"], [type="submit"]), ::file-selector-button {
+    appearance: button;
+  }
+  ::-webkit-inner-spin-button, ::-webkit-outer-spin-button {
+    height: auto;
+  }
+  [hidden]:where(:not([hidden="until-found"])) {
+    display: none !important;
+  }
+}
+@layer utilities {
+  .collapse {
+    visibility: collapse;
+  }
+  .container {
+    width: 100%;
+    @media (width >= 40rem) {
+      max-width: 40rem;
+    }
+    @media (width >= 48rem) {
+      max-width: 48rem;
+    }
+    @media (width >= 64rem) {
+      max-width: 64rem;
+    }
+    @media (width >= 80rem) {
+      max-width: 80rem;
+    }
+    @media (width >= 96rem) {
+      max-width: 96rem;
+    }
+  }
+  .me-2 {
+    margin-inline-end: calc(var(--spacing) * 2);
+  }
+  .me-auto {
+    margin-inline-end: auto;
+  }
+  .mb-0 {
+    margin-bottom: calc(var(--spacing) * 0);
+  }
+  .mb-2 {
+    margin-bottom: calc(var(--spacing) * 2);
+  }
+  .block {
+    display: block;
+  }
+  .grid {
+    display: grid;
+  }
+  .table {
+    display: table;
+  }
+  .flex-row {
+    flex-direction: row;
+  }
+  .rounded {
+    border-radius: 0.25rem;
+  }
+  .border {
+    border-style: var(--tw-border-style);
+    border-width: 1px;
+  }
+  .border-1 {
+    border-style: var(--tw-border-style);
+    border-width: 1px;
+  }
+  .p-1 {
+    padding: calc(var(--spacing) * 1);
+  }
+  .text-end {
+    text-align: end;
+  }
+  .align-middle {
+    vertical-align: middle;
+  }
+  .text-3xl {
+    font-size: var(--text-3xl);
+    line-height: var(--tw-leading, var(--text-3xl--line-height));
+  }
+  .font-bold {
+    --tw-font-weight: var(--font-weight-bold);
+    font-weight: var(--font-weight-bold);
+  }
+  .underline {
+    text-decoration-line: underline;
+  }
+  .shadow-sm {
+    --tw-shadow: 0 1px 3px 0 var(--tw-shadow-color, rgb(0 0 0 / 0.1)), 0 1px 2px -1px var(--tw-shadow-color, rgb(0 0 0 / 0.1));
+    box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+  }
+}
+@property --tw-border-style {
+  syntax: "*";
+  inherits: false;
+  initial-value: solid;
+}
+@property --tw-font-weight {
+  syntax: "*";
+  inherits: false;
+}
+@property --tw-shadow {
+  syntax: "*";
+  inherits: false;
+  initial-value: 0 0 #0000;
+}
+@property --tw-shadow-color {
+  syntax: "*";
+  inherits: false;
+}
+@property --tw-shadow-alpha {
+  syntax: "<percentage>";
+  inherits: false;
+  initial-value: 100%;
+}
+@property --tw-inset-shadow {
+  syntax: "*";
+  inherits: false;
+  initial-value: 0 0 #0000;
+}
+@property --tw-inset-shadow-color {
+  syntax: "*";
+  inherits: false;
+}
+@property --tw-inset-shadow-alpha {
+  syntax: "<percentage>";
+  inherits: false;
+  initial-value: 100%;
+}
+@property --tw-ring-color {
+  syntax: "*";
+  inherits: false;
+}
+@property --tw-ring-shadow {
+  syntax: "*";
+  inherits: false;
+  initial-value: 0 0 #0000;
+}
+@property --tw-inset-ring-color {
+  syntax: "*";
+  inherits: false;
+}
+@property --tw-inset-ring-shadow {
+  syntax: "*";
+  inherits: false;
+  initial-value: 0 0 #0000;
+}
+@property --tw-ring-inset {
+  syntax: "*";
+  inherits: false;
+}
+@property --tw-ring-offset-width {
+  syntax: "<length>";
+  inherits: false;
+  initial-value: 0px;
+}
+@property --tw-ring-offset-color {
+  syntax: "*";
+  inherits: false;
+  initial-value: #fff;
+}
+@property --tw-ring-offset-shadow {
+  syntax: "*";
+  inherits: false;
+  initial-value: 0 0 #0000;
+}
+@layer properties {
+  @supports ((-webkit-hyphens: none) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color:rgb(from red r g b)))) {
+    *, ::before, ::after, ::backdrop {
+      --tw-border-style: solid;
+      --tw-font-weight: initial;
+      --tw-shadow: 0 0 #0000;
+      --tw-shadow-color: initial;
+      --tw-shadow-alpha: 100%;
+      --tw-inset-shadow: 0 0 #0000;
+      --tw-inset-shadow-color: initial;
+      --tw-inset-shadow-alpha: 100%;
+      --tw-ring-color: initial;
+      --tw-ring-shadow: 0 0 #0000;
+      --tw-inset-ring-color: initial;
+      --tw-inset-ring-shadow: 0 0 #0000;
+      --tw-ring-inset: initial;
+      --tw-ring-offset-width: 0px;
+      --tw-ring-offset-color: #fff;
+      --tw-ring-offset-shadow: 0 0 #0000;
+    }
+  }
+}
--- a/templates/product.html.twig
+++ b/templates/product.html.twig
@@ -42,14 +42,13 @@
                            <th>Stock</th>
                        </tr>
                        </thead>
-                        {% set stock = product.stock().get() %}
                        {% for price in product.price %}
                            <tr>
-                                <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.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>{{ (stock | findByCreatedAtDate(price.created_at | slice(0,10))).stock ?? '' }}</td>
+                                <td>{{ (product.stock | findByCreatedAtDate(price.created_at | slice(0,10))).stock ?? '' }}</td>
                            </tr>
                        {% endfor %}
                    </table>
@@ -68,7 +67,7 @@
                labels: ['{{ price_dates|raw }}'],
                datasets: [
                    {
-                        label: 'Price ({{ product.country.currency }})',
+                        label: 'Price (PLN)',
                        data: {{ price_list|raw }},
                        yAxisID: 'yPrice',
                        tension: 0.1,
@@ -84,7 +83,6 @@
                ]
            },
            options: {
-                spanGaps: false,
                responsive: true,
                animation: false,
                scales: {
@@ -100,7 +98,7 @@
                        beginAtZero: true,
                        title: {
                            display: true,
-                            text: 'Price ({{ product.country.currency }})'
+                            text: 'Price (PLN)'
                        },
                        grid: {
                            drawOnChartArea: false
--- a/templates/productList.html.twig
+++ b/templates/productList.html.twig
@@ -29,7 +29,7 @@
                        <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.lastSeen }}">is discontinued</span>
+                        <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>
@@ -38,7 +38,7 @@
                </td>
                <td class="align-middle">
                    <nav aria-label="breadcrumb" style="--bs-breadcrumb-divider: '>';" >
-                        <ol class="breadcrumb mb-0">
+                        <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 %}
@@ -46,19 +46,13 @@
                    </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.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 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">
                    <div class="d-flex flex-row">
-                        {% 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>
+                        {% 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>
--- a/templates/template.html.twig
+++ b/templates/template.html.twig
@@ -5,10 +5,11 @@
    <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="/templates/css/bootstrap.min.css" rel="stylesheet" />
+    <link href="/templates/output/style.css" rel="stylesheet" />
    <script src="/templates/js/script.js" defer></script>
 </head>
 <body>
+<h1 class="text-3xl font-bold underline">test header</h1>
 <nav class="navbar navbar-expand-lg sticky-top bg-body-tertiary border-bottom border-secondary border-1">
    <div class="container-fluid">
        <a class="navbar-brand" href="{{ path('app_home') }}">Crawler</a>
@@ -18,16 +19,13 @@
        </button>
        <div class="collapse navbar-collapse" id="navbarNav">
            <ul class="navbar-nav me-auto mb-2 mb-lg-0">
-                {% cache "menu_count" ~ listType|default('') %}
+                {% 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_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>
@@ -47,7 +45,8 @@

 </nav>
 {% block content %}{% endblock %}
-<script src="/templates/js/bootstrap.bundle.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
+
 </body>
 </html>