Use MicroKernelTrait to bootstrap application. Rewrote routes, controllers and structure of application a bit. Including use of twig.

src/Controller/BaseController.php

@@ -2,11 +2,11 @@
 
 namespace Krzysiej\RyobiCrawler\Controller;
 
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Twig\Environment;
-use Twig\Loader\FilesystemLoader;
 use Illuminate\Database\Capsule\Manager as Capsule;
 
-class BaseController
+class BaseController extends AbstractController
 {
     protected Environment $twig;
 
@@ -16,7 +16,5 @@ class BaseController
         $capsule->addConnection(['driver' => 'sqlite', 'database' => __DIR__ . '/../../database.sqlite']);
         $capsule->setAsGlobal();
         $capsule->bootEloquent();
-        $loader = new FilesystemLoader( __DIR__ . '/../../src/templates');
-        $this->twig = new Environment($loader);
     }
 }

src/Controller/CategoryController.php

@@ -3,10 +3,13 @@
 namespace Krzysiej\RyobiCrawler\Controller;
 
 use Krzysiej\RyobiCrawler\Models\Product;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Attribute\Route;
 
 final class CategoryController extends BaseController
 {
-    public function __invoke(string $category): void
+    #[Route('/category/{category}', name: 'app_category')]
+    public function __invoke(string $category): Response
     {
         $products = Product::with('price')
             ->selectRaw('products.*')
@@ -15,6 +18,6 @@ final class CategoryController extends BaseController
             ->orderByDesc('starred')
             ->orderByDesc('created_by')
             ->get();
-        $this->twig->display('productList.html.twig', ['products' => $products]);
+        return $this->render('productList.html.twig', ['products' => $products]);
     }
 }

src/Controller/IndexController.php

@@ -3,12 +3,15 @@
 namespace Krzysiej\RyobiCrawler\Controller;
 
 use Krzysiej\RyobiCrawler\Models\Product;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Attribute\Route;
 
 final class IndexController extends BaseController
 {
-    public function __invoke(): void
+    #[Route('/', name: 'app_home')]
+    public function __invoke(): Response
     {
         $products = Product::with('price')->orderByDesc('starred')->orderByDesc('created_by')->get();
-        $this->twig->display('productList.html.twig', ['products' => $products]);
+        return $this->render('productList.html.twig', ['products' => $products]);
     }
 }

src/Controller/ProductController.php

@@ -4,6 +4,8 @@ namespace Krzysiej\RyobiCrawler\Controller;
 
 use Illuminate\Support\ItemNotFoundException;
 use Krzysiej\RyobiCrawler\Models\Product;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Attribute\Route;
 use Twig\Error\LoaderError;
 use Twig\Error\RuntimeError;
 use Twig\Error\SyntaxError;
@@ -15,7 +17,8 @@ final class ProductController extends BaseController
      * @throws RuntimeError
      * @throws LoaderError
      */
