diff --git a/assets/app.js b/assets/app.js index 157e085..8ed6e87 100644 --- a/assets/app.js +++ b/assets/app.js @@ -13,10 +13,8 @@ import './styles/emoji-footprint.css'; import './javascript/theme.js'; import './javascript/emoji-footprint.js'; import './javascript/modes.js'; -import htmx from 'htmx.org'; import { initNumberInputs } from './javascript/numberInputs.js'; import { initRadioState } from './javascript/radioState.js'; -window.htmx = htmx; // Initialize everything when DOM is ready document.addEventListener('DOMContentLoaded', function() { diff --git a/config/packages/asset_mapper.php b/config/packages/asset_mapper.php index c18fd42..4b68e6a 100644 --- a/config/packages/asset_mapper.php +++ b/config/packages/asset_mapper.php @@ -2,21 +2,22 @@ declare(strict_types=1); -use Symfony\Config\FrameworkConfig; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function ( - ContainerConfigurator $containerConfigurator, - FrameworkConfig $frameworkConfig, -): void { - $frameworkConfig - ->assetMapper() - ->missingImportMode('strict') - ->importmapPolyfill(false) - ->path('assets/', true); +return static function (ContainerConfigurator $containerConfigurator): void { + $containerConfigurator->extension('framework', [ + 'asset_mapper' => [ + 'paths' => [ + 'assets/', + ], + 'missing_import_mode' => 'strict', + ], + ]); if ($containerConfigurator->env() === 'prod') { - $frameworkConfig - ->assetMapper() - ->missingImportMode('ignore'); + $containerConfigurator->extension('framework', [ + 'asset_mapper' => [ + 'missing_import_mode' => 'warn', + ], + ]); } }; diff --git a/importmap.php b/importmap.php index f880a22..1dea2bd 100644 --- a/importmap.php +++ b/importmap.php @@ -37,7 +37,4 @@ return [ 'chart.js/auto' => [ 'version' => '4.5.0', ], - 'htmx.org' => [ - 'version' => '2.0.6', - ], ]; diff --git a/src/Controller/DrinkTypeController.php b/src/Controller/DrinkTypeController.php index 54c39a9..714e92d 100644 --- a/src/Controller/DrinkTypeController.php +++ b/src/Controller/DrinkTypeController.php @@ -110,19 +110,4 @@ final class DrinkTypeController extends AbstractController return $this->redirectToRoute('app_drink_type_index', [], Response::HTTP_SEE_OTHER); } - - #[Route(path: '/{id}/history-chart', name: 'app_drink_type_history_chart', methods: ['GET'])] - public function historyChart( - DrinkType $drinkType, - GetStockHistory $getStockHistory, - GetWantedHistory $getWantedHistory, - ): Response { - return $this->render('components/history_chart_with_dismiss.html.twig', [ - 'stock_history' => $getStockHistory($drinkType), - 'wanted_history' => $getWantedHistory($drinkType), - 'chart_id' => 'stockHistoryChart_' . $drinkType->getId(), - 'title' => $drinkType->getName() . ' History', - 'drink_type_id' => $drinkType->getId(), - ]); - } } diff --git a/templates/components/history_chart_with_dismiss.html.twig b/templates/components/history_chart_with_dismiss.html.twig deleted file mode 100644 index 09740f3..0000000 --- a/templates/components/history_chart_with_dismiss.html.twig +++ /dev/null @@ -1,118 +0,0 @@ - - -
-
-
{{ title }}
- -
-
-
- -
- -
-
- - diff --git a/templates/drink_type/bulk_edit_wanted_stock.html.twig b/templates/drink_type/bulk_edit_wanted_stock.html.twig index 907d402..492a75b 100644 --- a/templates/drink_type/bulk_edit_wanted_stock.html.twig +++ b/templates/drink_type/bulk_edit_wanted_stock.html.twig @@ -37,19 +37,13 @@ {{ form_widget(drinkTypeForm.name) }} - + lol {{ form_widget(drinkTypeForm.wantedStock) }} {{ form_errors(drinkTypeForm.wantedStock) }} - {% endfor %}