This commit is contained in:
Thomas 2025-01-25 20:42:01 +01:00
parent cb32d69821
commit 5eebc2647f
18 changed files with 2441 additions and 194 deletions

View File

@ -1,9 +0,0 @@
/*
* Welcome to your app's main JavaScript file!
*
* This file will be included onto the page via the importmap() Twig function,
* which should already be in your base.html.twig.
*/
import './styles/app.css';
console.log('This log comes from assets/app.js - welcome to AssetMapper! 🎉');

View File

@ -22,7 +22,7 @@ import 'brace/ext/searchbox'
import * as bootstrap from 'bootstrap' import * as bootstrap from 'bootstrap'
import 'summernote/dist/summernote-lite.js' import 'summernote/dist/summernote-lite.js'
//window.Dropzone = './js/dropzone'; //window.Dropzone = './js/dropzone';
window.bootstrap = bootstrap
import './js/summernote/mediabundle.plugin.js' import './js/summernote/mediabundle.plugin.js'
import { init } from './js/init.js'; import { init } from './js/init.js';
@ -34,7 +34,7 @@ window.psc = {};
window.psc.ajaxModal = new ajaxModal; window.psc.ajaxModal = new ajaxModal;
window.psc.mediaChooser = new mediaChooser; window.psc.mediaChooser = new mediaChooser;
window.psc.init = init; window.psc.init = init;
window.psc.order = new order; //window.psc.order = new order;
window.psc.product = new product; window.psc.product = new product;
window.psc.init(); window.psc.init();

View File

