Merge pull request #17 from aryehraber/feat/statamic-4

Support Statamic 4

Author: aryehraber

composer.json

@@ -10,8 +10,8 @@
     "homepage": "https://github.com/aryehraber/statamic-logbook",
     "license": "MIT",
     "require": {
-        "rap2hpoutre/laravel-log-viewer": "^2.2.0",
-        "statamic/cms": "^3.3"
+        "rap2hpoutre/laravel-log-viewer": "^2.3.0",
+        "statamic/cms": "^4.0"
     },
     "autoload": {
         "psr-4": {
@@ -30,7 +30,7 @@
         "statamic": {
             "name": "Logbook",
             "description": "Manage and view log files in the CP.",
-            "version": "2.2.0"
+            "version": "3.0.0"
         },
         "laravel": {
             "providers": [
@@ -39,5 +39,10 @@
         }
     },
     "minimum-stability": "dev",
-    "prefer-stable": true
+    "prefer-stable": true,
+    "config": {
+        "allow-plugins": {
+            "pixelfear/composer-dist-plugin": true
+        }
+    }
 }

resources/views/show.blade.php

@@ -16,14 +16,16 @@
         <div class="card mb-2">
             <div class="flex items-center justify-between">
                 <form class="flex" method="GET" action="{{ cp_route('utilities.logbook.show') }}">
-                    <div class="select-input-container relative">
-                        <select class="pr-4" name="log">
+                    <div class="select-input-container">
+                        <select class="select-input" name="log">
                             @foreach($files as $file)
                                 <option value="{{ urlencode($file) }}" @if($file === $currentFile) selected @endif>{{ $file }}</option>
                             @endforeach
                         </select>
 
-                        <svg-icon name="chevron-down-xs" class="absolute inset-y-0 right-0 w-2 h-full mr-1.5 pointer-events-none"></svg-icon>
+                        <div class="select-input-toggle">
+                            <svg-icon name="micro/chevron-down-xs" class="w-2"></svg-icon>
+                        </div>
                     </div>
                 </form>
 
@@ -42,10 +44,10 @@
                             @method('delete')
 
                             @if(count($files) > 1)
-                                <dropdown-list class="inline-block ml-1">
+                                <dropdown-list class="inline-block ml-2">
                                     <template #trigger>
-                                        <button class="btn-danger flex items-center pr-2" type="button">
-                                            {{ __('Delete Log') }} <svg-icon name="chevron-down-xs" class="w-2 ml-1"></svg-icon>
+                                        <button class="btn-danger flex items-center pr-3 hover:text-white" type="button">
+                                            {{ __('Delete Log') }} <svg-icon name="micro/chevron-down-xs" class="w-2 ml-2"></svg-icon>
                                         </button>
                                     </template>
 
@@ -54,7 +56,7 @@
                                     <button name="log" value="all" data-delete>{{ __('Delete All Logs') }}</button>
                                 </dropdown-list>
                             @else
-                                <button class="btn-danger ml-1" name="log" value="{{ urlencode($currentFile) }}" data-delete>{{ __('Delete Log') }}</button>
+                                <button class="btn-danger ml-2" name="log" value="{{ urlencode($currentFile) }}" data-delete>{{ __('Delete Log') }}</button>
                             @endif
                         </form>
                     </div>

src/LogbookServiceProvider.php

@@ -2,30 +2,29 @@
 
 namespace AryehRaber\Logbook;
 
-use Statamic\Facades\Utility;
 use Illuminate\Routing\Router;
+use Statamic\Facades\Utility;
 use Statamic\Providers\AddonServiceProvider;
 
 class LogbookServiceProvider extends AddonServiceProvider
 {
+    protected $viewNamespace = 'logbook';
+
     protected $scripts = [
         __DIR__.'/../resources/js/logbook.js'
     ];
 
-    public function boot()
+    public function bootAddon()
     {
-        parent::boot();
-
-        $this->loadViewsFrom(__DIR__.'/../resources/views', 'logbook');
-
-        Utility::make('logbook')
-            ->title(__('Logbook'))
-            ->icon('book-pages')
-            ->description(__('Manage and view log files.'))
-            ->routes(function (Router $router) {
-                $router->get('/', [LogbookController::class, 'show'])->name('show');
-                $router->delete('/delete', [LogbookController::class, 'destroy'])->name('destroy');
-            })
-            ->register();
+        Utility::extend(function () {
+            Utility::register('logbook')
+                ->title(__('Logbook'))
+                ->icon('book-pages')
+                ->description(__('Manage and view log files.'))
+                ->routes(function (Router $router) {
+                    $router->get('/', [LogbookController::class, 'show'])->name('show');
+                    $router->delete('/delete', [LogbookController::class, 'destroy'])->name('destroy');
+                });
+        });
     }
 }