From 9377b219a24c3d413faee241f760a359e0600e3d Mon Sep 17 00:00:00 2001
From: Oskar Dydo <oskar.dydo@gmail.com>
Date: Fri, 10 Jul 2020 13:45:55 +0200
Subject: [PATCH 1/4] Initial commit

---
 .../Form/GenerateNameViewHelper.php           |  55 ++++
 .../Form/MultiUploadViewHelper.php            |  65 ++++
 .../Form/RegisterFieldViewHelper.php          |  71 +++++
 .../Form/SelectFieldViewHelper.php            | 130 ++++++++
 Classes/ViewHelpers/Form/SelectViewHelper.php | 115 +++++++
 Classes/ViewHelpers/FormViewHelper.php        | 284 ++++++++++++++++++
 Configuration/TCA/Overrides/sys_template.php  |  13 +
 Configuration/TypoScript/constants.typoscript |   5 +
 Configuration/TypoScript/setup.typoscript     |  22 ++
 LICENSE => LICENSE.md                         |   0
 README.md                                     |  20 +-
 Resources/Private/Layout/Default.html         |   3 +
 .../Private/Partials/Form/Field/Check.html    |  44 +++
 .../Private/Partials/Form/Field/Content.html  |  18 ++
 .../Private/Partials/Form/Field/Date.html     |  23 ++
 .../Private/Partials/Form/Field/File.html     |  21 ++
 .../Private/Partials/Form/Field/Hidden.html   |  14 +
 .../Private/Partials/Form/Field/Html.html     |  19 ++
 .../Private/Partials/Form/Field/Input.html    |  23 ++
 .../Private/Partials/Form/Field/Radio.html    |  45 +++
 .../Private/Partials/Form/Field/Select.html   |  35 +++
 .../Private/Partials/Form/Field/Submit.html   |  16 +
 .../Private/Partials/Form/Field/Text.html     |  17 ++
 .../Private/Partials/Form/Field/Textarea.html |  23 ++
 .../Private/Partials/Form/FieldLabel.html     |  14 +
 Resources/Private/Partials/Form/Fields.html   |  10 +
 Resources/Private/Partials/Form/Page.html     |  10 +
 Resources/Private/Partials/Form/Pages.html    |   9 +
 Resources/Private/Template/Form/Form.html     |  24 ++
 composer.json                                 |  41 +++
 ext_emconf.php                                |  20 ++
 ext_icon.png                                  | Bin 0 -> 658 bytes
 ext_localconf.php                             |  13 +
 33 files changed, 1220 insertions(+), 2 deletions(-)
 create mode 100644 Classes/ViewHelpers/Form/GenerateNameViewHelper.php
 create mode 100644 Classes/ViewHelpers/Form/MultiUploadViewHelper.php
 create mode 100644 Classes/ViewHelpers/Form/RegisterFieldViewHelper.php
 create mode 100644 Classes/ViewHelpers/Form/SelectFieldViewHelper.php
 create mode 100644 Classes/ViewHelpers/Form/SelectViewHelper.php
 create mode 100644 Classes/ViewHelpers/FormViewHelper.php
 create mode 100644 Configuration/TCA/Overrides/sys_template.php
 create mode 100644 Configuration/TypoScript/constants.typoscript
 create mode 100644 Configuration/TypoScript/setup.typoscript
 rename LICENSE => LICENSE.md (100%)
 create mode 100644 Resources/Private/Layout/Default.html
 create mode 100644 Resources/Private/Partials/Form/Field/Check.html
 create mode 100644 Resources/Private/Partials/Form/Field/Content.html
 create mode 100644 Resources/Private/Partials/Form/Field/Date.html
 create mode 100644 Resources/Private/Partials/Form/Field/File.html
 create mode 100644 Resources/Private/Partials/Form/Field/Hidden.html
 create mode 100644 Resources/Private/Partials/Form/Field/Html.html
 create mode 100644 Resources/Private/Partials/Form/Field/Input.html
 create mode 100644 Resources/Private/Partials/Form/Field/Radio.html
 create mode 100644 Resources/Private/Partials/Form/Field/Select.html
 create mode 100644 Resources/Private/Partials/Form/Field/Submit.html
 create mode 100644 Resources/Private/Partials/Form/Field/Text.html
 create mode 100644 Resources/Private/Partials/Form/Field/Textarea.html
 create mode 100644 Resources/Private/Partials/Form/FieldLabel.html
 create mode 100644 Resources/Private/Partials/Form/Fields.html
 create mode 100644 Resources/Private/Partials/Form/Page.html
 create mode 100644 Resources/Private/Partials/Form/Pages.html
 create mode 100644 Resources/Private/Template/Form/Form.html
 create mode 100644 composer.json
 create mode 100644 ext_emconf.php
 create mode 100644 ext_icon.png
 create mode 100644 ext_localconf.php

