Merge pull request #69 from musimana/11.x

v11.5.1

app/Http/Resources/Views/Admin/Pages/CreateEditPageResource.php

@@ -11,11 +11,12 @@ final class CreateEditPageResource implements PageItemInterface
     /**
      * Get the content array for the given page's full public resource.
      *
-     * @return array<string, array<int, array<int|string, mixed>>|bool|string>
+     * @return array<string, array<int, array<int|string, mixed>>|bool|int|string>
      */
     public function getItem(Page $page): array
     {
         return [
+            'id' => $page->id,
             'blocks' => (new BlocksResource)->getItems($page->blocks),
             'content' => $page->getContent(),
             'subtitle' => $page->getSubtitle(),

app/Models/User.php

@@ -8,12 +8,10 @@
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
-use Laravel\Sanctum\HasApiTokens;
 
 final class User extends Authenticatable implements MustVerifyEmail
 {
-    use HasApiTokens,
-        HasFactory,
+    use HasFactory,
         HasUuids,
         Notifiable,
         SoftDeletes;

bootstrap/app.php

@@ -9,8 +9,6 @@
     ->withProviders()
     ->withRouting(
         web: __DIR__ . '/../routes/web.php',
-        api: __DIR__ . '/../routes/api.php',
-        commands: __DIR__ . '/../routes/console.php',
         health: '/up',
     )
     ->withMiddleware(function (Middleware $middleware) {
@@ -19,8 +17,6 @@
 
         $middleware->web(HandleInertiaRequests::class);
 
-        $middleware->api('throttle:60,1');
-
         $middleware->alias([
             'admin' => AdminAccess::class,
         ]);

composer.json

@@ -16,7 +16,6 @@
         "guzzlehttp/guzzle": "^7.8.1",
         "inertiajs/inertia-laravel": "^1.2",
         "laravel/framework": "^11.8",
-        "laravel/sanctum": "^4.0",
         "laravel/tinker": "^2.9.0",
         "tightenco/ziggy": "^1.8.2"
     },

resources/js/Components/Sections/AppHeader.vue

@@ -7,8 +7,8 @@ import { Link } from '@inertiajs/vue3'
 <template>
   <header class="w-full flex h-18 fixed top-0 lg:right-0 z-50 m-auto px-6 lg:px-8 py-6 bg-gray-100 dark:bg-gray-700 dark:bg-gradient-to-bl from-gray-700 via-transparent text-gray-900 dark:text-gray-100 hover:text-gray-600 dark:hover:text-gray-300 dark:ring-1 dark:ring-inset dark:ring-gray-100/5 shadow-2xl shadow-gray-500/20 dark:shadow-none">
     <div class="w-1/2 flex">
-      <Link id="site-logo" :href="route('home')" class="my-auto shrink-0 flex items-start space-x-4 focus:outline-none focus:rounded-sm focus:ring-2 focus:ring-gray-900 dark:focus:ring-gray-100">
-        <IconAppLogo class="w-8 h-8" />
+      <Link :href="route('home')" class="my-auto shrink-0 flex items-start space-x-4 focus:outline-none focus:rounded-sm focus:ring-2 focus:ring-gray-900 dark:focus:ring-gray-100">
+        <IconAppLogo id="site-logo" class="w-8 h-8" />
 
         <h1 id="site-title" class="my-auto text-lg lg:text-xl font-semibold">{{ $page.props.metadata.appName }}</h1>
       </Link>

resources/js/Pages/Admin/Partials/CreateEditPage.vue

@@ -28,7 +28,7 @@ const form = useForm({
 
   <AppForm
     class="w-full"
-    :endpoint="route('page.store', 'forms')"
+    :endpoint="route('admin.page.edit', page.id)"
     :form="form"
   >
     <div class="w-full flex pt-4 px-4">