Merge branch 'main' of github.com:TYPO3incubator/surfcamp-team6

TYPO3incubator · Apr 11, 2024 · 8dc7ccb · 8dc7ccb
2 parents b497240 + 0277a48
commit 8dc7ccb
Show file tree

Hide file tree

Showing 19 changed files with 96 additions and 55 deletions.
diff --git a/assets/scss/base/_global.scss b/assets/scss/base/_global.scss
@@ -34,25 +34,26 @@ html {
         @apply bg-black text-white hover:bg-gray-900 focus:bg-gray-900;
     }
 
-    .h1 {
-        @apply text-5xl font-bold font-heading;
+    .heading-xxl {
+        @apply text-5xl font-bold font-heading block;
     }
 
-    .h2 {
-        @apply text-3xl font-bold font-heading;
+    .heading-xl {
+        @apply text-3xl font-bold font-heading block;
     }
 
-    .h3 {
-        @apply text-xl font-bold font-heading;
+    .heading-lg {
+        @apply text-xl font-bold font-heading block;
     }
 
     h1,
     h2,
     h3,
     h4,
-    h5 {
+    h5,
+    span {
         &.default {
-            @apply text-lg font-bold font-heading;
+            @apply text-lg font-bold font-heading block;
         }
     }
 

diff --git a/local_packages/success/Classes/ViewHelpers/RenderBlockViewHelper.php b/local_packages/success/Classes/ViewHelpers/RenderBlockViewHelper.php
@@ -75,6 +75,7 @@ public static function renderStatic(array $arguments, \Closure $renderChildrenCl
         }
 
         $subView->assign('data', $data->toArray(true));
+        $subView->assign('rawData', $data->getRecord()->getRawRecord()->toArray());
         $subView->assign('context', $context);
         try {
             $content = $subView->render();

diff --git a/local_packages/success/Configuration/TCA/Overrides/tt_content.php b/local_packages/success/Configuration/TCA/Overrides/tt_content.php
@@ -107,16 +107,16 @@
                     'value' => 'default'
                 ],
                 [
-                    'label' => 'LLL:EXT:success/Resources/Private/Language/locallang_db.xlf:header_style.lovely',
-                    'value' => 'lovely'
+                    'label' => 'LLL:EXT:success/Resources/Private/Language/locallang_db.xlf:header_style.heading-xxl',
+                    'value' => 'heading-xxl'
                 ],
                 [
-                    'label' => 'LLL:EXT:success/Resources/Private/Language/locallang_db.xlf:header_style.fancy',
-                    'value' => 'fancy'
+                    'label' => 'LLL:EXT:success/Resources/Private/Language/locallang_db.xlf:header_style.heading-xl',
+                    'value' => 'heading-xl'
                 ],
                 [
-                    'label' => 'LLL:EXT:success/Resources/Private/Language/locallang_db.xlf:header_style.rainbow',
-                    'value' => 'rainbow'
+                    'label' => 'LLL:EXT:success/Resources/Private/Language/locallang_db.xlf:header_style.heading-lg',
+                    'value' => 'heading-lg'
                 ]
             ]
         ]

diff --git a/local_packages/success/Resources/Private/Language/locallang_db.xlf b/local_packages/success/Resources/Private/Language/locallang_db.xlf
@@ -16,14 +16,14 @@
 			<trans-unit id="header_style.default" resname="header_style.default">
 				<source>Default</source>
 			</trans-unit>
-			<trans-unit id="header_style.lovely" resname="header_style.lovely">
-				<source>Lovely</source>
+			<trans-unit id="header_style.heading-xxl" resname="header_style.heading-xxl">
+				<source>Heading XXLarge</source>
 			</trans-unit>
-			<trans-unit id="header_style.fancy" resname="header_style.fancy">
-				<source>Fancy</source>
+			<trans-unit id="header_style.heading-xl" resname="header_style.heading-xl">
+				<source>Heading XLarge</source>
 			</trans-unit>
-			<trans-unit id="header_style.rainbow" resname="header_style.rainbow">
-				<source>Over the rainbow</source>
+			<trans-unit id="header_style.heading-lg" resname="header_style.heading-lg">
+				<source>Heading Large</source>
 			</trans-unit>
 
 			<trans-unit id="button" resname="button">

diff --git a/local_packages/success/Resources/Private/Templates/ProductLaunch/Pages/Default.html b/local_packages/success/Resources/Private/Templates/ProductLaunch/Pages/Default.html
@@ -17,9 +17,7 @@
 
     <main class="font-text background-{settings.ui.layout.pagebg}">
         <f:for as="block" each="{content.column0.blocks}">
-            <div id="c{block.uid}">
-                <s:renderBlock data="{block}" />
-            </div>
+            <s:renderBlock data="{block}" />
         </f:for>
     </main>
     <f:render partial="Footer" arguments="{_all}" />

diff --git a/..._packages/success/Resources/Private/Templates/_LandingPage/Content/FormFormframework.html b/..._packages/success/Resources/Private/Templates/_LandingPage/Content/FormFormframework.html
@@ -0,0 +1,10 @@
+<html
+    data-namespace-typo3-fluid="true"
+    xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
+>
+
+<f:layout name="Default"/>
+<f:section name="Main">
+    <f:cObject typoscriptObjectPath="tt_content.form_formframework.20" data="{rawData}"/>
+</f:section>
+</html>
diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessCards.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessCards.html
@@ -2,6 +2,8 @@
     data-namespace-typo3-fluid="true"
     xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
 >
+<f:layout name="Default"/>
+<f:section name="Main">
 <div class="background-light py-12">
     <div class="container px-5 mx-auto">
         <f:render partial="Content/Header"
@@ -36,4 +38,5 @@
         </div>
     </div>
 </div>
+</f:section>
 </html>
diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessFaq.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessFaq.html
@@ -2,6 +2,8 @@
     data-namespace-typo3-fluid="true"
     xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
 >
+<f:layout name="Default"/>
+<f:section name="Main">
 <div class="background-primary py-12">
     <div class="container px-5 mx-auto">
         <f:render partial="Content/Header"
@@ -25,4 +27,5 @@
         </f:if>
     </div>
 </div>
+</f:section>
 </html>
diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessFeatures.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessFeatures.html
@@ -2,28 +2,24 @@
     data-namespace-typo3-fluid="true"
     xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
 >
+<f:layout name="Default"/>
+<f:section name="Main">
 <div class="background-secondary relative">
-    <f:if condition="{data.media}">
+    <f:if condition="{data.assets}">
         <div class="aspect-video md:aspect-auto relative md:static">
-            <f:image image="{data.media.0}" class="object-cover h-full absolute right-0 md:left-0 w-full md:w-1/3" width="600"></f:image>
+            <f:image image="{data.assets.0}" class="object-cover h-full absolute right-0 md:left-0 brightness-50 w-full md:w-1/3" width="600"></f:image>
         </div>
     </f:if>
 
     <div class="container px-5 mx-auto">
-        <div class="{f:if(condition: data.media, then: 'grid md:grid-cols-3')}">
-            <f:if condition="{data.media}">
-                <div class="min-h-20">
-                    <f:image image="{data.media.0}" class="object-cover w-full h-full brightness-50" width="600"></f:image>
-                </div>
-            </f:if>
-
+        <div class="{f:if(condition: data.assets, then: 'grid md:grid-cols-3')}">            
             <div></div>
 
-            <div class="{f:if(condition: data.media, then: 'md:col-span-2')} py-5 md:p-10 flex items-center">
+            <div class="{f:if(condition: data.assets, then: 'md:col-span-2')} py-5 md:p-10 flex items-center">
                 <div>
                     <f:render partial="Content/Header"
                         arguments="{headerLayout: data.header_layout, headerStyle: data.header_style, header: data.header, subheader: data.subheader, overline: data.overline}"/>
-        
+
                     <f:for each="{data.tx_success_feature}" as="feature">
                         <div class="mt-8 sm:flex">
                             <f:if condition="{feature.icon}">
@@ -40,7 +36,7 @@
                                 </f:else>
                             </f:if>
 
-                            
+
                             <div>
                                 <h3 class="h3 my-1">{feature.header}</h3>
                                 <div>{feature.text -> f:format.html()}</div>
@@ -52,4 +48,5 @@ <h3 class="h3 my-1">{feature.header}</h3>
         </div>
     </div>
 </div>
+</f:section>
 </html>
diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessGallery.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessGallery.html
@@ -2,6 +2,8 @@
     data-namespace-typo3-fluid="true"
     xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
 >
+<f:layout name="Default"/>
+<f:section name="Main">
 <div class="background-secondary py-12">
     <div class="container px-5 mx-auto">
         <f:render partial="Content/Header"
@@ -15,4 +17,5 @@
         </div>
     </div>
 </div>
+</f:section>
 </html>
diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessHero.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessHero.html
@@ -2,6 +2,8 @@
     data-namespace-typo3-fluid="true"
     xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
 >
+<f:layout name="Default"/>
+<f:section name="Main">
 <div class="background-black relative min-h-screen flex items-center">
     <f:if condition="{data.assets}">
         <f:image image="{data.assets.0}" class="object-cover w-full h-full brightness-50 absolute top-0 left-0" width="1400"></f:image>
@@ -13,7 +15,7 @@
                     arguments="{headerLayout: data.header_layout, headerStyle: data.header_style, header: data.header, overline: data.overline}"/>
 
                 <f:if condition="{data.bodytext}">
-                    <div class="rte">{data.bodytext -> f:format.html()}</div>
+                    <div class="rte mt-4">{data.bodytext -> f:format.html()}</div>
                 </f:if>
 
                 <div class="mt-5">
@@ -24,5 +26,5 @@
         </div>
     </div>
 </div>
-
+</f:section>
 </html>
diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessNumbers.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessNumbers.html
@@ -2,6 +2,8 @@
     data-namespace-typo3-fluid="true"
     xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
 >
+<f:layout name="Default"/>
+<f:section name="Main">
 <div class="background-light py-12">
     <div class="container px-5 mx-auto">
         <f:render partial="Content/Header"
@@ -22,4 +24,5 @@
         </f:if>
     </div>
 </div>
+</f:section>
 </html>
diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessPartner.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessPartner.html
@@ -2,6 +2,8 @@
     data-namespace-typo3-fluid="true"
     xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
 >
+<f:layout name="Default"/>
+<f:section name="Main">
 <div class="mt-8">
     <f:render partial="Content/Header"
               arguments="{headerLayout: data.header_layout, headerStyle: data.header_style, header: data.header}"/>
@@ -15,4 +17,5 @@
         </f:if>
     </div>
 </div>
+</f:section>
 </html>
diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessReview.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessReview.html
@@ -2,7 +2,8 @@
     data-namespace-typo3-fluid="true"
     xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
 >
-
+<f:layout name="Default"/>
+<f:section name="Main">
 <div class="background-light py-12">
     <div class="container px-5 mx-auto">
         <f:render partial="Content/Header"
@@ -23,5 +24,5 @@
         </div>
     </div>
 </div>
-
+</f:section>
 </html>
diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/Textmedia.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/Textmedia.html
@@ -2,22 +2,25 @@
     data-namespace-typo3-fluid="true"
     xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
 >
+<f:layout name="Default"/>
+<f:section name="Main">
 <div class="background-secondary py-12">
     <div class="container px-5 mx-auto">
         <div class="grid gap-8 md:grid-cols-2">
             <f:switch expression="{data.imageorient}">
                 <f:case value="1">
                     <f:render section="text" arguments="{data: data}"/>
-                    <f:render section="media" arguments="{data: data}"/>
+                    <f:render section="media" arguments="{data: data, rotate: 'rotate-right'}"/>
                 </f:case>
                 <f:defaultCase>
-                    <f:render section="media" arguments="{data: data}"/>
+                    <f:render section="media" arguments="{data: data, rotate: 'rotate-left'}"/>
                     <f:render section="text" arguments="{data: data}"/>
                 </f:defaultCase>
             </f:switch>
         </div>
     </div>
 </div>
+</f:section>
 <f:section name="text">
     <div class="flex items-center">
         <div>
@@ -31,7 +34,7 @@
 </f:section>
 <f:section name="media">
     <div class="md:flex justify-center items-center">
-        <div class="aspect-square rounded overflow-hidden rotate-left max-w-80">
+        <div class="aspect-square rounded overflow-hidden {rotate} max-w-80">
             <f:if condition="{data.assets}">
                 <f:for each="{data.assets}" as="media">
                     <f:image src="{media.uid}" treatIdAsReference="1" class="object-cover h-full w-full" width="400"/>

diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Layouts/Default.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Layouts/Default.html
@@ -0,0 +1,10 @@
+<html
+    data-namespace-typo3-fluid="true"
+    xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
+    xmlns:vac="http://typo3.org/ns/Praetorius/ViteAssetCollector/ViewHelpers"
+    xmlns:s="http://typo3.org/ns/Surfcamp/Success/ViewHelpers"
+>
+<div id="c{data.uid}" class="{data.space_before_class} {data.space_after_class}">
+    <f:render section="Main" />
+</div>
+</html>
diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Pages/Default.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Pages/Default.html
@@ -11,17 +11,11 @@
 </f:asset.css>
 
 <div data-ui-theme="{settings.ui.theme}"></div>
-
-{_all -> f:debug()}
-
-<h1>{page.title}</h1>
-
-<f:cObject typoscriptObjectPath="styles.content.get" data="{colPos: '0'}" />
-
-<div id="modal" class="modal">
-    <div class="container mx-auto px-5">
-        <div class="modal-content" id="modal-content"></div>
-        <div id="loading-indicator" class="loading-indicator"></div>
-    </div>
-</div>
+<main class="font-text background-light">
+    <f:for as="block" each="{content.column0.blocks}">
+        <s:renderBlock data="{block}" />
+    </f:for>
+</main>
+<f:render partial="Footer" arguments="{_all}" />
+<f:render partial="Page/Modal" />
 </html>
diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Partials/Content/Header.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Partials/Content/Header.html
@@ -38,6 +38,10 @@ <h5 class="{headerStyle}">
     </f:defaultCase>
 </f:switch>
 
+<f:if condition="{headerStyle} == 'heading-xxl'">
+    <span aria-hidden="true" class="w-12 border-b-4 border-primary-500 inline-block"></span>
+</f:if>
+
 <f:if condition="{subheader}">
     <span class="block text-lg mt-3">{subheader}</span>
 </f:if>

diff --git a/tailwind.config.js b/tailwind.config.js
@@ -42,5 +42,10 @@ export default {
       lighttext: 'var(--color-lighttext)',
     },
     extend: {},
+    safelist: [
+      'heading-xxl',
+      'heading-xl',
+      'heading-lg',
+    ]
   },
 }