diff --git a/migrations/Version20240627212849.php b/migrations/Version20240627212849.php
deleted file mode 100644
index 2a5650b..0000000
--- a/migrations/Version20240627212849.php
+++ /dev/null
@@ -1,44 +0,0 @@
-addSql('ALTER TABLE food_order ADD COLUMN created_by VARCHAR(255) DEFAULT \'nobody\' NOT NULL');
- $this->addSql('ALTER TABLE order_item ADD COLUMN created_by VARCHAR(255) DEFAULT \'nobody\' NOT NULL');
- }
-
- public function down(Schema $schema): void
- {
- // this down() migration is auto-generated, please modify it to your needs
- $this->addSql('CREATE TEMPORARY TABLE __temp__food_order AS SELECT id, closed_at, food_vendor_id FROM food_order');
- $this->addSql('DROP TABLE food_order');
- $this->addSql('CREATE TABLE food_order (id BLOB NOT NULL, closed_at DATETIME DEFAULT NULL, food_vendor_id BLOB NOT NULL, PRIMARY KEY(id), CONSTRAINT FK_44856726EF983E8 FOREIGN KEY (food_vendor_id) REFERENCES food_vendor (id) NOT DEFERRABLE INITIALLY IMMEDIATE)');
- $this->addSql('INSERT INTO food_order (id, closed_at, food_vendor_id) SELECT id, closed_at, food_vendor_id FROM __temp__food_order');
- $this->addSql('DROP TABLE __temp__food_order');
- $this->addSql('CREATE INDEX IDX_44856726EF983E8 ON food_order (food_vendor_id)');
- $this->addSql('CREATE TEMPORARY TABLE __temp__order_item AS SELECT id, name, extras, food_order_id, menu_item_id FROM order_item');
- $this->addSql('DROP TABLE order_item');
- $this->addSql('CREATE TABLE order_item (id BLOB NOT NULL, name VARCHAR(255) NOT NULL, extras VARCHAR(255) DEFAULT NULL, food_order_id BLOB DEFAULT NULL, menu_item_id BLOB NOT NULL, PRIMARY KEY(id), CONSTRAINT FK_52EA1F09A5D24A7A FOREIGN KEY (food_order_id) REFERENCES food_order (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_52EA1F099AB44FE0 FOREIGN KEY (menu_item_id) REFERENCES menu_item (id) NOT DEFERRABLE INITIALLY IMMEDIATE)');
- $this->addSql('INSERT INTO order_item (id, name, extras, food_order_id, menu_item_id) SELECT id, name, extras, food_order_id, menu_item_id FROM __temp__order_item');
- $this->addSql('DROP TABLE __temp__order_item');
- $this->addSql('CREATE INDEX IDX_52EA1F09A5D24A7A ON order_item (food_order_id)');
- $this->addSql('CREATE INDEX IDX_52EA1F099AB44FE0 ON order_item (menu_item_id)');
- }
-}
diff --git a/src/Controller/FoodOrderController.php b/src/Controller/FoodOrderController.php
index 50e5df4..7251951 100644
--- a/src/Controller/FoodOrderController.php
+++ b/src/Controller/FoodOrderController.php
@@ -26,8 +26,6 @@ final class FoodOrderController extends AbstractController
public function new(Request $request, EntityManagerInterface $entityManager): Response
{
$foodOrder = new FoodOrder;
- $username = $request->cookies->get('username', 'nobody');
- $foodOrder->setCreatedBy($username);
$form = $this->createForm(FoodOrderType::class, $foodOrder, [
'action' => $this->generateUrl('app_food_order_new'),
]);
diff --git a/src/Controller/HomeController.php b/src/Controller/HomeController.php
index 46c90c7..a9bd31e 100644
--- a/src/Controller/HomeController.php
+++ b/src/Controller/HomeController.php
@@ -2,46 +2,16 @@
namespace App\Controller;
-use App\Form\UserNameFormType;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Cookie;
use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Attribute\Route;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-final class HomeController extends AbstractController
+final class HomeController
{
- public const string DEFAULT_USERNAME = 'nobody';
-
#[Route('/', name: 'home')]
public function home(UrlGeneratorInterface $router): Response
{
return new RedirectResponse($router->generate('app_food_order_index'));
}
-
- #[Route('/username', name: 'username')]
- public function usernameForm(Request $request, UrlGeneratorInterface $router): Response
- {
- $form = $this->createForm(UsernameFormType::class);
- $form->handleRequest($request);
- if ($form->isSubmitted() && $form->isValid()) {
- $username = $form->getData()['username'] ?? self::DEFAULT_USERNAME;
- $response = new RedirectResponse($router->generate('app_food_order_index'));
- if ($username === self::DEFAULT_USERNAME || $username === '') {
- $response->headers->clearCookie('username');
- return $response;
- }
- $response->headers->setCookie(new Cookie('username', $username));
- return $response;
- }
- $username = $request->cookies->get('username', self::DEFAULT_USERNAME);
- $form->setData([
- 'username' => $username,
- ]);
- return $this->render('username.html.twig', [
- 'form' => $form,
- ]);
- }
}
diff --git a/src/Controller/OrderItemController.php b/src/Controller/OrderItemController.php
index 1be90d7..6f615a8 100644
--- a/src/Controller/OrderItemController.php
+++ b/src/Controller/OrderItemController.php
@@ -26,9 +26,6 @@ final class OrderItemController extends AbstractController
}
$orderItem = new OrderItem;
- $username = $request->cookies->get('username', 'nobody');
- $orderItem->setCreatedBy($username);
-
$form = $this->createForm(OrderItemType::class, $orderItem);
$form->handleRequest($request);
diff --git a/src/Entity/FoodOrder.php b/src/Entity/FoodOrder.php
index 40d7db8..72a9530 100644
--- a/src/Entity/FoodOrder.php
+++ b/src/Entity/FoodOrder.php
@@ -34,11 +34,6 @@ class FoodOrder
#[ORM\OneToMany(targetEntity: OrderItem::class, mappedBy: 'foodOrder', orphanRemoval: true)]
private Collection $orderItems;
- #[ORM\Column(length: 255, options: [
- 'default' => 'nobody',
- ])]
- private string|null $createdBy = 'nobody';
-
public function __construct()
{
$this->orderItems = new ArrayCollection;
@@ -122,16 +117,4 @@ class FoodOrder
return $this;
}
-
- public function getCreatedBy(): string|null
- {
- return $this->createdBy;
- }
-
- public function setCreatedBy(string $createdBy): static
- {
- $this->createdBy = $createdBy;
-
- return $this;
- }
}
diff --git a/src/Entity/OrderItem.php b/src/Entity/OrderItem.php
index cc7abd4..1429a5d 100644
--- a/src/Entity/OrderItem.php
+++ b/src/Entity/OrderItem.php
@@ -31,11 +31,6 @@ class OrderItem
#[ORM\JoinColumn(nullable: false)]
private MenuItem|null $menuItem = null;
- #[ORM\Column(length: 255, options: [
- 'default' => 'nobody',
- ])]
- private string|null $createdBy = 'nobody';
-
public function getId(): Ulid|null
{
return $this->id;
@@ -88,16 +83,4 @@ class OrderItem
return $this;
}
-
- public function getCreatedBy(): string|null
- {
- return $this->createdBy;
- }
-
- public function setCreatedBy(string $createdBy): static
- {
- $this->createdBy = $createdBy;
-
- return $this;
- }
}
diff --git a/src/Form/FoodOrderType.php b/src/Form/FoodOrderType.php
index 5e5576c..b0f177b 100644
--- a/src/Form/FoodOrderType.php
+++ b/src/Form/FoodOrderType.php
@@ -24,7 +24,6 @@ final class FoodOrderType extends AbstractType
->add(child: 'closedAt', options: [
'label' => 'closes at',
])
- ->add(child: 'createdBy')
;
if ($action !== null) {
$builder->setAction($action);
diff --git a/src/Form/OrderItemType.php b/src/Form/OrderItemType.php
index 393a99c..4716baf 100644
--- a/src/Form/OrderItemType.php
+++ b/src/Form/OrderItemType.php
@@ -14,11 +14,8 @@ final class OrderItemType extends AbstractType
public function buildForm(FormBuilderInterface $builder, array $options): void
{
$builder
- ->add(child: 'name', options: [
- 'data' => $options['name'] ?? '',
- ])
+ ->add('name')
->add('extras')
- ->add('createdBy')
;
}
diff --git a/src/Form/UserNameFormType.php b/src/Form/UserNameFormType.php
deleted file mode 100644
index 6d2a011..0000000
--- a/src/Form/UserNameFormType.php
+++ /dev/null
@@ -1,29 +0,0 @@
-add(child: 'username', options: [
- 'required' => false,
- ])
- ;
- }
-
- #[Override]
- public function configureOptions(OptionsResolver $resolver): void
- {
- $resolver->setDefaults([
- // Configure your form options here
- ]);
- }
-}
diff --git a/templates/base.html.twig b/templates/base.html.twig
index a286536..1918768 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -4,29 +4,23 @@
{% block title %}Welcome!{% endblock %}
-
-
+
-
-
- {% block body %}{% endblock %}
-
-
+
+
+ {% block body %}{% endblock %}
+