Skip to content

TASK: Move NodeTypes to dedicated folder and apply constraints and type hierarchies #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 18, 2022
Merged

TASK: Move NodeTypes to dedicated folder and apply constraints and type hierarchies #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions Configuration/Development/ddev/Settings.Log.yaml
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions DistributionPackages/Vendor.WheelInventor/Configuration/NodeTypes.Document.HomePage.yaml
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions DistributionPackages/Vendor.WheelInventor/Configuration/NodeTypes.Document.LandingPage.yaml
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions DistributionPackages/Vendor.WheelInventor/NodeTypes/Collection/Content.Main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
'Vendor.WheelInventor:Collection.Content.Main':
superTypes:
'Neos.Neos:ContentCollection': true
constraints:
nodeTypes:
'*': false
'Neos.Neos:Document': false
'Vendor.WheelInventor:Constraint.Content.Main': true
2 changes: 2 additions & 0 deletions DistributionPackages/Vendor.WheelInventor/NodeTypes/Constraint/Content.Main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
'Vendor.WheelInventor:Constraint.Content.Main':
abstract: true
2 changes: 2 additions & 0 deletions DistributionPackages/Vendor.WheelInventor/NodeTypes/Constraint/Document.Restricted.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
'Vendor.WheelInventor:Constraint.Document.Restricted':
abstract: true
0 ...ntor/Configuration/NodeTypes.Content.yaml → ...elInventor/NodeTypes/Content/Content.yaml
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions ...Configuration/NodeTypes.Content.Text.yaml → ...WheelInventor/NodeTypes/Content/Text.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'Vendor.WheelInventor:Content.Text':
superTypes:
'Vendor.WheelInventor:Content': true
'Vendor.WheelInventor:Constraint.Content.Main': true
ui:
icon: align-justify
label: i18n
Expand Down
2 changes: 2 additions & 0 deletions ...tor/Configuration/NodeTypes.Document.yaml → ...Inventor/NodeTypes/Document/Document.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@
nodeTypes:
'*': false
'Neos.Neos:Document': false
'Vendor.WheelInventor:Document': true
'Vendor.WheelInventor:Constraint.Document.Restricted': false
1 change: 1 addition & 0 deletions ...uration/NodeTypes.Document.Error.404.yaml → ...nventor/NodeTypes/Document/Error.404.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'Vendor.WheelInventor:Document.Error.404':
superTypes:
'Vendor.WheelInventor:Document': true
'Vendor.WheelInventor:Constraint.Document.Restricted': true
ui:
icon: exclamation-triangle
label: i18n
Expand Down
11 changes: 11 additions & 0 deletions DistributionPackages/Vendor.WheelInventor/NodeTypes/Document/HomePage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
'Vendor.WheelInventor:Document.HomePage':
superTypes:
'Vendor.WheelInventor:Document.LandingPage': true
'Vendor.WheelInventor:Constraint.Document.Restricted': true
ui:
icon: globe
label: i18n

childNodes:
notfound:
type: 'Vendor.WheelInventor:Document.Error.404'
7 changes: 7 additions & 0 deletions DistributionPackages/Vendor.WheelInventor/NodeTypes/Document/LandingPage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
'Vendor.WheelInventor:Document.LandingPage':
superTypes:
'Vendor.WheelInventor:Document.WebPage': true

ui:
icon: file-import
label: i18n
0 ...guration/NodeTypes.Document.Shortcut.yaml → ...Inventor/NodeTypes/Document/Shortcut.yaml
View file
Open in desktop
File renamed without changes.
6 changes: 1 addition & 5 deletions ...iguration/NodeTypes.Document.WebPage.yaml → ...lInventor/NodeTypes/Document/WebPage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,4 @@

