From 397cce2c588671a5018cd751f9bf5bca0c162061 Mon Sep 17 00:00:00 2001
From: Vic Luijkx <vic@vic-luijkx.nl>
Date: Sat, 6 Jan 2024 18:45:00 +0100
Subject: [PATCH] Small improvements

---
 resources/js/components/RedirectListing.vue   |  2 +-
 resources/views/errors/show.blade.php         | 44 ----------
 resources/views/index.blade.php               |  4 +-
 resources/views/redirects/index.blade.php     | 10 +--
 resources/views/widgets/errors.blade.php      | 15 +---
 routes/cp.php                                 | 14 +--
 src/Controllers/ErrorController.php           | 33 -------
 src/Controllers/ExportController.php          | 38 ---------
 src/Controllers/ImportRedirectsController.php | 85 -------------------
 9 files changed, 8 insertions(+), 237 deletions(-)
 delete mode 100644 resources/views/errors/show.blade.php
 delete mode 100644 src/Controllers/ErrorController.php
 delete mode 100644 src/Controllers/ExportController.php
 delete mode 100644 src/Controllers/ImportRedirectsController.php

diff --git a/resources/js/components/RedirectListing.vue b/resources/js/components/RedirectListing.vue
index 96acac3..29727d1 100644
--- a/resources/js/components/RedirectListing.vue
+++ b/resources/js/components/RedirectListing.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <header class="mb-3">
+    <header class="mb-6">
 
       <div class="flex items-center">
         <h1 class="flex-1" >Redirects</h1>
diff --git a/resources/views/errors/show.blade.php b/resources/views/errors/show.blade.php
deleted file mode 100644
index 99cfea1..0000000
--- a/resources/views/errors/show.blade.php
+++ /dev/null
@@ -1,44 +0,0 @@
-@extends('statamic::layout')
-
-@section('title', 'Error details - ' . $error->url)
-@section('wrapper_class', 'max-w-3xl')
-
-@section('content')
-    <div class="page-wrapper max-w-3xl">
-        <div>
-            <div class="flex items-center mb-3">
-                <h1 class="flex-1 flex items-center">Error details for <p class="ml-1 inline-block truncate w-128"
-                                                                          title="{{ $error->url }}">{{ $error->url }}</p>
-                </h1>
-                <a href="{{ cp_route('redirect.errors.delete', $error->id) }}" class="mr-1 btn">Delete error</a>
-                <a href="{{ cp_route('redirect.redirects.create', ['source' => $error->url]) }}" class="btn-primary">Create redirect</a>
-            </div>
-            <div class="card p-0 relative">
-                <table tabindex="0" class="data-table">
-                    <thead>
-                    <tr>
-                        <th class="sortable-column"><span>User agent</span></th>
-                        <th class="sortable-column"><span>IP</span></th>
-                        <th class="sortable-column"><span>Referer</span></th>
-                        <th class="sortable-column"><span>Time</span></th>
-                    </tr>
-                    </thead>
-                    <tbody tabindex="0">
-                        @forelse ($error->hits->reverse() as $hit)
-                            <tr class="row outline-none" tabindex="0">
-                                <td><p class="m-0 truncate w-64" title="{{ $hit->data['userAgent'] ?? '' }}">{{ $hit->data['userAgent'] ?? '' }}</p></td>
-                                <td>{{ $hit->data['ip'] ?? '' }}</td>
-                                <td>{{ $hit->data['referer'] ?? '' }}</td>
-                                <td><time datetime="{{ \Illuminate\Support\Carbon::createFromTimestamp($hit->timestamp)->toIso8601String() }}">{!! isset($hit->timestamp) ? str_replace(' ', '&nbsp;', \Illuminate\Support\Carbon::createFromTimestamp($hit['timestamp'])->diffForHumans()) : '' !!}</time></td>
-                            </tr>
-                        @empty
-                            <tr class="row outline-none" tabindex="0">
-                                <td colspan="4">No hits found.</td>
-                            </tr>
-                        @endforelse
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </div>
-@stop
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 4de975b..23defff 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -3,8 +3,8 @@
 
 @section('content')
 
-    <header class="mb-3">
-        <h1>Redirect</h1>
+    <header class="mb-5">
+        <h1>Dashboard</h1>
     </header>
 
     @if(! config('statamic.redirect.enable', true))
diff --git a/resources/views/redirects/index.blade.php b/resources/views/redirects/index.blade.php
index 575c5f4..c03128a 100644
--- a/resources/views/redirects/index.blade.php
+++ b/resources/views/redirects/index.blade.php
@@ -8,13 +8,5 @@
         create-label="Create redirect"
         :columns="{{ $columns->toJson() }}"
         :filters="{{ $filters->toJson() }}"
