Merge pull request #46 from anditsung/support-nova-4

composer.json

@@ -15,9 +15,9 @@
         }
     ],
     "require": {
-        "php": ">=7.1.0",
+        "php": ">=8",
         "kabbouchi/laravel-ward": "^0.5.0",
-        "laravel/nova": "^1.0|^2.0|^3.0"
+        "laravel/nova": "^4"
     },
     "require-dev": {
         "orchestra/testbench": "^3.6",
@@ -40,12 +40,6 @@
             ]
         }
     },
-    "repositories": [
-        {
-            "type": "path",
-            "url": "../nova-lib"
-        }
-    ],
     "config": {
         "sort-packages": true
     },

dist/css/tool.css

@@ -0,0 +1 @@
+

mix.js

@@ -0,0 +1,33 @@
+const mix = require('laravel-mix')
+const webpack = require('webpack')
+const path = require('path')
+
+class NovaExtension {
+  name() {
+    return 'nova-extension'
+  }
+
+  register(name) {
+    this.name = name
+  }
+
+  webpackConfig(webpackConfig) {
+    webpackConfig.externals = {
+      vue: 'Vue',
+    }
+
+    webpackConfig.resolve.alias = {
+      ...(webpackConfig.resolve.alias || {}),
+      'laravel-nova': path.join(
+        __dirname,
+        '../../vendor/laravel/nova/resources/js/mixins/packages.js'
+      ),
+    }
+
+    webpackConfig.output = {
+      uniqueName: this.name,
+    }
+  }
+}
+
+mix.extend('nova', new NovaExtension())

package.json

@@ -2,23 +2,20 @@
     "private": true,
     "scripts": {
         "dev": "npm run development",
-        "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-        "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-        "watch-poll": "npm run watch -- --watch-poll",
-        "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "development": "mix",
+        "watch": "mix watch",
+        "watch-poll": "mix watch -- --watch-options-poll=1000",
+        "hot": "mix watch --hot",
         "prod": "npm run production",
-        "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "production": "mix --production",
         "format": "prettier --single-quote --write 'resources/**/*.{css,js,vue}'"
     },
     "devDependencies": {
-        "cross-env": "^5.0.0",
-        "laravel-mix": "^1.0",
+        "@vue/compiler-sfc": "^3.2.22",
+        "laravel-mix": "^6.0.41",
         "prettier": "^1.14.0",
-        "vue-template-compiler": "^2.5.17"
+        "vue-loader": "^16.8.3",
+        "prismjs": "^1.21.0"
     },
-    "dependencies": {
-        "animated-scroll-to": "^1.2.2",
-        "prismjs": "^1.21.0",
-        "vue": "^2.5.0"
-    }
+    "dependencies": {}
 }

resources/js/tool.js

@@ -1,9 +1,5 @@
-Nova.booting((Vue, router) => {
-    router.addRoutes([
-        {
-            name: 'LogsTool',
-            path: '/logs',
-            component: require('./components/LogsTool.vue')
-        }
-    ]);
-});
+import LogsTool from "./components/LogsTool";
+
+Nova.booting((app, store) => {
+    Nova.inertia('Logs', LogsTool)
+})

routes/api.php

@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Support\Facades\Route;
+use KABBOUCHI\LogsTool\Http\Controllers\LogsController;
 
 /*
 |--------------------------------------------------------------------------
@@ -13,8 +14,8 @@
 |
 */
 
-Route::get('logs', \KABBOUCHI\LogsTool\Http\Controllers\LogsController::class.'@index');
-Route::get('logs/permissions', \KABBOUCHI\LogsTool\Http\Controllers\LogsController::class.'@permissions');
-Route::get('logs/{log}', \KABBOUCHI\LogsTool\Http\Controllers\LogsController::class.'@show');
-Route::get('daily-log-files', \KABBOUCHI\LogsTool\Http\Controllers\LogsController::class.'@dailyLogFiles');
-Route::delete('logs', \KABBOUCHI\LogsTool\Http\Controllers\LogsController::class.'@destroy');
+Route::get('logs', [LogsController::class, 'index']);
+Route::get('logs/permissions', [LogsController::class, 'permissions']);
+Route::get('logs/{log}', [LogsController::class, 'show']);
+Route::get('daily-log-files', [LogsController::class, 'dailyLogFiles']);
+Route::delete('logs', [LogsController::class, 'destroy']);

routes/inertia.php

@@ -0,0 +1,19 @@
+<?php
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Route;
+
+/*
+|--------------------------------------------------------------------------
+| Tool Routes
+|--------------------------------------------------------------------------
+|
+| Here is where you may register Inertia routes for your tool. These are
+| loaded by the ServiceProvider of the tool. The routes are protected
+| by your tool's "Authorize" middleware by default. Now - go build!
+|
+*/
+
+Route::get('/', function (Request $request) {
+    return inertia('Logs');
+});

src/LogsTool.php

@@ -3,6 +3,7 @@
 namespace KABBOUCHI\LogsTool;
 
 use Illuminate\Http\Request;
+use Laravel\Nova\Menu\MenuSection;
 use Laravel\Nova\Nova;
 use Laravel\Nova\Tool as BaseTool;
 
@@ -22,13 +23,16 @@ public function boot()
     }
 
     /**
-     * Build the view that renders the navigation links for the tool.
+     * Build the menu that renders the navigation links for the tool.
      *
-     * @return \Illuminate\View\View
+     * @param  \Illuminate\Http\Request  $request
+     * @return mixed
      */
-    public function renderNavigation()
+    public function menu(Request $request)
     {
-        return view('LogsTool::navigation');
+        return MenuSection::make('Logs')
+            ->path('/logs-tool')
+            ->icon('document-duplicate');
     }
 
     public static function authorizedToDownload(Request $request)

src/LogsToolServiceProvider.php

@@ -17,15 +17,13 @@ class LogsToolServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->loadViewsFrom(__DIR__.'/../resources/views', 'LogsTool');
-
-        $this->publishes([__DIR__.'/../config/nova-logs-tool.php' => config_path('nova-logs-tool.php'),
-        ], 'nova-logs-tool-config');
-
         $this->app->booted(function () {
             $this->routes();
         });
 
+        $this->publishes([__DIR__.'/../config/nova-logs-tool.php' => config_path('nova-logs-tool.php'),
+        ], 'nova-logs-tool-config');
+
         Nova::serving(function (ServingNova $event) {
             //
         });
@@ -42,9 +40,12 @@ protected function routes()
             return;
         }
 
+        Nova::router(['nova', Authorize::class], 'logs-tool')
+            ->group(__DIR__.'/../routes/inertia.php');
+
         Route::middleware(['nova', Authorize::class])
-                ->prefix('nova-vendor/KABBOUCHI/logs-tool')
-                ->group(__DIR__.'/../routes/api.php');
+            ->prefix('nova-vendor/KABBOUCHI/logs-tool')
+            ->group(__DIR__.'/../routes/api.php');
     }
 
     /**

webpack.mix.js

@@ -1,4 +1,9 @@
 let mix = require('laravel-mix')
 
-mix.js('resources/js/tool.js', 'dist/js')
-    .sass('resources/sass/tool.scss', 'dist/css');
+require('./mix')
+
+mix
+    .setPublicPath('dist')
+    .js('resources/js/tool.js', 'js')
+    .vue({ version: 3 })
+    .nova('kabbouchi/nova-logs-tool')