Merge pull request #14 from michelegiorgi/development

release 1.3
michelegiorgi · Apr 5, 2021 · e759eaf · e759eaf
2 parents 8087302 + f10fad1
commit e759eaf
Show file tree

Hide file tree

Showing 69 changed files with 2,010 additions and 1,465 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,4 @@
-[![Formality](https://formality.dev/download/mark-repo-final.svg)](https://formality.dev)
-
-# Formality ![license](https://img.shields.io/github/license/michelegiorgi/formality?color=%231B4DDB&style=flat-square) ![license](https://img.shields.io/github/v/release/michelegiorgi/formality?color=%231B4DDB&style=flat-square)
+# [![Formality](https://formality.dev/download/logo-github.svg)](https://formality.dev) ![license](https://img.shields.io/github/license/michelegiorgi/formality?color=%231B4DDB&style=flat-square) ![license](https://img.shields.io/github/v/release/michelegiorgi/formality?color=%231B4DDB&style=flat-square)
 
 **[New plugin website](https://formality.dev)** &nbsp;|&nbsp; [Wordpress.org page](https://wordpress.org/plugins/formality) &nbsp;|&nbsp; [Donate link](https://www.paypal.me/michelegiorgi/)  
 Designless, multistep, conversational, secure, all-in-one WordPress forms plugin.  
@@ -12,7 +10,7 @@ If you are not a developer, please download the latest release of the Formality
 
 ## Requirements
 
-* [WordPress](https://wordpress.org/) >= 5.5
+* [WordPress](https://wordpress.org/) >= 5.6
 
 ## Plugin setup
 

diff --git a/admin/class-formality-admin.php b/admin/class-formality-admin.php
@@ -4,7 +4,7 @@
  * The admin-specific functionality of the plugin.
  *
  * @link       https://formality.dev
- * @since      1.0.0
+ * @since      1.0
  * @package    Formality
  * @subpackage Formality/admin
  * @author     Michele Giorgi <[email protected]>

diff --git a/admin/class-formality-editor.php b/admin/class-formality-editor.php
@@ -4,7 +4,7 @@
  * The editor-specific functionality of the plugin.
  *
  * @link       https://formality.dev
- * @since      1.0.0
+ * @since      1.0
  * @package    Formality
  * @subpackage Formality/admin
  * @author     Michele Giorgi <[email protected]>
@@ -41,17 +41,28 @@ public function register_blocks() {
 
   public function enqueue_scripts() {
     $upload = wp_upload_dir();
+    $formats = array();
+    $mimes = get_allowed_mime_types();
+    $maxsize = wp_max_upload_size() / 1048576;
+    if(!empty($mimes)) {
+      foreach ($mimes as $type => $mime) {
+        $multiple = explode("|", $type);
+        foreach ($multiple as $single) {
+          $formats[] = $single;
+        }
+      }
+    }
     wp_enqueue_script( $this->formality . "-editor", plugin_dir_url(__DIR__) . 'dist/scripts/formality-editor.js', array( 'wp-blocks', 'wp-i18n', 'wp-element', 'wp-editor', 'wp-plugins', 'wp-edit-post' ), $this->version, false );
-
     wp_localize_script( $this->formality . "-editor", 'formality', array(
       'plugin_url' => str_replace('admin/', '', plugin_dir_url( __FILE__ )),
       'templates_url' => $upload['baseurl'] . '/formality/templates',
       'templates_count' => get_option('formality_templates', 0),
       'admin_url' => get_admin_url(),
       'api' => esc_url_raw(rest_url()),
       'nonce' => wp_create_nonce('wp_rest'),
+      'upload_formats' => $formats,
+      'upload_max' => $maxsize
     ));
-
     wp_set_script_translations( $this->formality . "-editor", 'formality', plugin_dir_path( __DIR__ ) . 'languages' );
   }
 
@@ -122,6 +133,7 @@ public function get_allowed( $type = 'blocks' ) {
         'formality/switch',
         'formality/multiple',
         'formality/rating',
+        'formality/upload',
         'formality/step',
         'formality/message',
         'formality/media',

diff --git a/admin/class-formality-notifications.php b/admin/class-formality-notifications.php
@@ -4,7 +4,7 @@
  * Build and send notifications.
  *
  * @link       https://formality.dev
- * @since      1.0.0
+ * @since      1.0
  * @package    Formality
  * @subpackage Formality/admin
  * @author     Michele Giorgi <[email protected]>

diff --git a/admin/class-formality-results.php b/admin/class-formality-results.php
@@ -4,7 +4,7 @@
  * Results functions.
  *
  * @link       https://formality.dev
- * @since      1.0.0
+ * @since      1.0
  * @package    Formality
  * @subpackage Formality/admin
  * @author     Michele Giorgi <[email protected]>
@@ -124,13 +124,21 @@ public function result_data($result_id = 0, $echo = true) {
   public function field($result_id, $block, $index) {
     if(!isset($block["attrs"]['exclude'])) {
       $fieldname = "field_" . $block["attrs"]["uid"];
+      $type = str_replace("formality/","",$block['blockName']);
       $fieldvalue = get_post_meta( $result_id, $fieldname, true );
       if(is_array($fieldvalue)) {
         $values = "";
         foreach($fieldvalue as $subvalue){
           $values .= $subvalue . '<br>';
         }
         $fieldvalue = $values;
+      } else if($type=="upload") {
+        $ext = pathinfo($fieldvalue, PATHINFO_EXTENSION);
+        if(in_array($ext, array('gif', 'png', 'bmp', 'jpg', 'jpeg', 'svg'))) {
+          $fieldvalue = '<a target="_blank" href="' . $fieldvalue . '"><img style="max-width:100%; height:auto;" src="' . $fieldvalue . '" alt="" /></a>';
+        } else {
+          $fieldvalue = '<a target="_blank" href="' . $fieldvalue . '">' . $fieldvalue . '</a>';
+        }
       } else {
         $fieldvalue = nl2br($fieldvalue);
       }

diff --git a/admin/class-formality-tools.php b/admin/class-formality-tools.php
@@ -4,7 +4,7 @@
  * Helper functions and tools of the plugin.
  *
  * @link       https://formality.dev
- * @since      1.0.0
+ * @since      1.0
  * @package    Formality
  * @subpackage Formality/admin
  * @author     Michele Giorgi <[email protected]>

diff --git a/assets/images/admin/block-preview-upload.png b/assets/images/admin/block-preview-upload.png
diff --git a/assets/images/source/blockpreview.sketch b/assets/images/source/blockpreview.sketch
diff --git a/assets/scripts/editor.js b/assets/scripts/editor.js
@@ -13,9 +13,10 @@ import './editor/blocks/select.js';
 import './editor/blocks/multiple.js';
 import './editor/blocks/switch.js';
 import './editor/blocks/rating.js';
+import './editor/blocks/upload.js';
 
 import './editor/blocks/step.js';
 import './editor/blocks/message.js';
 import './editor/blocks/media.js';
 
-import './editor/blocks/widget.js';
+import './editor/blocks/widget.js';
diff --git a/assets/scripts/editor/blocks/email.js b/assets/scripts/editor/blocks/email.js
@@ -14,6 +14,7 @@ import {
   mainOptions,
   advancedPanel,
   hasRules,
+  inlineName,
 } from '../utility/blocks.js'
 
 const { __ } = wp.i18n;
@@ -80,13 +81,12 @@ registerBlockType( blockName, {
       <div
         className={ "formality__field formality__field--email" + ( focus ? ' formality__field--focus' : '' ) + ( required ? ' formality__field--required' : '' ) + ( value ? ' formality__field--filled' : '' ) }
       >
-        <label
+        <div
           className="formality__label"
-          htmlFor={ uid }
         >
-          { name ? name : __('Field name', 'formality') }
+          { inlineName(props) }
           <Icon icon={ hasRules(rules) ? "hidden" : "" } />
-        </label>
+        </div>
         <div
           className="formality__input"
         >

diff --git a/assets/scripts/editor/blocks/multiple.js b/assets/scripts/editor/blocks/multiple.js
@@ -15,6 +15,7 @@ import {
   mainOptions,
   advancedPanel,
   hasRules,
+  inlineName,
 } from '../utility/blocks.js'
 
 import { iconMultiple as blockicon } from '../utility/icons.js'
@@ -162,13 +163,12 @@ registerBlockType( blockName, {
       <div
         className={ "formality__field formality__field--multiple" + ( focus ? ' formality__field--focus' : '' ) + ( required ? ' formality__field--required' : '' ) + ( value ? ' formality__field--filled' : '' ) }
       >
-        <label
+        <div
           className="formality__label"
-          htmlFor={ uid }
         >
-          { name ? name : __('Field name', 'formality') }
+          { inlineName(props) }
           <Icon icon={ hasRules(rules) ? "hidden" : "" } />
-        </label>
+        </div>
         <div
           className="formality__input"
           data-placeholder={ placeholder ? placeholder : __('Select your choice', 'formality') }

diff --git a/assets/scripts/editor/blocks/number.js b/assets/scripts/editor/blocks/number.js
@@ -15,6 +15,7 @@ import {
   mainOptions,
   advancedPanel,
   hasRules,
+  inlineName,
 } from '../utility/blocks.js'
 
 const { __ } = wp.i18n;
@@ -108,13 +109,12 @@ registerBlockType( blockName, {
       <div
         className={ "formality__field formality__field--text" + ( focus ? ' formality__field--focus' : '' ) + ( required ? ' formality__field--required' : '' ) + ( value ? ' formality__field--filled' : '' ) }
       >
-        <label
+        <div
           className="formality__label"
-          htmlFor={ uid }
         >
-          { name ? name : __('Field name', 'formality') }
+          { inlineName(props) }
           <Icon icon={ hasRules(rules) ? "hidden" : "" } />
-        </label>
+        </div>
         <div
           className="formality__input"
         >

diff --git a/assets/scripts/editor/blocks/rating.js b/assets/scripts/editor/blocks/rating.js
@@ -15,6 +15,7 @@ import {
   mainOptions,
   advancedPanel,
   hasRules,
+  inlineName,
 } from '../utility/blocks.js'
 
 const { __ } = wp.i18n;
@@ -121,13 +122,12 @@ registerBlockType( blockName, {
       <div
         className={ "formality__field formality__field--rating" + ( focus ? ' formality__field--focus' : '' ) + ( required ? ' formality__field--required' : '' ) + ( value ? ' formality__field--filled' : '' ) }
       >
-        <label
+        <div
           className="formality__label"
-          htmlFor={ uid }
         >
-          { name ? name : __('Field name', 'formality') }
+          { inlineName(props) }
           <Icon icon={ hasRules(rules) ? "hidden" : "" } />
-        </label>
+        </div>
         <div
           className="formality__input"
         >

diff --git a/assets/scripts/editor/blocks/select.js b/assets/scripts/editor/blocks/select.js
@@ -15,6 +15,7 @@ import {
   mainOptions,
   advancedPanel,
   hasRules,
+  inlineName,
 } from '../utility/blocks.js'
 
 import { iconSelect as blockicon } from '../utility/icons.js'
@@ -119,13 +120,12 @@ registerBlockType( blockName, {
       <div
         className={ "formality__field formality__field--select" + ( focus ? ' formality__field--focus' : '' ) + ( required ? ' formality__field--required' : '' ) + ( value ? ' formality__field--filled' : '' ) }
       >
-        <label
+        <div
           className="formality__label"
-          htmlFor={ uid }
         >
-          { name ? name : __('Field name', 'formality') }
+          { inlineName(props) }
           <Icon icon={ hasRules(rules) ? "hidden" : "" } />
-        </label>
+        </div>
         <div
           className="formality__input"
         >
@@ -141,7 +141,7 @@ registerBlockType( blockName, {
               value=""
             >{ value ? value : (placeholder ? placeholder : __('Select your choice', 'formality')) }</option>
           </select>
-          <div className="formality__input__status" data-placeholder={ placeholder ? placeholder : __('Type your answer here', 'formality') }/>
+          <div className="formality__input__status" data-placeholder={ placeholder ? placeholder : __('Select your choice', 'formality') }/>
         </div>
       </div>,
     ])

diff --git a/assets/scripts/editor/blocks/switch.js b/assets/scripts/editor/blocks/switch.js
@@ -15,6 +15,7 @@ import {
   mainOptions,
   advancedPanel,
   hasRules,
+  inlineName,
 } from '../utility/blocks.js'
 
 const { __ } = wp.i18n;
@@ -92,13 +93,12 @@ registerBlockType( blockName, {
       <div
         className={ "formality__field formality__field--switch" + ( focus ? ' formality__field--focus' : '' ) + ( required ? ' formality__field--required' : '' ) + ( value ? ' formality__field--filled' : '' ) }
       >
-        <label
+        <div
           className="formality__label"
-          htmlFor={ uid }
         >
-          { name ? name : __('Field name', 'formality') }
+          { inlineName(props) }
           <Icon icon={ hasRules(rules) ? "hidden" : "" } />
-        </label>
+        </div>
         <div
           className="formality__input"
         >

diff --git a/assets/scripts/editor/blocks/text.js b/assets/scripts/editor/blocks/text.js
@@ -14,6 +14,7 @@ import {
   mainOptions,
   advancedPanel,
   hasRules,
+  inlineName,
 } from '../utility/blocks.js'
 
 const { __ } = wp.i18n;
@@ -80,17 +81,17 @@ registerBlockType( blockName, {
       <div
         className={ "formality__field formality__field--text" + ( focus ? ' formality__field--focus' : '' ) + ( required ? ' formality__field--required' : '' ) + ( value ? ' formality__field--filled' : '' ) }
       >
-        <label
+        <div
           className="formality__label"
-          htmlFor={ uid }
         >
-          { name ? name : __('Field name', 'formality') }
+          { inlineName(props) }
           <Icon icon={ hasRules(rules) ? "hidden" : "" } />
-        </label>
+        </div>
         <div
           className="formality__input"
         >
           <input
+            tabindex={ "-1" }
             type="text"
             id={ uid }
             name={ uid }

diff --git a/assets/scripts/editor/blocks/textarea.js b/assets/scripts/editor/blocks/textarea.js
@@ -15,6 +15,7 @@ import {
   mainOptions,
   advancedPanel,
   hasRules,
+  inlineName,
 } from '../utility/blocks.js'
 
 const { __ } = wp.i18n;
@@ -102,13 +103,12 @@ registerBlockType( blockName, {
       <div
         className={ "formality__field formality__field--textarea" + ( focus ? ' formality__field--focus' : '' ) + ( required ? ' formality__field--required' : '' ) + ( value ? ' formality__field--filled' : '' ) }
       >
-        <label
+        <div
           className="formality__label"
-          htmlFor={ uid }
         >
-          { name ? name : __('Field name', 'formality') }
+          { inlineName(props) }
           <Icon icon={ hasRules(rules) ? "hidden" : "" } />
-        </label>
+        </div>
         <div
           className="formality__input"
         >