Merge pull request #58 from sitegeist/task/webPageAndJsonLd

mficzel · web-flow · commit c414e6ce5f18 · 2021-08-20T13:08:15.000+02:00
Add JsonLD, Fragments and rename Page to WebPage
diff --git a/DistributionPackages/Vendor.Site/Configuration/NodeTypes.Document.Error.404.yaml b/DistributionPackages/Vendor.Site/Configuration/NodeTypes.Document.Error.404.yaml
@@ -1,6 +1,6 @@
 'Vendor.Site:Document.Error.404':
   superTypes:
-    'Vendor.Site:Document.Page': true
+    'Vendor.Site:Document.WebPage': true
     'Vendor.Site:Constraint.Document.Restricted': true
   ui:
     icon: exclamation-triangle
diff --git a/DistributionPackages/Vendor.Site/Configuration/NodeTypes.Document.HomePage.yaml b/DistributionPackages/Vendor.Site/Configuration/NodeTypes.Document.HomePage.yaml
@@ -1,6 +1,6 @@
 'Vendor.Site:Document.HomePage':
   superTypes:
-    'Vendor.Site:Document.Page': true
+    'Vendor.Site:Document.WebPage': true
     'Vendor.Site:Constraint.Document.Restricted': true
   ui:
     icon: globe
diff --git a/DistributionPackages/Vendor.Site/Configuration/NodeTypes.Document.WebPage.yaml b/DistributionPackages/Vendor.Site/Configuration/NodeTypes.Document.WebPage.yaml
@@ -1,4 +1,4 @@
-'Vendor.Site:Document.Page':
+'Vendor.Site:Document.WebPage':
   superTypes:
     'Vendor.Site:Document': true
 
diff --git a/DistributionPackages/Vendor.Site/Resources/Private/Content/Sites.xml b/DistributionPackages/Vendor.Site/Resources/Private/Content/Sites.xml
@@ -2,37 +2,59 @@
 <root>
     <site name="Vendor.Site" state="1" siteResourcesPackageKey="Vendor.Site" siteNodeName="vendor-site">
         <nodes formatVersion="2.0">
-            <node nodeName="vendor-site">
-                <variant
-                    workspace="live"
-                    nodeType="Vendor.Site:Document.HomePage"
-                    sortingIndex="100"
-                    version="1"
-                    removed=""
-                    hidden=""
-                    hiddenInIndex=""
-                    >
+            <node identifier="a44f0678-9744-4334-8e4b-b14c5b74be4d" nodeName="vendor-site">
+                <variant sortingIndex="100" workspace="live" nodeType="Vendor.Site:Document.HomePage" version="1"
+                        removed="" hidden="" hiddenInIndex="">
                     <dimensions/>
                     <accessRoles __type="array"/>
+                    <creationDateTime __type="object" __classname="DateTime">2021-08-20T08:58:16+00:00
+                    </creationDateTime>
+                    <lastModificationDateTime __type="object" __classname="DateTime">2021-08-20T08:58:16+00:00
+                    </lastModificationDateTime>
                     <properties>
                         <title __type="string">Vendor.Site</title>
                         <uriPathSegment __type="string">vendor-site</uriPathSegment>
                     </properties>
                 </variant>
-                <node nodeName="main">
-                    <variant
-                        workspace="live"
-                        nodeType="Vendor.Site:Collection.Content.Main"
-                        sortingIndex="100"
-                        version="1"
-                        removed=""
-                        hidden=""
-                        hiddenInIndex=""
-                        >
+                <node identifier="da8e4081-b40f-86a1-3015-9e94e89a8a74" nodeName="main">
+                    <variant sortingIndex="100" workspace="live" nodeType="Vendor.Site:Collection.Content.Main"
+                            version="1" removed="" hidden="" hiddenInIndex="">
                         <dimensions/>
-                        <accessRoles __type="array" />
+                        <accessRoles __type="array"/>
+                        <creationDateTime __type="object" __classname="DateTime">2021-08-20T08:58:16+00:00
+                        </creationDateTime>
+                        <lastModificationDateTime __type="object" __classname="DateTime">2021-08-20T08:58:16+00:00
+                        </lastModificationDateTime>
+                        <properties/>
                     </variant>
                 </node>
