Merge remote-tracking branch 'origin/main'

# Conflicts:
#	resources/dist/build/manifest.json

Author: benmAltDesign

resources/dist/build/assets/alt-redirect-addon-a954be4e.js

@@ -134,7 +134,7 @@ export default ({
                         <th class="group to-column pr-8" style="width:8%">
                             <span>Type</span>
                         </th>
-                        <th class="group to-column pr-8">
+                        <th class="group to-column pr-8" style="width:15%">
                             <span>Sites</span>
                         </th>
                         <th class="actions-column" style="width:13.4%"></th>
@@ -152,7 +152,7 @@ export default ({
                             {{ item.redirect_type }}
                         </td>
                         <td>
-                            {{ item.sites.join(', ') }}
+                            {{ (item.sites && item.sites.length ) ? item.sites.join(', ') : "Unknown" }}
                         </td>
                         <td>
                             <button @click="deleteRedirect(item.from, item.id)" class="btn"

resources/js/components/AltRedirect.vue

@@ -14,33 +14,5 @@
         <!--  -->
     </div>
 
-    <!--<div class="card overflow-hidden p-0">
-        <table data-size="sm" tabindex="0" class="data-table">
-            <thead>
-            <tr>
-                <th class="group from-column sortable-column">
-                    <span>From</span>
-                </th>
-                <th class="group to-column pr-8">
-                    <span>To</span>
-                </th>
-                <th class="actions-column"></th>
-            </tr>
-            </thead>
-            <tbody>
-            @foreach ($data as $key => $value)
-                <tr class="redirect-row outline-none">
-                    @foreach ($value as $key => $value)
-                        @if($key === 'sites')
-                            <td style="width:50%;">{{ implode(', ', $value) }}</td>
-                        @elseif ($key !== 'id')
-                            <td style="width:50%;">{{ $value }}</td>
-                        @endif
-                    @endforeach
-                    <td><button class="btn" style="color: #bc2626;">Remove</button></td>
-                </tr>
-            @endforeach
-            </tbody>
-        </table>
-    </div>-->
+
 @endsection

resources/views/index.blade.php

@@ -13,7 +13,7 @@ class Data
     public $data = [];
     public $regexData = [];
 
-    public function __construct($type)
+    public function __construct($type, $onlyRegex = false)
     {
         $this->type = $type;
 
@@ -28,15 +28,17 @@ public function __construct($type)
             $this->manager->disk()->makeDirectory('content/alt-redirect/alt-regex');
         }
 
-        $allRedirects = File::allFiles(base_path('/content/alt-redirect'));
-        $allRedirects = collect($allRedirects)->sortByDesc(function ($file) {
-            return $file->getCTime();
-        });
-        foreach ($allRedirects as $redirect) {
-            $data = Yaml::parse(File::get($redirect));
-            $this->data[] = $data;
+        if(!$onlyRegex) {
+            $allRedirects = File::allFiles(base_path('/content/alt-redirect'));
+            $allRedirects = collect($allRedirects)->sortByDesc(function ($file) {
+                return $file->getCTime();
+            });
+            foreach ($allRedirects as $redirect) {
+                $data = Yaml::parse(File::get($redirect));
+                $this->data[] = $data;
+            }
         }
-        
+
         $allRegexRedirects = File::allFiles(base_path('/content/alt-redirect/alt-regex'));
         $allRegexRedirects = collect($allRegexRedirects)->sortBy(function ($file) {
             return $file->getCTime();

src/Helpers/Data.php

@@ -32,7 +32,9 @@ public function index()
         $fields = $fields->preProcess();
 
         // Reset the directory to the old one
-        Blueprint::setDirectory($oldDirectory);
+        if ($oldDirectory) {
+            Blueprint::setDirectory($oldDirectory);
+        }
 
         return view('alt-redirect::index', [
             'blueprint' => $blueprint->toPublishArray(),
@@ -46,7 +48,7 @@ public function create(Request $request)
     {
 
         // Grab the old directory just in case
-        $oldDirectory = Blueprint::directory();
+//        $oldDirectory = Blueprint::directory();
 
         $data = new Data('redirects');
 
@@ -68,7 +70,7 @@ public function create(Request $request)
         $values = $data->all();
 
         // Reset the directory to the old one
-        Blueprint::setDirectory($oldDirectory);
+//        Blueprint::setDirectory($oldDirectory);
 
         return [
             'data' => $values
@@ -123,7 +125,7 @@ public function import(Request $request)
                     'from' => $row[0],
                     'to' => $row[1],
                     'redirect_type' => $row[2],
-                    'sites' => explode(',', $row[3]),
+                    'sites' => isset($row[3]) ? explode(',', $row[3]) : false,
                     'id' => $row[4] ?? uniqid(),
                 ];
                 foreach ($currentData as $rdKey => $redirect) {

src/Http/Controllers/AltRedirectController.php

@@ -37,7 +37,7 @@ public function handle(Request $request, Closure $next, string ...$guards): Resp
             }
         }
 
-        $data = new Data('redirect');
+        $data = new Data('redirect', true);
         foreach ($data->regexData as $redirect) {
             if (preg_match('#' . $redirect['from'] . '#', $uri)) {
                 $redirectTo = preg_replace('#' . $redirect['from'] . '#', $redirect['to'], $uri);