diff --git a/Classes/ViewHelpers/Form/GenerateNameViewHelper.php b/Classes/ViewHelpers/Form/GenerateNameViewHelper.php
new file mode 100644
index 0000000..a5e4ff9
--- /dev/null
+++ b/Classes/ViewHelpers/Form/GenerateNameViewHelper.php
@@ -0,0 +1,55 @@
+<?php
+namespace FriendsOfTYPO3\HeadlessPowermail\ViewHelpers\Form;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+/**
+ * ViewHelper which creates a text field :html:`<input type="text">`.
+ *
+ * Examples
+ * ========
+ *
+ * Example::
+ *
+ *    <f:form.textfield name="myTextBox" value="default value" />
+ *
+ * Output::
+ *
+ *    <input type="text" name="myTextBox" value="default value" />
+ */
+class GenerateNameViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFieldViewHelper
+{
+    /**
+     * Initialize the arguments.
+     *
+     * @throws \TYPO3Fluid\Fluid\Core\ViewHelper\Exception
+     */
+    public function initializeArguments()
+    {
+        $this->registerArgument(
+            'property',
+            'string',
+            'Name of Object Property. If used in conjunction with <f:form object="...">, "name" and "value" properties will be ignored.'
+        );
+        $this->registerArgument('name', 'string', 'Name of input tag');
+    }
+
+    /**
+     * @return string|void
+     */
+    public function render()
+    {
+        return $this->getName();
+    }
+}
diff --git a/Classes/ViewHelpers/Form/MultiUploadViewHelper.php b/Classes/ViewHelpers/Form/MultiUploadViewHelper.php
new file mode 100644
index 0000000..7a6b2d9
--- /dev/null
+++ b/Classes/ViewHelpers/Form/MultiUploadViewHelper.php
@@ -0,0 +1,65 @@
+<?php
+
+declare(strict_types=1);
+
+namespace FriendsOfTYPO3\HeadlessPowermail\ViewHelpers\Form;
+
+use TYPO3\CMS\Fluid\ViewHelpers\Form\UploadViewHelper;
+
+/**
+ * Class MultiUploadViewHelper
+ */
+class MultiUploadViewHelper extends UploadViewHelper
+{
+
+    /**
+     * Initialize the arguments.
+     *
+     * @api
+     */
+    public function initializeArguments()
+    {
+        parent::initializeArguments();
+    }
+
+    /**
+     * Renders the upload field.
+     *
+     * @return string
+     */
+    public function render(): string
+    {
+        $name = $this->getName();
+        $allowedFields = ['name', 'type', 'tmp_name', 'error', 'size'];
+        foreach ($allowedFields as $fieldName) {
+            $this->registerFieldNameForFormTokenGeneration($name . '[' . $fieldName . '][]');
+        }
+        $this->tag->addAttribute('type', 'file');
+        $name .= '[]';
+        $this->tag->addAttribute('name', $name);
+        $this->setErrorClassAttribute();
+        return $this->renderInput();
+    }
+
+    /**
+     * Renders and returns the tag
+     *
+     * @return string
+     * @api
+     */
+    public function renderInput()
+    {
+        $data = [];
+        if (empty($this->tagName)) {
+            return '';
+        }
+        foreach ($this->tag->getAttributes() as $attributeName => $attributeValue) {
+            $data[$attributeName] = $attributeValue;
+        }
+        $data['name'] = $this->tag->getTagName();
+        if ($this->tag->hasContent()) {
+            $data['content'] = $this->tag->getContent();
+        }
+        return json_encode($data);
+    }
+}
diff --git a/Classes/ViewHelpers/Form/RegisterFieldViewHelper.php b/Classes/ViewHelpers/Form/RegisterFieldViewHelper.php
new file mode 100644
index 0000000..0731d35
--- /dev/null
+++ b/Classes/ViewHelpers/Form/RegisterFieldViewHelper.php
@@ -0,0 +1,71 @@
+<?php
+namespace FriendsOfTYPO3\HeadlessPowermail\ViewHelpers\Form;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+/**
+ * Registers field for generating hidden fields
+ */
+class RegisterFieldViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFieldViewHelper
+{
+
+    /**
+     * Initialize the arguments.
+     *
+     * @throws \TYPO3Fluid\Fluid\Core\ViewHelper\Exception
+     */
+    public function initializeArguments()
+    {
+        $this->registerArgument('name', 'string', 'Name of input tag');
+        $this->registerArgument('value', 'mixed', 'Value of input tag');
+        $this->registerArgument(
+            'property',
+            'string',
+            'Name of Object Property. If used in conjunction with <f:form object="...">, "name" and "value" properties will be ignored.'
+        );
+        $this->registerArgument('additionalAttributes', 'array', 'Additional tag attributes. They will be added directly to the resulting HTML tag.', false);
+        $this->registerArgument('checked', 'bool', 'Specifies that the input element should be preselected');
+        $this->registerArgument('multiple', 'bool', 'Specifies whether this checkbox belongs to a multivalue (is part of a checkbox group)', false, false);
+    }
+
+    /**
+     * @return string|void
+     */
+    public function render()
+    {
+        $nameAttribute = $this->getName();
+
+        $checked = $this->arguments['checked'];
+        $multiple = $this->arguments['multiple'];
+
+        $propertyValue = null;
+        if ($this->hasMappingErrorOccurred()) {
+            $propertyValue = $this->getLastSubmittedFormData();
+        }
+        if ($checked === null && $propertyValue === null) {
+            $propertyValue = $this->getPropertyValue();
+        }
+
+        if ($propertyValue instanceof \Traversable) {
+            $propertyValue = iterator_to_array($propertyValue);
+        }
+        if (is_array($propertyValue)) {
+            $nameAttribute .= '[]';
+        } elseif ($multiple === true) {
+            $nameAttribute .= '[]';
+        }
+
+        $this->registerFieldNameForFormTokenGeneration($nameAttribute);
+    }
+}
diff --git a/Classes/ViewHelpers/Form/SelectFieldViewHelper.php b/Classes/ViewHelpers/Form/SelectFieldViewHelper.php
new file mode 100644
index 0000000..0ad9f57
--- /dev/null
+++ b/Classes/ViewHelpers/Form/SelectFieldViewHelper.php
@@ -0,0 +1,130 @@
+<?php
+
+declare(strict_types=1);
+
+namespace FriendsOfTYPO3\HeadlessPowermail\ViewHelpers\Form;
+
+/**
+ * Class SelectFieldViewHelper
+ */
+class SelectFieldViewHelper extends SelectViewHelper
+{
+
+    /**
+     * @var array
+     */
+    protected $originalOptions = [];
+
+    /**
+     * Render the tag.
+     *
+     * @return string rendered tag.
+     * @api
+     */
+    public function render()
+    {
+        $this->originalOptions = $this->arguments['options'];
+        $this->setOptions();
+        return json_encode(parent::render());
+    }
+
+    /**
+     * Set options with key and value from $field->getModifiedOptions()
+     *        convert:
+     *            array(
+     *                array(
+     *                    'label' => 'Red shoes',
+     *                    'value' => 'red',
+     *                    'selected' => 0
+     *                )
+     *            )
+     *
+     *        to:
+     *            array(
+     *                'red' => 'Red shoes'
+     *            )
+     */
+    protected function setOptions(): void
+    {
+        $optionArray = [];
+        foreach ($this->arguments['options'] as $option) {
+            $optionArray[$option['value']] = $option['label'];
+        }
+        $this->arguments['options'] = $optionArray;
+    }
+
+    /**
+     * Render one option tag
+     *
+     * @param string $value value attribute of the option tag (will be escaped)
+     * @param string $label content of the option tag (will be escaped)
+     * @param bool $isSelected specifies wether or not to add selected attribute
+     * @return string the rendered option tag
+     */
+    protected function renderOptionTag($value, $label, $isSelected = false)
+    {
+        unset($isSelected);
+        return parent::renderOptionTag(
+            $value,
+            $label,
+            $this->isSelectedAlternative($this->getOptionFromOriginalOptionsByValue((string)$value))
+        );
+    }
+
+    /**
+     * @param string $value
+     * @return array
+     */
+    protected function getOptionFromOriginalOptionsByValue(string $value): array
+    {
+        foreach ($this->originalOptions as $option) {
+            if ((string)$value === $option['value'] || (string)$value === $option['label']) {
+                return $option;
+            }
+        }
+        return [];
+    }
+
+    /**
+     * Check if option is selected
+     *
+     * @param array $option Current option
+     * @return bool TRUE if the value marked a s selected; FALSE otherwise
+     */
+    protected function isSelectedAlternative(array $option): bool
+    {
+        if (is_array($this->getValueAttribute())) {
+            return $this->isSelectedAlternativeForArray($option);
+        }
+        return $this->isSelectedAlternativeForString($option);
+    }
+
+    /**
+     * @param array $option
+     * @return bool
+     */
+    protected function isSelectedAlternativeForString(array $option): bool
+    {
+        if (($option['selected'] && !$this->getValueAttribute()) ||
+            ($this->getValueAttribute() &&
+                ($option['value'] === $this->getValueAttribute() || $option['label'] === $this->getValueAttribute()))
+        ) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @param array $option
+     * @return bool
+     */
+    protected function isSelectedAlternativeForArray(array $option): bool
+    {
+        foreach ($this->getValueAttribute() as $singleValue) {
+            if (!empty($singleValue) && ($option['value'] === $singleValue || $option['label'] === $singleValue)) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/Classes/ViewHelpers/Form/SelectViewHelper.php b/Classes/ViewHelpers/Form/SelectViewHelper.php
new file mode 100644
index 0000000..6c29a63
--- /dev/null
+++ b/Classes/ViewHelpers/Form/SelectViewHelper.php
@@ -0,0 +1,115 @@
+<?php
+namespace FriendsOfTYPO3\HeadlessPowermail\ViewHelpers\Form;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+/**
+ * Returns options in array with value, name
+ */
+class SelectViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\SelectViewHelper
+{
+    /**
+     * @var array
+     */
+    public $data = [];
+
+    /**
+     * @var int
+     */
+    public $elementCounter = 0;
+
+    /**
+     * Render the tag.
+     *
+     * @return string rendered tag.
+     */
+    public function render()
+    {
+        if (isset($this->arguments['required']) && $this->arguments['required']) {
+            $this->tag->addAttribute('required', 'required');
+        }
+        $name = $this->getName();
+        if (isset($this->arguments['multiple']) && $this->arguments['multiple']) {
+            $this->tag->addAttribute('multiple', 'multiple');
+            $name .= '[]';
+        }
+        $this->tag->addAttribute('name', $name);
+        $options = $this->getOptions();
+
+        $this->addAdditionalIdentityPropertiesIfNeeded();
+        $this->setErrorClassAttribute();
+        $content = '';
+        // register field name for token generation.
+        // in case it is a multi-select, we need to register the field name
+        // as often as there are elements in the box
+        if (isset($this->arguments['multiple']) && $this->arguments['multiple']) {
+            $content .= $this->renderHiddenFieldForEmptyValue();
+            $optionsCount = count($options);
+            for ($i = 0; $i < $optionsCount; $i++) {
+                $this->registerFieldNameForFormTokenGeneration($name);
+            }
+            // save the parent field name so that any child f:form.select.option
+            // tag will know to call registerFieldNameForFormTokenGeneration
+            // this is the reason why "self::class" is used instead of static::class (no LSB)
+            $this->viewHelperVariableContainer->addOrUpdate(
+                self::class,
+                'registerFieldNameForFormTokenGeneration',
+                $name
+            );
+        } else {
+            $this->registerFieldNameForFormTokenGeneration($name);
+        }
+
+        $this->viewHelperVariableContainer->addOrUpdate(self::class, 'selectedValue', $this->getSelectedValue());
+        $this->renderPrependOptionTag();
+        $this->renderOptionTags($options);
+
+        //TODO check if we need it in 'production mode'
+        $childContent = $this->renderChildren();
+        $this->viewHelperVariableContainer->remove(self::class, 'selectedValue');
+        $this->viewHelperVariableContainer->remove(self::class, 'registerFieldNameForFormTokenGeneration');
+
+        return $this->data;
+    }
+
+    /**
+     * Render the option tags.
+     *
+     * @param array $options the options for the form.
+     */
+    protected function renderOptionTags($options)
+    {
+        foreach ($options as $value => $label) {
+            $isSelected = $this->isSelected($value);
+            $this->renderOptionTag($value, $label, $isSelected) . LF;
+        }
+    }
+
+    /**
+     * Render one option tag
+     *
+     * @param string $value value attribute of the option tag (will be escaped)
+     * @param string $label content of the option tag (will be escaped)
+     * @param bool $isSelected specifies whether or not to add selected attribute
+     * @return string the rendered option tag
+     */
+    protected function renderOptionTag($value, $label, $isSelected)
+    {
+        $this->data[$this->elementCounter]['value'] = $value;
+        $this->data[$this->elementCounter]['label'] = $label;
+        $this->data[$this->elementCounter]['isSelected'] = $isSelected;
+
+        $this->elementCounter++;
+    }
+}
diff --git a/Classes/ViewHelpers/FormViewHelper.php b/Classes/ViewHelpers/FormViewHelper.php
new file mode 100644
index 0000000..fbd5490
--- /dev/null
+++ b/Classes/ViewHelpers/FormViewHelper.php
@@ -0,0 +1,284 @@
+<?php
+
+namespace FriendsOfTYPO3\HeadlessPowermail\ViewHelpers;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+use TYPO3\CMS\Extbase\DomainObject\AbstractDomainObject;
+use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
+use TYPO3\CMS\Extbase\Persistence\Generic\LazyLoadingProxy;
+
+/**
+ * Form ViewHelper. Generates a :html:`<form>` Tag.
+ *
+ * Basic usage
+ * ===========
+ *
+ * Use :html:`<f:form>` to output an HTML :html:`<form>` tag which is targeted
+ * at the specified action, in the current controller and package.
+ * It will submit the form data via a POST request. If you want to change this,
+ * use :html:`method="get"` as an argument.
+ *
+ * Examples
+ * ========
+ *
+ * A complex form with a specified encoding type
+ * ---------------------------------------------
+ *
+ * Form with enctype set::
+ *
+ *    <f:form action=".." controller="..." package="..." enctype="multipart/form-data">...</f:form>
+ *
+ * A Form which should render a domain object
+ * ------------------------------------------
+ *
+ * Binding a domain object to a form::
+ *
+ *    <f:form action="..." name="customer" object="{customer}">
+ *       <f:form.hidden property="id" />
+ *       <f:form.textbox property="name" />
+ *    </f:form>
+ *
+ * This automatically inserts the value of ``{customer.name}`` inside the
+ * textbox and adjusts the name of the textbox accordingly.
+ */
+class FormViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper
+{
+    /**
+     * @var array
+     */
+    protected $data = [];
+
+    /**
+     * @var int
+     */
+    protected $i = 0;
+
+    /**
+     * Initialize arguments.
+     */
+    public function initializeArguments()
+    {
+        parent::initializeArguments();
+        $this->registerArgument('formUid', 'int', 'Form uid', true);
+    }
+
+    /**
+     * @return false|string
+     * @throws \TYPO3\CMS\EXTBASE\Security\Exception\InvalidArgumentForHashGenerationException
+     */
+    public function render()
+    {
+        $this->setFormActionUri();
+        if (isset($this->arguments['method']) && strtolower($this->arguments['method']) === 'get') {
+            $this->tag->addAttribute('method', 'get');
+        } else {
+            $this->tag->addAttribute('method', 'post');
+        }
+
+        if (isset($this->arguments['novalidate']) && $this->arguments['novalidate'] === true) {
+            $this->tag->addAttribute('novalidate', 'novalidate');
+        }
+
+        $this->addFormObjectNameToViewHelperVariableContainer();
+        $this->addFormObjectToViewHelperVariableContainer();
+        $this->addFieldNamePrefixToViewHelperVariableContainer();
+        $this->addFormFieldNamesToViewHelperVariableContainer();
+        $this->data['pages'] = $this->renderChildren();
+
+        $this->renderHiddenIdentityField($this->arguments['object'] ?? null, $this->getFormObjectName());
+        $this->renderAdditionalIdentityFields();
+        $this->renderHiddenReferrerFields();
+
+        // Render the trusted list of all properties after everything else has been rendered
+        $this->renderTrustedPropertiesField();
+        $this->renderFormUidField();
+
+        $this->removeFieldNamePrefixFromViewHelperVariableContainer();
+        $this->removeFormObjectFromViewHelperVariableContainer();
+        $this->removeFormObjectNameFromViewHelperVariableContainer();
+        $this->removeFormFieldNamesFromViewHelperVariableContainer();
+        $this->removeCheckboxFieldNamesFromViewHelperVariableContainer();
+
+        return json_encode($this->data);
+    }
+
+    /**
+     * Sets the "action" attribute of the form tag
+     */
+    protected function setFormActionUri()
+    {
+        if ($this->hasArgument('actionUri')) {
+            $formActionUri = $this->arguments['actionUri'];
+        } else {
+            if (isset($this->arguments['noCacheHash'])) {
+                trigger_error(
+                    'Using the argument "noCacheHash" in <f:form> ViewHelper has no effect anymore. Remove the argument in your fluid template, as it will result in a fatal error.',
+                    E_USER_DEPRECATED
+                );
+            }
+
+            /** @var UriBuilder $uriBuilder */
+            $uriBuilder = $this->renderingContext->getControllerContext()->getUriBuilder();
+            $uriBuilder
+                ->reset()
+                ->setTargetPageType($this->arguments['pageType'] ?? 0)
+                ->setNoCache($this->arguments['noCache'] ?? false)
+                ->setSection($this->arguments['section'] ?? '')
+                ->setCreateAbsoluteUri($this->arguments['absolute'] ?? false)
+                ->setArguments(isset($this->arguments['additionalParams']) ? (array)$this->arguments['additionalParams'] : [])
+                ->setAddQueryString($this->arguments['addQueryString'] ?? false)
+                ->setArgumentsToBeExcludedFromQueryString(isset($this->arguments['argumentsToBeExcludedFromQueryString']) ? (array)$this->arguments['argumentsToBeExcludedFromQueryString'] : [])
+                ->setFormat($this->arguments['format'] ?? '');
+
+            $addQueryStringMethod = $this->arguments['addQueryStringMethod'] ?? null;
+            if (is_string($addQueryStringMethod)) {
+                $uriBuilder->setAddQueryStringMethod($addQueryStringMethod);
+            }
+
+            $pageUid = (int)($this->arguments['pageUid'] ?? 0);
+            if ($pageUid > 0) {
+                $uriBuilder->setTargetPageUid($pageUid);
+            }
+
+            $formActionUri = $uriBuilder->uriFor(
+                $this->arguments['action'] ?? null,
+                $this->arguments['arguments'] ?? [],
+                $this->arguments['controller'] ?? null,
+                $this->arguments['extensionName'] ?? null,
+                $this->arguments['pluginName'] ?? null
+            );
+            $this->formActionUriArguments = $uriBuilder->getArguments();
+        }
+        $this->data['action'] = $formActionUri;
+    }
+
+    /**
+     * Render additional identity fields which were registered by form elements.
+     * This happens if a form field is defined like property="bla.blubb" - then we might need an identity property for the sub-object "bla".
+     *
+     * @return string HTML-string for the additional identity properties
+     */
+    protected function renderAdditionalIdentityFields()
+    {
+        if ($this->viewHelperVariableContainer->exists(\TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class, 'additionalIdentityProperties')) {
+            $additionalIdentityProperties = $this->viewHelperVariableContainer->get(\TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class, 'additionalIdentityProperties');
+
+            foreach ($additionalIdentityProperties as $identity) {
+                $this->addHiddenField('identity', $identity);
+            }
+        }
+
+        return '';
+    }
+
+    /**
+     * Renders hidden form fields for referrer information about
+     * the current controller and action.
+     *
+     * @return string Hidden fields with referrer information
+     * @todo filter out referrer information that is equal to the target (e.g. same packageKey)
+     */
+    protected function renderHiddenReferrerFields()
+    {
+        $request = $this->renderingContext->getControllerContext()->getRequest();
+        $extensionName = $request->getControllerExtensionName();
+        $controllerName = $request->getControllerName();
+        $actionName = $request->getControllerActionName();
+        $actionRequest = [
+            '@extension' => $extensionName,
+            '@controller' => $controllerName,
+            '@action' => $actionName,
+        ];
+        $this->addHiddenField($this->prefixFieldName('__referrer[@extension]'), $extensionName);
+        $this->addHiddenField($this->prefixFieldName('__referrer[@controller]'), $controllerName);
+        $this->addHiddenField($this->prefixFieldName('__referrer[@action]'), $actionName);
+        $this->addHiddenField($this->prefixFieldName('__referrer[@request]'), $this->hashService->appendHmac(json_encode($actionRequest)));
+    }
+
+    /**
+     * Adds the field name prefix to the ViewHelperVariableContainer
+     */
+    protected function addFieldNamePrefixToViewHelperVariableContainer()
+    {
+        $fieldNamePrefix = $this->getFieldNamePrefix();
+        $this->viewHelperVariableContainer->add(\TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class, 'fieldNamePrefix', $fieldNamePrefix);
+    }
+
+    /**
+     * Renders a hidden form field containing the technical identity of the given object.
+     *
+     * @param object $object Object to create the identity field for
+     * @param string $name Name
+     *
+     * @return string A hidden field containing the Identity (UID in TYPO3 Flow, uid in Extbase) of the given object or NULL if the object is unknown to the persistence framework
+     * @see \TYPO3\CMS\Extbase\Mvc\Controller\Argument::setValue()
+     */
+    protected function renderHiddenIdentityField($object, $name)
+    {
+        if ($object instanceof LazyLoadingProxy) {
+            $object = $object->_loadRealInstance();
+        }
+        if (!is_object($object)
+            || !($object instanceof AbstractDomainObject)
+            || ($object->_isNew() && !$object->_isClone())) {
+            return '';
+        }
+        // Intentionally NOT using PersistenceManager::getIdentifierByObject here!!
+        // Using that one breaks re-submission of data in forms in case of an error.
+        $identifier = $object->getUid();
+        if ($identifier === null) {
+            return '';
+        }
+        $name = $this->prefixFieldName($name) . '[__identity]';
+        $this->registerFieldNameForFormTokenGeneration($name);
+
+        $this->addHiddenField($name, $identifier);
+    }
+
+    /**
+     * Render the request hash field
+     *
+     * @return string|void
+     * @throws \TYPO3\CMS\EXTBASE\Security\Exception\InvalidArgumentForHashGenerationException
+     */
+    protected function renderTrustedPropertiesField()
+    {
+        $formFieldNames = $this->viewHelperVariableContainer->get(\TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class, 'formFieldNames');
+        $requestHash = $this->mvcPropertyMappingConfigurationService->generateTrustedPropertiesToken($formFieldNames, $this->getFieldNamePrefix());
+        $this->addHiddenField($this->prefixFieldName('__trustedProperties'), $requestHash);
+    }
+
+    /**
+     * Render the request form uid field
+     *
+     * @return string|void
+     * @throws \TYPO3\CMS\EXTBASE\Security\Exception\InvalidArgumentForHashGenerationException
+     */
+    protected function renderFormUidField()
+    {
+        $this->addHiddenField($this->prefixFieldName('mail[form]'), $this->arguments['formUid']);
+    }
+
+    /**
+     * @param $name
+     * @param $value
+     */
+    protected function addHiddenField($name, $value)
+    {
+        $this->data['hiddenFields'][$this->i]['name'] = $name;
+        $this->data['hiddenFields'][$this->i]['value'] = $value;
+        $this->i++;
+    }
+}
diff --git a/Configuration/TCA/Overrides/sys_template.php b/Configuration/TCA/Overrides/sys_template.php
new file mode 100644
index 0000000..0396076
--- /dev/null
+++ b/Configuration/TCA/Overrides/sys_template.php
@@ -0,0 +1,13 @@
+<?php
+defined('TYPO3_MODE') || die();
+
+call_user_func(function () {
+    /**
+     * Default TypoScript for Headless Powermail
+     */
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile(
+        'headless_powermail',
+        'Configuration/TypoScript',
+        'Headless Powermail'
+    );
+});
diff --git a/Configuration/TypoScript/constants.typoscript b/Configuration/TypoScript/constants.typoscript
new file mode 100644
index 0000000..12ad1a9
--- /dev/null
+++ b/Configuration/TypoScript/constants.typoscript
@@ -0,0 +1,5 @@
+plugin.tx_powermail.view {
+    templateRootPath = EXT:headless_powermail/Resources/Private/Template/
+    partialRootPath = EXT:headless_powermail/Resources/Private/Partials/
+    layoutRootPath = EXT:headless_powermail/Resources/Private/Layout/
+}
diff --git a/Configuration/TypoScript/setup.typoscript b/Configuration/TypoScript/setup.typoscript
new file mode 100644
index 0000000..ce1f5af
--- /dev/null
+++ b/Configuration/TypoScript/setup.typoscript
@@ -0,0 +1,22 @@
+tt_content.list =< lib.contentElementWithHeader
+tt_content.list {
+    fields {
+        content {
+            fields {
+                data = CASE
+                data {
+                    key.field = list_type
+
+                    powermail_pi1 = USER
+                    powermail_pi1 {
+                        userFunc = TYPO3\CMS\Extbase\Core\Bootstrap->run
+                        vendorName = In2code
+                        extensionName = Powermail
+                        pluginName = Pi1
+                        controller = Form
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/LICENSE b/LICENSE.md
similarity index 100%
rename from LICENSE
rename to LICENSE.md
diff --git a/README.md b/README.md
index e0c76fd..dbee57f 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,18 @@
-# headless_powermail
-Connects together EXT:headless and EXT:powermail
+# TYPO3 Extension "headless_powermail" - Connects together EXT:headless and EXT:powermail
+
+Headless Powermail allows you to render Powermail forms in JSON.
+
+## Features
+
+- JSON API for Powermail extension
+- Powermail standard fields are in JSON
+- Some of extra fields are converted to JSON such as: Hidden, Date, File, Content, show HTML, show some text
+
+## Installation
+Install extension using composer\
+``composer require friendsoftypo3/headless_powermail``
+
+Then, you should include extension typoscript template, and use provided constants.
+
+## Development
+Development for this extension is happening as part of the TYPO3 PWA initiative, see https://typo3.org/community/teams/typo3-development/initiatives/pwa/
diff --git a/Resources/Private/Layout/Default.html b/Resources/Private/Layout/Default.html
new file mode 100644
index 0000000..34e2859
--- /dev/null
+++ b/Resources/Private/Layout/Default.html
@@ -0,0 +1,3 @@
+<f:spaceless>
+    <f:render section="main" />
+</f:spaceless>
diff --git a/Resources/Private/Partials/Form/Field/Check.html b/Resources/Private/Partials/Form/Field/Check.html
new file mode 100644
index 0000000..be31129
--- /dev/null
+++ b/Resources/Private/Partials/Form/Field/Check.html
@@ -0,0 +1,44 @@
+{namespace vh=In2code\Powermail\ViewHelpers}
+<f:spaceless>
+    <hlpowermail:form.registerField property="{field.marker}."
+                            value="{setting.value}"
+                            checked="{vh:misc.prefillMultiField(field:field, mail:mail, cycle:index.cycle)}"/>
+        <f:format.raw>
+            <f:format.json value="{
+                field: {
+                    label: '{f:render(partial: \'Form/FieldLabel\', arguments: \'{_all}\') -> headless:format.json.decode()}',
+                    marker: field.marker,
+                    name: '{hlpowermail:form.generateName(property:\'{field.marker}.\')}',
+                    css: field.css,
+                    fieldWrappingClasses: settings.styles.framework.fieldWrappingClasses,
+                    fieldAndLabelWrappingClasses: settings.styles.framework.fieldAndLabelWrappingClasses,
+                    checkClasses: settings.styles.framework.checkClasses,
+                    validationClass: '{vh:validation.errorClass(field:field, class:\'powermail_field_error\')}',
+                    additionalAttributes: '{vh:validation.validationDataAttribute(field:field, iteration:iteration)}',
+                    type: 'check',
+                    options: '{f:render(section:\'checkbox\',arguments:\'{_all}\') -> headless:format.json.decode()}',
+                    client: settings.validation.client
+                }
+            }"/>
+        </f:format.raw>
+</f:spaceless>
+
+<f:section name="checkbox">
+    <f:spaceless>
+        [
+        <f:for each="{field.modifiedSettings}" as="setting" iteration="iteration">
+            <f:format.raw>
+                <f:format.json value="{
+                    value: setting.value,
+                    label: setting.label,
+                    isSelected: setting.selected,
+                    cycle: iteration.cycle,
+                    checked: '{vh:misc.prefillMultiField(field:field, mail:mail, cycle:iteration.cycle)}',
+                    additionalAttributes: '{vh:validation.validationDataAttribute(field:field, iteration:iteration)}'
+                }"/>
+            </f:format.raw>{f:if(condition:iteration.isLast,else:',')}
+        </f:for>
+        ]
+    </f:spaceless>
+</f:section>
+
diff --git a/Resources/Private/Partials/Form/Field/Content.html b/Resources/Private/Partials/Form/Field/Content.html
new file mode 100644
index 0000000..e948acf
--- /dev/null
+++ b/Resources/Private/Partials/Form/Field/Content.html
@@ -0,0 +1,18 @@
+{namespace vh=In2code\Powermail\ViewHelpers}
+<f:spaceless>
+    <hlpowermail:form.registerField property="{field.marker}"/>
+    <f:format.raw>
+        <f:format.json value="{
+            field: {
+                type: 'content',
+                marker: field.marker,
+                css: field.css,
+                fieldAndLabelWrappingClasses: settings.styles.framework.fieldAndLabelWrappingClasses,
+                fieldWrappingClasses: settings.styles.framework.fieldWrappingClasses,
+                offsetClasses: settings.styles.framework.offsetClasses,
+                value: '{vh:misc.contentElement(uid:field.contentElement) -> headless:format.json.decode()}',
+                name: '{hlpowermail:form.generateName(property:field.marker)}'
+            }
+        }"/>
+    </f:format.raw>
+</f:spaceless>
diff --git a/Resources/Private/Partials/Form/Field/Date.html b/Resources/Private/Partials/Form/Field/Date.html
new file mode 100644
index 0000000..f4e9d50
--- /dev/null
+++ b/Resources/Private/Partials/Form/Field/Date.html
@@ -0,0 +1,23 @@
+{namespace vh=In2code\Powermail\ViewHelpers}
+<f:spaceless>
+    <hlpowermail:form.registerField property="{field.marker}"/>
+    <f:format.raw>
+        <f:format.json value="{
+            field: {
+                label: '{f:render(partial: \'Form/FieldLabel\', arguments: \'{_all}\') -> headless:format.json.decode()}',
+                marker: field.marker,
+                name: '{hlpowermail:form.generateName(property:field.marker)}',
+                css: field.css,
+                fieldWrappingClasses: settings.styles.framework.fieldWrappingClasses,
+                fieldAndLabelWrappingClasses: settings.styles.framework.fieldAndLabelWrappingClasses,
+                type: 'date',
+                value: '{vh:misc.prefillField(field:field, mail:mail)}',
+                placeholder: field.placeholder,
+                fieldClasses: settings.styles.framework.fieldClasses,
+                validationClass: '{vh:validation.errorClass(field:field, class:\'powermail_field_error\')}',
+                additionalAttributes: '{vh:validation.validationDataAttribute(field:field)}',
+                id: 'powermail_field_{field.marker}'
+            }
+        }"/>
+    </f:format.raw>
+</f:spaceless>
diff --git a/Resources/Private/Partials/Form/Field/File.html b/Resources/Private/Partials/Form/Field/File.html
new file mode 100644
index 0000000..e754fcf
--- /dev/null
+++ b/Resources/Private/Partials/Form/Field/File.html
@@ -0,0 +1,21 @@
+{namespace vh=In2code\Powermail\ViewHelpers}
+<f:spaceless>
+    <f:format.raw>
+        <f:format.json value="{
+            field: {
+                label: '{f:render(partial: \'Form/FieldLabel\', arguments: \'{_all}\') -> headless:format.json.decode()}',
+                type: 'file',
+                marker: field.marker,
+                css: field.css,
+                fieldAndLabelWrappingClasses: settings.styles.framework.fieldAndLabelWrappingClasses,
+                fieldWrappingClasses: settings.styles.framework.fieldWrappingClasses,
+                fieldClasses: settings.styles.framework.fieldClasses,
+                offsetClasses: settings.styles.framework.offsetClasses,
+                name: '{hlpowermail:form.generateName(property:\'{field.marker}.\')}',
+                additionalAttributes: '{vh:validation.uploadAttributes(field:field)}',
+                errorClass: '{vh:validation.errorClass(field:field, class: \'powermail_field_error\')}',
+                additionalGeneratedAttributes: '{hlpowermail:form.multiUpload(property:field.marker,additionalAttributes:\'{vh:validation.uploadAttributes(field:field)}\') -> headless:format.json.decode()}'
+            }
+        }"/>
+    </f:format.raw>
+</f:spaceless>
diff --git a/Resources/Private/Partials/Form/Field/Hidden.html b/Resources/Private/Partials/Form/Field/Hidden.html
new file mode 100644
index 0000000..05c858d
--- /dev/null
+++ b/Resources/Private/Partials/Form/Field/Hidden.html
@@ -0,0 +1,14 @@
+{namespace vh=In2code\Powermail\ViewHelpers}
+<f:spaceless>
+    <hlpowermail:form.registerField property="{field.marker}"/>
+    <f:format.raw>
+        <f:format.json value="{
+            field: {
+                type: 'hidden',
+                marker: field.marker,
+                value: '{vh:misc.prefillField(field:field, mail:mail)}',
+                css: field.css
+            }
+        }"/>
+    </f:format.raw>
+</f:spaceless>
diff --git a/Resources/Private/Partials/Form/Field/Html.html b/Resources/Private/Partials/Form/Field/Html.html
new file mode 100644
index 0000000..4837d37
--- /dev/null
+++ b/Resources/Private/Partials/Form/Field/Html.html
@@ -0,0 +1,19 @@
+{namespace vh=In2code\Powermail\ViewHelpers}
+<f:spaceless>
+    <hlpowermail:form.registerField property="{field.marker}"/>
+    <f:format.raw>
+        <f:format.json value="{
+            field: {
+                type: 'html',
+                marker: field.marker,
+                css: field.css,
+                fieldAndLabelWrappingClasses: settings.styles.framework.fieldAndLabelWrappingClasses,
+                fieldWrappingClasses: settings.styles.framework.fieldWrappingClasses,
+                offsetClasses: settings.styles.framework.offsetClasses,
+                text: '{field.text -> f:format.raw()}',
+                htmlForHtmlFields: settings.misc.htmlForHtmlFields,
+                name: '{hlpowermail:form.generateName(property:field.marker)}'
+            }
+        }"/>
+    </f:format.raw>
+</f:spaceless>
diff --git a/Resources/Private/Partials/Form/Field/Input.html b/Resources/Private/Partials/Form/Field/Input.html
new file mode 100644
index 0000000..0e9167b
--- /dev/null
+++ b/Resources/Private/Partials/Form/Field/Input.html
@@ -0,0 +1,23 @@
+{namespace vh=In2code\Powermail\ViewHelpers}
+<f:spaceless>
+    <hlpowermail:form.registerField property="{field.marker}"/>
+    <f:format.raw>
+        <f:format.json value="{
+            field: {
+                label: '{f:render(partial: \'Form/FieldLabel\', arguments: \'{_all}\') -> headless:format.json.decode()}',
+                marker: field.marker,
+                name: '{hlpowermail:form.generateName(property:field.marker)}',
+                css: field.css,
+                fieldWrappingClasses: settings.styles.framework.fieldWrappingClasses,
+                fieldAndLabelWrappingClasses: settings.styles.framework.fieldAndLabelWrappingClasses,
+                type: '{vh:validation.fieldTypeFromValidation(field:field)}',
+                value: '{vh:misc.prefillField(field:field, mail:mail)}',
+                placeholder: field.placeholder,
+                fieldClasses: settings.styles.framework.fieldClasses,
+                validationClass: '{vh:validation.errorClass(field:field, class:\'powermail_field_error\')}',
+                additionalAttributes: '{vh:validation.validationDataAttribute(field:field)}',
+                id: 'powermail_field_{field.marker}'
+            }
+        }"/>
+    </f:format.raw>
+</f:spaceless>
diff --git a/Resources/Private/Partials/Form/Field/Radio.html b/Resources/Private/Partials/Form/Field/Radio.html
new file mode 100644
index 0000000..c657af4
--- /dev/null
+++ b/Resources/Private/Partials/Form/Field/Radio.html
@@ -0,0 +1,45 @@
+{namespace vh=In2code\Powermail\ViewHelpers}
+<f:spaceless>
+    <hlpowermail:form.registerField property="{field.marker}."
+                            value="{setting.value}"
+                            checked="{vh:misc.prefillMultiField(field:field, mail:mail, cycle:index.cycle)}"/>
+    <f:format.raw>
+        <f:format.json value="{
+                field: {
+                    label: '{f:render(partial: \'Form/FieldLabel\', arguments: \'{_all}\') -> headless:format.json.decode()}',
+                    marker: field.marker,
+                    name: '{hlpowermail:form.generateName(property:\'{field.marker}.\')}',
+                    css: field.css,
+                    fieldWrappingClasses: settings.styles.framework.fieldWrappingClasses,
+                    fieldAndLabelWrappingClasses: settings.styles.framework.fieldAndLabelWrappingClasses,
+                    radioClasses: settings.styles.framework.radioClasses,
+                    validationClass: '{vh:validation.errorClass(field:field, class:\'powermail_field_error\')}',
+                    checked: '{vh:misc.prefillMultiField(field:field, mail:mail, cycle:index.cycle)}',
+                    additionalAttributes: '{vh:validation.validationDataAttribute(field:field, iteration:iteration)}',
+                    type: 'radio',
+                    options: '{f:render(section:\'radio\',arguments:\'{_all}\') -> headless:format.json.decode()}',
+                    client: settings.validation.client
+                }
+            }"/>
+    </f:format.raw>
+</f:spaceless>
+
+<f:section name="radio">
+    <f:spaceless>
+        [
+        <f:for each="{field.modifiedSettings}" as="setting" iteration="iteration">
+            <f:format.raw>
+                <f:format.json value="{
+                    value: setting.value,
+                    label: setting.label,
+                    isSelected: setting.selected,
+                    cycle: iteration.cycle,
+                    checked: '{vh:misc.prefillMultiField(field:field, mail:mail, cycle:iteration.cycle)}',
+                    additionalAttributes: '{vh:validation.validationDataAttribute(field:field, iteration:iteration)}'
+                }"/>
+            </f:format.raw>{f:if(condition:iteration.isLast,else:',')}
+        </f:for>
+        ]
+    </f:spaceless>
+</f:section>
+
diff --git a/Resources/Private/Partials/Form/Field/Select.html b/Resources/Private/Partials/Form/Field/Select.html
new file mode 100644
index 0000000..78171ea
--- /dev/null
+++ b/Resources/Private/Partials/Form/Field/Select.html
@@ -0,0 +1,35 @@
+{namespace vh=In2code\Powermail\ViewHelpers}
+<f:spaceless>
+    <hlpowermail:form.registerField property="{field.marker}"
+                            value="{setting.value}"
+                            checked="{vh:misc.prefillMultiField(field:field, mail:mail, cycle:index.cycle)}"/>
+    <f:format.raw>
+        <f:format.json value="{
+                field: {
+                    label: '{f:render(partial: \'Form/FieldLabel\', arguments: \'{_all}\') -> headless:format.json.decode()}',
+                    marker: field.marker,
+                    name: '{hlpowermail:form.generateName(property:\'{field.marker}\')}',
+                    css: field.css,
+                    fieldWrappingClasses: settings.styles.framework.fieldWrappingClasses,
+                    fieldAndLabelWrappingClasses: settings.styles.framework.fieldAndLabelWrappingClasses,
+                    validationClass: '{vh:validation.errorClass(field:field, class:\'powermail_field_error\')}',
+                    additionalAttributes: '{vh:validation.validationDataAttribute(field:field)}',
+                    multiple: field.multiselectForField,
+                    multiselect: field.multiselect,
+                    type: 'select',
+                    client: settings.validation.client,
+                    options: '{f:render(section:\'select\',arguments:\'{_all}\') -> headless:format.json.decode()}'
+                }
+            }"/>
+    </f:format.raw>
+</f:spaceless>
+<f:section name="select">
+    <hlpowermail:form.selectField
+        options="{field.modifiedSettings}"
+        property="{field.marker}"
+        class="powermail_select {settings.styles.framework.fieldClasses} {vh:validation.errorClass(field:field, class:'powermail_field_error')}"
+        id="powermail_field_{field.marker}"
+        additionalAttributes="{vh:validation.validationDataAttribute(field:field)}"
+        multiple="{field.multiselectForField}"
+        value="{vh:misc.prefillField(field:field, mail:mail)}" />
+</f:section>
diff --git a/Resources/Private/Partials/Form/Field/Submit.html b/Resources/Private/Partials/Form/Field/Submit.html
new file mode 100644
index 0000000..c08a26c
--- /dev/null
+++ b/Resources/Private/Partials/Form/Field/Submit.html
@@ -0,0 +1,16 @@
+<f:spaceless>
+    <f:format.raw>
+        <f:format.json value="{
+            field: {
+                marker: field.marker,
+                title: field.title,
+                css: field.css,
+                type: 'submit',
+                fieldAndLabelWrappingClasses: settings.styles.framework.fieldAndLabelWrappingClasses,
+                fieldWrappingClasses: settings.styles.framework.fieldWrappingClasses,
+                offsetClasses: settings.styles.framework.offsetClasses,
+                submitClasses: settings.styles.framework.submitClasses
+            }
+        }"/>
+    </f:format.raw>
+</f:spaceless>
diff --git a/Resources/Private/Partials/Form/Field/Text.html b/Resources/Private/Partials/Form/Field/Text.html
new file mode 100644
index 0000000..44534c3
--- /dev/null
+++ b/Resources/Private/Partials/Form/Field/Text.html
@@ -0,0 +1,17 @@
+<f:spaceless>
+    <hlpowermail:form.registerField property="{field.marker}"/>
+    <f:format.raw>
+        <f:format.json value="{
+            field: {
+                type: 'text',
+                marker: field.marker,
+                css: field.css,
+                fieldAndLabelWrappingClasses: settings.styles.framework.fieldAndLabelWrappingClasses,
+                fieldWrappingClasses: settings.styles.framework.fieldWrappingClasses,
+                offsetClasses: settings.styles.framework.offsetClasses,
+                text: field.text,
+                name: '{hlpowermail:form.generateName(property:\'{field.marker}.\')}'
+            }
+        }"/>
+    </f:format.raw>
+</f:spaceless>
diff --git a/Resources/Private/Partials/Form/Field/Textarea.html b/Resources/Private/Partials/Form/Field/Textarea.html
new file mode 100644
index 0000000..4349706
--- /dev/null
+++ b/Resources/Private/Partials/Form/Field/Textarea.html
@@ -0,0 +1,23 @@
+{namespace vh=In2code\Powermail\ViewHelpers}
+<f:spaceless>
+    <hlpowermail:form.registerField property="{field.marker}"/>
+    <f:format.raw>
+        <f:format.json value="{
+            field: {
+                label: '{f:render(partial: \'Form/FieldLabel\', arguments: \'{_all}\') -> headless:format.json.decode()}',
+                marker: field.marker,
+                name: '{hlpowermail:form.generateName(property:field.marker)}',
+                css: field.css,
+                fieldWrappingClasses: settings.styles.framework.fieldWrappingClasses,
+                fieldAndLabelWrappingClasses: settings.styles.framework.fieldAndLabelWrappingClasses,
+                type: 'textarea',
+                value: '{vh:misc.prefillField(field:field, mail:mail)}',
+                placeholder: field.placeholder,
+                fieldClasses: settings.styles.framework.fieldClasses,
+                validationClass: '{vh:validation.errorClass(field:field, class:\'powermail_field_error\')}',
+                additionalAttributes: '{vh:validation.validationDataAttribute(field:field)}',
+                id: 'powermail_field_{field.marker}'
+            }
+        }"/>
+    </f:format.raw>
+</f:spaceless>
diff --git a/Resources/Private/Partials/Form/FieldLabel.html b/Resources/Private/Partials/Form/FieldLabel.html
new file mode 100644
index 0000000..044692c
--- /dev/null
+++ b/Resources/Private/Partials/Form/FieldLabel.html
@@ -0,0 +1,14 @@
+{namespace vh=In2code\Powermail\ViewHelpers}
+<f:spaceless>
+    <f:format.raw>
+        <f:format.json value="{
+            css: field.css,
+            mandatory: field.mandatory,
+            linkedMandatory: field.linkedMandatory,
+            labelClasses: settings.styles.framework.labelClasses,
+            title: field.title,
+            description: field.description,
+            marker: field.marker
+        }"/>
+    </f:format.raw>
+</f:spaceless>
diff --git a/Resources/Private/Partials/Form/Fields.html b/Resources/Private/Partials/Form/Fields.html
new file mode 100644
index 0000000..11830eb
--- /dev/null
+++ b/Resources/Private/Partials/Form/Fields.html
@@ -0,0 +1,10 @@
+{namespace vh=In2code\Powermail\ViewHelpers}
+<f:spaceless>
+    <f:format.raw>
+        [
+            <f:for each="{page.fields}" as="field" iteration="iteration">
+                <f:render partial="Form/Field/{vh:String.Upper(string:field.type)}" arguments="{_all}" />{f:if(condition:iteration.isLast,else:',')}
+            </f:for>
+        ]
+    </f:format.raw>
+</f:spaceless>
diff --git a/Resources/Private/Partials/Form/Page.html b/Resources/Private/Partials/Form/Page.html
new file mode 100644
index 0000000..5d337a8
--- /dev/null
+++ b/Resources/Private/Partials/Form/Page.html
@@ -0,0 +1,10 @@
+{namespace vh=In2code\Powermail\ViewHelpers}
+<f:spaceless>
+    <f:format.raw>
+        <f:format.json value="{
+            title: page.title,
+            pageId: page.uid,
+            fields: '{f:render(partial: \'Form/Fields\', arguments: \'{_all}\') -> headless:format.json.decode()}'
+        }"/>
+    </f:format.raw>
+</f:spaceless>
diff --git a/Resources/Private/Partials/Form/Pages.html b/Resources/Private/Partials/Form/Pages.html
new file mode 100644
index 0000000..fd56e7a
--- /dev/null
+++ b/Resources/Private/Partials/Form/Pages.html
@@ -0,0 +1,9 @@
+<f:spaceless>
+    <f:format.raw>
+        [
+        <f:for each="{form.pages}" as="page" iteration="iteration">
+            <f:render partial="Form/Page" arguments="{_all}" />{f:if(condition:iteration.isLast,else:',')}
+        </f:for>
+        ]
+    </f:format.raw>
+</f:spaceless>
diff --git a/Resources/Private/Template/Form/Form.html b/Resources/Private/Template/Form/Form.html
new file mode 100644
index 0000000..da29108
--- /dev/null
+++ b/Resources/Private/Template/Form/Form.html
@@ -0,0 +1,24 @@
+{namespace vh=In2code\Powermail\ViewHelpers}
+<f:spaceless>
+	<f:alias map="{flashMessageClass:'powermail_message_error'}">
+		<f:render partial="Misc/FlashMessages" arguments="{_all}" />
+	</f:alias>
+	<f:format.raw>
+
+		<f:format.json value="{
+            form: {
+                action: action,
+                section: 'c{ttContentData.uid}',
+                additionalAttributes: '{vh:validation.enableParsleyAndAjax(form:form)}',
+                addQueryString: settings.misc.addQueryString,
+                css: form.css,
+                formUid: form.uid,
+                showTitle: form.showTitle,
+                formClasses: '{settings.styles.framework.formClasses}',
+                moreSteps: '{vh:misc.morestepClass(activate:settings.main.moresteps)}',
+                title: form.title,
+                fields: '{f:render(partial: \'Form/Pages\', arguments: \'{_all}\') -> headless:format.json.decode() -> hlpowermail:form(action:action, name:\'field\', formUid:form.uid) -> headless:format.json.decode()}'
+            }
+        }"/>
+	</f:format.raw>
+</f:spaceless>
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..5698fa0
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,41 @@
+{
+  "name": "friendsoftypo3/headless_powermail",
+  "type": "typo3-cms-extension",
+  "description": "This extension provides integration with powermail to output content from TYPO3 in JSON format.",
+  "keywords": [
+    "TYPO3",
+    "headless",
+    "pwa",
+    "json",
+    "powermail"
+  ],
+  "license": [
+    "GPL-2.0-or-later"
+  ],
+  "authors": [
+    {
+      "name": "Tymoteusz Motylewski",
+      "role": "Head"
+    },
+    {
+      "name": "Oskar Dydo",
+      "role": "Developer"
+    },
+    {
+      "name": "TYPO3 PWA Initiative",
+      "role": "Developer",
+      "email": "extensions@macopedia.com"
+    }
+  ],
+  "require": {
+    "typo3/cms-core": "^9.5 || ^10.0"
+  },
+  "suggest": {
+    "friendsoftypo3/headless": "^1.0"
+  }
+  "autoload": {
+    "psr-4": {
+      "FriendsOfTYPO3\\HeadlessPowermail\\": "Classes"
+    }
+  }
+}
diff --git a/ext_emconf.php b/ext_emconf.php
new file mode 100644
index 0000000..d1e0761
--- /dev/null
+++ b/ext_emconf.php
@@ -0,0 +1,20 @@
+<?php
+
+$EM_CONF[$_EXTKEY] = [
+    'title' => 'Headless Powermail',
+    'description' => 'This extension provides way to output content from TYPO3 in JSON format.',
+    'state' => 'stable',
+    'author' => 'Oskar Dydo',
+    'author_email' => 'extensions@macopedia.pl',
+    'category' => 'fe',
+    'internal' => '',
+    'version' => '2.1.0',
+    'constraints' => [
+        'depends' => [
+            'typo3' => '9.5.0-10.4.99',
+            'frontend' => '9.5.0-10.4.99'
+        ],
+        'conflicts' => [],
+        'suggests' => [],
+    ],
+];
diff --git a/ext_icon.png b/ext_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a0c72b8e6459c2d5a75dcf60629cbd394343194
GIT binary patch
literal 658
zcmV;D0&V??P)<h;3K|Lk000e1NJLTq002M$002M;0{{R3owtGP0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUyGf+%aMgNZw|M1`c;lKa1VE?5+|CS*C
z_wWDGpZ}gP|HFU(tx*5y&;Qx4|GaSj%8&nt0RR90!$aS~0000HbW%=J|NsC0|NsC0
z|NsC0|NsC0041%NVgLXE*hxe|RCwCtm)UlNAPhhgHW5(#|F3O3_ONIYaOSPelSkm1
zjhMjkp}?O8#8@7c&%a_#SQ8Ebao68R3IOv(>=t<d?g3uAba}PryBI|RaI<AgDsN4u
zWVr#{;@b^s05~^PfLnoBmjJp0>_C3tB^wPe4Zs;jL)M8s04=e;7eJx`p#nT>BAo}P
ztOY=S!PofM0f2FmD*!zRBNL{j02Xo`M}X=CM=jf91Zc7}a6vc$fd(|UVUh0wlPHZ1
z2QV%;0ec?WuyIj-?NJP%i34(p3apc>pXgL@Z9%ad0a+DvSJJpJ<c(E9bpXzb8EQHs
z+^%wSo%7g@eX!M~Dzi?oP0jR_cR?&#y$aO`z$+l-85JTy1wK{pn~!w;<y3&4QsIcE
zk8K4+7I0Rsicm=Zo!L0F9+Q6WJFh~R0`R%i78a?&;N2)1Q2|O&!B4d~Mj+@Jz>?n~
zv<-%p2*Hg3q6!(dl(s>eC#rBy$~#~goVRY&XnGlthMlSs&xeUtH%MM|69D83OVe~o
z&G!Bz0%WhuCA67s_ZcIso1PcQWPtc!;LuOblLLpJ3;+vo7XqlKGgD6x^k-+Lmf-QN
sscjwP&v@)Z4L?N$|M%!SCtm^#0IK}(onZ=9i~s-t07*qoM6N<$f*;i=ng9R*

literal 0
HcmV?d00001

diff --git a/ext_localconf.php b/ext_localconf.php
new file mode 100644
index 0000000..4bd0d9b
--- /dev/null
+++ b/ext_localconf.php
@@ -0,0 +1,13 @@
+<?php
+defined('TYPO3_MODE') || die();
+
+call_user_func(
+    function ($extensionKey) {
+        $GLOBALS['TYPO3_CONF_VARS']['SYS']['fluid']['namespaces']['hlpowermail'] = [
+            'FriendsOfTYPO3\HeadlessPowermail\ViewHelpers'
+        ];
+
+        $GLOBALS['TYPO3_CONF_VARS']['FE']['contentRenderingTemplates'][] = 'headless_powermail/Configuration/TypoScript/';
+    },
+    'headless_powermail'
+);

From decb9ebd5d40c329b26e11b88526c9ab6b968270 Mon Sep 17 00:00:00 2001
From: Oskar Dydo <oskar.dydo@gmail.com>
Date: Fri, 10 Jul 2020 13:47:53 +0200
Subject: [PATCH 2/4] Fix composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 5698fa0..c3345cb 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
   },
   "suggest": {
     "friendsoftypo3/headless": "^1.0"
-  }
+  },
   "autoload": {
     "psr-4": {
       "FriendsOfTYPO3\\HeadlessPowermail\\": "Classes"

From 6063221678009385a235c27aa95f9aab36f10e22 Mon Sep 17 00:00:00 2001
From: Oskar Dydo <oskar.dydo@gmail.com>
Date: Fri, 10 Jul 2020 14:05:10 +0200
Subject: [PATCH 3/4] Change fluid namespace of Viewhelpers

---
 Resources/Private/Partials/Form/Field/Check.html    | 4 ++--
 Resources/Private/Partials/Form/Field/Content.html  | 4 ++--
 Resources/Private/Partials/Form/Field/Date.html     | 4 ++--
 Resources/Private/Partials/Form/Field/File.html     | 4 ++--
 Resources/Private/Partials/Form/Field/Hidden.html   | 2 +-
 Resources/Private/Partials/Form/Field/Html.html     | 4 ++--
 Resources/Private/Partials/Form/Field/Input.html    | 4 ++--
 Resources/Private/Partials/Form/Field/Radio.html    | 4 ++--
 Resources/Private/Partials/Form/Field/Select.html   | 6 +++---
 Resources/Private/Partials/Form/Field/Text.html     | 4 ++--
 Resources/Private/Partials/Form/Field/Textarea.html | 4 ++--
 Resources/Private/Template/Form/Form.html           | 2 +-
 composer.json                                       | 1 +
 ext_localconf.php                                   | 2 +-
 14 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/Resources/Private/Partials/Form/Field/Check.html b/Resources/Private/Partials/Form/Field/Check.html
index be31129..0b2be29 100644
--- a/Resources/Private/Partials/Form/Field/Check.html
+++ b/Resources/Private/Partials/Form/Field/Check.html
@@ -1,6 +1,6 @@
 {namespace vh=In2code\Powermail\ViewHelpers}
 <f:spaceless>
-    <hlpowermail:form.registerField property="{field.marker}."
+    <headlesspowermail:form.registerField property="{field.marker}."
                             value="{setting.value}"
                             checked="{vh:misc.prefillMultiField(field:field, mail:mail, cycle:index.cycle)}"/>
         <f:format.raw>
@@ -8,7 +8,7 @@
                 field: {
                     label: '{f:render(partial: \'Form/FieldLabel\', arguments: \'{_all}\') -> headless:format.json.decode()}',
                     marker: field.marker,
-                    name: '{hlpowermail:form.generateName(property:\'{field.marker}.\')}',
+                    name: '{headlesspowermail:form.generateName(property:\'{field.marker}.\')}',
                     css: field.css,
                     fieldWrappingClasses: settings.styles.framework.fieldWrappingClasses,
                     fieldAndLabelWrappingClasses: settings.styles.framework.fieldAndLabelWrappingClasses,
diff --git a/Resources/Private/Partials/Form/Field/Content.html b/Resources/Private/Partials/Form/Field/Content.html
index e948acf..da3d8dc 100644
--- a/Resources/Private/Partials/Form/Field/Content.html
+++ b/Resources/Private/Partials/Form/Field/Content.html
@@ -1,6 +1,6 @@
 {namespace vh=In2code\Powermail\ViewHelpers}
 <f:spaceless>
-    <hlpowermail:form.registerField property="{field.marker}"/>
+    <headlesspowermail:form.registerField property="{field.marker}"/>
     <f:format.raw>
         <f:format.json value="{
             field: {
@@ -11,7 +11,7 @@
                 fieldWrappingClasses: settings.styles.framework.fieldWrappingClasses,
                 offsetClasses: settings.styles.framework.offsetClasses,
                 value: '{vh:misc.contentElement(uid:field.contentElement) -> headless:format.json.decode()}',
-                name: '{hlpowermail:form.generateName(property:field.marker)}'
+                name: '{headlesspowermail:form.generateName(property:field.marker)}'
             }
         }"/>
     </f:format.raw>
diff --git a/Resources/Private/Partials/Form/Field/Date.html b/Resources/Private/Partials/Form/Field/Date.html
index f4e9d50..10e579e 100644
--- a/Resources/Private/Partials/Form/Field/Date.html
+++ b/Resources/Private/Partials/Form/Field/Date.html
@@ -1,12 +1,12 @@
 {namespace vh=In2code\Powermail\ViewHelpers}
 <f:spaceless>
-    <hlpowermail:form.registerField property="{field.marker}"/>
+    <headlesspowermail:form.registerField property="{field.marker}"/>
     <f:format.raw>
         <f:format.json value="{
             field: {
                 label: '{f:render(partial: \'Form/FieldLabel\', arguments: \'{_all}\') -> headless:format.json.decode()}',
                 marker: field.marker,
-                name: '{hlpowermail:form.generateName(property:field.marker)}',
+                name: '{headlesspowermail:form.generateName(property:field.marker)}',
                 css: field.css,
                 fieldWrappingClasses: settings.styles.framework.fieldWrappingClasses,
                 fieldAndLabelWrappingClasses: settings.styles.framework.fieldAndLabelWrappingClasses,
diff --git a/Resources/Private/Partials/Form/Field/File.html b/Resources/Private/Partials/Form/Field/File.html
index e754fcf..045f3d3 100644
--- a/Resources/Private/Partials/Form/Field/File.html
+++ b/Resources/Private/Partials/Form/Field/File.html
@@ -11,10 +11,10 @@
                 fieldWrappingClasses: settings.styles.framework.fieldWrappingClasses,
                 fieldClasses: settings.styles.framework.fieldClasses,
                 offsetClasses: settings.styles.framework.offsetClasses,
-                name: '{hlpowermail:form.generateName(property:\'{field.marker}.\')}',
+                name: '{headlesspowermail:form.generateName(property:\'{field.marker}.\')}',
                 additionalAttributes: '{vh:validation.uploadAttributes(field:field)}',
                 errorClass: '{vh:validation.errorClass(field:field, class: \'powermail_field_error\')}',
-                additionalGeneratedAttributes: '{hlpowermail:form.multiUpload(property:field.marker,additionalAttributes:\'{vh:validation.uploadAttributes(field:field)}\') -> headless:format.json.decode()}'
+                additionalGeneratedAttributes: '{headlesspowermail:form.multiUpload(property:field.marker,additionalAttributes:\'{vh:validation.uploadAttributes(field:field)}\') -> headless:format.json.decode()}'
             }
         }"/>
     </f:format.raw>
diff --git a/Resources/Private/Partials/Form/Field/Hidden.html b/Resources/Private/Partials/Form/Field/Hidden.html
index 05c858d..b34ed88 100644
--- a/Resources/Private/Partials/Form/Field/Hidden.html
+++ b/Resources/Private/Partials/Form/Field/Hidden.html
@@ -1,6 +1,6 @@
 {namespace vh=In2code\Powermail\ViewHelpers}
 <f:spaceless>
-    <hlpowermail:form.registerField property="{field.marker}"/>
+    <headlesspowermail:form.registerField property="{field.marker}"/>
     <f:format.raw>
         <f:format.json value="{
             field: {
diff --git a/Resources/Private/Partials/Form/Field/Html.html b/Resources/Private/Partials/Form/Field/Html.html
index 4837d37..c29cd59 100644
--- a/Resources/Private/Partials/Form/Field/Html.html
+++ b/Resources/Private/Partials/Form/Field/Html.html
@@ -1,6 +1,6 @@
 {namespace vh=In2code\Powermail\ViewHelpers}
 <f:spaceless>
-    <hlpowermail:form.registerField property="{field.marker}"/>
+    <headlesspowermail:form.registerField property="{field.marker}"/>
     <f:format.raw>
         <f:format.json value="{
             field: {
@@ -12,7 +12,7 @@
                 offsetClasses: settings.styles.framework.offsetClasses,
                 text: '{field.text -> f:format.raw()}',
                 htmlForHtmlFields: settings.misc.htmlForHtmlFields,
-                name: '{hlpowermail:form.generateName(property:field.marker)}'
+                name: '{headlesspowermail:form.generateName(property:field.marker)}'
             }
         }"/>
     </f:format.raw>
diff --git a/Resources/Private/Partials/Form/Field/Input.html b/Resources/Private/Partials/Form/Field/Input.html
index 0e9167b..6a7caa8 100644
--- a/Resources/Private/Partials/Form/Field/Input.html
+++ b/Resources/Private/Partials/Form/Field/Input.html
@@ -1,12 +1,12 @@
 {namespace vh=In2code\Powermail\ViewHelpers}
 <f:spaceless>
-    <hlpowermail:form.registerField property="{field.marker}"/>
+    <headlesspowermail:form.registerField property="{field.marker}"/>
     <f:format.raw>
         <f:format.json value="{
             field: {
                 label: '{f:render(partial: \'Form/FieldLabel\', arguments: \'{_all}\') -> headless:format.json.decode()}',
                 marker: field.marker,
-                name: '{hlpowermail:form.generateName(property:field.marker)}',
+                name: '{headlesspowermail:form.generateName(property:field.marker)}',
                 css: field.css,
                 fieldWrappingClasses: settings.styles.framework.fieldWrappingClasses,
                 fieldAndLabelWrappingClasses: settings.styles.framework.fieldAndLabelWrappingClasses,
diff --git a/Resources/Private/Partials/Form/Field/Radio.html b/Resources/Private/Partials/Form/Field/Radio.html
index c657af4..37a0f0c 100644
--- a/Resources/Private/Partials/Form/Field/Radio.html
+++ b/Resources/Private/Partials/Form/Field/Radio.html
@@ -1,6 +1,6 @@
 {namespace vh=In2code\Powermail\ViewHelpers}
 <f:spaceless>
-    <hlpowermail:form.registerField property="{field.marker}."
+    <headlesspowermail:form.registerField property="{field.marker}."
                             value="{setting.value}"
                             checked="{vh:misc.prefillMultiField(field:field, mail:mail, cycle:index.cycle)}"/>
     <f:format.raw>
@@ -8,7 +8,7 @@
                 field: {
                     label: '{f:render(partial: \'Form/FieldLabel\', arguments: \'{_all}\') -> headless:format.json.decode()}',
                     marker: field.marker,
-                    name: '{hlpowermail:form.generateName(property:\'{field.marker}.\')}',
+                    name: '{headlesspowermail:form.generateName(property:\'{field.marker}.\')}',
                     css: field.css,
                     fieldWrappingClasses: settings.styles.framework.fieldWrappingClasses,
                     fieldAndLabelWrappingClasses: settings.styles.framework.fieldAndLabelWrappingClasses,
diff --git a/Resources/Private/Partials/Form/Field/Select.html b/Resources/Private/Partials/Form/Field/Select.html
index 78171ea..64643df 100644
--- a/Resources/Private/Partials/Form/Field/Select.html
+++ b/Resources/Private/Partials/Form/Field/Select.html
@@ -1,6 +1,6 @@
 {namespace vh=In2code\Powermail\ViewHelpers}
 <f:spaceless>
-    <hlpowermail:form.registerField property="{field.marker}"
+    <headlesspowermail:form.registerField property="{field.marker}"
                             value="{setting.value}"
                             checked="{vh:misc.prefillMultiField(field:field, mail:mail, cycle:index.cycle)}"/>
     <f:format.raw>
@@ -8,7 +8,7 @@
                 field: {
                     label: '{f:render(partial: \'Form/FieldLabel\', arguments: \'{_all}\') -> headless:format.json.decode()}',
                     marker: field.marker,
-                    name: '{hlpowermail:form.generateName(property:\'{field.marker}\')}',
+                    name: '{headlesspowermail:form.generateName(property:\'{field.marker}\')}',
                     css: field.css,
                     fieldWrappingClasses: settings.styles.framework.fieldWrappingClasses,
                     fieldAndLabelWrappingClasses: settings.styles.framework.fieldAndLabelWrappingClasses,
@@ -24,7 +24,7 @@
     </f:format.raw>
 </f:spaceless>
 <f:section name="select">
-    <hlpowermail:form.selectField
+    <headlesspowermail:form.selectField
         options="{field.modifiedSettings}"
         property="{field.marker}"
         class="powermail_select {settings.styles.framework.fieldClasses} {vh:validation.errorClass(field:field, class:'powermail_field_error')}"
diff --git a/Resources/Private/Partials/Form/Field/Text.html b/Resources/Private/Partials/Form/Field/Text.html
index 44534c3..ac72394 100644
--- a/Resources/Private/Partials/Form/Field/Text.html
+++ b/Resources/Private/Partials/Form/Field/Text.html
@@ -1,5 +1,5 @@
 <f:spaceless>
-    <hlpowermail:form.registerField property="{field.marker}"/>
+    <headlesspowermail:form.registerField property="{field.marker}"/>
     <f:format.raw>
         <f:format.json value="{
             field: {
@@ -10,7 +10,7 @@
                 fieldWrappingClasses: settings.styles.framework.fieldWrappingClasses,
                 offsetClasses: settings.styles.framework.offsetClasses,
                 text: field.text,
-                name: '{hlpowermail:form.generateName(property:\'{field.marker}.\')}'
+                name: '{headlesspowermail:form.generateName(property:\'{field.marker}.\')}'
             }
         }"/>
     </f:format.raw>
diff --git a/Resources/Private/Partials/Form/Field/Textarea.html b/Resources/Private/Partials/Form/Field/Textarea.html
index 4349706..532e39e 100644
--- a/Resources/Private/Partials/Form/Field/Textarea.html
+++ b/Resources/Private/Partials/Form/Field/Textarea.html
@@ -1,12 +1,12 @@
 {namespace vh=In2code\Powermail\ViewHelpers}
 <f:spaceless>
-    <hlpowermail:form.registerField property="{field.marker}"/>
+    <headlesspowermail:form.registerField property="{field.marker}"/>
     <f:format.raw>
         <f:format.json value="{
             field: {
                 label: '{f:render(partial: \'Form/FieldLabel\', arguments: \'{_all}\') -> headless:format.json.decode()}',
                 marker: field.marker,
-                name: '{hlpowermail:form.generateName(property:field.marker)}',
+                name: '{headlesspowermail:form.generateName(property:field.marker)}',
                 css: field.css,
                 fieldWrappingClasses: settings.styles.framework.fieldWrappingClasses,
                 fieldAndLabelWrappingClasses: settings.styles.framework.fieldAndLabelWrappingClasses,
diff --git a/Resources/Private/Template/Form/Form.html b/Resources/Private/Template/Form/Form.html
index da29108..492cddf 100644
--- a/Resources/Private/Template/Form/Form.html
+++ b/Resources/Private/Template/Form/Form.html
@@ -17,7 +17,7 @@
                 formClasses: '{settings.styles.framework.formClasses}',
                 moreSteps: '{vh:misc.morestepClass(activate:settings.main.moresteps)}',
                 title: form.title,
-                fields: '{f:render(partial: \'Form/Pages\', arguments: \'{_all}\') -> headless:format.json.decode() -> hlpowermail:form(action:action, name:\'field\', formUid:form.uid) -> headless:format.json.decode()}'
+                fields: '{f:render(partial: \'Form/Pages\', arguments: \'{_all}\') -> headless:format.json.decode() -> headlesspowermail:form(action:action, name:\'field\', formUid:form.uid) -> headless:format.json.decode()}'
             }
         }"/>
 	</f:format.raw>
diff --git a/composer.json b/composer.json
index c3345cb..78f4e95 100644
--- a/composer.json
+++ b/composer.json
@@ -30,6 +30,7 @@
   "require": {
     "typo3/cms-core": "^9.5 || ^10.0"
   },
+  "version": "2.0.0",
   "suggest": {
     "friendsoftypo3/headless": "^1.0"
   },
diff --git a/ext_localconf.php b/ext_localconf.php
index 4bd0d9b..dee5651 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -3,7 +3,7 @@
 
 call_user_func(
     function ($extensionKey) {
-        $GLOBALS['TYPO3_CONF_VARS']['SYS']['fluid']['namespaces']['hlpowermail'] = [
+        $GLOBALS['TYPO3_CONF_VARS']['SYS']['fluid']['namespaces']['headlesspowermail'] = [
             'FriendsOfTYPO3\HeadlessPowermail\ViewHelpers'
         ];
 

From 9613df154a4d1ad7b48c8b6a46dcbaea9853b175 Mon Sep 17 00:00:00 2001
From: Oskar Dydo <oskar.dydo@gmail.com>
Date: Fri, 10 Jul 2020 14:27:21 +0200
Subject: [PATCH 4/4] Add constraint for powermail

---
 ext_emconf.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ext_emconf.php b/ext_emconf.php
index d1e0761..9a72e48 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -12,7 +12,8 @@
     'constraints' => [
         'depends' => [
             'typo3' => '9.5.0-10.4.99',
-            'frontend' => '9.5.0-10.4.99'
+            'frontend' => '9.5.0-10.4.99',
+            'powermail' => '^7.4',
         ],
         'conflicts' => [],
         'suggests' => [],