diff --git a/assets/javascript/emoji-footprint.js b/assets/javascript/emoji-footprint.js index 434300b..238377b 100644 --- a/assets/javascript/emoji-footprint.js +++ b/assets/javascript/emoji-footprint.js @@ -1,14 +1,6 @@ // Sparkle effect on mouse move document.addEventListener('mousemove', function (e) { - const htmlElement = document.documentElement; - if (htmlElement.getAttribute('data-website-mode') === 'normal') { - return; - } - let emojis = ['✨', '💖', '🌟', '💅', '🦄', '🎉', '🌈']; - - if (htmlElement.getAttribute('data-website-mode') === 'mono') { - emojis = ['🦇', '🦉', '🦔', '🦡', '🐺', '', '', '', '', '', '', '', '', '', '']; - } + const 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 6525ce2..39dd41e 100644 --- a/assets/styles/modes.css +++ b/assets/styles/modes.css @@ -307,11 +307,6 @@ animation: discoFlash 0.3s infinite, wiggle 0.2s infinite; } -[data-website-mode="mono"] { - 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/src/Controller/HomeController.php b/src/Controller/HomeController.php index bf6a72d..46c90c7 100644 --- a/src/Controller/HomeController.php +++ b/src/Controller/HomeController.php @@ -3,7 +3,6 @@ namespace App\Controller; use App\Form\UserNameFormType; -use DateTimeImmutable; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Cookie; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -34,13 +33,7 @@ final class HomeController extends AbstractController $response->headers->clearCookie('username'); return $response; } - $response->headers->setCookie( - new Cookie( - name: 'username', - value: $username, - expire: new DateTimeImmutable('+1 year'), - ) - ); + $response->headers->setCookie(new Cookie('username', $username)); return $response; } $username = $request->cookies->get('username', self::DEFAULT_USERNAME); diff --git a/src/Entity/OrderItem.php b/src/Entity/OrderItem.php index d3741da..e91c1c0 100644 --- a/src/Entity/OrderItem.php +++ b/src/Entity/OrderItem.php @@ -130,9 +130,6 @@ class OrderItem public function setMenuItem(MenuItem|null $menuItem): static { - if (! $menuItem instanceof MenuItem) { - return $this; - } $this->menuItem = $menuItem; $this->name = $menuItem->getName(); diff --git a/src/Repository/FoodOrderRepository.php b/src/Repository/FoodOrderRepository.php index 31bc176..a781506 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/base.html.twig b/templates/base.html.twig index 75fae8c..6e78f0a 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 dbd9375..368b4b0 100644 --- a/templates/food_order/show.html.twig +++ b/templates/food_order/show.html.twig @@ -15,15 +15,6 @@ Vendorphone {{ food_order.foodVendor.phone }} - {% if food_order.foodVendor.menuLink != '' %} - - - - External link to Menu - - - - {% endif %} Created By {{ food_order.createdBy }} @@ -95,9 +86,7 @@ {{ 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 e87b0e7..51c7e6d 100644 --- a/templates/food_vendor/show.html.twig +++ b/templates/food_vendor/show.html.twig @@ -20,27 +20,16 @@

known 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 8b2a264..8761330 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('tr.menu-item'); + $itemNodes = $crawler->filter('ul.list-group li.list-group-item'); $this->assertCount(4, $itemNodes); });