childNodes:
main:
type: 'Neos.Neos:ContentCollection'
constraints:
nodeTypes:
'*': false
'Vendor.WheelInventor:Content.Text': true
type: 'Vendor.WheelInventor:Collection.Content.Main'
67 changes: 45 additions & 22 deletions DistributionPackages/Vendor.WheelInventor/Resources/Private/Content/Sites.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
<root>
<site name="Vendor.WheelInventor" state="1" siteResourcesPackageKey="Vendor.WheelInventor" siteNodeName="vendor-wheelinventor">
<site name="Vendor.WheelInventor" state="1" siteResourcesPackageKey="Vendor.WheelInventor"
siteNodeName="vendor-wheelinventor">
<nodes formatVersion="2.0">
<node nodeName="vendor-wheelinventor">
<variant
workspace="live"
nodeType="Vendor.WheelInventor:Document.HomePage"
sortingIndex="100"
version="1"
removed=""
hidden=""
hiddenInIndex=""
>
<node identifier="b9936423-8f86-4834-821b-a14cb6db0407" nodeName="vendor-wheelinventor">
<variant sortingIndex="100" workspace="live" nodeType="Vendor.WheelInventor:Document.HomePage"
version="1" removed="" hidden="" hiddenInIndex="">
<dimensions/>
<accessRoles __type="array"/>
<creationDateTime __type="object" __classname="DateTime">2022-01-18T18:19:35+00:00
</creationDateTime>
<lastModificationDateTime __type="object" __classname="DateTime">2022-01-18T18:19:35+00:00
</lastModificationDateTime>
<properties>
<title __type="string">Vendor.WheelInventor</title>
<uriPathSegment __type="string">vendor-wheelinventor</uriPathSegment>
</properties>
</variant>
<node nodeName="main">
<variant
workspace="live"
nodeType="Vendor.WheelInventor:Collection.Content.Main"
sortingIndex="100"
version="1"
removed=""
hidden=""
hiddenInIndex=""
>
<node identifier="be44cc2e-f9c5-30de-aaeb-9a8f33fc299b" nodeName="main">
<variant sortingIndex="100" workspace="live" nodeType="Vendor.WheelInventor:Collection.Content.Main"
version="1" removed="" hidden="" hiddenInIndex="">
<dimensions/>
<accessRoles __type="array" />
<accessRoles __type="array"/>
<creationDateTime __type="object" __classname="DateTime">2022-01-18T18:19:35+00:00
</creationDateTime>
<lastModificationDateTime __type="object" __classname="DateTime">2022-01-18T18:19:35+00:00
</lastModificationDateTime>
<properties/>
</variant>
</node>
<node identifier="510168d1-9337-7bee-0caf-e20917cbc41c" nodeName="notfound">
<variant sortingIndex="200" workspace="live" nodeType="Vendor.WheelInventor:Document.Error.404"
version="1" removed="" hidden="" hiddenInIndex="1">
<dimensions/>
<accessRoles __type="array"/>
<creationDateTime __type="object" __classname="DateTime">2022-01-18T18:35:50+00:00
</creationDateTime>
<lastModificationDateTime __type="object" __classname="DateTime">2022-01-18T18:35:50+00:00
</lastModificationDateTime>
<properties>
<uriPathSegment __type="string">notfound</uriPathSegment>
<title __type="string">404</title>
</properties>
</variant>
<node identifier="5bec9937-e5b4-7cb8-139d-78b0c7e59c3d" nodeName="main">
<variant sortingIndex="100" workspace="live" nodeType="Neos.Neos:ContentCollection" version="1"
removed="" hidden="" hiddenInIndex="">
<dimensions/>
<accessRoles __type="array"/>
<creationDateTime __type="object" __classname="DateTime">2022-01-18T18:35:50+00:00
</creationDateTime>
<lastModificationDateTime __type="object" __classname="DateTime">2022-01-18T18:35:50+00:00
</lastModificationDateTime>
<properties/>
</variant>
</node>
</node>
</node>
</nodes>
</site>
Expand Down
2 changes: 1 addition & 1 deletion ...kages/Vendor.WheelInventor/Resources/Private/Fusion/Integration/Document/Error/404.fusion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
prototype(Vendor.WheelInventor:Document.Error.404) < prototype(Vendor.WheelInventor:Document.Page) {
prototype(Vendor.WheelInventor:Document.Error.404) < prototype(Vendor.WheelInventor:Document.WebPage) {
prototype(Neos.Neos:Page) {
httpResponseHead {
statusCode = 404
Expand Down
14 changes: 1 addition & 13 deletions ...ckages/Vendor.WheelInventor/Resources/Private/Fusion/Integration/Document/HomePage.fusion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1 @@
prototype(Vendor.WheelInventor:Document.HomePage) < prototype(Neos.Fusion:Component) {
renderer = Vendor.WheelInventor:Document.Base {
body = Vendor.WheelInventor:Layout.Page {
header = Vendor.WheelInventor:Fragment.SiteHeader

main = Neos.Neos:ContentCollection {
nodePath = 'main'
}

footer = Vendor.WheelInventor:Fragment.SiteFooter
}
}
}
prototype(Vendor.WheelInventor:Document.HomePage) < prototype(Vendor.WheelInventor:Document.WebPage)
14 changes: 1 addition & 13 deletions ...ges/Vendor.WheelInventor/Resources/Private/Fusion/Integration/Document/LandingPage.fusion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1 @@
prototype(Vendor.WheelInventor:Document.LandingPage) < prototype(Neos.Fusion:Component) {
renderer = Vendor.WheelInventor:Document.Base {
body = Vendor.WheelInventor:Layout.Page {
header = Vendor.WheelInventor:Fragment.SiteHeader

main = Neos.Neos:ContentCollection {
nodePath = 'main'
}

footer = Vendor.WheelInventor:Fragment.SiteFooter
}
}
}
prototype(Vendor.WheelInventor:Document.LandingPage) < prototype(Vendor.WheelInventor:Document.WebPage)