-    >
-        <template slot="twirldown">
-            @if(\Statamic\Facades\User::fromUser(auth()->user())->isSuper() || \Statamic\Facades\User::fromUser(auth()->user())->hasPermission('create redirects'))
-                <dropdown-item :text="__('Import CSV')" redirect="{{ cp_route('redirect.redirects.import') }}"></dropdown-item>
-            @endif
-            <dropdown-item :text="__('Export as CSV')" redirect="{{ cp_route('redirect.export', ['type' => 'csv']) }}?download=true"></dropdown-item>
-            <dropdown-item :text="__('Export as JSON')" redirect="{{ cp_route('redirect.export', ['type' => 'json']) }}?download=true"></dropdown-item>
-        </template>
-    </redirect-listing>
+    />
 @endsection
diff --git a/resources/views/widgets/errors.blade.php b/resources/views/widgets/errors.blade.php
index b015da8..2f9e8ec 100644
--- a/resources/views/widgets/errors.blade.php
+++ b/resources/views/widgets/errors.blade.php
@@ -8,12 +8,6 @@
                 <span>{{ $title }}</span>
             </a>
         </h2>
-        @if(\Statamic\Facades\User::fromUser(auth()->user())->isSuper() || \Statamic\Facades\User::fromUser(auth()->user())->hasPermission('create redirects'))
-            <a
-                class="btn-primary"
-                href="{{ cp_route('redirect.redirects.create') }}"
-            >{{ __('Create redirect') }}</a>
-        @endcan
     </div>
     <div>
         <div>
@@ -21,18 +15,15 @@ class="btn-primary"
                 <tbody tabindex="0">
                 @foreach ($errors as $error)
                     <tr class="sortable-row outline-none" tabindex="0">
-                        <td class="">
-                            <div class="flex items-center">
-                                <div class="little-dot mr-2 {{ $error->handled ? 'bg-green-600' : 'bg-gray-400' }}"></div>
-                                <a class="text-blue hover:text-blue-dark" href="{{ cp_route('redirect.errors.show', $error->id) }}" style="word-break: break-all">{{ $error->url }}</a>
-                            </div>
+                        <td class="text-gray-800">
+                            {{ $error->url }}
                         </td>
                         <td class="">
                             <span>{{ \Carbon\Carbon::createFromTimestamp($error->lastSeenAt)->diffForHumans() }}</span>
                         </td>
                         <th class="actions-column">
                             @if (! $error->handled)
-                                <a href="{{ cp_route('redirect.redirects.create', ['source' => urlencode($error->url)]) }}" class="text-blue inline-block">
+                                <a href="{{ cp_route('redirect.redirects.create', ['source' => urlencode($error->url)]) }}" class="text-blue flex align-center mr-2">
                                     <svg
                                         class="w-4 h-4 mr-2"
                                         aria-hidden="true"
diff --git a/routes/cp.php b/routes/cp.php
index 9b5e759..d5fab8b 100644
--- a/routes/cp.php
+++ b/routes/cp.php
@@ -3,28 +3,16 @@
 use Rias\StatamicRedirect\Controllers\Api\RedirectController as ApiRedirectController;
 use Rias\StatamicRedirect\Controllers\DashboardController;
 use Rias\StatamicRedirect\Controllers\Api\ErrorController as ApiErrorController;
-use Rias\StatamicRedirect\Controllers\ErrorController;
-use Rias\StatamicRedirect\Controllers\ExportController;
-use Rias\StatamicRedirect\Controllers\ImportRedirectsController;
 use Rias\StatamicRedirect\Controllers\RedirectController;
 
-Route::get('redirect/dashboard', '\\'. DashboardController::class)->name('redirect.index');
-Route::get('redirect/export/{type}', '\\'. ExportController::class)->name('redirect.export');
-
 Route::get('redirect/api/errors', ['\\' . ApiErrorController::class, 'index'])->name('redirect.api.errors.index');
 Route::get('redirect/api/redirects', ['\\' . ApiRedirectController::class, 'index'])->name('redirect.api.redirects.index');
 Route::post('redirect/api/redirects/reorder', ['\\' . ApiRedirectController::class, 'reorder'])->name('redirect.api.redirects.reorder');
 
