From ab2971e56d3ed50b458a11edb7e35e1ceb5a8d44 Mon Sep 17 00:00:00 2001 From: Thomas Peterson Date: Mon, 30 Jun 2025 20:11:01 +0200 Subject: [PATCH] Fixes --- .docker/images/php/base/Dockerfile | 13 +- .../Controller/Backend/IndexController.php | 20 +++ .../Custom/PSC/FormBuilder/FormBuilderTS/+ | 64 --------- .../PSC/FormBuilder/FormBuilderTS/bun.lock | 3 + .../FormBuilder/FormBuilderTS/package.json | 2 + .../FormBuilderTS/src/components/Gui.vue | 12 +- .../src/components/app/debug/Debug.vue | 7 +- .../components/app/elementborder/Border.vue | 16 +-- .../app/elementborder/ElementBorder.vue | 21 +-- .../app/elementdependency/Dependency.vue | 20 +-- .../elementdependency/ElementDependency.vue | 13 +- .../elementproperties/ElementProperties.vue | 29 +++-- .../app/elements/HeadlineElementForm.vue | 23 ++-- .../app/elements/HiddenElementForm.vue | 11 +- .../app/elements/InputElementForm.vue | 13 +- .../app/elements/MediaElementForm.vue | 24 ++++ .../app/elements/RowElementForm.vue | 32 ++--- .../app/elements/SelectElementForm.vue | 6 +- .../app/elements/TextElementForm.vue | 10 +- .../app/elements/TextareaElementForm.vue | 11 +- .../src/components/app/library/Library.vue | 20 ++- .../src/components/app/main/Main.vue | 8 +- .../app/properties/HeadlineElement.vue | 7 +- .../app/properties/HiddenElement.vue | 5 +- .../app/properties/InputElement.vue | 42 +++--- .../app/properties/MediaElement.vue | 29 +++++ .../app/properties/OptionElement.vue | 27 ++-- .../components/app/properties/RowElement.vue | 19 +-- .../app/properties/SelectElement.vue | 21 ++- .../components/app/properties/TextElement.vue | 17 ++- .../app/properties/TextareaElement.vue | 22 ++-- .../app/renderelements/RenderElements.vue | 39 +++--- .../src/components/ui/button/Button.vue | 2 +- .../src/components/ui/checkbox/Checkbox.vue | 2 +- .../components/ui/dialog/DialogContent.vue | 2 +- .../ui/dialog/DialogDescription.vue | 2 +- .../src/components/ui/dialog/DialogFooter.vue | 2 +- .../src/components/ui/dialog/DialogHeader.vue | 2 +- .../components/ui/dialog/DialogOverlay.vue | 2 +- .../ui/dialog/DialogScrollContent.vue | 2 +- .../src/components/ui/dialog/DialogTitle.vue | 2 +- .../src/components/ui/input/Input.vue | 2 +- .../src/components/ui/label/Label.vue | 2 +- .../ui/resizable/ResizableHandle.vue | 2 +- .../ui/resizable/ResizablePanelGroup.vue | 2 +- .../components/ui/select/SelectContent.vue | 2 +- .../src/components/ui/select/SelectItem.vue | 2 +- .../src/components/ui/select/SelectLabel.vue | 2 +- .../ui/select/SelectScrollDownButton.vue | 2 +- .../ui/select/SelectScrollUpButton.vue | 2 +- .../components/ui/select/SelectSeparator.vue | 2 +- .../components/ui/select/SelectTrigger.vue | 2 +- .../src/components/ui/sheet/SheetContent.vue | 2 +- .../components/ui/sheet/SheetDescription.vue | 2 +- .../src/components/ui/sheet/SheetFooter.vue | 2 +- .../src/components/ui/sheet/SheetHeader.vue | 2 +- .../src/components/ui/sheet/SheetOverlay.vue | 2 +- .../src/components/ui/sheet/SheetTitle.vue | 2 +- .../src/components/ui/switch/Switch.vue | 2 +- .../src/components/ui/textarea/Textarea.vue | 2 +- .../FormBuilderTS/src/composables/useMedia.ts | 28 ++++ .../FormBuilder/FormBuilderTS/src/lib/api.ts | 22 ++++ .../FormBuilderTS/src/lib/parser.ts | 3 + .../FormBuilderTS/src/model/BaseElement.ts | 24 ++-- .../FormBuilderTS/src/model/Border.ts | 8 +- .../FormBuilderTS/src/model/Column.ts | 25 +--- .../FormBuilderTS/src/model/Dependency.ts | 6 +- .../src/model/HeadlineElement.ts | 2 +- .../FormBuilderTS/src/model/HiddenElement.ts | 2 +- .../FormBuilderTS/src/model/InputElement.ts | 10 +- .../FormBuilderTS/src/model/MediaElement.ts | 4 +- .../FormBuilderTS/src/model/Row.ts | 24 +--- .../FormBuilderTS/src/model/SelectElement.ts | 10 +- .../FormBuilderTS/src/model/TextElement.ts | 2 +- .../src/model/TextareaElement.ts | 2 +- .../FormBuilderTS/src/model/select/Option.ts | 8 +- .../FormBuilderTS/src/stores/Items.ts | 54 ++------ .../FormBuilderTS/tsconfig.app.json | 7 +- .../FormBuilder/FormBuilderTS/vite.config.ts | 11 ++ .../FormBuilder/Resources/config/routing.yml | 6 + .../FormBuilder/Resources/config/services.yml | 11 ++ .../public/formbuilderts/assets/index.css | 1 + .../public/formbuilderts/assets/index.js | 123 ++++++++++++++++++ .../Resources/public/formbuilderts/index.html | 14 ++ .../Resources/public/formbuilderts/vite.svg | 1 + .../views/backend/index/index.html.twig | 24 ++++ .../views/backend/order/index.html.twig | 7 + .../articletemplates/scripts/100.phtml | 22 ++++ .../articletemplates/scripts/100.phtml | 40 +++--- .../articletemplates/scripts/6.phtml | 24 ++-- src/old/library/TP/Basket/Item.php | 6 + .../vorlagen/bootstrap4_api/saxoprint.js | 26 ++++ .../vorlagen/tailwindcss_wp/js/saxoprint.js | 28 ++++ 93 files changed, 761 insertions(+), 486 deletions(-) create mode 100644 src/new/var/plugins/Custom/PSC/FormBuilder/Controller/Backend/IndexController.php delete mode 100644 src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/+ create mode 100644 src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/elements/MediaElementForm.vue create mode 100644 src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/properties/MediaElement.vue create mode 100644 src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/composables/useMedia.ts create mode 100644 src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/lib/api.ts create mode 100644 src/new/var/plugins/Custom/PSC/FormBuilder/Resources/config/routing.yml create mode 100644 src/new/var/plugins/Custom/PSC/FormBuilder/Resources/config/services.yml create mode 100644 src/new/var/plugins/Custom/PSC/FormBuilder/Resources/public/formbuilderts/assets/index.css create mode 100644 src/new/var/plugins/Custom/PSC/FormBuilder/Resources/public/formbuilderts/assets/index.js create mode 100644 src/new/var/plugins/Custom/PSC/FormBuilder/Resources/public/formbuilderts/index.html create mode 100644 src/new/var/plugins/Custom/PSC/FormBuilder/Resources/public/formbuilderts/vite.svg create mode 100644 src/new/var/plugins/Custom/PSC/FormBuilder/Resources/views/backend/index/index.html.twig create mode 100644 src/new/var/plugins/Custom/PSC/FormBuilder/Resources/views/backend/order/index.html.twig diff --git a/.docker/images/php/base/Dockerfile b/.docker/images/php/base/Dockerfile index 4d633a7d0..d74827d8a 100644 --- a/.docker/images/php/base/Dockerfile +++ b/.docker/images/php/base/Dockerfile @@ -57,9 +57,7 @@ RUN apt-get update && apt-get install -y \ unzip \ libzip-dev \ mupdf-tools \ - imagemagick \ - libmcrypt-dev - + imagemagick # Install fileinfo RUN docker-php-ext-install -j$(nproc) fileinfo # Install intl @@ -69,9 +67,6 @@ RUN docker-php-ext-install -j$(nproc) intl # Install mongodb RUN pecl install mongodb \ && docker-php-ext-enable mongodb -# Install mcrypt -RUN pecl install mcrypt \ - && docker-php-ext-enable mcrypt # Install curl RUN docker-php-ext-install -j$(nproc) curl # Install Zip @@ -97,8 +92,10 @@ RUN apt-get update && apt-get install -y \ # Install ldap RUN docker-php-ext-install -j$(nproc) ldap -RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \ - docker-php-ext-install -j$(nproc) imap +#RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \ +# docker-php-ext-install -j$(nproc) imap + +RUN pecl install imap # COPY ./.docker/images/php/base/pdf/php_pdflib.so /pdflib.so diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/Controller/Backend/IndexController.php b/src/new/var/plugins/Custom/PSC/FormBuilder/Controller/Backend/IndexController.php new file mode 100644 index 000000000..f1160d8db --- /dev/null +++ b/src/new/var/plugins/Custom/PSC/FormBuilder/Controller/Backend/IndexController.php @@ -0,0 +1,20 @@ + $jwtManager->create($this->getUser())); + } +} diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/+ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/+ deleted file mode 100644 index ad958838f..000000000 --- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/+ +++ /dev/null @@ -1,64 +0,0 @@ -import {v4 as uuidv4} from 'uuid' -import Dependency from './Dependency.ts' - -export default class Border { - uuid: string = ""; - formula: string = ""; - calcValue: string = ""; - calcValue1: string = ""; - calcValue2: string = ""; - calcValue3: string = ""; - calcValue4: string = ""; - calcValue5: string = ""; - calcValue6: string = ""; - calcValue7: string = ""; - calcValue8: string = ""; - calcValue9: string = ""; - calcValue10: string = ""; - flatRate: string = ""; - value: string = ""; - dependencys: Dependency[] = []; - - constructor() { - this.uuid = uuidv4(); - } - - addDependency(dep: Dependeny) - { - this.dependencys.push(dep) - } - - toJSON() { - return { - 'formula': this.formula, - 'calcValue': this.calcValue, - 'calcValue1': this.calcValue1, - 'calcValue2': this.calcValue2, - 'calcValue3': this.calcValue3, - 'calcValue4': this.calcValue4, - 'calcValue5': this.calcValue5, - 'calcValue6': this.calcValue6, - 'calcValue7': this.calcValue7, - 'calcValue8': this.calcValue8, - 'calcValue9': this.calcValue9, - 'calcValue10': this.calcValue10, - 'flatRate': this.flatRate, - 'value': this.value, - 'dependencys': this.dependencys.reduce((result, dep) => { - result.push(dep.toJSON()) - return result - }, []) - } - } - fromJSON(obj) { - this.formula = obj.formula - this.value = obj.value - this.flatRate = obj.flatRate - this.calcValue = obj.calcValue - obj.dependencys.map((d) => { - const dep = new Dependency() - dep.fromJSON(d) - this.dependencys.push(dep) - }) - } -} diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/bun.lock b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/bun.lock index 8bf4390e3..447e182d8 100644 --- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/bun.lock +++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/bun.lock @@ -8,6 +8,7 @@ "@vueuse/core": "^13.4.0", "class-variance-authority": "^0.7.1", "clsx": "^2.1.1", + "ky": "^1.8.1", "lucide-vue-next": "^0.514.0", "pinia": "^3.0.3", "reka-ui": "^2.3.1", @@ -420,6 +421,8 @@ "kolorist": ["kolorist@1.8.0", "", {}, "sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ=="], + "ky": ["ky@1.8.1", "", {}, "sha512-7Bp3TpsE+L+TARSnnDpk3xg8Idi8RwSLdj6CMbNWoOARIrGrbuLGusV0dYwbZOm4bB3jHNxSw8Wk/ByDqJEnDw=="], + "lightningcss": ["lightningcss@1.30.1", "", { "dependencies": { "detect-libc": "^2.0.3" }, "optionalDependencies": { "lightningcss-darwin-arm64": "1.30.1", "lightningcss-darwin-x64": "1.30.1", "lightningcss-freebsd-x64": "1.30.1", "lightningcss-linux-arm-gnueabihf": "1.30.1", "lightningcss-linux-arm64-gnu": "1.30.1", "lightningcss-linux-arm64-musl": "1.30.1", "lightningcss-linux-x64-gnu": "1.30.1", "lightningcss-linux-x64-musl": "1.30.1", "lightningcss-win32-arm64-msvc": "1.30.1", "lightningcss-win32-x64-msvc": "1.30.1" } }, "sha512-xi6IyHML+c9+Q3W0S4fCQJOym42pyurFiJUHEcEyHS0CeKzia4yZDEsLlqOFykxOdHpNy0NmvVO31vcSqAxJCg=="], "lightningcss-darwin-arm64": ["lightningcss-darwin-arm64@1.30.1", "", { "os": "darwin", "cpu": "arm64" }, "sha512-c8JK7hyE65X1MHMN+Viq9n11RRC7hgin3HhYKhrMyaXflk5GVplZ60IxyoVtzILeKr+xAJwg6zK6sjTBJ0FKYQ=="], diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/package.json b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/package.json index 550325e7e..0714372fc 100644 --- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/package.json +++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/package.json @@ -5,6 +5,7 @@ "type": "module", "scripts": { "dev": "vite", + "check": "vue-tsc -b", "build": "vue-tsc -b && vite build", "preview": "vite preview" }, @@ -13,6 +14,7 @@ "@vueuse/core": "^13.4.0", "class-variance-authority": "^0.7.1", "clsx": "^2.1.1", + "ky": "^1.8.1", "lucide-vue-next": "^0.514.0", "pinia": "^3.0.3", "reka-ui": "^2.3.1", diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/Gui.vue b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/Gui.vue index 3f0a795e7..27a7f57bf 100644 --- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/Gui.vue +++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/Gui.vue @@ -3,13 +3,13 @@ import { ResizableHandle, ResizablePanel, ResizablePanelGroup, -} from '@/components/ui/resizable' +} from '../components/ui/resizable' -import { Library } from '@/components/app/library' -import { Debug } from '@/components/app/debug' -import { ElementProperties } from '@/components/app/elementproperties' -import { ElementDependency } from '@/components/app/elementdependency' -import { Main } from '@/components/app/main' +import { Library } from '../components/app/library' +import { Debug } from '../components/app/debug' +import { ElementProperties } from '../components/app/elementproperties' +import { ElementDependency } from '../components/app/elementdependency' +import { Main } from '../components/app/main'