+                <node identifier="392145e5-66f3-fc79-39c7-bdd76f5608d0" nodeName="notfound">
+                    <variant sortingIndex="200" workspace="live" nodeType="Vendor.Site:Document.Error.404" version="1"
+                            removed="" hidden="" hiddenInIndex="1">
+                        <dimensions/>
+                        <accessRoles __type="array"/>
+                        <creationDateTime __type="object" __classname="DateTime">2021-08-20T08:58:41+00:00
+                        </creationDateTime>
+                        <lastModificationDateTime __type="object" __classname="DateTime">2021-08-20T08:58:41+00:00
+                        </lastModificationDateTime>
+                        <properties>
+                            <uriPathSegment __type="string">notfound</uriPathSegment>
+                            <title __type="string">404</title>
+                        </properties>
+                    </variant>
+                    <node identifier="936373a3-2a04-6ac2-d531-b8e7c4ce1439" nodeName="main">
+                        <variant sortingIndex="100" workspace="live" nodeType="Vendor.Site:Collection.Content.Main"
+                                version="1" removed="" hidden="" hiddenInIndex="">
+                            <dimensions/>
+                            <accessRoles __type="array"/>
+                            <creationDateTime __type="object" __classname="DateTime">2021-08-20T08:58:41+00:00
+                            </creationDateTime>
+                            <lastModificationDateTime __type="object" __classname="DateTime">2021-08-20T08:58:41+00:00
+                            </lastModificationDateTime>
+                            <properties/>
+                        </variant>
+                    </node>
+                </node>
             </node>
         </nodes>
     </site>
