6 - Convert blade views to layouts/app inheritance

2026-04-29 21:07:43 +02:00 · 2026-04-29 21:07:43 +02:00 · 920985eec8
commit 920985eec8
parent f9cebe5bae
6 changed files with 22 additions and 240 deletions
--- a/resources/views/admin/index.blade.php
+++ b/resources/views/admin/index.blade.php
@ -1,4 +1,6 @@
-<x-layout>
+@extends('layouts.app')
+
+@section('content')
    <div>
        <h1>Instances</h1>

@ -23,4 +25,5 @@
            </tbody>
        </table>
    </div>
-</x-layout>
+@endsection
+
--- a/resources/views/bot.blade.php
+++ b/resources/views/bot.blade.php
@ -1,4 +1,7 @@
-<x-layout>
+@extends('layouts.app')
+
+@section('content')
+
    <main>
        <h1>About TroveBot</h1>

@ -57,4 +60,4 @@
            </li>
        </ul>
    </main>
-</x-layout>
+@endsection
--- a/resources/views/components/layout.blade.php
+++ b/resources/views/components/layout.blade.php
@ -4,14 +4,14 @@
        <meta charset="utf-8">
        <meta name="viewport" content="width=device-width, initial-scale=1.0">

-        <title>{{ $title ?? config('app.name') }}</title>
+        <title>Trove @yield('title')</title>

        @vite(['resources/css/app.css', 'resources/js/app.js'])

        @livewireStyles
    </head>
    <body>
-        {{ $slot }}
+        @yield('content')

        @livewireScripts
    </body>
--- a/resources/views/layouts/layout.blade.php
+++ b/resources/views/layouts/layout.blade.php
@ -1,8 +0,0 @@
-<html>
-    <head>
-        <title>{{ $title ?? 'Trove' }}</title>
-    </head>
-    <body>
-        {{ $slot }}
-    </body>
-</html>
--- a/resources/views/urls/submit.blade.php
+++ b/resources/views/urls/submit.blade.php
@ -1,3 +1,7 @@
-<x-layout>
+@extends('layouts.app')
+
+@section('content')
+
    <livewire:url-submission-form />
-</x-layout>
+
+@endsection
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php