From 920985eec86251a0d42b17d12fe8862649f8c84e Mon Sep 17 00:00:00 2001 From: myrmidex Date: Wed, 29 Apr 2026 21:07:43 +0200 Subject: [PATCH] 6 - Convert blade views to layouts/app inheritance --- resources/views/admin/index.blade.php | 7 +- resources/views/bot.blade.php | 7 +- .../app.blade.php} | 4 +- resources/views/layouts/layout.blade.php | 8 - resources/views/urls/submit.blade.php | 8 +- resources/views/welcome.blade.php | 228 +----------------- 6 files changed, 22 insertions(+), 240 deletions(-) rename resources/views/{components/layout.blade.php => layouts/app.blade.php} (82%) delete mode 100644 resources/views/layouts/layout.blade.php diff --git a/resources/views/admin/index.blade.php b/resources/views/admin/index.blade.php index 721bca7..033c409 100644 --- a/resources/views/admin/index.blade.php +++ b/resources/views/admin/index.blade.php @@ -1,4 +1,6 @@ - +@extends('layouts.app') + +@section('content')

Instances

@@ -23,4 +25,5 @@
- +@endsection + diff --git a/resources/views/bot.blade.php b/resources/views/bot.blade.php index 4859039..ad4ef5d 100644 --- a/resources/views/bot.blade.php +++ b/resources/views/bot.blade.php @@ -1,4 +1,7 @@ - +@extends('layouts.app') + +@section('content') +

About TroveBot

@@ -57,4 +60,4 @@
- +@endsection diff --git a/resources/views/components/layout.blade.php b/resources/views/layouts/app.blade.php similarity index 82% rename from resources/views/components/layout.blade.php rename to resources/views/layouts/app.blade.php index 5100c31..8e6f01a 100644 --- a/resources/views/components/layout.blade.php +++ b/resources/views/layouts/app.blade.php @@ -4,14 +4,14 @@ - {{ $title ?? config('app.name') }} + Trove @yield('title') @vite(['resources/css/app.css', 'resources/js/app.js']) @livewireStyles - {{ $slot }} + @yield('content') @livewireScripts diff --git a/resources/views/layouts/layout.blade.php b/resources/views/layouts/layout.blade.php deleted file mode 100644 index 5179da6..0000000 --- a/resources/views/layouts/layout.blade.php +++ /dev/null @@ -1,8 +0,0 @@ - - - {{ $title ?? 'Trove' }} - - - {{ $slot }} - - diff --git a/resources/views/urls/submit.blade.php b/resources/views/urls/submit.blade.php index 266ab36..1385d93 100644 --- a/resources/views/urls/submit.blade.php +++ b/resources/views/urls/submit.blade.php @@ -1,3 +1,7 @@ - +@extends('layouts.app') + +@section('content') + - + +@endsection diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index 2c2e7c2..9c0de81 100644 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -1,225 +1,5 @@ - - - - - +@extends('layouts.app') - {{ config('app.name', 'Laravel') }} - - - - - - - @if (file_exists(public_path('build/manifest.json')) || file_exists(public_path('hot'))) - @vite(['resources/css/app.css', 'resources/js/app.js']) - @else - - @endif - - -
- @if (Route::has('login')) - - @endif -
-
-
-
-

Let's get started

-

With so many options available to you,
we suggest you start with the following:

- - - -

- v{{ app()->version() }} - - View changelog - - - - -

-
-
- {{-- Laravel Logo --}} - - - - - - - - - - - {{-- 13 --}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
- - @if (Route::has('login')) - - @endif - - +@section('content') + Welcome +@endsection