11 changed files with 126 additions and 66 deletions
@@ -2,7 +2,7 @@ FROM php:8.3-cli

 WORKDIR /usr/src/app
 ENV PHP_MEMORY_LIMIT=512M
-
+RUN echo "memory_limit=512M" > /usr/local/etc/php/conf.d/memory-limit.ini
 RUN apt-get update && apt-get install -y \
    git \
    unzip \
@@ -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();

@@ -0,0 +1,24 @@
+<?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
+    {
+
+        $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]);
+    }
+}
@@ -7,13 +7,14 @@ 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)
+        $products = Product::where('created_at', '>', now()->modify('-30 days')->format('Y-m-d'))
            ->orderByDesc('starred')
            ->orderByDesc('name')
            ->orderByDesc('created_by')
@@ -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');
    }
 }
@@ -11,6 +11,8 @@ use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
 use Twig\TwigFunction;

+use function Symfony\Component\Clock\now;
+
 class AppExtension extends AbstractExtension
 {
    public function getFunctions(): array
@@ -18,6 +20,7 @@ class AppExtension extends AbstractExtension
        return [
            new TwigFunction('promosCount', [$this, 'promosCount']),
            new TwigFunction('newCount', [$this, 'newCount']),
+            new TwigFunction('discontinuedCount', [$this, 'discontinuedCount']),
        ];
    }

@@ -35,8 +38,12 @@ class AppExtension extends AbstractExtension

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

 {% block content %}
+<div class="table-responsive">
    {{ app.request.get('order') }}
    <table class='table table-hover'>
        <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>
@@ -53,4 +57,5 @@
            </tr>
        {% endfor %}
    </table>
-{% endblock %}
+</div>
+{% endblock %}
@@ -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/[email protected]/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">
@@ -19,15 +19,20 @@
        <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>
+                    <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 active" aria-current="page" href="{{ path('app_new') }}">New in last 30 days <span class="badge text-bg-secondary">{{ newCount() }}</span></a>
+                    <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>
            </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>