From 994d837de995ea266fe37317747693d3a2e3bbe0 Mon Sep 17 00:00:00 2001 From: lubiana Date: Mon, 7 Jul 2025 18:22:30 +0200 Subject: [PATCH 1/3] better readable forms --- src/Form/OrderItemFinalize.php | 3 +++ templates/base.html.twig | 4 ++-- templates/food_order/show.html.twig | 10 ++++++++-- templates/food_vendor/show.html.twig | 19 +++++++++++++++---- .../Controller/FoodVendorControllerTest.php | 2 +- 5 files changed, 29 insertions(+), 9 deletions(-) diff --git a/src/Form/OrderItemFinalize.php b/src/Form/OrderItemFinalize.php index f4627a9..fbe285d 100644 --- a/src/Form/OrderItemFinalize.php +++ b/src/Form/OrderItemFinalize.php @@ -5,6 +5,7 @@ namespace App\Form; use App\Entity\OrderItem; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\CheckboxType; +use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\Extension\Core\Type\MoneyType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; @@ -21,6 +22,8 @@ final class OrderItemFinalize extends AbstractType ->add(child: 'extras', options: [ 'disabled' => true, ]) + ->add(child: 'menuItem', type: HiddenType::class, options: [ + ]) ->add(child: 'createdBy', options: [ 'disabled' => true, ]) diff --git a/templates/base.html.twig b/templates/base.html.twig index 6e78f0a..3a14f40 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -12,7 +12,7 @@
-
-
+
{% block body %}{% endblock %}
diff --git a/templates/food_order/show.html.twig b/templates/food_order/show.html.twig index 368b4b0..f25fc6f 100644 --- a/templates/food_order/show.html.twig +++ b/templates/food_order/show.html.twig @@ -56,7 +56,11 @@ {% for itemForm in form.orderItems %} {{ field_value(itemForm.createdBy) }} - {{ field_value(itemForm.name) }} + + + {{ field_value(itemForm.name) }} + + {{ field_value(itemForm.extras) }} {{ form_widget(itemForm.priceCents) }} {{ form_widget(itemForm.isPaid) }} @@ -86,7 +90,9 @@ {{ loop.index }} {{ item.createdBy }} - {{ item.name }} + + {{ item.name }} + {{ item.extras }} {% if(food_order.isClosed) %} diff --git a/templates/food_vendor/show.html.twig b/templates/food_vendor/show.html.twig index 51c7e6d..e87b0e7 100644 --- a/templates/food_vendor/show.html.twig +++ b/templates/food_vendor/show.html.twig @@ -20,16 +20,27 @@

known menuitems

-
    + + + + + + + + {% for item in food_vendor.menuItems %} -
  • +
    • + + + {% endfor %} - + +
    nameprice
    {{ item.name }} {% if(item.aliasOf) %} (alias of: {{ item.aliasOf.name }}) {% endif %} - + {{ (item.priceCents / 100)|format_currency('EUR') }}
diff --git a/tests/Feature/Controller/FoodVendorControllerTest.php b/tests/Feature/Controller/FoodVendorControllerTest.php index 8761330..8b2a264 100644 --- a/tests/Feature/Controller/FoodVendorControllerTest.php +++ b/tests/Feature/Controller/FoodVendorControllerTest.php @@ -119,7 +119,7 @@ describe(FoodVendorController::class, function (): void { )->text(); $this->assertSame('My Title', $nameNode); - $itemNodes = $crawler->filter('ul.list-group li.list-group-item'); + $itemNodes = $crawler->filter('tr.menu-item'); $this->assertCount(4, $itemNodes); }); From feeb4aca61128f9fb7379132234561512fe24f1e Mon Sep 17 00:00:00 2001 From: lubiana Date: Mon, 14 Jul 2025 18:42:18 +0200 Subject: [PATCH 2/3] add cart to order view --- src/Repository/FoodOrderRepository.php | 2 +- templates/food_order/show.html.twig | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Repository/FoodOrderRepository.php b/src/Repository/FoodOrderRepository.php index a781506..31bc176 100644 --- a/src/Repository/FoodOrderRepository.php +++ b/src/Repository/FoodOrderRepository.php @@ -25,7 +25,7 @@ final class FoodOrderRepository extends ServiceEntityRepository public function findLatestEntries(int $page = 1, int $pagesize = 10, int $days = 4): array { - $result = $this->createQueryBuilder('alias') + $result = $this->createQueryBuilder('alias') ->orderBy('alias.id', 'DESC') ->setFirstResult(($page - 1) * $pagesize) ->setMaxResults($pagesize) diff --git a/templates/food_order/show.html.twig b/templates/food_order/show.html.twig index f25fc6f..44b5d7a 100644 --- a/templates/food_order/show.html.twig +++ b/templates/food_order/show.html.twig @@ -15,6 +15,15 @@ Vendorphone {{ food_order.foodVendor.phone }} + {% if food_order.foodVendor.menuLink != '' %} + + + + External link to Menu + + + + {% endif %} Created By {{ food_order.createdBy }} From a8db69786a71fc309d7527644a04dca99af215f9 Mon Sep 17 00:00:00 2001 From: lubiana Date: Mon, 14 Jul 2025 19:08:17 +0200 Subject: [PATCH 3/3] add mono mode --- assets/javascript/emoji-footprint.js | 7 ++++++- assets/styles/modes.css | 4 ++++ templates/base.html.twig | 4 ++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/assets/javascript/emoji-footprint.js b/assets/javascript/emoji-footprint.js index 238377b..8e29ae0 100644 --- a/assets/javascript/emoji-footprint.js +++ b/assets/javascript/emoji-footprint.js @@ -1,6 +1,11 @@ // Sparkle effect on mouse move document.addEventListener('mousemove', function (e) { - const emojis = ['✹', '💖', '🌟', '💅', '🩄', '🎉', '🌈']; + let emojis = ['✹', '💖', '🌟', '💅', '🩄', '🎉', '🌈']; + const htmlElement = document.documentElement; + + if (htmlElement.getAttribute('data-website-mode') === 'mono') { + emojis = ['🩇', 'đŸŠč', '🌙', '⚰', 'đŸ•Żïž']; + } const sparkle = document.createElement('div'); sparkle.className = 'emoji-footprint'; sparkle.textContent = emojis[Math.floor(Math.random() * emojis.length)]; diff --git a/assets/styles/modes.css b/assets/styles/modes.css index 39dd41e..f43d9d3 100644 --- a/assets/styles/modes.css +++ b/assets/styles/modes.css @@ -307,6 +307,10 @@ animation: discoFlash 0.3s infinite, wiggle 0.2s infinite; } +[data-website-mode="mono"] body { + filter: grayscale(1); +} + /* Enhanced mode styles (for future use) */ [data-website-mode="enhanced"] .btn { background: linear-gradient(45deg, var(--bs-pink), var(--bs-purple), var(--bs-cyan), var(--bs-yellow), var(--bs-green), var(--bs-orange), var(--bs-red)); diff --git a/templates/base.html.twig b/templates/base.html.twig index 3a14f40..75fae8c 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -26,6 +26,10 @@
  • Create Issue
    • + +