diff --git a/config/sites/default/config.yaml b/config/sites/default/config.yaml index c7a7746..5bada4e 100644 --- a/config/sites/default/config.yaml +++ b/config/sites/default/config.yaml @@ -7,7 +7,6 @@ baseVariants: dependencies: - georgringer/news - typo3/redirects - - typo3/form - cloonar-typo3/base languages: - diff --git a/package-lock.json b/package-lock.json index 452e3ca..0f6e87d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,12 @@ { - "name": "dialog-relations-website", + "name": "lena-schilling-website", "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "dialog-relations-website", + "name": "lena-schilling-website", "version": "1.0.0", - "dependencies": { - "yaml-loader": "^0.8.1" - }, "devDependencies": { "autoprefixer": "^10.4.21", "css-loader": "^6.7.3", @@ -947,15 +944,6 @@ "dev": true, "license": "MIT" }, - "node_modules/big.js": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", - "license": "MIT", - "engines": { - "node": "*" - } - }, "node_modules/binary-extensions": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", @@ -1288,15 +1276,6 @@ "dev": true, "license": "MIT" }, - "node_modules/emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, "node_modules/enhanced-resolve": { "version": "5.18.1", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz", @@ -1858,12 +1837,6 @@ "@pkgjs/parseargs": "^0.11.0" } }, - "node_modules/javascript-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.1.0.tgz", - "integrity": "sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==", - "license": "MIT" - }, "node_modules/jest-worker": { "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", @@ -1923,18 +1896,6 @@ "dev": true, "license": "MIT" }, - "node_modules/json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "license": "MIT", - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -1975,20 +1936,6 @@ "node": ">=6.11.5" } }, - "node_modules/loader-utils": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", - "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", - "license": "MIT", - "dependencies": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - }, - "engines": { - "node": ">=8.9.0" - } - }, "node_modules/locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -3685,6 +3632,7 @@ "version": "2.7.1", "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.1.tgz", "integrity": "sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ==", + "dev": true, "license": "ISC", "bin": { "yaml": "bin.mjs" @@ -3692,20 +3640,6 @@ "engines": { "node": ">= 14" } - }, - "node_modules/yaml-loader": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/yaml-loader/-/yaml-loader-0.8.1.tgz", - "integrity": "sha512-BCEndnUoi3BaZmePkwGGe93txRxLgMhBa/gE725v1/GHnura8QvNs7c4+4C1yyhhKoj3Dg63M7IqhA++15j6ww==", - "license": "MIT", - "dependencies": { - "javascript-stringify": "^2.0.1", - "loader-utils": "^2.0.0", - "yaml": "^2.0.0" - }, - "engines": { - "node": ">= 14" - } } } } diff --git a/package.json b/package.json index 9ee95d0..7029d54 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "dialog-relations-website", + "name": "lena-schilling-website", "version": "1.0.0", "scripts": { "build:css": "NODE_ENV=production webpack --config webpack.config.js --mode production", @@ -16,8 +16,5 @@ "tailwindcss": "^3.4.17", "webpack": "^5.88.0", "webpack-cli": "^5.1.4" - }, - "dependencies": { - "yaml-loader": "^0.8.1" } } diff --git a/packages/base/Configuration/Ext/Form/TypoScript/setup.typoscript b/packages/base/Configuration/Ext/Form/TypoScript/setup.typoscript deleted file mode 100644 index a9b6ca2..0000000 --- a/packages/base/Configuration/Ext/Form/TypoScript/setup.typoscript +++ /dev/null @@ -1,15 +0,0 @@ -plugin.tx_form { - settings { - yamlConfigurations { - 11 = EXT:base/Configuration/Ext/Form/Yaml/Setup.yaml - } - } -} - -module.tx_form { - settings { - yamlConfigurations { - 11 = EXT:base/Configuration/Ext/Form/Yaml/Setup.yaml - } - } -} \ No newline at end of file diff --git a/packages/base/Configuration/Ext/Form/Yaml/Setup.yaml b/packages/base/Configuration/Ext/Form/Yaml/Setup.yaml deleted file mode 100644 index 68c33fc..0000000 --- a/packages/base/Configuration/Ext/Form/Yaml/Setup.yaml +++ /dev/null @@ -1,200 +0,0 @@ -TYPO3: - CMS: - Form: - prototypes: - standard: - formElementsDefinition: - Form: - renderingOptions: - templateVariant: version2 - partialRootPaths: - 20: 'EXT:base/Resources/Private/Extensions/Form/Partials/' - variants: - - - renderingOptions: - formNavigation: - btnNextClassAttribute: 'btn btn-primary' - btnPreviousClassAttribute: 'btn btn-outline btn-primary' - btnSubmitClassAttribute: 'btn btn-primary' - fieldProperties: - descriptionClassAttribute: 'form-text' - errorClassAttribute: 'peer [&_input]:input-error [&_[type=checkbox]]:checkbox-error [&_[type=file]]:file-input-error [&_[type=radio]]:radio-error [&_select]:select-error [&_textarea]:textarea-error' - errorMsgClassAttribute: 'label label-text-alt justify-start text-error peer-[.form-control]:-mt-4' - requiredMarkClassAttribute: 'required' - visuallyHiddenClassAttribute: 'sr-only' - SummaryPage: - variants: - - - renderingOptions: - listRowClassAttribute: 'grid grid-cols-2 gap-4' - - # Form elements - AdvancedPassword: - variants: - - - properties: - fieldsetClassAttribute: 'form-control form-element-advancedpassword mb-4' - containerClassAttribute: 'form-control mb-4' - elementClassAttribute: 'input input-bordered' - confirmationClassAttribute: 'input input-bordered' - labelClassAttribute: 'label label-text justify-start' - renderFieldset: 0 - Checkbox: - variants: - - - properties: - containerClassAttribute: 'form-control form-element-checkbox mb-4' - elementClassAttribute: 'checkbox' - labelTextClassAttribute: 'label-text' - labelClassAttribute: 'label cursor-pointer justify-start gap-2' - ContentElement: - variants: - 1: - properties: - outerContainerClassAttribute: 'mb-4 [&_.container]:max-w-none [&_.frame]:py-0' - CountrySelect: - variants: - - - properties: - containerClassAttribute: 'form-control form-element-select mb-4' - elementClassAttribute: 'select select-bordered' - labelClassAttribute: 'label label-text justify-start' - Date: - variants: - - - properties: - containerClassAttribute: 'form-control form-element-date mb-4' - elementClassAttribute: 'input input-bordered' - labelClassAttribute: 'label label-text justify-start' - DatePicker: - variants: - - - properties: - containerClassAttribute: 'form-control form-element-date mb-4' - elementClassAttribute: 'input input-bordered' - labelClassAttribute: 'label label-text justify-start' - SingleSelect: - variants: - - - properties: - containerClassAttribute: 'form-control form-element-select mb-4' - elementClassAttribute: 'select select-bordered' - labelClassAttribute: 'label label-text justify-start' - StaticText: - variants: - 1: - properties: - containerClassAttribute: 'form-element-statictext mb-4 [&>p]:label-text' - Email: - variants: - - - properties: - containerClassAttribute: 'form-control form-element-email mb-4' - elementClassAttribute: 'border border-primary block w-full p-2' - labelClassAttribute: 'label label-text font-bold justify-start block w-full mb-2' - Fieldset: - variants: - - - properties: - elementClassAttribute: 'form-element-fieldset mb-4 [&>legend]:font-bold' - FileUpload: - variants: - - - properties: - containerClassAttribute: 'form-control form-element-fileupload mb-4' - elementClassAttribute: 'file-input file-input-bordered' - labelClassAttribute: 'label label-text justify-start' - ImageUpload: - variants: - - - properties: - containerClassAttribute: 'form-control form-element-imageupload mb-4' - elementClassAttribute: 'file-input file-input-bordered' - labelClassAttribute: 'label label-text justify-start' - MultiCheckbox: - variants: - - - properties: - fieldsetClassAttribute: 'mb-4 [&>legend]:label [&>legend]:label-text [&>legend]:justify-start' - containerClassAttribute: 'form-control form-element-checkbox' - elementClassAttribute: 'checkbox' - labelTextClassAttribute: 'label-text' - labelClassAttribute: 'label cursor-pointer justify-start gap-2' - MultiSelect: - variants: - - - properties: - containerClassAttribute: 'form-control form-element-multiselect mb-4' - elementClassAttribute: 'select select-bordered' - labelClassAttribute: 'label label-text justify-start' - Number: - variants: - - - properties: - containerClassAttribute: 'form-control form-element-number mb-4' - elementClassAttribute: 'input input-bordered' - labelClassAttribute: 'label label-text justify-start' - Password: - variants: - - - properties: - containerClassAttribute: 'form-control form-element-password mb-4' - elementClassAttribute: 'input input-bordered' - labelClassAttribute: 'label label-text justify-start' - RadioButton: - variants: - - - properties: - fieldsetClassAttribute: 'mb-4 [&>legend]:label [&>legend]:label-text [&>legend]:justify-start' - containerClassAttribute: 'form-control form-element-radio' - elementClassAttribute: 'radio' - labelTextClassAttribute: 'label-text' - labelClassAttribute: 'label cursor-pointer justify-start gap-2' - Telephone: - variants: - - - properties: - containerClassAttribute: 'form-control form-element-phone mb-4' - elementClassAttribute: 'border border-primary block w-full p-2' - labelClassAttribute: 'label label-text font-bold justify-start block w-full mb-2' - Text: - variants: - - - properties: - containerClassAttribute: 'form-control form-element-text mb-4' - elementClassAttribute: 'border border-primary block w-full p-2' - labelClassAttribute: 'label label-text font-bold justify-start block w-full mb-2' - Textarea: - variants: - - - properties: - containerClassAttribute: 'form-control form-element-textarea mb-4' - elementClassAttribute: 'border border-primary block w-full p-2 h-24' - labelClassAttribute: 'label label-text font-bold justify-start block w-full mb-2' - Url: - variants: - - - properties: - containerClassAttribute: 'form-control form-element-url mb-4' - elementClassAttribute: 'border border-primary block w-full p-2' - labelClassAttribute: 'label label-text font-bold justify-start block w-full mb-2' - GridRow: - variants: - - - properties: - elementClassAttribute: 'form-element form-element-gridrow grid grid-cols-12 gap-8 md:gap-16' - gridColumnClassAutoConfiguration: - gridSize: 12 - viewPorts: - xs: - classPattern: 'col-span-{@numbersOfColumnsToUse}' - sm: - classPattern: 'sm:col-span-{@numbersOfColumnsToUse}' - md: - classPattern: 'md:col-span-{@numbersOfColumnsToUse}' - lg: - classPattern: 'lg:col-span-{@numbersOfColumnsToUse}' - xl: - classPattern: 'xl:col-span-{@numbersOfColumnsToUse}' - xxl: - classPattern: 'xxl:col-span-{@numbersOfColumnsToUse}' diff --git a/packages/base/Configuration/Sets/SitePackage/PageTsConfig/BackendLayouts/default.tsconfig b/packages/base/Configuration/Sets/SitePackage/PageTsConfig/BackendLayouts/default.tsconfig index 0a8c9f9..0f83a90 100644 --- a/packages/base/Configuration/Sets/SitePackage/PageTsConfig/BackendLayouts/default.tsconfig +++ b/packages/base/Configuration/Sets/SitePackage/PageTsConfig/BackendLayouts/default.tsconfig @@ -8,18 +8,35 @@ mod { title = Default config { backend_layout { - colCount = 1 - rowCount = 1 + colCount = 12 + rowCount = 2 rows { 1 { columns { 1 { name = LLL:EXT:base/Resources/Private/Language/locallang_be.xlf:backend_layout.column.normal colPos = 0 + colspan = 12 identifier = main } } } + 2 { + columns { + 1 { + name = Footer Left + colPos = 90 + colspan = 6 + identifier = footer-left + } + 2 { + name = Footer Right + colPos = 91 + colspan = 6 + identifier = footer-right + } + } + } } } } diff --git a/packages/base/Configuration/Sets/SitePackage/page.tsconfig b/packages/base/Configuration/Sets/SitePackage/page.tsconfig index b727dba..18b8be6 100644 --- a/packages/base/Configuration/Sets/SitePackage/page.tsconfig +++ b/packages/base/Configuration/Sets/SitePackage/page.tsconfig @@ -9,7 +9,7 @@ RTE { TCEFORM { tt_content { CType { - keepItems = cloonar_text,cloonar_textimage,cloonar_hero,form_formframework + keepItems = cloonar_header,cloonar_text,cloonar_textimage,news_newsliststicky,news_pi1,cloonar_hero,cloonar_stats } } } diff --git a/packages/base/Configuration/Sets/SitePackage/setup.typoscript b/packages/base/Configuration/Sets/SitePackage/setup.typoscript index 746e688..44b5ce0 100644 --- a/packages/base/Configuration/Sets/SitePackage/setup.typoscript +++ b/packages/base/Configuration/Sets/SitePackage/setup.typoscript @@ -1,5 +1,4 @@ @import './TypoScript/' -@import 'EXT:base/Configuration/Ext/Form/TypoScript/setup.typoscript' # Override tx_news templates plugin.tx_news { diff --git a/packages/base/ContentBlocks/ContentElements/hero/templates/frontend.html b/packages/base/ContentBlocks/ContentElements/hero/templates/frontend.html index 8262b9d..6033b6a 100644 --- a/packages/base/ContentBlocks/ContentElements/hero/templates/frontend.html +++ b/packages/base/ContentBlocks/ContentElements/hero/templates/frontend.html @@ -3,7 +3,7 @@ -
+
@@ -69,7 +69,7 @@
-