@ -1,7 +1,7 @@
export function init() { export function init() {
window.psc.ajaxModal.init(); window.psc.ajaxModal.init();
psc.mediaChooser.init(); psc.mediaChooser.init();
psc.order.init(); // psc.order.init();
psc.product.init(); psc.product.init();
if (typeof bootstrapApp === 'function') { if (typeof bootstrapApp === 'function') {
bootstrapApp(); bootstrapApp();

View File

@ -24,7 +24,7 @@ export class mediaChooser {
// URL-Chooser // URL-Chooser
urlChooser() { urlChooser() {
var self = this;
// Link Chooser select // Link Chooser select
$('body').on('click', '.js-url-chooser-link-select', function (e) { $('body').on('click', '.js-url-chooser-link-select', function (e) {
e.preventDefault(); e.preventDefault();
@ -35,14 +35,14 @@ export class mediaChooser {
replaceUrl = $this.closest('nav').data('replace-url'); replaceUrl = $this.closest('nav').data('replace-url');
// Store values // Store values
itemUrl = (slug ? slug : ''); self.itemUrl = (slug ? slug : '');
itemId = id; self.itemId = id;
// Replace URL // Replace URL
$.ajax({ $.ajax({
url: replaceUrl, url: replaceUrl,
type: 'GET', type: 'GET',
data: {'text': itemUrl}, data: {'text': this.itemUrl},
success: function (response) { success: function (response) {
replacedUrl = response.text; replacedUrl = response.text;
@ -65,33 +65,33 @@ export class mediaChooser {
replaceUrl = $this.closest('.thumbnail-wrapper').data('replace-url'); replaceUrl = $this.closest('.thumbnail-wrapper').data('replace-url');
// Store values // Store values
var itemUrl = path; self.itemUrl = path;
var itemId = id; self.itemId = id;
var itemTitle = title; self.itemTitle = title;
var itemThumbPath = thumbPath; self.itemThumbPath = thumbPath;
// Save // Save
if (!cke) { if (!cke) {
var isMediaChooser = $(window.frameElement).closest('.js-ajax-modal').data('media-chooser'); var isMediaChooser = $(window.frameElement).closest('.js-ajax-modal').data('media-chooser');
if (isMediaChooser) { if (isMediaChooser) {
psc.mediaChooser.saveMediaChooserModal(false); self.saveMediaChooserModal(false);
} else { } else {
// Replace URL // Replace URL
$.ajax({ $.ajax({
url: replaceUrl, url: replaceUrl,
type: 'GET', type: 'GET',
data: {'text': itemUrl}, data: {'text': this.itemUrl},
success: function (response) { success: function (response) {
replacedUrl = response.text; replacedUrl = response.text;
} }
}).done(function () { }).done(function () {
psc.mediaChooser.saveUrlChooserModal(false); self.saveUrlChooserModal(false);
}); });
} }
} else { } else {
psc.mediaChooser.saveMediaChooserModal(true); self.saveMediaChooserModal(true);
} }
}); });
@ -104,7 +104,7 @@ export class mediaChooser {
var $parentModal = $(window.frameElement).closest('.js-ajax-modal'), var $parentModal = $(window.frameElement).closest('.js-ajax-modal'),
parentModalId = $parentModal.attr('id'); parentModalId = $parentModal.attr('id');
parent.$('#' + parentModalId).modal('hide'); parent.bootstrap.Modal.getInstance('#' + parentModalId).hide();
} else { } else {
window.close(); window.close();
@ -116,7 +116,7 @@ export class mediaChooser {
$(document).on('click', '#save-url-chooser-modal', function () { $(document).on('click', '#save-url-chooser-modal', function () {
var cke = $(this).data('cke'); var cke = $(this).data('cke');
psc.mediaChooser.saveUrlChooserModal(cke); self.saveUrlChooserModal(cke);
}); });
} }
@ -128,19 +128,19 @@ export class mediaChooser {
parentModalId = $parentModal.attr('id'); parentModalId = $parentModal.attr('id');
// Set val // Set val
parent.$('#' + linkedInputId).val(itemUrl).change(); parent.$('#' + linkedInputId).val(this.itemUrl).change();
// Set proper URL // Set proper URL
parent.$('#' + linkedInputId).parent().find('.js-urlchooser-value').val(replacedUrl); parent.$('#' + linkedInputId).parent().find('.js-urlchooser-value').val(replacedUrl);
// Close modal // Close modal
parent.$('#' + parentModalId).modal('hide'); parent.bootstrap.Modal.getInstance('#' + parentModalId).hide();
} else { } else {
var funcNum = getUrlParam('CKEditorFuncNum'); var funcNum = getUrlParam('CKEditorFuncNum');
// Set val // Set val
window.opener.CKEDITOR.tools.callFunction(funcNum, itemUrl); window.opener.CKEDITOR.tools.callFunction(funcNum, this.itemUrl);
// Close window // Close window
window.close(); window.close();
@ -156,7 +156,7 @@ export class mediaChooser {
parentModalId = $parentModal.attr('id'); parentModalId = $parentModal.attr('id');
// Set val // Set val
parent.$('#' + linkedInputId).val(itemId).change(); parent.$('#' + linkedInputId).val(this.itemId).change();
// Update preview // Update preview
var $mediaChooser = parent.$('#' + linkedInputId + '-widget'), var $mediaChooser = parent.$('#' + linkedInputId + '-widget'),
@ -164,23 +164,23 @@ export class mediaChooser {
$previewTitle = parent.$('#' + linkedInputId + '__preview__title'); $previewTitle = parent.$('#' + linkedInputId + '__preview__title');
$mediaChooser.addClass('media-chooser--choosen'); $mediaChooser.addClass('media-chooser--choosen');
$previewTitle.html(itemTitle); $previewTitle.html(this.itemTitle);
if (itemThumbPath === "") { if (this.itemThumbPath === "") {
var $parent = $previewTitle.parent(); var $parent = $previewTitle.parent();
$parent.prepend('<i class="fa fa-file-o media-thumbnail__icon"></i>'); $parent.prepend('<i class="fa fa-file-o media-thumbnail__icon"></i>');
} else { } else {
$previewImg.attr('src', itemThumbPath); $previewImg.attr('src', this.itemThumbPath);
} }
// Close modal // Close modal
parent.$('#' + parentModalId).modal('hide'); parent.bootstrap.Modal.getInstance('#' + parentModalId).hide();
} else { } else {
var funcNum = getUrlParam('CKEditorFuncNum'); var funcNum = getUrlParam('CKEditorFuncNum');
// Set val // Set val
window.opener.CKEDITOR.tools.callFunction(funcNum, itemUrl); window.opener.CKEDITOR.tools.callFunction(funcNum, this.itemUrl);
// Close window // Close window
window.close(); window.close();

View File

@ -1,3 +0,0 @@
body {
background-color: skyblue;
}

View File

@ -1,3 +1,5 @@
@import url('https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap');
@tailwind base; @tailwind base;
@tailwind components; @tailwind components;
@tailwind utilities; @tailwind utilities;
@ -17,5 +19,4 @@
z-index: 1; z-index: 1;
top: -1px; top: -1px;
} }
} }

134
src/new/composer.lock generated
View File

@ -1064,16 +1064,16 @@
}, },
{ {
"name": "doctrine/dbal", "name": "doctrine/dbal",
"version": "3.9.3", "version": "3.9.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/dbal.git", "url": "https://github.com/doctrine/dbal.git",
"reference": "61446f07fcb522414d6cfd8b1c3e5f9e18c579ba" "reference": "ec16c82f20be1a7224e65ac67144a29199f87959"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/61446f07fcb522414d6cfd8b1c3e5f9e18c579ba", "url": "https://api.github.com/repos/doctrine/dbal/zipball/ec16c82f20be1a7224e65ac67144a29199f87959",
"reference": "61446f07fcb522414d6cfd8b1c3e5f9e18c579ba", "reference": "ec16c82f20be1a7224e65ac67144a29199f87959",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1089,15 +1089,13 @@
"doctrine/coding-standard": "12.0.0", "doctrine/coding-standard": "12.0.0",
"fig/log-test": "^1", "fig/log-test": "^1",
"jetbrains/phpstorm-stubs": "2023.1", "jetbrains/phpstorm-stubs": "2023.1",
"phpstan/phpstan": "1.12.6", "phpstan/phpstan": "2.1.1",
"phpstan/phpstan-strict-rules": "^1.6", "phpstan/phpstan-strict-rules": "^2",
"phpunit/phpunit": "9.6.20", "phpunit/phpunit": "9.6.22",
"psalm/plugin-phpunit": "0.18.4",
"slevomat/coding-standard": "8.13.1", "slevomat/coding-standard": "8.13.1",
"squizlabs/php_codesniffer": "3.10.2", "squizlabs/php_codesniffer": "3.10.2",
"symfony/cache": "^5.4|^6.0|^7.0", "symfony/cache": "^5.4|^6.0|^7.0",
"symfony/console": "^4.4|^5.4|^6.0|^7.0", "symfony/console": "^4.4|^5.4|^6.0|^7.0"
"vimeo/psalm": "4.30.0"
}, },
"suggest": { "suggest": {
"symfony/console": "For helpful console commands such as SQL execution and import of files." "symfony/console": "For helpful console commands such as SQL execution and import of files."
@ -1157,7 +1155,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/doctrine/dbal/issues", "issues": "https://github.com/doctrine/dbal/issues",
"source": "https://github.com/doctrine/dbal/tree/3.9.3" "source": "https://github.com/doctrine/dbal/tree/3.9.4"
}, },
"funding": [ "funding": [
{ {
@ -1173,7 +1171,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-10-10T17:56:43+00:00" "time": "2025-01-16T08:28:55+00:00"
}, },
{ {
"name": "doctrine/deprecations", "name": "doctrine/deprecations",
@ -1666,16 +1664,16 @@
}, },
{ {
"name": "doctrine/mongodb-odm", "name": "doctrine/mongodb-odm",
"version": "2.9.1", "version": "2.10.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/mongodb-odm.git", "url": "https://github.com/doctrine/mongodb-odm.git",
"reference": "ad7827c7915b8b867cb28f5252d99b08ec67ac78" "reference": "a00f135370ca3e99832a09397e7abb7bf12be681"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/mongodb-odm/zipball/ad7827c7915b8b867cb28f5252d99b08ec67ac78", "url": "https://api.github.com/repos/doctrine/mongodb-odm/zipball/a00f135370ca3e99832a09397e7abb7bf12be681",
"reference": "ad7827c7915b8b867cb28f5252d99b08ec67ac78", "reference": "a00f135370ca3e99832a09397e7abb7bf12be681",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1683,7 +1681,7 @@
"doctrine/collections": "^1.5 || ^2.0", "doctrine/collections": "^1.5 || ^2.0",
"doctrine/event-manager": "^1.0 || ^2.0", "doctrine/event-manager": "^1.0 || ^2.0",
"doctrine/instantiator": "^1.1 || ^2", "doctrine/instantiator": "^1.1 || ^2",
"doctrine/persistence": "^3.2", "doctrine/persistence": "^3.2 || ^4",
"ext-mongodb": "^1.17", "ext-mongodb": "^1.17",
"friendsofphp/proxy-manager-lts": "^1.0", "friendsofphp/proxy-manager-lts": "^1.0",
"jean85/pretty-package-versions": "^1.3.0 || ^2.0.1", "jean85/pretty-package-versions": "^1.3.0 || ^2.0.1",
@ -1692,7 +1690,8 @@
"psr/cache": "^1.0 || ^2.0 || ^3.0", "psr/cache": "^1.0 || ^2.0 || ^3.0",
"symfony/console": "^5.4 || ^6.0 || ^7.0", "symfony/console": "^5.4 || ^6.0 || ^7.0",
"symfony/deprecation-contracts": "^2.2 || ^3.0", "symfony/deprecation-contracts": "^2.2 || ^3.0",
"symfony/var-dumper": "^5.4 || ^6.0 || ^7.0" "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0",
"symfony/var-exporter": "^6.2 || ^7.0"
}, },
"conflict": { "conflict": {
"doctrine/annotations": "<1.12 || >=3.0" "doctrine/annotations": "<1.12 || >=3.0"
@ -1708,8 +1707,7 @@
"phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-phpunit": "^1.0",
"phpunit/phpunit": "^10.4", "phpunit/phpunit": "^10.4",
"squizlabs/php_codesniffer": "^3.5", "squizlabs/php_codesniffer": "^3.5",
"symfony/cache": "^5.4 || ^6.0 || ^7.0", "symfony/cache": "^5.4 || ^6.0 || ^7.0"
"vimeo/psalm": "~5.24.0"
}, },
"suggest": { "suggest": {
"doctrine/annotations": "For annotation mapping support", "doctrine/annotations": "For annotation mapping support",
@ -1760,7 +1758,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/doctrine/mongodb-odm/issues", "issues": "https://github.com/doctrine/mongodb-odm/issues",
"source": "https://github.com/doctrine/mongodb-odm/tree/2.9.1" "source": "https://github.com/doctrine/mongodb-odm/tree/2.10.0"
}, },
"funding": [ "funding": [
{ {
@ -1776,7 +1774,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-12-19T09:54:22+00:00" "time": "2025-01-23T15:34:31+00:00"
}, },
{ {
"name": "doctrine/mongodb-odm-bundle", "name": "doctrine/mongodb-odm-bundle",
@ -2069,16 +2067,16 @@
}, },
{ {
"name": "doctrine/sql-formatter", "name": "doctrine/sql-formatter",
"version": "1.5.1", "version": "1.5.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/sql-formatter.git", "url": "https://github.com/doctrine/sql-formatter.git",
"reference": "b784cbde727cf806721451dde40eff4fec3bbe86" "reference": "d6d00aba6fd2957fe5216fe2b7673e9985db20c8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/sql-formatter/zipball/b784cbde727cf806721451dde40eff4fec3bbe86", "url": "https://api.github.com/repos/doctrine/sql-formatter/zipball/d6d00aba6fd2957fe5216fe2b7673e9985db20c8",
"reference": "b784cbde727cf806721451dde40eff4fec3bbe86", "reference": "d6d00aba6fd2957fe5216fe2b7673e9985db20c8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2088,8 +2086,7 @@
"doctrine/coding-standard": "^12", "doctrine/coding-standard": "^12",
"ergebnis/phpunit-slow-test-detector": "^2.14", "ergebnis/phpunit-slow-test-detector": "^2.14",
"phpstan/phpstan": "^1.10", "phpstan/phpstan": "^1.10",
"phpunit/phpunit": "^10.5", "phpunit/phpunit": "^10.5"
"vimeo/psalm": "^5.24"
}, },
"bin": [ "bin": [
"bin/sql-formatter" "bin/sql-formatter"
@ -2119,9 +2116,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/doctrine/sql-formatter/issues", "issues": "https://github.com/doctrine/sql-formatter/issues",
"source": "https://github.com/doctrine/sql-formatter/tree/1.5.1" "source": "https://github.com/doctrine/sql-formatter/tree/1.5.2"
}, },
"time": "2024-10-21T18:21:57+00:00" "time": "2025-01-24T11:45:48+00:00"
}, },
{ {
"name": "egulias/email-validator", "name": "egulias/email-validator",
@ -3011,16 +3008,16 @@
}, },
{ {
"name": "horstoeko/zugferd", "name": "horstoeko/zugferd",
"version": "v1.0.102", "version": "v1.0.104",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/horstoeko/zugferd.git", "url": "https://github.com/horstoeko/zugferd.git",
"reference": "c43788ad1713393247a2d73bbded8308f1eea031" "reference": "9c37fbe55e37e3082dc3702867d669fb67ef988e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/horstoeko/zugferd/zipball/c43788ad1713393247a2d73bbded8308f1eea031", "url": "https://api.github.com/repos/horstoeko/zugferd/zipball/9c37fbe55e37e3082dc3702867d669fb67ef988e",
"reference": "c43788ad1713393247a2d73bbded8308f1eea031", "reference": "9c37fbe55e37e3082dc3702867d669fb67ef988e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3079,9 +3076,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/horstoeko/zugferd/issues", "issues": "https://github.com/horstoeko/zugferd/issues",
"source": "https://github.com/horstoeko/zugferd/tree/v1.0.102" "source": "https://github.com/horstoeko/zugferd/tree/v1.0.104"
}, },
"time": "2025-01-03T10:49:47+00:00" "time": "2025-01-19T09:23:02+00:00"
}, },
{ {
"name": "imagine/imagine", "name": "imagine/imagine",
@ -3327,16 +3324,16 @@
}, },
{ {
"name": "jms/serializer", "name": "jms/serializer",
"version": "3.32.1", "version": "3.32.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/schmittjoh/serializer.git", "url": "https://github.com/schmittjoh/serializer.git",
"reference": "b4285f4197a5b961d365e2c756b144d7af24a7fd" "reference": "fa7ab39504c24d76107ba16c00aafa5da3605971"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/schmittjoh/serializer/zipball/b4285f4197a5b961d365e2c756b144d7af24a7fd", "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/fa7ab39504c24d76107ba16c00aafa5da3605971",
"reference": "b4285f4197a5b961d365e2c756b144d7af24a7fd", "reference": "fa7ab39504c24d76107ba16c00aafa5da3605971",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3413,7 +3410,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/schmittjoh/serializer/issues", "issues": "https://github.com/schmittjoh/serializer/issues",
"source": "https://github.com/schmittjoh/serializer/tree/3.32.1" "source": "https://github.com/schmittjoh/serializer/tree/3.32.2"
}, },
"funding": [ "funding": [
{ {
@ -3421,7 +3418,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2024-12-03T22:30:06+00:00" "time": "2025-01-03T22:43:29+00:00"
}, },
{ {
"name": "jms/serializer-bundle", "name": "jms/serializer-bundle",
@ -5424,12 +5421,12 @@
"version": "3.8.4", "version": "3.8.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/briannesbitt/Carbon.git", "url": "https://github.com/CarbonPHP/carbon.git",
"reference": "129700ed449b1f02d70272d2ac802357c8c30c58" "reference": "129700ed449b1f02d70272d2ac802357c8c30c58"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/129700ed449b1f02d70272d2ac802357c8c30c58", "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/129700ed449b1f02d70272d2ac802357c8c30c58",
"reference": "129700ed449b1f02d70272d2ac802357c8c30c58", "reference": "129700ed449b1f02d70272d2ac802357c8c30c58",
"shasum": "" "shasum": ""
}, },
@ -6366,16 +6363,16 @@
}, },
{ {
"name": "phpoffice/phpspreadsheet", "name": "phpoffice/phpspreadsheet",
"version": "1.29.7", "version": "1.29.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/PHPOffice/PhpSpreadsheet.git", "url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
"reference": "02c8625411dcb96e1f63d58c47460284e15b2e80" "reference": "089ffdfc04b5fcf25a3503d81a4e589f247e20e3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/02c8625411dcb96e1f63d58c47460284e15b2e80", "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/089ffdfc04b5fcf25a3503d81a4e589f247e20e3",
"reference": "02c8625411dcb96e1f63d58c47460284e15b2e80", "reference": "089ffdfc04b5fcf25a3503d81a4e589f247e20e3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -6465,9 +6462,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues",
"source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.29.7" "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.29.8"
}, },
"time": "2024-12-27T05:10:37+00:00" "time": "2025-01-12T03:16:27+00:00"
}, },
{ {
"name": "phpstan/phpdoc-parser", "name": "phpstan/phpdoc-parser",
@ -13931,16 +13928,16 @@
}, },
{ {
"name": "symfonycasts/tailwind-bundle", "name": "symfonycasts/tailwind-bundle",
"version": "v0.7.0", "version": "v0.7.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/SymfonyCasts/tailwind-bundle.git", "url": "https://github.com/SymfonyCasts/tailwind-bundle.git",
"reference": "5c0e36694a49f017a06d0331e45ca384fc5f7677" "reference": "81c9e6ff2bb1a95e67fc6af04ca87fccdcf55aa4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/SymfonyCasts/tailwind-bundle/zipball/5c0e36694a49f017a06d0331e45ca384fc5f7677", "url": "https://api.github.com/repos/SymfonyCasts/tailwind-bundle/zipball/81c9e6ff2bb1a95e67fc6af04ca87fccdcf55aa4",
"reference": "5c0e36694a49f017a06d0331e45ca384fc5f7677", "reference": "81c9e6ff2bb1a95e67fc6af04ca87fccdcf55aa4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -13980,9 +13977,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/SymfonyCasts/tailwind-bundle/issues", "issues": "https://github.com/SymfonyCasts/tailwind-bundle/issues",
"source": "https://github.com/SymfonyCasts/tailwind-bundle/tree/v0.7.0" "source": "https://github.com/SymfonyCasts/tailwind-bundle/tree/v0.7.1"
}, },
"time": "2025-01-22T16:31:51+00:00" "time": "2025-01-23T14:54:07+00:00"
}, },
{ {
"name": "tp/paydirekt-php", "name": "tp/paydirekt-php",
@ -15442,16 +15439,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "1.12.15", "version": "1.12.16",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "c91d4e8bc056f46cf653656e6f71004b254574d1" "reference": "e0bb5cb78545aae631220735aa706eac633a6be9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/c91d4e8bc056f46cf653656e6f71004b254574d1", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e0bb5cb78545aae631220735aa706eac633a6be9",
"reference": "c91d4e8bc056f46cf653656e6f71004b254574d1", "reference": "e0bb5cb78545aae631220735aa706eac633a6be9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -15496,7 +15493,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2025-01-05T16:40:22+00:00" "time": "2025-01-21T14:50:05+00:00"
}, },
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",
@ -16940,16 +16937,16 @@
}, },
{ {
"name": "squizlabs/php_codesniffer", "name": "squizlabs/php_codesniffer",
"version": "3.11.2", "version": "3.11.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
"reference": "1368f4a58c3c52114b86b1abe8f4098869cb0079" "reference": "ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/1368f4a58c3c52114b86b1abe8f4098869cb0079", "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10",
"reference": "1368f4a58c3c52114b86b1abe8f4098869cb0079", "reference": "ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -17014,9 +17011,13 @@
{ {
"url": "https://opencollective.com/php_codesniffer", "url": "https://opencollective.com/php_codesniffer",
"type": "open_collective" "type": "open_collective"
},
{
"url": "https://thanks.dev/phpcsstandards",
"type": "thanks_dev"
} }
], ],
"time": "2024-12-11T16:04:26+00:00" "time": "2025-01-23T17:04:15+00:00"
}, },
{ {
"name": "symfony/browser-kit", "name": "symfony/browser-kit",
@ -17857,6 +17858,7 @@
"type": "github" "type": "github"
} }
], ],
"abandoned": "rector/swiss-knife",
"time": "2024-04-10T10:52:45+00:00" "time": "2024-04-10T10:52:45+00:00"
}, },
{ {

View File

@ -1,3 +1,5 @@
symfonycasts_tailwind: symfonycasts_tailwind:
binary_version: 'v3.3.0' binary_version: 'v3.3.0'
input_css: 'assets/tailwind/css/backend.css' input_css:
- 'assets/tailwind/css/login.css'
- 'assets/tailwind/css/backend.css'

View File

@ -20,6 +20,16 @@ return [
'path' => './assets/tailwind/backend.js', 'path' => './assets/tailwind/backend.js',
'entrypoint' => true, 'entrypoint' => true,
], ],
'backend/login' => [
'path' => './assets/tailwind/login.js',
'entrypoint' => true,
],
'@symfony/stimulus-bundle' => [
'path' => '@symfony/stimulus-bundle/loader.js',
],
'@symfony/ux-live-component' => [
'path' => './vendor/symfony/ux-live-component/assets/dist/live_controller.js',
],
'@hotwired/stimulus' => [ '@hotwired/stimulus' => [
'version' => '3.2.2', 'version' => '3.2.2',
], ],
@ -27,9 +37,6 @@ return [
'version' => '2.4.1', 'version' => '2.4.1',
'type' => 'css', 'type' => 'css',
], ],
'@symfony/stimulus-bundle' => [
'path' => '@symfony/stimulus-bundle/loader.js',
],
'tom-select' => [ 'tom-select' => [
'version' => '2.4.1', 'version' => '2.4.1',
], ],
@ -40,10 +47,7 @@ return [
'version' => '1.1.2', 'version' => '1.1.2',
], ],
'chart.js' => [ 'chart.js' => [
'version' => '3.9.1', 'version' => '4.4.7',
],
'@symfony/ux-live-component' => [
'path' => './vendor/symfony/ux-live-component/assets/dist/live_controller.js',
], ],
'alpinejs' => [ 'alpinejs' => [
'version' => '3.14.8', 'version' => '3.14.8',
@ -100,4 +104,11 @@ return [
'summernote/dist/summernote-lite.js' => [ 'summernote/dist/summernote-lite.js' => [
'version' => '0.9.1', 'version' => '0.9.1',
], ],
'@kurkle/color' => [
'version' => '0.3.4',
],
'tom-select/dist/css/tom-select.default.min.css' => [
'version' => '2.4.1',
'type' => 'css',
],
]; ];

View File

@ -4,7 +4,7 @@
{% if error %} {% if error %}
<div>{{ error.messageKey|trans(error.messageData, 'security') }}</div> <div>{{ error.messageKey|trans(error.messageData, 'security') }}</div>
{% endif %} {% endif %}
<pre><img src="{{ asset('build/images/logo.png') }}" alt="Logo"></pre> <pre><img src="{{ asset('images/logo.png') }}" alt="Logo"></pre>
<form method="post"> <form method="post">
<label class="text-sm font-medium leading-4 text-gray-700" for="username">{{ 'psc_backend_dashboard.username'|trans }}:</label> <label class="text-sm font-medium leading-4 text-gray-700" for="username">{{ 'psc_backend_dashboard.username'|trans }}:</label>
<input type="text" class="mt-1 block w-full rounded-lg shadow-sm outline-none border-gray-300 focus:border-psc-500 focus:ring-1 focus:ring-inset focus:ring-psc-500" id="username" name="username" value="{{ last_username }}" /> <input type="text" class="mt-1 block w-full rounded-lg shadow-sm outline-none border-gray-300 focus:border-psc-500 focus:ring-1 focus:ring-inset focus:ring-psc-500" id="username" name="username" value="{{ last_username }}" />

View File

@ -20,7 +20,7 @@
</div> </div>
{% block javascripts %} {% block javascripts %}
{% endblock %} {% endblock %}
{% block importmap %}{{ importmap('backend/dashboard') }}{% endblock %} {% block importmap %}{{ importmap('backend/login') }}{% endblock %}
</body> </body>
</html> </html>

View File

@ -18,9 +18,10 @@
<body> <body>
{% block body %} {% block body %}
{% endblock %} {% endblock %}
{% block importmap %}{{ importmap('backend/dashboard') }}{% endblock %}
{% block javascripts %} {% block javascripts %}
{% endblock %} {% endblock %}
{% block importmap %}{{ importmap('backend/dashboard') }}{% endblock %}
</body> </body>
</html> </html>

View File

@ -9,8 +9,9 @@
<base href="{{ app.request.getBaseURL() }}/"/> <base href="{{ app.request.getBaseURL() }}/"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<script> <script type="module">
var jwt_token = '{{tokenService.generateToken()}}'; var jwt_token = '{{tokenService.generateToken()}}';
window.jwt_token = jwt_token;
</script> </script>
{% block stylesheets %} {% block stylesheets %}
{% endblock %} {% endblock %}
@ -52,9 +53,9 @@
</main> </main>
</div> </div>
{% endblock %} {% endblock %}
{% block importmap %}{{ importmap('backend/dashboard') }}{% endblock %}
{% block javascripts %} {% block javascripts %}
{% endblock %} {% endblock %}
{% block importmap %}{{ importmap('backend/dashboard') }}{% endblock %}
</body> </body>
</html> </html>

View File

@ -328,7 +328,6 @@
{% block javascripts %} {% block javascripts %}
{{ parent() }} {{ parent() }}
{% autoescape 'js' %} {% autoescape 'js' %}
<script>
var productUUId = "{{product.uuid}}"; var productUUId = "{{product.uuid}}";
var formContact = false; var formContact = false;
$(function() { $(function() {
@ -340,9 +339,9 @@
}); });
function makeFullScreen(id) { function makeFullScreen(id) {
card = $('#' + id).parent(); var card = $('#' + id).parent();
editorElm = $('#' + id); var editorElm = $('#' + id);
if(card.hasClass("card-fullscreen")) { if(card.hasClass("card-fullscreen")) {
editorElm.height(editorElm.data('height')); editorElm.height(editorElm.data('height'));
@ -355,7 +354,7 @@
card.toggleClass("card-fullscreen"); card.toggleClass("card-fullscreen");
card.css('display', 'flex'); card.css('display', 'flex');
editor = ace.edit(id); var editor = ace.edit(id);
editor.resize(); editor.resize();
return; return;
}; };
@ -656,8 +655,8 @@
} }
function save() { function save() {
editorHTML = ace.edit("templateHTML"); var editorHTML = ace.edit("templateHTML");
editorCSS = ace.edit("templateCSS"); var editorCSS = ace.edit("templateCSS");
var triggerEl = document.querySelector('#myTab #general-tab'); var triggerEl = document.querySelector('#myTab #general-tab');
triggerEl.click(); triggerEl.click();
$.ajax({ $.ajax({

View File

@ -125,9 +125,9 @@
.card-fullscreen { .card-fullscreen {
display: block; display: block;
z-index: 9999; z-index: 9999;
position: fixed; position: fixed !important;
width: 100%; width: 100% !important;
height: 100%; height: 100% !important;
top: 0; top: 0;
right: 0; right: 0;
left: 0; left: 0;
@ -142,7 +142,8 @@
{{ parent() }} {{ parent() }}
{% autoescape 'js' %} {% autoescape 'js' %}
<script> <script type="module">
import $ from 'jquery';
$(function() { $(function() {
var productUUId = "{{product}}"; var productUUId = "{{product}}";
@ -160,28 +161,30 @@ $(function() {
}); });
function makeFullScreen(id) { function makeFullScreen(id) {
card = $('#' + id).parent(); var card = $('#' + id).parent();
editorElm = $('#' + id); var editorElm = $('#' + id);
if(card.hasClass("card-fullscreen")) { if(card.hasClass("card-fullscreen")) {
editorElm.height(editorElm.data('height')); editorElm.height(editorElm.data('height'));
editorElm.position('');
}else{ }else{
if(typeof card.data('height') === 'undefined') { if(typeof card.data('height') === 'undefined') {
editorElm.data('height', editorElm.height()); editorElm.data('height', editorElm.height());
} }
editorElm.height('100%'); editorElm.height('100%');
} editorElm.position('absolute');
}
card.toggleClass("card-fullscreen"); card.toggleClass("card-fullscreen");
card.css('display', 'flex'); card.css('display', 'flex');
editor = ace.edit(id); var editor = ace.edit(id);
editor.resize(); editor.resize();
return; return;
}; };
function saveCalcXml(productUUId, testMode) { function saveCalcXml(productUUId, testMode) {
editor = ace.edit("calcXmlEditor"); var editor = ace.edit("calcXmlEditor");
$.ajax({ $.ajax({
url: "/apps/api/plugin/system/psc/xmlcalc/product/" + productUUId, url: "/apps/api/plugin/system/psc/xmlcalc/product/" + productUUId,
contentType: "application/json", contentType: "application/json",
@ -198,16 +201,16 @@ function saveCalcXml(productUUId, testMode) {
}) })
} }
function saveFormelXml(productUUId, shopUUId, testMode) { function saveFormelXml(productUUId, shopUUId, testMode) {
editorFormel = ace.edit("calcFormelEditor"); var editorFormel = ace.edit("calcFormelEditor");
editorParam = ace.edit("calcParameterEditor"); var editorParam = ace.edit("calcParameterEditor");
if(testMode) { if(testMode) {
data = { var data = {
formelTest: editorFormel.getValue(), formelTest: editorFormel.getValue(),
parameterTest: editorParam.getValue() parameterTest: editorParam.getValue()
} }
}else{ }else{
data = { var data = {
formel: editorFormel.getValue(), formel: editorFormel.getValue(),
parameter: editorParam.getValue() parameter: editorParam.getValue()
} }
@ -259,7 +262,7 @@ function loadPaperContainer(productUUId, testMode) {
}); });
} }
function savePaperDB(productUUId, testMode) { function savePaperDB(productUUId, testMode) {
editor = ace.edit("calcPaperContainerEditor"); var editor = ace.edit("calcPaperContainerEditor");
$.ajax({ $.ajax({
url: "/apps/api/system/papercontainer", url: "/apps/api/system/papercontainer",
@ -275,14 +278,14 @@ function savePaperDB(productUUId, testMode) {
}) })
} }
function saveCalcCalcTemplates(productUUId, testMode) { function saveCalcCalcTemplates(productUUId, testMode) {
editor = ace.edit("calcTemplatesEditor"); var editor = ace.edit("calcTemplatesEditor");
if(testMode) { if(testMode) {
data = { var data = {
calcTemplatesTest: editor.getValue() calcTemplatesTest: editor.getValue()
} }
}else{ }else{
data = { var data = {
calcTemplates: editor.getValue() calcTemplates: editor.getValue()
} }
} }
@ -423,7 +426,7 @@ function calc(productUUId, testMode) {
if(result.xmlProductTypes.length > 1) { if(result.xmlProductTypes.length > 1) {
var $label = $('<label>').addClass('col-4 col-form-label col-form-label-sm').text("Typ"); var $label = $('<label>').addClass('col-4 col-form-label col-form-label-sm').text("Typ");
$container = $('<div class="row" id="container_xmlProduct"></div>'); var $container = $('<div class="row" id="container_xmlProduct"></div>');
var $obj = $('<select>', { var $obj = $('<select>', {
id: 'xmlProduct', id: 'xmlProduct',
@ -434,8 +437,8 @@ function calc(productUUId, testMode) {
$obj.append(new Option(opt, opt, result.xmlProduct == opt, result.xmlProduct == opt)); $obj.append(new Option(opt, opt, result.xmlProduct == opt, result.xmlProduct == opt));
}); });
$obj.addClass('form-control'); $obj.addClass('form-control');
$element = $('<div>').addClass("col-8"); var $element = $('<div>').addClass("col-8");
$inputGroup = $('<div class="input-group input-group-sm">'); var $inputGroup = $('<div class="input-group input-group-sm">');
$inputGroup.appendTo($element); $inputGroup.appendTo($element);
$obj.appendTo($inputGroup); $obj.appendTo($inputGroup);
addOrReplaceFormElement("", 'xmlProduct', $container, $element, $label, true, ""); addOrReplaceFormElement("", 'xmlProduct', $container, $element, $label, true, "");
@ -509,7 +512,6 @@ function calc(productUUId, testMode) {
$('#calcButton > span').addClass('d-none'); $('#calcButton > span').addClass('d-none');
loadPreCalc(productUUId, testMode, result.preCalc); loadPreCalc(productUUId, testMode, result.preCalc);
productXml = result.xmlProduct;
}, },
error: function(err){ error: function(err){
if(err.status === 500) { if(err.status === 500) {
@ -624,7 +626,7 @@ function buildForm(elements, display_group = "", validEelements = []) {
validEelements.push(element.id); validEelements.push(element.id);
var $label = $('<label>').addClass('col-4 col-form-label col-form-label-sm').text(element.name); var $label = $('<label>').addClass('col-4 col-form-label col-form-label-sm').text(element.name);
$container = $('<div class="row" id="container_' + element.id + '"></div>'); var $container = $('<div class="row" id="container_' + element.id + '"></div>');
if(element.htmlType == "hidden") { if(element.htmlType == "hidden") {
var $obj = $('<input>', { var $obj = $('<input>', {
type: 'hidden', type: 'hidden',
@ -632,7 +634,7 @@ function buildForm(elements, display_group = "", validEelements = []) {
id: element.id, id: element.id,
name: element.id name: element.id
}); });
$element = $('<div>').addClass("col-8"); var $element = $('<div>').addClass("col-8");
$obj.appendTo($element); $obj.appendTo($element);
addOrReplaceFormElement(previousId, element.id, $container, $element, null, element.valid, display_group); addOrReplaceFormElement(previousId, element.id, $container, $element, null, element.valid, display_group);
@ -724,8 +726,8 @@ function buildForm(elements, display_group = "", validEelements = []) {
$obj.append(element.rawValue); $obj.append(element.rawValue);
} }
$element = $('<div>').addClass("col-8"); var $element = $('<div>').addClass("col-8");
$inputGroup = $('<div class="input-group input-group-sm">'); var $inputGroup = $('<div class="input-group input-group-sm">');
$inputGroup.appendTo($element); $inputGroup.appendTo($element);
$obj.appendTo($inputGroup); $obj.appendTo($inputGroup);

View File

@ -815,18 +815,6 @@ html {
bottom: 0px; bottom: 0px;
} }
.left-0{
left: 0px;
}
.right-0{
right: 0px;
}
.top-0{
top: 0px;
}
.bottom-0{ .bottom-0{
bottom: 0px; bottom: 0px;
} }
@ -835,6 +823,14 @@ html {
inset-inline-end: 0px; inset-inline-end: 0px;
} }
.left-0{
left: 0px;
}
.right-0{
right: 0px;
}
.start-0{ .start-0{
inset-inline-start: 0px; inset-inline-start: 0px;
} }
@ -843,6 +839,10 @@ html {
inset-inline-start: 0.25rem; inset-inline-start: 0.25rem;
} }
.top-0{
top: 0px;
}
.isolate{ .isolate{
isolation: isolate; isolation: isolate;
} }
@ -875,6 +875,10 @@ html {
float: right; float: right;
} }
.m-1{
margin: 0.25rem;
}
.m-2{ .m-2{
margin: 0.5rem; margin: 0.5rem;
} }
@ -883,10 +887,6 @@ html {
margin: auto; margin: auto;
} }
.m-1{
margin: 0.25rem;
}
.-mx-3{ .-mx-3{
margin-left: -0.75rem; margin-left: -0.75rem;
margin-right: -0.75rem; margin-right: -0.75rem;
@ -917,11 +917,21 @@ html {
margin-bottom: 1.5rem; margin-bottom: 1.5rem;
} }
.me-1{
-webkit-margin-end: 0.25rem;
margin-inline-end: 0.25rem;
}
.me-2{ .me-2{
-webkit-margin-end: 0.5rem; -webkit-margin-end: 0.5rem;
margin-inline-end: 0.5rem; margin-inline-end: 0.5rem;
} }
.me-auto{
-webkit-margin-end: auto;
margin-inline-end: auto;
}
.ml-4{ .ml-4{
margin-left: 1rem; margin-left: 1rem;
} }
@ -942,6 +952,11 @@ html {
margin-right: 0.75rem; margin-right: 0.75rem;
} }
.ms-1{
-webkit-margin-start: 0.25rem;
margin-inline-start: 0.25rem;
}
.mt-1{ .mt-1{
margin-top: 0.25rem; margin-top: 0.25rem;
} }
@ -958,21 +973,6 @@ html {
margin-top: 1rem; margin-top: 1rem;
} }
.me-1{
-webkit-margin-end: 0.25rem;
margin-inline-end: 0.25rem;
}
.me-auto{
-webkit-margin-end: auto;
margin-inline-end: auto;
}
.ms-1{
-webkit-margin-start: 0.25rem;
margin-inline-start: 0.25rem;
}
.block{ .block{
display: block; display: block;
} }
@ -1053,6 +1053,10 @@ html {
display: none; display: none;
} }
.h-1{
height: 0.25rem;
}
.h-10{ .h-10{
height: 2.5rem; height: 2.5rem;
} }
@ -1089,10 +1093,6 @@ html {
height: 100vh; height: 100vh;
} }
.h-1{
height: 0.25rem;
}
.min-h-\[2\.25rem\]{ .min-h-\[2\.25rem\]{
min-height: 2.25rem; min-height: 2.25rem;
} }
@ -1573,14 +1573,14 @@ html {
padding-bottom: 1.5rem; padding-bottom: 1.5rem;
} }
.pl-8{
padding-left: 2rem;
}
.pb-1{ .pb-1{
padding-bottom: 0.25rem; padding-bottom: 0.25rem;
} }
.pl-8{
padding-left: 2rem;
}
.pt-2{ .pt-2{
padding-top: 0.5rem; padding-top: 0.5rem;
} }
@ -1775,18 +1775,18 @@ html {
outline-style: solid; outline-style: solid;
} }
.ring-1{
--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);
--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);
box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
}
.ring{ .ring{
--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color); --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);
--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(3px + var(--tw-ring-offset-width)) var(--tw-ring-color); --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(3px + var(--tw-ring-offset-width)) var(--tw-ring-color);
box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000); box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
} }
.ring-1{
--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);
--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);
box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
}
.ring-black\/5{ .ring-black\/5{
--tw-ring-color: rgb(0 0 0 / 0.05); --tw-ring-color: rgb(0 0 0 / 0.05);
} }

File diff suppressed because it is too large Load Diff