v1.0.2 (#2)

* feat(console): Add form:list command for displaying available forms and their submissions
* feat(view): Add `@htmlform` blade directive for calling the form in views
* enhance(provider): Clean up ServiceProvider
* enhance(admin): Better implementation of the admin menu clean up

Author: Log1x

composer.lock

@@ -0,0 +1,85 @@
+<?php
+
+namespace Log1x\HtmlForms\Console;
+
+use Roots\Acorn\Console\Commands\Command;
+use Illuminate\Support\Str;
+
+class FormListCommand extends Command
+{
+    /**
+     * The console command signature.
+     *
+     * @var string
+     */
+    protected $signature = 'form:list {name?}';
+
+    /**
+     * The description of the command.
+     *
+     * @var string
+     */
+    protected $description = 'List the available forms and submissions managed by HTML Forms';
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        if (! empty($this->argument('name'))) {
+            $form = collect(
+                get_posts([
+                    'post_type' => 'html-form',
+                    'name' => $this->argument('name'),
+                    'post_status' => 'publish',
+                    'posts_per_page' => 1,
+                    'ignore_sticky_posts' => true,
+                    'no_found_rows' => true,
+                ])
+            );
+
+            if ($form->isEmpty()) {
+                return $this->error(
+                    sprintf('The form %s could not be found.', $this->argument('name'))
+                );
+            }
+
+            $submissions = collect(
+                hf_get_form_submissions($form->shift()->ID)
+            )->filter();
+
+            if ($submissions->isEmpty()) {
+                return $this->line('There were no submissions found for the %s form.', $form->shift()->title);
+            }
+
+            return $this->table(
+                collect($submissions->first()->data)->keys()->map(function ($value) {
+                    return Str::title(str_replace('_', ' ', $value));
+                })->all(),
+                $submissions->map(function ($value) {
+                    return array_values($value->data);
+                })->all()
+            );
+        }
+
+        return $this->table(['ID', 'Name', 'Slug', 'Actions', 'Submissions'], collect(
+            get_posts(['post_type' => 'html-form'])
+        )->map(function ($value) {
+            $value = hf_get_form($value->ID);
+
+            return [
+                $value->ID,
+                $value->title,
+                $value->slug,
+                collect($value->settings['actions'])->map(function ($value) {
+                    return Str::title($value['type']);
+                })->implode(', '),
+                collect(
+                    hf_get_form_submissions($value->ID)
+                )->count(),
+            ];
+        })->all());
+    }
+}

src/Console/FormListCommand.php

@@ -2,6 +2,8 @@
 
 namespace Log1x\HtmlForms;
 
+use Illuminate\Support\Str;
+
 use function Roots\view;
 
 class HtmlForms
@@ -14,7 +16,10 @@ class HtmlForms
     public function __construct()
     {
         $this->render();
-        $this->clean();
+
+        if (is_admin()) {
+            $this->cleanAdmin();
+        }
     }
 
     /**
@@ -31,7 +36,10 @@ protected function render()
                 return $html;
             }
 
-            return view('forms.' . $form->slug, ['form' => $form->ID])->render();
+            return view(
+                Str::start($form->slug, 'forms.'),
+                ['form' => $form->ID]
+            )->render();
         }, 10, 2);
     }
 
@@ -41,20 +49,21 @@ protected function render()
      *
      * @return void
      */
-    protected function clean()
+    protected function cleanAdmin()
     {
         add_filter('hf_admin_output_misc_settings', function () {
             echo '<style>.hf-sidebar { display: none; }</style>';
         });
 
         add_filter('admin_menu', function () {
             remove_menu_page('html-forms');
-
-            array_push($GLOBALS['submenu']['options-general.php'], [
+            add_submenu_page(
+                'options-general.php',
+                'HTML Forms',
                 'HTML Forms',
                 'edit_forms',
-                admin_url('admin.php?page=html-forms'),
-            ]);
+                'html-forms'
+            );
         });
     }
 }

src/HtmlForms.php

@@ -2,10 +2,12 @@
 
 namespace Log1x\HtmlForms;
 
-use Roots\Acorn\ServiceProvider;
+use Illuminate\Support\Facades\Blade;
 use Illuminate\View\Compilers\BladeCompiler;
+use Roots\Acorn\ServiceProvider;
 use Log1x\HtmlForms\HtmlForms;
 use Log1x\HtmlForms\Console\FormMakeCommand;
+use Log1x\HtmlForms\Console\FormListCommand;
 use Log1x\HtmlForms\View\Components\HtmlForms as HtmlFormsComponent;
 
 class HtmlFormsServiceProvider extends ServiceProvider
@@ -29,8 +31,13 @@ public function register()
      */
     public function boot()
     {
+        if (! class_exists('\HTML_Forms\Form')) {
+            return;
+        }
+
         $this->commands([
             FormMakeCommand::class,
+            FormListCommand::class,
         ]);
 
         $this->loadViewsFrom(__DIR__ . '/../resources/views', 'HtmlForms');
@@ -39,6 +46,10 @@ public function boot()
             $view->component(HtmlFormsComponent::class);
         });
 
+        Blade::directive('htmlform', function ($expression) {
+            return "<?php echo \hf_get_form($expression); ?>";
+        });
+
         $this->app->make('Log1x\HtmlForms');
     }
 }