diff --git a/DistributionPackages/Vendor.Site/Resources/Private/Fusion/Integration/Document/Error/404.fusion b/DistributionPackages/Vendor.Site/Resources/Private/Fusion/Integration/Document/Error/404.fusion
@@ -1,4 +1,4 @@
-prototype(Vendor.Site:Document.Error.404) < prototype(Vendor.Site:Document.Page) {
+prototype(Vendor.Site:Document.Error.404) < prototype(Vendor.Site:Document.WebPage) {
     prototype(Neos.Neos:Page) {
         httpResponseHead {
             statusCode = 404
diff --git a/DistributionPackages/Vendor.Site/Resources/Private/Fusion/Integration/Document/Fragment/Footer.fusion b/DistributionPackages/Vendor.Site/Resources/Private/Fusion/Integration/Document/Fragment/Footer.fusion
@@ -0,0 +1,13 @@
+prototype(Vendor.Site:Document.Fragment.Footer) < prototype(Neos.Fusion:Component) {
+    renderer = Vendor.Site:Component.Organism.SiteFooter
+
+    @cache {
+        mode = 'cached'
+        entryIdentifier {
+            documentNode = ${documentNode}
+        }
+        entryTags {
+            1 = ${Neos.Caching.nodeTypeTag('Neos.Neos:Document', documentNode)}
+        }
+    }
+}
diff --git a/DistributionPackages/Vendor.Site/Resources/Private/Fusion/Integration/Document/Fragment/Header.fusion b/DistributionPackages/Vendor.Site/Resources/Private/Fusion/Integration/Document/Fragment/Header.fusion
@@ -0,0 +1,25 @@
+prototype(Vendor.Site:Document.Fragment.Header) < prototype(Neos.Fusion:Component) {
+
+    renderer = Vendor.Site:Component.Organism.SiteHeader {
+        menuItems = Neos.Fusion:Map {
+            items = Neos.Neos:MenuItems
+            itemName = 'menuitem'
+            itemRenderer = Neos.Fusion:DataStructure {
+                url = Neos.Neos:NodeUri {
+                    node = ${menuitem.node}
+                }
+                label = ${menuitem.label}
+            }
+        }
+    }
+
+    @cache {
+        mode = 'cached'
+        entryIdentifier {
+            documentNode = ${documentNode}
+        }
+        entryTags {
+            1 = ${Neos.Caching.nodeTypeTag('Neos.Neos:Document', documentNode)}
+        }
+    }
+}
diff --git a/DistributionPackages/Vendor.Site/Resources/Private/Fusion/Integration/Document/HomePage.fusion b/DistributionPackages/Vendor.Site/Resources/Private/Fusion/Integration/Document/HomePage.fusion
@@ -1 +1 @@
-prototype(Vendor.Site:Document.HomePage) < prototype(Vendor.Site:Document.Page)
+prototype(Vendor.Site:Document.HomePage) < prototype(Vendor.Site:Document.WebPage)
diff --git a/DistributionPackages/Vendor.Site/Resources/Private/Fusion/Integration/Document/Page.fusion b/DistributionPackages/Vendor.Site/Resources/Private/Fusion/Integration/Document/Page.fusion
diff --git a/DistributionPackages/Vendor.Site/Resources/Private/Fusion/Integration/Document/WebPage.fusion b/DistributionPackages/Vendor.Site/Resources/Private/Fusion/Integration/Document/WebPage.fusion
@@ -0,0 +1,11 @@
+prototype(Vendor.Site:Document.WebPage) < prototype(Neos.Fusion:Component) {
+    renderer = Vendor.Site:Document.Base {
+        body = Vendor.Site:Component.Template.Page {
+            header = Vendor.Site:Document.Fragment.Header
+            content = Neos.Neos:PrimaryContent {
+                nodePath = 'main'
+            }
+            footer = Vendor.Site:Document.Fragment.Footer
+        }
+    }
+}
diff --git a/DistributionPackages/Vendor.Site/Resources/Private/Fusion/Presentation/Component/Organism/SiteHeader/SiteHeader.fusion b/DistributionPackages/Vendor.Site/Resources/Private/Fusion/Presentation/Component/Organism/SiteHeader/SiteHeader.fusion
@@ -1,13 +1,30 @@
 prototype(Vendor.Site:Component.Organism.SiteHeader) < prototype(Neos.Fusion:Component)  {
     @styleguide {
         title = 'Site Header'
+        props {
+            menuItems = Neos.Fusion:DataStructure {
+                0 = ${{url:'#', label:'Page 1'}}
+                1 = ${{url:'#', label:'Page 2'}}
+                2 = ${{url:'#', label:'Page 3'}}
+                3 = ${{url:'#', label:'Page 4'}}
+            }
+        }
     }
 
     i18n = ${CsvPO.create('resource://Vendor.Site/Private/Fusion/Presentation/Component/Organism/SiteHeader/SiteHeader.translation.csv')}
 
+    menuItems = null
+
     renderer = afx`
         <header class={styles.siteHeader}>
             {props.i18n.title}
+            <nav>
+                <ul>
+                    <Neos.Fusion:Loop items={props.menuItems} itemName="menuItem">
+                        <li><Neos.Neos:NodeLink node={menuItem.url} >{menuItem.label}</Neos.Neos:NodeLink></li>
+                    </Neos.Fusion:Loop>
+                </ul>
+            </nav>
         </header>
     `
 }
diff --git a/DistributionPackages/Vendor.Site/Resources/Private/Fusion/Presentation/Component/Template/Page/Page.fusion b/DistributionPackages/Vendor.Site/Resources/Private/Fusion/Presentation/Component/Template/Page/Page.fusion
@@ -1,13 +1,25 @@
 prototype(Vendor.Site:Component.Template.Page) < prototype(Neos.Fusion:Component) {
     @styleguide {
         title = 'Page'
+        props {
+            header = Sitegeist.Monocle:Preview.Prototype {
+                prototypeName = 'Vendor.Site:Component.Organism.SiteHeader'
+            }
+            footer = Sitegeist.Monocle:Preview.Prototype {
+                prototypeName = 'Vendor.Site:Component.Organism.SiteFooter'
+            }
+        }
     }
 
+    header = null
+    content = null
+    footer = null
+
     renderer = afx`
-        <Vendor.Site:Component.Organism.SiteHeader/>
+        {props.header}
         <main class={styles.page}>
             {props.content}
         </main>
-        <Vendor.Site:Component.Organism.SiteFooter/>
+        {props.footer}
     `
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-'Vendor.Site:Document.Page':`
	`1`	`+'Vendor.Site:Document.WebPage':`
`2`	`2`	`superTypes:`
`3`	`3`	`'Vendor.Site:Document': true`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-prototype(Vendor.Site:Document.Error.404) < prototype(Vendor.Site:Document.Page) {`
	`1`	`+prototype(Vendor.Site:Document.Error.404) < prototype(Vendor.Site:Document.WebPage) {`
`2`	`2`	`prototype(Neos.Neos:Page) {`
`3`	`3`	`httpResponseHead {`
`4`	`4`	`statusCode = 404`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-prototype(Vendor.Site:Document.HomePage) < prototype(Vendor.Site:Document.Page)`
	`1`	`+prototype(Vendor.Site:Document.HomePage) < prototype(Vendor.Site:Document.WebPage)`