first

Author: inmanturbo

.php_cs.dist.php renamed to .php-cs-fixer.php

@@ -16,13 +16,14 @@
         }
     ],
     "require": {
-        "spatie/laravel-package-tools": "^1.4.3",
         "illuminate/contracts": "~8.0",
         "illuminate/routing": "~8.0",
-        "illuminate/support": "~8.0"
+        "illuminate/support": "~8.0",
+        "spatie/laravel-package-tools": "^1.4.3"
     },
     "require-dev": {
         "brianium/paratest": "^6.2",
+        "friendsofphp/php-cs-fixer": "^3.0",
         "nunomaduro/collision": "^5.3",
         "orchestra/testbench": "^6.15",
         "phpunit/phpunit": "^9.3",
@@ -31,8 +32,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Headerx\\Iframes\\": "src",
-            "Headerx\\Iframes\\Database\\Factories\\": "database/factories"
+            "HeaderX\\Iframes\\": "src"
         }
     },
     "autoload-dev": {
@@ -43,18 +43,19 @@
     "scripts": {
         "psalm": "vendor/bin/psalm",
         "test": "./vendor/bin/testbench package:test --parallel --no-coverage",
-        "test-coverage": "vendor/bin/phpunit --coverage-html coverage"
+        "test-coverage": "vendor/bin/phpunit --coverage-html coverage",
+        "format": "vendor/bin/php-cs-fixer fix --allow-risky=yes"
     },
     "config": {
         "sort-packages": true
     },
     "extra": {
         "laravel": {
             "providers": [
-                "Headerx\\Iframes\\IframesServiceProvider"
+                "HeaderX\\Iframes\\IframesServiceProvider"
             ],
             "aliases": {
-                "Iframes": "Headerx\\Iframes\\IframesFacade"
+                "Iframes": "HeaderX\\Iframes\\IframesFacade"
             }
         }
     },

composer.json

@@ -4,6 +4,11 @@
 
     'theme' => 'jetstream',
 
+    'middleware' => [
+        'web',
+        'auth',
+    ],
+
     /**
      * The Route prefix under which views should be loaded in an iframe.
      * This can be useful when you want to keep the appearance of the

config/iframes.php

@@ -9,7 +9,7 @@ class="w-full h-full mainFrame"
                 frameborder="0"
                 noresize='noresize'
                 scrolling='auto'
-                src="{{ url($frame . '?' . http_build_query($_GET)) }}"
+                src="{{ url($iframeSource . '?' . http_build_query($_GET)) }}"
                 class="maniFrame">
             </iframe>
         </div>
@@ -23,7 +23,7 @@ class="w-full h-full mainFrame"
                 frameborder="0"
                 noresize='noresize'
                 scrolling='auto'
-                src="{{ url($frame) }}"
+                src="{{ url($iframeSource) }}"
                 class="mainFrame">
             </iframe>
         </div>

resources/views/jetstream/internal-frame.blade.php renamed to resources/views/jetstream/internal-iframe.blade.php

@@ -1,9 +1,10 @@
 <?php
 
-use App\Core\App\Controllers\Iframes\ExternalIframeController;
-use App\Core\App\Controllers\Iframes\InternalIframeController;
+use HeaderX\Iframes\Http\Controllers\ExternalIframeController;
+use HeaderX\Iframes\Http\Controllers\InternalIframeController;
 use Illuminate\Support\Facades\Route;
 
-Route::any('/'.config('iframes.internal_iframe_prefix').'/{path}', InternalIframeController::class)->where('path', '(.*)');
+Route::any('/'.config('iframes.internal_iframe_prefix').'/{path}', InternalIframeController::class)->where('path', '(.*)')
+->middleware(config('iframes.middleware'));
 
-Route::get('/'.config('iframes.external_iframe_prefix'), ExternalIframeController::class);
+Route::get('/'.config('iframes.external_iframe_prefix'), ExternalIframeController::class)->middleware(config('iframes.middleware'));

routes/iframes.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace App\Core\App\Controllers\Iframes;
+namespace HeaderX\Iframes\Http\Controllers;
 
-use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
-class ExternalIframeController extends Controller
+class ExternalIframeController
 {
     public function __invoke(Request $request)
     {
         if ($request->has(str_replace(['?', '='], '', config('iframes.external_link_query')))) {
             $iframeSource = $request->{str_replace(['?', '='], '', config('iframes.external_link_query'))};
-            return view('headerx::'.config('iframes.theme').'.external-iframe', ['iframeSource' => $iframeSource]);
+
+            return view('laravel-iframes::'.config('iframes.theme').'.external-iframe', ['iframeSource' => $iframeSource]);
         }
         abort('404');
     }

src/Http/Controllers/ExternalIframeController.php

@@ -1,11 +1,10 @@
 <?php
 
-namespace App\Core\App\Controllers\Iframes;
+namespace HeaderX\Iframes\Http\Controllers;
 
-use App\Http\Controllers\Controller;
 use Illuminate\Contracts\View\View;
 
-class InternalIframeController extends Controller
+class InternalIframeController
 {
     public function __invoke(string $path): View
     {
@@ -20,9 +19,9 @@ public function __invoke(string $path): View
 
         parse_str($query_string, $_GET);
 
-        return view('headerx::'.config('iframes.theme').'.index', [
+        return view('iframes::'.config('iframes.theme').'.internal-iframe', [
             'iframeSource' => $path,
-            '$_GET' => $query_string
+            '$_GET' => $query_string,
         ]);
     }
 }

src/Http/Controllers/InternalIframeController.php

@@ -4,7 +4,6 @@
 
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
-use HeaderX\Iframes\Commands\IframesCommand;
 
 class IframesServiceProvider extends PackageServiceProvider
 {
@@ -18,6 +17,7 @@ public function configurePackage(Package $package): void
         $package
             ->name('laravel-iframes')
             ->hasConfigFile()
+            ->hasRoute('iframes')
             ->hasViews();
     }
 }

src/IframesServiceProvider.php

@@ -2,9 +2,9 @@
 
 namespace HeaderX\Iframes\Tests;
 
+use HeaderX\Iframes\IframesServiceProvider;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Orchestra\Testbench\TestCase as Orchestra;
-use HeaderX\Iframes\IframesServiceProvider;
 
 class TestCase extends Orchestra
 {