Merge pull request #97 from neos/feature/addContactFormBasedOnFusionF…

…orms FEATURE: Add ContactForm NodeType based on the Neos.Fusion.Form package This change adds a very basic ContactForm NodeType based on Neos.Fusion.Forms. https://github.com/neos/fusion-form The content still mentions the fusion.form framework alongside neos.fusion.form but the content o the form page is now a fusion form with inspector settings.
neos · Apr 16, 2021 · 7097e47 · 7097e47
2 parents 9168305 + ff2391f
commit 7097e47
Show file tree

Hide file tree

Showing 13 changed files with 240 additions and 159 deletions.
diff --git a/Configuration/NodeTypes.Content.ContactForm.yaml b/Configuration/NodeTypes.Content.ContactForm.yaml
@@ -0,0 +1,79 @@
+##
+# A very simple "contactForm" nodetype based on the Neos.Fusion.Form package
+#
+'Neos.Demo:Content.ContactForm':
+  superTypes:
+    'Neos.Neos:Content': true
+    'Neos.Demo:Constraint.Content.Column': true
+  ui:
+    label: i18n
+    icon: 'icon-envelope'
+    inspector:
+      groups:
+        email:
+          label: i18n
+          icon: envelope
+          tab: default
+        redirect:
+          label: i18n
+          icon: share
+          tab: default
+        message:
+          label: i18n
+          icon: comment
+          tab: default
+  properties:
+    subject:
+      type: string
+      defaultValue: ''
+      ui:
+        label: i18n
+        inspector:
+          group: email
+    recipientName:
+      type: string
+      defaultValue: ''
+      ui:
+        label: i18n
+        inspector:
+          group: email
+    recipientAddress:
+      type: string
+      defaultValue: ''
+      ui:
+        label: i18n
+        inspector:
+          group: email
+    senderName:
+      type: string
+      defaultValue: ''
+      ui:
+        label: i18n
+        inspector:
+          group: email
+    senderAddress:
+      type: string
+      defaultValue: ''
+      ui:
+        label: i18n
+        inspector:
+          group: email
+    redirect:
+      type: reference
+      defaultValue: null
+      ui:
+        label: i18n
+        inspector:
+          group: redirect
+          editorOptions:
+            nodeTyps: ['Neos.Neos:Document']
+    message:
+      type: string
+      defaultValue: ''
+      ui:
+        label: i18n
+        inspector:
+          group: message
+          editor: 'Neos.Neos/Inspector/Editors/TextAreaEditor'
+          editorOptions:
+            rows: 7
diff --git a/Configuration/NodeTypes.Override.Neos.NodeTypes.Form.yaml b/Configuration/NodeTypes.Override.Neos.NodeTypes.Form.yaml
diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml
@@ -4,23 +4,6 @@ Neos:
     flickr:
       tagStreamUriPattern: 'http://api.flickr.com/services/feeds/photos_public.gne?format=json&nojsoncallback=1&tags=%s'
       userStreamUriPattern: 'http://api.flickr.com/services/feeds/photos_public.gne?format=json&nojsoncallback=1&id=%s'
-  Form:
-    yamlPersistenceManager:
-      savePath: 'resource://Neos.Demo/Private/Form/'
-    presets:
-      bootstrap:
-        title: 'Twitter bootstrap'
-        parentPreset: default
-        formElementTypes:
-          'Neos.Form:Base':
-            renderingOptions:
-              layoutPathPattern: 'resource://Neos.Demo/Private/Templates/ContactForm/{@type}.html'
-          'Neos.Form:FormElement':
-            properties:
-              elementClassAttribute: form-control
-          'Neos.Form:MultiLineText':
-            properties:
-              elementClassAttribute: form-control
   Neos:
     userInterface:
       editPreviewModes:

