From 252eac442e5b12a98cff823668d85e132a10c1c9 Mon Sep 17 00:00:00 2001 From: lubiana Date: Mon, 16 Jun 2025 18:14:44 +0200 Subject: [PATCH 1/6] move js files --- assets/app.js | 12 ++++++------ assets/{ => javascript}/emoji-footprint.js | 0 assets/{ => javascript}/modes.js | 0 assets/{ => javascript}/numberInputs.js | 0 assets/{ => javascript}/radioState.js | 0 assets/{ => javascript}/theme.js | 0 6 files changed, 6 insertions(+), 6 deletions(-) rename assets/{ => javascript}/emoji-footprint.js (100%) rename assets/{ => javascript}/modes.js (100%) rename assets/{ => javascript}/numberInputs.js (100%) rename assets/{ => javascript}/radioState.js (100%) rename assets/{ => javascript}/theme.js (100%) diff --git a/assets/app.js b/assets/app.js index 7aa7252..8ed6e87 100644 --- a/assets/app.js +++ b/assets/app.js @@ -10,11 +10,11 @@ import './styles/modes.css'; import './styles/emoji-footprint.css'; // Import modules -import './theme.js'; -import './emoji-footprint.js'; -import './modes.js'; -import { initNumberInputs } from './numberInputs.js'; -import { initRadioState } from './radioState.js'; +import './javascript/theme.js'; +import './javascript/emoji-footprint.js'; +import './javascript/modes.js'; +import { initNumberInputs } from './javascript/numberInputs.js'; +import { initRadioState } from './javascript/radioState.js'; // Initialize everything when DOM is ready document.addEventListener('DOMContentLoaded', function() { @@ -23,4 +23,4 @@ document.addEventListener('DOMContentLoaded', function() { // Initialize number inputs on page load initNumberInputs(); -}); \ No newline at end of file +}); diff --git a/assets/emoji-footprint.js b/assets/javascript/emoji-footprint.js similarity index 100% rename from assets/emoji-footprint.js rename to assets/javascript/emoji-footprint.js diff --git a/assets/modes.js b/assets/javascript/modes.js similarity index 100% rename from assets/modes.js rename to assets/javascript/modes.js diff --git a/assets/numberInputs.js b/assets/javascript/numberInputs.js similarity index 100% rename from assets/numberInputs.js rename to assets/javascript/numberInputs.js diff --git a/assets/radioState.js b/assets/javascript/radioState.js similarity index 100% rename from assets/radioState.js rename to assets/javascript/radioState.js diff --git a/assets/theme.js b/assets/javascript/theme.js similarity index 100% rename from assets/theme.js rename to assets/javascript/theme.js From 0d236677d4854d7b66a0b8f242a4aa38700ae97d Mon Sep 17 00:00:00 2001 From: lubiana Date: Mon, 16 Jun 2025 19:05:29 +0200 Subject: [PATCH 2/6] add first chartychaaaaarrrt --- importmap.php | 11 ++++++-- templates/drink_type/show.html.twig | 42 +++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/importmap.php b/importmap.php index fbddf9e..d13ef46 100644 --- a/importmap.php +++ b/importmap.php @@ -1,7 +1,5 @@ '5.3.6', 'type' => 'css', ], + 'chart.js' => [ + 'version' => '4.5.0', + ], + '@kurkle/color' => [ + 'version' => '0.3.4', + ], + 'chart.js/auto' => [ + 'version' => '4.5.0', + ], ]; diff --git a/templates/drink_type/show.html.twig b/templates/drink_type/show.html.twig index 9531d0a..7801144 100644 --- a/templates/drink_type/show.html.twig +++ b/templates/drink_type/show.html.twig @@ -50,6 +50,48 @@ +
+
+
+
+
Example Chart
+
+
+ + +
+
+
+
+
From f0c738362aebee9025313e4c29e176ac867c5fa3 Mon Sep 17 00:00:00 2001 From: Continuous Integration Date: Mon, 16 Jun 2025 17:07:14 +0000 Subject: [PATCH 3/6] Continuous Integration Fixes --- importmap.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/importmap.php b/importmap.php index d13ef46..1dea2bd 100644 --- a/importmap.php +++ b/importmap.php @@ -1,5 +1,7 @@ Date: Mon, 16 Jun 2025 20:10:48 +0200 Subject: [PATCH 4/6] emojis --- assets/javascript/modes.js | 14 ++++ assets/styles/app.css | 15 +++- templates/base.html.twig | 67 ++++++++++++--- templates/drink_type/_delete_form.html.twig | 9 +- templates/drink_type/_form.html.twig | 7 +- .../drink_type/bulk_edit_stock.html.twig | 10 +-- .../bulk_edit_wanted_stock.html.twig | 16 ++-- templates/drink_type/edit.html.twig | 18 +++- templates/drink_type/index.html.twig | 75 +++++++++++++---- templates/drink_type/new.html.twig | 16 +++- templates/drink_type/show.html.twig | 82 ++++++++++++------- templates/form/theme.html.twig | 4 +- templates/index.html.twig | 55 ++++++++----- templates/order/_delete_form.html.twig | 4 +- templates/order/_form.html.twig | 37 +++++++-- templates/order/edit.html.twig | 8 +- templates/order/index.html.twig | 42 +++++++--- templates/order/new.html.twig | 6 +- templates/order/show.html.twig | 36 ++++---- templates/system_config/_form.html.twig | 2 +- templates/system_config/_reset_form.html.twig | 4 +- templates/system_config/edit.html.twig | 8 +- templates/system_config/index.html.twig | 18 ++-- tests/Feature/Web/BulkEditFormTest.php | 6 +- .../Web/BulkEditWantedStockFormTest.php | 6 +- tests/Feature/Web/HelloWorldTest.php | 2 +- .../Web/SystemConfigControllerTest.php | 8 +- 27 files changed, 401 insertions(+), 174 deletions(-) diff --git a/assets/javascript/modes.js b/assets/javascript/modes.js index 909348f..a288f32 100644 --- a/assets/javascript/modes.js +++ b/assets/javascript/modes.js @@ -1,7 +1,19 @@ // Bonkers mode functionality +function setEmojiLevelClass(mode) { + document.body.classList.remove('emoji-normal', 'emoji-enhanced', 'emoji-bonkers'); + if (mode === 'bonkers') { + document.body.classList.add('emoji-bonkers'); + } else if (mode === 'enhanced') { + document.body.classList.add('emoji-enhanced'); + } else { + document.body.classList.add('emoji-normal'); + } +} + function initBonkersMode() { // Check if we're in bonkers mode const currentMode = document.documentElement.getAttribute('data-website-mode'); + setEmojiLevelClass(currentMode); if (currentMode === 'bonkers') { // Apply bonkers mode immediately @@ -92,6 +104,7 @@ function watchModeChanges() { if (newMode === 'bonkers') { document.body.classList.add('bonkers-mode'); + setEmojiLevelClass(newMode); // Start the fabulous effects createExtraSparkles(); @@ -100,6 +113,7 @@ function watchModeChanges() { console.log('🌈✨ Switched to bonkers mode! ✨🌈'); } else { document.body.classList.remove('bonkers-mode'); + setEmojiLevelClass(newMode); console.log(`😴 Switched to ${newMode} mode`); } } diff --git a/assets/styles/app.css b/assets/styles/app.css index befa7ed..f0278fd 100644 --- a/assets/styles/app.css +++ b/assets/styles/app.css @@ -117,4 +117,17 @@ --bs-info-bg-subtle: #00313D; --bs-warning-bg-subtle: #3E3D1C; --bs-danger-bg-subtle: #520E0E; - } \ No newline at end of file + } + +/* === EMOJI LEVELS === */ +.emoji-normal .emoji-normal { display: inline; } +.emoji-normal .emoji-enhanced, +.emoji-normal .emoji-bonkers { display: none; } + +.emoji-enhanced .emoji-enhanced { display: inline; } +.emoji-enhanced .emoji-normal, +.emoji-enhanced .emoji-bonkers { display: none; } + +.emoji-bonkers .emoji-bonkers { display: inline; } +.emoji-bonkers .emoji-normal, +.emoji-bonkers .emoji-enhanced { display: none; } \ No newline at end of file diff --git a/templates/base.html.twig b/templates/base.html.twig index c0dab35..3af52a6 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -8,7 +8,7 @@ "> - {% block title %}Welcome!{% endblock %} + {% block title %}Welcome! 🥵💦🍆💋👅😈😏🍑💕💖💗💘💝💞💟💌💏💑🍌🥒💦👀😉😌😍🥰😘😚😋😫😩🥺🥴💖💗💕💞💓💗💖💘💝💋💏💑{% endblock %} {% block stylesheets %} {% endblock %} @@ -19,29 +19,63 @@
- +