Render captcha script directly in the view

aerni · Aug 2, 2021 · eefea6b · eefea6b
1 parent 2cc1ebf
commit eefea6b
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 58 deletions.
diff --git a/README.md b/README.md
@@ -109,18 +109,6 @@ Add the Livewire `styles` in the `head`, and the `scripts` before the closing `b
 </body>
 ```
 
-If you want to use `Google reCAPTCHA v2` you also need to add the captcha scripts before the closing `body` tag in your template.
-
-```html
-<body>
-    <!-- Antlers -->
-    {{ captcha:scripts }}
-
-    <!-- Blade -->
-    @captchaScripts
-</body>
-```
-
 ### 3. Create a Livewire form view
 
 Run the following command and follow the instructions to create a Livewire view for your Statamic form. The form view will be published to `views/livewire/forms/my-form-handle.{antlers.html|blade.php}`.

diff --git a/resources/views/captcha/captcha.blade.php b/resources/views/captcha/captcha.blade.php
@@ -18,8 +18,8 @@ function resetResponseToken_{{ $_instance->id }}() {
         }
     </script>
 
-    @section('captchaScripts')
+    @once
         <script src="https://www.google.com/recaptcha/api.js" async defer></script>
-    @endsection
+    @endonce
 
 @endif
diff --git a/resources/views/captcha/scripts.blade.php b/resources/views/captcha/scripts.blade.php
diff --git a/src/BladeDirectives.php b/src/BladeDirectives.php
@@ -6,14 +6,6 @@
 
 class BladeDirectives
 {
-    /**
-     * Get the rendered captcha scripts view.
-     */
-    public static function captchaScripts(): string
-    {
-        return '{!! \Aerni\LivewireForms\Facades\Captcha::scripts() !!}';
-    }
-
     /**
      * Get the captcha's key.
      */

diff --git a/src/Captcha/ReCaptcha.php b/src/Captcha/ReCaptcha.php
@@ -67,14 +67,6 @@ public function secret(): string
         return config('livewire-forms.captcha.secret');
     }
 
-    /**
-     * Render the captcha's scripts view.
-     */
-    public function scripts()
-    {
-        return view('livewire-forms::scripts')->render();
-    }
-
     /**
      * Get the URL that's used to verify the captcha.
      */

diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -19,7 +19,6 @@ class ServiceProvider extends AddonServiceProvider
     protected $tags = [
         Tags\LivewireForms::class,
         Tags\Iterate::class,
-        Tags\Captcha::class,
     ];
 
     public function boot()
@@ -59,7 +58,6 @@ protected function registerPublishables()
 
     protected function registerBladeDirectives()
     {
-        Blade::directive('captchaScripts', [BladeDirectives::class, 'captchaScripts']);
         Blade::directive('captchaKey', [BladeDirectives::class, 'captchaKey']);
     }
 

diff --git a/src/Tags/Captcha.php b/src/Tags/Captcha.php