docker compose exec php-app php index.php app:migrateto 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(); +class Kernel extends BaseKernel +{ + use MicroKernelTrait; -$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); + public function registerBundles(): iterable + { + return [ + new Symfony\Bundle\FrameworkBundle\FrameworkBundle(), + new Symfony\Bundle\TwigBundle\TwigBundle() + ]; + } -$context = new RequestContext(); -$matcher = new UrlMatcher($routes, $context); -try { - $parameters = $matcher->match($_SERVER['REQUEST_URI']); -} catch (Exception $e) { - die($e->getMessage()); + protected function configureContainer(ContainerConfigurator $container): void + { + $container->extension('framework', [ + 'secret' => 'S0ME_SECRET' + ]); + $container->services() + ->load('Krzysiej\\RyobiCrawler\\Controller\\', __DIR__.'/src/Controller/*') + ->autowire() + ->autoconfigure() + ; + } + + protected function configureRoutes(RoutingConfigurator $routes): void + { + $routes->import(__DIR__.'/src/Controller/', 'attribute'); + } } -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 => (new $parameters['_controller']())(), - IndexController::class => (new $parameters['_controller']())(), - default => throw new Exception('Route not found') -}; +$kernel = new Kernel('prod', false); +$request = Request::createFromGlobals(); +$response = $kernel->handle($request); +$response->send(); +$kernel->terminate($request, $response); \ No newline at end of file diff --git a/index_old.php b/index_old.php new file mode 100644 index 0000000..785c415 --- /dev/null +++ b/index_old.php @@ -0,0 +1,48 @@ +database.sqlite missing. Run docker compose
docker compose exec php-app php index.php app:migrateto 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') +}; diff --git a/src/Controller/BaseController.php b/src/Controller/BaseController.php index aa2d626..d9e3322 100644 --- a/src/Controller/BaseController.php +++ b/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); } } diff --git a/src/Controller/CategoryController.php b/src/Controller/CategoryController.php index 9f0e83b..a6dafcb 100644 --- a/src/Controller/CategoryController.php +++ b/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]); } } diff --git a/src/Controller/IndexController.php b/src/Controller/IndexController.php index 3aa0bd1..71a6b45 100644 --- a/src/Controller/IndexController.php +++ b/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]); } } diff --git a/src/Controller/ProductController.php b/src/Controller/ProductController.php index 5a36f49..a6f5b81 100644 --- a/src/Controller/ProductController.php +++ b/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]); } } diff --git a/src/Controller/PromosController.php b/src/Controller/PromosController.php index cdba55d..05319b1 100644 --- a/src/Controller/PromosController.php +++ b/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]); } } diff --git a/src/Controller/SearchController.php b/src/Controller/SearchController.php index 1235d43..0a42dbd 100644 --- a/src/Controller/SearchController.php +++ b/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]); } } diff --git a/src/Controller/StarController.php b/src/Controller/StarController.php index 069437b..7b743ba 100644 --- a/src/Controller/StarController.php +++ b/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')); } } diff --git a/src/Models/Product.php b/src/Models/Product.php index 3ea318b..8537677 100644 --- a/src/Models/Product.php +++ b/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; } diff --git a/src/templates/product.html.twig b/templates/product.html.twig similarity index 87% rename from src/templates/product.html.twig rename to templates/product.html.twig index b8c55e6..6e77d72 100644 --- a/src/templates/product.html.twig +++ b/templates/product.html.twig @@ -3,14 +3,15 @@ {% block content %}
| {% if product.starred %}★{% else %} ☆ {% endif %} | +{% if product.starred %}★{% else %} ☆ {% endif %} | {{ product.name }} | +{{ product.name }} | {{ product.subTitle }} | diff --git a/src/templates/productList.html.twig b/templates/productList.html.twig similarity index 79% rename from src/templates/productList.html.twig rename to templates/productList.html.twig index fc4842d..d15089f 100644 --- a/src/templates/productList.html.twig +++ b/templates/productList.html.twig @@ -15,14 +15,14 @@ {% for product in products %} | |
| {% if product.starred %}★{% else %} ☆ {% endif %} | +{% if product.starred == true %}★{% else %} ☆ {% endif %} | {{ product.name }} | +{{ product.name }} | {{ product.subTitle }} | diff --git a/src/templates/template.html.twig b/templates/template.html.twig similarity index 86% rename from src/templates/template.html.twig rename to templates/template.html.twig index 4002ad4..7eb63ac 100644 --- a/src/templates/template.html.twig +++ b/templates/template.html.twig @@ -11,7 +11,7 @@ |