diff --git a/Resources/Private/Content/Resources/4a87504ef49f5c5d1aaa7ce7ff47a124fd421dec b/Resources/Private/Content/Resources/4a87504ef49f5c5d1aaa7ce7ff47a124fd421dec
diff --git a/Resources/Private/Content/Resources/d798dbdb80df7f24e94455c4961b7a3d231ccce0 b/Resources/Private/Content/Resources/d798dbdb80df7f24e94455c4961b7a3d231ccce0
diff --git a/Resources/Private/Content/Resources/f1769206023d2b0d9ab00475867da01c44c4a74e b/Resources/Private/Content/Resources/f1769206023d2b0d9ab00475867da01c44c4a74e
diff --git a/Resources/Private/Content/Sites.xml b/Resources/Private/Content/Sites.xml
diff --git a/Resources/Private/Form/contact-form.yaml b/Resources/Private/Form/contact-form.yaml
diff --git a/Resources/Private/Fusion/Content/ContactForm.fusion b/Resources/Private/Fusion/Content/ContactForm.fusion
@@ -0,0 +1,73 @@
+##
+# "ContactForm" element
+#
+prototype(Neos.Demo:Content.ContactForm) < prototype(Neos.Neos:ContentComponent) {
+
+    renderer = Neos.Fusion.Form:Runtime.RuntimeForm {
+        namespace = 'contact'
+        process {
+            content = afx`
+                <fieldset>
+                    <legend>Contact</legend>
+                    <Neos.Fusion.Form:FieldContainer label="Name" field.name="name" attributes.class="form-group clearfix">
+                        <div class="input">
+                            <Neos.Fusion.Form:Input attributes.class="form-control" />
+                        </div>
+                    </Neos.Fusion.Form:FieldContainer>
+                    <Neos.Fusion.Form:FieldContainer label="Email" field.name="email" attributes.class="form-group clearfix">
+                        <div class="input">
+                            <Neos.Fusion.Form:Input attributes.class="form-control" />
+                        </div>
+                    </Neos.Fusion.Form:FieldContainer>
+                    <Neos.Fusion.Form:FieldContainer label="Message" field.name="message" attributes.class="form-group clearfix">
+                        <div class="input">
+                            <Neos.Fusion.Form:Textarea attributes.class="form-control" />
+                        </div>
+                    </Neos.Fusion.Form:FieldContainer>
+                </fieldset>
+            `
+
+            footer = afx`
+                <button type="submit" class="btn btn-primary">Submit</button>
+            `
+
+            schema {
+                name = ${Form.Schema.string().isRequired()}
+                email = ${Form.Schema.string().isRequired().validator('EmailAddress')}
+                message = ${Form.Schema.string().isRequired()}
+            }
+        }
+
+        action {
+            message {
+                type = 'Neos.Fusion.Form.Runtime:Message'
+                options.message = ${q(node).property('message')}
+            }
+
+            email {
+                @if.has = ${q(node).property('subject') && q(node).property('recipientAddress') && q(node).property('senderAddress')}
+                type = 'Neos.Fusion.Form.Runtime:Email'
+                options {
+                    recipientName = ${q(node).property('recipientName')}
+                    recipientAddress = ${q(node).property('recipientAddress')}
+                    senderName = ${q(node).property('senderName')}
+                    senderAddress = ${q(node).property('senderAddress')}
+                    replyToAddress = ${data.email}
+                    subject = ${q(node).property('subject')}
+                    html = afx`
+                        <p>Message from {data.name}</p>
+                        <p>{data.message}</p>
+                    `
+                }
+            }
+
+            redirect {
+                @if.has = ${q(node).property('redirect')}
+                type = 'Neos.Fusion.Form.Runtime:Redirect'
+                options.uri = Neos.Neos:NodeUri {
+                    node = ${q(node).property('redirect')}
+                }
+            }
+        }
+    }
+}
diff --git a/Resources/Private/Templates/ContactForm/Email.txt b/Resources/Private/Templates/ContactForm/Email.txt
diff --git a/Resources/Private/Templates/ContactForm/Field.html b/Resources/Private/Templates/ContactForm/Field.html
diff --git a/Resources/Private/Translations/en/NodeTypes/Content/ContactForm.xlf b/Resources/Private/Translations/en/NodeTypes/Content/ContactForm.xlf
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+	<file original="" product-name="Neos.Demo" source-language="en" datatype="plaintext">
+		<body>
+			<trans-unit id="ui.label" xml:space="preserve">
+				<source>Contact Form</source>
+			</trans-unit>
+            <trans-unit id="groups.message" xml:space="preserve">
+				<source>Message</source>
+			</trans-unit>
+            <trans-unit id="groups.email" xml:space="preserve">
+				<source>EMail</source>
+			</trans-unit>
+            <trans-unit id="groups.redirect" xml:space="preserve">
+				<source>Redirect</source>
+			</trans-unit>
+            <trans-unit id="properties.message" xml:space="preserve">
+				<source>Message after submit</source>
+			</trans-unit>
+            <trans-unit id="properties.redirect" xml:space="preserve">
+				<source>Redirect after submit</source>
+			</trans-unit>
+            <trans-unit id="properties.recipientName" xml:space="preserve">
+				<source>Recipient name</source>
+			</trans-unit>
+            <trans-unit id="properties.recipientAddress" xml:space="preserve">
+				<source>Recipient email address</source>
+			</trans-unit>
+            <trans-unit id="properties.senderName" xml:space="preserve">
+				<source>Sender name</source>
+			</trans-unit>
+            <trans-unit id="properties.senderAddress" xml:space="preserve">
+				<source>Sender email address</source>
+			</trans-unit>
+            <trans-unit id="properties.subject" xml:space="preserve">
+				<source>Subject</source>
+			</trans-unit>
+		</body>
+	</file>
+</xliff>
diff --git a/composer.json b/composer.json
@@ -11,7 +11,6 @@
         "neos/nodetypes-basemixins": "*",
         "neos/nodetypes-assetlist": "*",
         "neos/nodetypes-contentreferences": "*",
-        "neos/nodetypes-form": "*",
         "neos/nodetypes-html": "*",
         "neos/nodetypes-navigation": "*",
         "flowpack/neos-frontendlogin": "^4.0"