Skip to content

Commit

Permalink
Small improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
vluijkx committed Jan 6, 2024
1 parent bbf504f commit 397cce2
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 237 deletions.
2 changes: 1 addition & 1 deletion resources/js/components/RedirectListing.vue
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
44 changes: 0 additions & 44 deletions resources/views/errors/show.blade.php

This file was deleted.

4 changes: 2 additions & 2 deletions resources/views/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
10 changes: 1 addition & 9 deletions resources/views/redirects/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
15 changes: 3 additions & 12 deletions resources/views/widgets/errors.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,22 @@
<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>
<table data-size="sm" tabindex="0" class="data-table">
<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"
Expand Down
14 changes: 1 addition & 13 deletions routes/cp.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
33 changes: 0 additions & 33 deletions src/Controllers/ErrorController.php

This file was deleted.

38 changes: 0 additions & 38 deletions src/Controllers/ExportController.php

This file was deleted.

85 changes: 0 additions & 85 deletions src/Controllers/ImportRedirectsController.php

This file was deleted.

0 comments on commit 397cce2

Please # to comment.