-    public function __invoke(int $productId): void
+    #[Route('/product/{productId<\d+>}', name: 'app_product')]
+    public function __invoke(int $productId): Response
     {
         $product = Product::with([
             'price' => fn($query) => $query->orderBy('created_at', 'desc')
@@ -27,6 +30,6 @@ final class ProductController extends BaseController
 
         $priceList = $product->price()->pluck('price')->implode(',');
         $priceDates = $product->price()->pluck('created_at')->map(fn($date) => $date->format('Y-m-d'))->implode("','");
-        $this->twig->display('product.html.twig', ['product' => $product, 'price_list' => $priceList, 'price_dates' => $priceDates]);
+        return $this->render('product.html.twig', ['product' => $product, 'price_list' => $priceList, 'price_dates' => $priceDates]);
     }
 }

src/Controller/PromosController.php

@@ -4,12 +4,15 @@ 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;
 
 final class PromosController extends BaseController
 {
-    public function __invoke(): void
+    #[Route('/promos', name: 'app_promos')]
+    public function __invoke(): Response
     {
         $products = Product::whereHas('currentPrice', fn(Builder $query) => $query->whereColumn('price', '<', 'productStandardPrice'))->with(['currentPrice'])->get();
-        $this->twig->display('productList.html.twig', ['products' => $products]);
+        return $this->render('productList.html.twig', ['products' => $products]);
     }
 }

src/Controller/SearchController.php

@@ -3,15 +3,21 @@
 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 SearchController extends BaseController
 {
-    public function __invoke(string $search): void
+    #[Route('/search', name: 'app_search')]
+    public function __invoke(Request $request): Response
     {
+        $search = $request->query->get('search');
+        //dd();
         $products = Product::with('price')
             ->orWhere([['name', 'like', "%$search%"]])
             ->orWhere([['subTitle', 'like', "%$search%"]])->get();
 
-        $this->twig->display('productList.html.twig', ['products' => $products ?? [], 'search' => $search]);
+        return $this->render('productList.html.twig', ['products' => $products ?? [], 'search' => $search]);
     }
 }

src/Controller/StarController.php

@@ -3,12 +3,16 @@
 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 StarController extends BaseController
 {
-    public function __invoke(int $productId): void
+    #[Route('/star/{productId<\d+>}', name: 'app_star')]
+    public function __invoke(int $productId, Request $request): Response
     {
         Product::find($productId)->toggleStarred()->save();
-        header('Location: ' . $_SERVER['HTTP_REFERER']);
+        return $this->redirect($request->headers->get('referer'));
     }
 }

src/Models/Product.php

@@ -18,7 +18,7 @@ use Illuminate\Database\Eloquent\Relations\HasOne;
  * @property string $variantCode
  * @property string $modelCode
  * @property string $url
- * @property boolean $starred
+ * @property int $starred
  */
 class Product extends Model
 {
@@ -30,10 +30,16 @@ class Product extends Model
         return $this->hasMany(Price::class);
     }
 
+    public function isStarred(): bool
+    {
+        return (bool) $this->starred;
+    }
+
     public function currentPrice(): HasOne
     {
         return $this->hasOne(Price::class)->latestOfMany('created_at');
     }
+
     public function stock(): HasMany
     {
         return $this->hasMany(Stock::class);
@@ -42,6 +48,7 @@ class Product extends Model
     public function toggleStarred(): self
     {
         $this->starred = !$this->starred;
+
         return $this;
     }
 

src/templates/product.html.twig

@@ -1,90 +0,0 @@
-{% 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="/star/{{ 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='/product/{{ product.id }}' class="text-decoration-none">{{ product.name }}</a></td>
-            <td>{{ product.subTitle }}</td>
-            <td>
-                <ul class='nav'>
-                    {% for category in product.categories %}
-                        <li class="nav-item"><a class="nav-link" href="/category/{{ category }}"> {{ category }} </a></li>
-                    {% endfor %}
-                </ul>
-            </td>
-            <td><a href='https://pl.ryobitools.eu/{{ product.url }}'>link</a></td>
-        </tr>
-        <tr>
-            <td colspan="4">
-                <div style="width: 800px;">
-                    <canvas id="price"></canvas>
-                </div>
-            </td>
-        </tr>
-        <tr>
-            <td colspan="4">
-                <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>
-                    </tr>
-                    </thead>
-                    {% for price in product.price %}
-                        <tr>
-                            <td>{{ price.price }}</td>
-                            <td>{{ price.lowestProductPrice30Days }}</td>
-                            <td>{{ price.productStandardPrice }}</td>
-                            <td>{{ price.created_at }}</td>
-                        </tr>
-                    {% endfor %}
-                </table>
-            </td>
-        </tr>
-    </table>
-    <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-
-    <script>
-        const ctx = document.getElementById('price');
-
-        new Chart(ctx, {
-            type: 'line',
-            data: {
-                labels: ['{{ price_dates|raw }}'],
-                datasets: [{
-                    label: 'Price (PLN)',
-                    data: [{{ price_list }}],
-                    borderWidth: 1
-                }]
-            },
-            options: {
-                animation: false,
-                plugins: {
-                    title: {
-                        display: true,
-                        text: 'Price in time'
-                    },
-                },
-                scales: {
-                    x: {
-                        title: {
-                            display: true,
-                            text: 'Date'
-                        }
-                    },
-                    y: {
-                        beginAtZero: true,
-                        title: {
-                            display: true,
-                            text: 'Price'
-                        }
-                    }
-                }
-            }
-        });
-    </script>
-{% endblock %}
-

src/templates/productList.html.twig

@@ -1,35 +0,0 @@
-{% extends "template.html.twig" %}
-
-{% block content %}
-    <table class='table table-hover'>
-        <thead>
-        <tr>
-            <th></th>
-            <th></th>
-            <th>Name</th>
-            <th>Code</th>
-            <th>Categories</th>
-            <th></th>
-            <th>Price</th>
-        </tr>
-        </thead>
-        {% for product in products %}
-            <tr>
-                <td class="align-middle font-weight-bold h3"><a class="text-warning text-decoration-none" href="/star/{{ product.id }}">{% if product.starred %}★{% else %} ☆ {% endif %}</a></td>
-                <td class="align-middle" style="width: 120px;"><img src='{{ product.image }}&width=70' class='border rounded p-1' alt='{{ product.name }}'/></td>
-                <td class="align-middle"><a href='/product/{{ product.id }}' class="text-decoration-none">{{ product.name }}</a></td>
-                <td class="align-middle">{{ product.subTitle }}</td>
-                <td class="align-middle">
-                    <ul class='nav'>
-                        {% for category in product.categories %}
-                            <li class="nav-item"><a class="nav-link" href="/category/{{ category }}"> {{ category }} </a></li>
-                        {% endfor %}
-                    </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>
-            </tr>
-        {% endfor %}
-    </table>
-{% endblock %}

src/templates/template.html.twig

@@ -1,36 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
-    <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"/>
-</head>
-<body>
-<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="/">Crawler</a>
-
-        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-        </button>
-        <div class="collapse navbar-collapse" id="navbarNav">
-            <ul class="navbar-nav">
-                <li class="nav-item">
-                    <a class="nav-link active" aria-current="page" href="/promos">Promos</a>
-                </li>
-            </ul>
-        </div>
-    </div>
-
-    <form class="d-flex w-50" role="search" action="/">
-        <input class="form-control me-2" type="search" name="search" placeholder="Search term eg. 36v or RCS18X" value="{{ search }}" aria-label="Search">
-        <button class="btn btn-outline-success" type="submit">Search</button>
-    </form>
-</nav>
-{% block content %}{% endblock %}
-</body>
-</html>
-