-Route::prefix('redirect/errors')->group(function () {
-    Route::get('clear', ['\\' . ErrorController::class, 'clearAll'])->name('redirect.api.errors.clear');
-    Route::get('/{error}', ['\\' . ErrorController::class, 'show'])->name('redirect.errors.show');
-    Route::get('/{error}/delete', ['\\' . ErrorController::class, 'delete'])->name('redirect.errors.delete');
-});
+Route::get('redirect/dashboard', '\\'. DashboardController::class)->name('redirect.index');
 
 Route::prefix('redirect/redirects')->group(function () {
     Route::get('/', ['\\' . RedirectController::class, 'index'])->name('redirect.redirects.index');
-    Route::get('/import', ['\\' . ImportRedirectsController::class, 'index'])->name('redirect.redirects.import');
-    Route::post('/import', ['\\' . ImportRedirectsController::class, 'store'])->name('redirect.redirects.handleImport');
     Route::get('/create', ['\\' . RedirectController::class, 'create'])->name('redirect.redirects.create');
     Route::get('/{id}', ['\\' . RedirectController::class, 'edit'])->name('redirect.redirects.edit');
     Route::post('/{id}', ['\\' . RedirectController::class, 'update'])->name('redirect.redirects.update');
diff --git a/src/Controllers/ErrorController.php b/src/Controllers/ErrorController.php
deleted file mode 100644
index 39e292d..0000000
--- a/src/Controllers/ErrorController.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Rias\StatamicRedirect\Controllers;
-
-use Rias\StatamicRedirect\Data\Error;
-
-class ErrorController
-{
-    public function clearAll()
-    {
-        Error::query()->delete();
-
-        session()->flash('success', __('Errors cleared!'));
-
-        return redirect(cp_route('redirect.index'));
-    }
-
-    public function delete(Error $error)
-    {
-        $error->delete();
-
-        session()->flash('success', __('Error deleted!'));
-
-        return redirect(cp_route('redirect.index'));
-    }
-
-    public function show(Error $error)
-    {
-        $title = "Error details - {$error->id}";
-
-        return view('redirect::errors.show', compact('title', 'error'));
-    }
-}
diff --git a/src/Controllers/ExportController.php b/src/Controllers/ExportController.php
deleted file mode 100644
index 6d99d59..0000000
--- a/src/Controllers/ExportController.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace Rias\StatamicRedirect\Controllers;
-
-use Statamic\Exceptions\FatalException;
-use Statamic\Facades\File;
-use Statamic\Facades\User;
-use Statamic\Support\Str;
-
-class ExportController
-{
-    public function __invoke($type)
-    {
-        $user = User::fromUser(auth()->user());
-
-        abort_unless($user->isSuper() || $user->hasPermission('view redirects'), 401);
-
-        $exporter = 'Rias\StatamicRedirect\Exporters\\'.Str::studly($type).'Exporter';
-
-        if (! class_exists($exporter)) {
-            throw new FatalException("Exporter of type [$type] does not exist.");
-        }
-
-        $exporter = new $exporter;
-
-        $content = $exporter->export();
-
-        if (request()->has('download')) {
-            $path = storage_path('statamic/tmp/redirect/'.time().'.'.$type);
-
-            File::put($path, $content);
-
-            return response()->download($path)->deleteFileAfterSend();
-        }
-
-        return response($content)->header('Content-Type', $exporter->contentType());
-    }
-}
diff --git a/src/Controllers/ImportRedirectsController.php b/src/Controllers/ImportRedirectsController.php
deleted file mode 100644
index 0cae125..0000000
--- a/src/Controllers/ImportRedirectsController.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-namespace Rias\StatamicRedirect\Controllers;
-
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Str;
-use Rias\StatamicRedirect\Facades\Redirect;
-use Spatie\SimpleExcel\SimpleExcelReader;
-use Statamic\Facades\Site;
-use Statamic\Facades\User;
-
-class ImportRedirectsController
-{
-    public function index()
-    {
-        $user = User::fromUser(auth()->user());
-
-        abort_unless($user->isSuper() || $user->hasPermission('create redirects'), 401);
-
-        return view('redirect::redirects.import');
-    }
-
-    public function store(Request $request)
-    {
-        $user = User::fromUser(auth()->user());
-
-        abort_unless($user->isSuper() || $user->hasPermission('create redirects'), 401);
-
-        $request->validate([
-            'file' => ['required', 'file'],
-            'delimiter' => ['required'],
-        ]);
-
-        /** @var \Illuminate\Http\UploadedFile $file */
-        $file = $request->file('file');
-        $delimiter = $request->input('delimiter', ',');
-
-        $extension = with($file->extension(), fn ($ext) => $ext === 'txt' ? 'csv' : $ext);
-
-        $reader = SimpleExcelReader::create($file->getRealPath(), $extension)
-            ->useDelimiter($delimiter);
-
-        $skipped = 0;
-        $reader->getRows()->each(function (array $data) use (&$skipped) {
-            if (! $data['source'] || ! $data['destination'] || ! $data['type'] || ! $data['match_type']) {
-                $skipped++;
-
-                return;
-            }
-
-            if (Redirect::query()->where('source', $data['source'])->where('site', $data['site'] ?? Site::current()->handle())->count() > 0) {
-                $skipped++;
-
-                return;
-            }
-
-            /** @var Redirect $redirect */
-            $redirect = Redirect::make()
-                ->source($data['source'])
-                ->destination($data['destination'])
-                ->enabled(true)
-                ->type($data['type'])
-                ->matchType($data['match_type']);
-
-            if (isset($data['site'])) {
-                $redirect->locale($data['site']);
-            }
-
-            $redirect->save();
-        });
-
-        $message = 'Redirects imported successfully.';
-
-        if ($skipped > 0) {
-            $message .= " {$skipped} " . Str::plural('row', $skipped) . " skipped due to invalid data.";
-        }
-
-        session()->flash('success', $message);
-
-        Cache::forget('statamic.redirect.redirects');
-
-        return redirect()->action([RedirectController::class, 'index']);
-    }
-}