update Feature/add remote server logs (#166)

This commit is contained in:
Saeed Vaziry 2024-04-14 14:41:00 +02:00 committed by GitHub
parent 4517ca7d2a
commit 8a4ef66946
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 16 additions and 16 deletions

View File

@ -16,6 +16,7 @@
* @property string $disk * @property string $disk
* @property Server $server * @property Server $server
* @property ?Site $site * @property ?Site $site
* @property bool $is_remote
*/ */
class ServerLog extends AbstractModel class ServerLog extends AbstractModel
{ {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
{ {
"resources/css/app.css": { "resources/css/app.css": {
"file": "assets/app-53e4d707.css", "file": "assets/app-817eb31c.css",
"isEntry": true, "isEntry": true,
"src": "resources/css/app.css" "src": "resources/css/app.css"
}, },

View File

@ -1,5 +1,5 @@
@php @php
$class = "mx-auto px-4 sm:px-6 lg:px-8"; $class = "mx-auto";
if (! str($attributes->get("class"))->contains("max-w-")) { if (! str($attributes->get("class"))->contains("max-w-")) {
$class .= " max-w-7xl"; $class .= " max-w-7xl";
} }

View File

@ -4,14 +4,14 @@
@endif @endif
<x-slot name="header"> <x-slot name="header">
<h2 class="text-lg font-semibold">{{ $server->name }}</h2>
@if (isset($header)) @if (isset($header))
<header class="flex-grow border-b border-gray-200 bg-white dark:border-gray-700 dark:bg-gray-800"> <header class="flex-grow border-b border-gray-200 bg-white dark:border-gray-700 dark:bg-gray-800">
<div class="mx-auto flex h-20 w-full max-w-full items-center justify-between px-5"> <div class="mx-auto flex h-20 w-full max-w-full items-center justify-between">
{{ $header }} {{ $header }}
</div> </div>
</header> </header>
@else
<h2 class="text-lg font-semibold">{{ $server->name }}</h2>
@endif @endif
<div class="flex flex-col items-end"> <div class="flex flex-col items-end">

View File

@ -1,6 +1,6 @@
<x-server-layout :server="$server"> <x-server-layout :server="$server">
@if (isset($pageTitle)) @if (isset($pageTitle))
<x-slot name="pageTitle">{{ $server->name }} - {{ $pageTitle }}</x-slot> <x-slot name="pageTitle">{{ $pageTitle }}</x-slot>
@endif @endif
@include("server-logs.partials.header") @include("server-logs.partials.header")

View File

@ -1,5 +1,5 @@
@if (isset($pageTitle)) @if (isset($pageTitle))
<x-slot name="pageTitle">{{ $pageTitle }} - {{ $server->name }}</x-slot> <x-slot name="pageTitle">{{ $pageTitle }}</x-slot>
@endif @endif
<x-slot name="header"> <x-slot name="header">

View File

@ -1,14 +1,13 @@
@php @php
if (isset($site) && ! isset($remote)) { if (isset($site)) {
$logs = \App\Models\ServerLog::getRemote($site->logs(), false) $logs = $site
->latest() ->logs()
->paginate(10);
} elseif (isset($remote)) {
$logs = \App\Models\ServerLog::getRemote($server->logs())
->latest() ->latest()
->paginate(10); ->paginate(10);
} else { } else {
$logs = \App\Models\ServerLog::getRemote($server->logs(), false) $logs = $server
->logs()
->where("is_remote", isset($remote) ? 1 : 0)
->latest() ->latest()
->paginate(10); ->paginate(10);
} }
@ -42,7 +41,7 @@
{{ $log->name }} {{ $log->name }}
@else @else
{{ $log->type }} {{ $log->type }}
@if (data_get($log, "type") === "remote") @if ($log->is_remote)
<span class="text-sm text-gray-400"> <span class="text-sm text-gray-400">
{{ $log->name }} {{ $log->name }}
</span> </span>