+

{data.header}

diff --git a/packages/base/ContentBlocks/ContentElements/text/templates/frontend.html b/packages/base/ContentBlocks/ContentElements/text/templates/frontend.html index 7f400dd..a923288 100644 --- a/packages/base/ContentBlocks/ContentElements/text/templates/frontend.html +++ b/packages/base/ContentBlocks/ContentElements/text/templates/frontend.html @@ -1,8 +1,8 @@ -
+
-

{data.header}

 +

{data.header}

 diff --git a/packages/base/ContentBlocks/ContentElements/textimage/templates/frontend.html b/packages/base/ContentBlocks/ContentElements/textimage/templates/frontend.html index d7e1238..4550bfb 100644 --- a/packages/base/ContentBlocks/ContentElements/textimage/templates/frontend.html +++ b/packages/base/ContentBlocks/ContentElements/textimage/templates/frontend.html @@ -3,7 +3,7 @@ - + @@ -11,7 +11,7 @@ -
+
@@ -39,7 +39,7 @@ cropVariant="default" width="538c" alt="{data.image.0.alternative}" - class="max-w-full h-auto block" + class="max-w-full h-auto rounded-lg block" /> @@ -50,7 +50,8 @@
-

{data.header}

+

{data.header}

+

{data.subheader}
diff --git a/packages/base/Resources/Private/Extensions/Form/Partials/GridRow.html b/packages/base/Resources/Private/Extensions/Form/Partials/GridRow.html deleted file mode 100644 index 1274104..0000000 --- a/packages/base/Resources/Private/Extensions/Form/Partials/GridRow.html +++ /dev/null @@ -1,11 +0,0 @@ - - -
- -
- -
- -
- - diff --git a/packages/base/Resources/Private/PageView/Partials/Navigation/Main.html b/packages/base/Resources/Private/PageView/Partials/Navigation/Main.html index ba92c76..ac7875c 100644 --- a/packages/base/Resources/Private/PageView/Partials/Navigation/Main.html +++ b/packages/base/Resources/Private/PageView/Partials/Navigation/Main.html @@ -1,18 +1,18 @@ -