refactor: minor UI fixes for logs

This commit is contained in:
arabcoders 2026-04-24 20:48:17 +03:00
parent 31786ad8d9
commit 7d79e0e8b0
2 changed files with 142 additions and 109 deletions

View file

@ -55,9 +55,15 @@
</template> </template>
<template #actions> <template #actions>
<UButton color="neutral" variant="link" size="sm" class="px-0" @click="reloadPage"> <div class="flex items-center gap-3">
Reload app <UButton to="/changelog" color="neutral" variant="link" size="sm" class="px-0">
</UButton> View changelog
</UButton>
<UButton color="neutral" variant="link" size="sm" class="px-0" @click="reloadPage">
Reload app
</UButton>
</div>
</template> </template>
</UAlert> </UAlert>
@ -393,11 +399,7 @@
> >
<UIcon name="i-lucide-info" class="size-4 text-warning" /> <UIcon name="i-lucide-info" class="size-4 text-warning" />
<span>Update available:</span> <span>Update available:</span>
<NuxtLink <NuxtLink to="/changelog" class="font-semibold text-highlighted">
:href="`https://github.com/ArabCoders/ytptube/releases/tag/${config.app.new_version}`"
target="_blank"
class="font-semibold text-highlighted"
>
{{ config.app.new_version }} {{ config.app.new_version }}
</NuxtLink> </NuxtLink>
</p> </p>

View file

@ -38,7 +38,7 @@
icon="i-lucide-arrow-down" icon="i-lucide-arrow-down"
@click="scrollToBottom(false)" @click="scrollToBottom(false)"
> >
Jump to Live Tail Scroll to bottom
</UButton> </UButton>
<UButton <UButton
@ -79,69 +79,69 @@
<UPageCard variant="naked" :ui="pageCardUi"> <UPageCard variant="naked" :ui="pageCardUi">
<template #body> <template #body>
<div class="w-full min-w-0 max-w-full space-y-3"> <div class="overflow-hidden rounded-sm border border-default bg-default shadow-sm">
<div class="w-full min-w-0 max-w-full overflow-hidden"> <div
ref="logContainer"
class="logbox overflow-x-auto overflow-y-auto bg-elevated/30 font-mono text-sm text-default overscroll-x-contain"
@scroll.passive="handleScroll"
>
<div <div
ref="logContainer" v-if="reachedEnd && !hasActiveFilter"
class="logbox overflow-x-auto overflow-y-auto overscroll-x-contain" class="flex justify-center border-b border-default/40 px-4 py-3"
@scroll.passive="handleScroll"
> >
<div <div
:class="[ class="rounded-full border border-default bg-elevated/40 px-3 py-1 text-[11px] text-toned"
'space-y-2 font-mono text-[12px] leading-6 text-default',
textWrap ? 'w-full min-w-0' : 'w-max min-w-full',
]"
role="log"
aria-live="polite"
> >
<div v-if="reachedEnd && !hasActiveFilter" class="flex justify-center"> No older lines remain in this file.
<div </div>
class="rounded-full border border-default bg-muted/40 px-3 py-1 text-[11px] text-toned" </div>
>
No older lines remain in this file. <template v-if="filteredLogs.length > 0">
</div> <article
v-for="(entry, index) in filteredLogs"
:key="entry.log.id"
:class="logRowClass(entry, index)"
>
<div class="log-timestamp" :title="logTimeTitle(entry.log.datetime)">
{{ logTimeLabel(entry.log.datetime) }}
</div> </div>
<div v-if="filteredLogs.length > 0" class="space-y-1.5"> <div
<article class="log-content"
v-for="(entry, index) in filteredLogs" :class="textWrap ? 'log-content--wrap' : 'log-content--nowrap'"
:key="entry.log.id" >
:class="[ <span
logRowClass(entry, index), class="log-tone-dot"
textWrap ? 'log-row--wrap-fit' : 'log-row--nowrap-fit', :class="`log-tone-dot--${detectLogTone(entry.log.line)}`"
]"
>
<span class="log-timestamp" :title="logTimeTitle(entry.log.datetime)">
{{ logTimeLabel(entry.log.datetime) }}
</span>
<p class="log-line" :class="textWrap ? 'log-line--wrap' : 'log-line--nowrap'">
{{ entry.log.line }}
</p>
</article>
</div>
<div v-else class="space-y-3 font-sans text-sm leading-normal">
<UAlert
v-if="query"
color="warning"
variant="soft"
icon="i-lucide-search"
title="No Results"
:description="`No log lines found for the query: ${query}. Please try a different search term.`"
/>
<UAlert
v-else
color="warning"
variant="soft"
icon="i-lucide-circle-alert"
title="No log lines"
description="No log lines are available yet."
/> />
<p class="log-line" :class="textWrap ? 'log-line--wrap' : 'log-line--nowrap'">
{{ entry.log.line }}
</p>
</div> </div>
</article>
</template>
<div ref="bottomMarker" /> <div
v-else
class="flex min-h-[55vh] flex-col items-center justify-center gap-3 px-6 py-8 text-center font-sans"
>
<UIcon
:name="query ? 'i-lucide-filter-x' : 'i-lucide-circle-off'"
class="size-6 text-toned"
/>
<div class="space-y-1">
<p class="text-sm font-medium text-default">
{{ query ? 'No logs match this query' : 'No log lines available' }}
</p>
<p class="text-sm text-toned">
{{
query
? `No log lines found for the query: ${query}. Please try a different search term.`
: 'No log lines are available yet.'
}}
</p>
</div> </div>
</div> </div>
</div> </div>
@ -157,7 +157,7 @@ import type { EventSourceMessage } from '@microsoft/fetch-event-source';
import moment from 'moment'; import moment from 'moment';
import { useStorage } from '@vueuse/core'; import { useStorage } from '@vueuse/core';
import type { log_line } from '~/types/logs'; import type { log_line } from '~/types/logs';
import { disableOpacity, enableOpacity, parse_api_error, request, uri } from '~/utils'; import { parse_api_error, request, uri } from '~/utils';
import { requirePageShell } from '~/utils/topLevelNavigation'; import { requirePageShell } from '~/utils/topLevelNavigation';
type FilteredLogEntry = { type FilteredLogEntry = {
@ -178,7 +178,6 @@ const route = useRoute();
const pageShell = requirePageShell('logs'); const pageShell = requirePageShell('logs');
const logContainer = useTemplateRef<HTMLDivElement>('logContainer'); const logContainer = useTemplateRef<HTMLDivElement>('logContainer');
const bottomMarker = useTemplateRef<HTMLDivElement>('bottomMarker');
const textWrap = useStorage<boolean>('logs_wrap', true); const textWrap = useStorage<boolean>('logs_wrap', true);
const sseController = ref<AbortController | null>(null); const sseController = ref<AbortController | null>(null);
@ -277,6 +276,19 @@ const filteredLogs = computed<FilteredLogEntry[]>(() => {
return result; return result;
}); });
const scrollLogContainerToBottom = async (behavior: ScrollBehavior = 'auto'): Promise<void> => {
await nextTick();
if (!logContainer.value) {
return;
}
logContainer.value.scrollTo({
top: logContainer.value.scrollHeight,
behavior,
});
};
const fetchLogs = async (): Promise<void> => { const fetchLogs = async (): Promise<void> => {
loading.value = true; loading.value = true;
@ -311,11 +323,9 @@ const fetchLogs = async (): Promise<void> => {
reachedEnd.value = true; reachedEnd.value = true;
} }
nextTick(() => { if (autoScroll.value) {
if (autoScroll.value && bottomMarker.value) { await scrollLogContainerToBottom();
bottomMarker.value.scrollIntoView({ behavior: 'auto' }); }
}
});
} catch (error) { } catch (error) {
console.error('Failed to fetch logs:', error); console.error('Failed to fetch logs:', error);
} finally { } finally {
@ -347,11 +357,9 @@ const handleScroll = (): void => {
} }
}; };
const scrollToBottom = (fast = false): void => { const scrollToBottom = async (fast = false): Promise<void> => {
autoScroll.value = true; autoScroll.value = true;
nextTick(() => { await scrollLogContainerToBottom(fast ? 'auto' : 'smooth');
bottomMarker.value?.scrollIntoView({ behavior: fast ? 'auto' : 'smooth' });
});
}; };
const handleStreamMessage = (event: EventSourceMessage): void => { const handleStreamMessage = (event: EventSourceMessage): void => {
@ -372,11 +380,9 @@ const handleStreamMessage = (event: EventSourceMessage): void => {
logs.value.push(payload); logs.value.push(payload);
nextTick(() => { if (autoScroll.value) {
if (autoScroll.value && bottomMarker.value) { void scrollLogContainerToBottom('smooth');
bottomMarker.value.scrollIntoView({ behavior: 'smooth' }); }
}
});
}; };
const startLogStream = async (): Promise<void> => { const startLogStream = async (): Promise<void> => {
@ -483,14 +489,12 @@ onMounted(async () => {
return; return;
} }
disableOpacity();
await fetchLogs(); await fetchLogs();
await startLogStream(); await startLogStream();
}); });
onBeforeUnmount(() => { onBeforeUnmount(() => {
sseController.value?.abort(); sseController.value?.abort();
enableOpacity();
if (scrollTimeout) { if (scrollTimeout) {
clearTimeout(scrollTimeout); clearTimeout(scrollTimeout);
@ -507,67 +511,94 @@ onBeforeUnmount(() => {
min-height: 55vh; min-height: 55vh;
max-height: 60vh; max-height: 60vh;
background: transparent; background: transparent;
padding: 0.75rem;
} }
.log-row { .log-row {
display: flex; display: flex;
min-width: 0; min-width: 0;
align-items: flex-start; border-bottom: 1px solid color-mix(in oklab, var(--ui-border) 40%, transparent);
gap: 0.75rem;
border: 1px solid transparent;
border-radius: 0.75rem;
box-sizing: border-box; box-sizing: border-box;
padding: 0.625rem 0.75rem; background: transparent;
background: var(--ui-bg);
transition: transition:
background-color 0.15s ease, background-color 0.15s ease,
border-color 0.15s ease; border-color 0.15s ease;
} }
.log-row--wrap-fit { .log-row:last-child {
width: 100%; border-bottom: 0;
}
.log-row--nowrap-fit {
min-width: 100%;
width: max-content;
} }
.log-row--alt { .log-row--alt {
background: var(--ui-bg-elevated); background: color-mix(in oklab, var(--ui-bg-elevated) 40%, transparent);
} }
.log-row--match { .log-row--match {
border-color: color-mix(in oklab, var(--ui-warning) 35%, transparent); background: color-mix(in oklab, var(--ui-warning) 10%, var(--ui-bg-elevated) 90%);
background: color-mix(in oklab, var(--ui-warning) 12%, var(--ui-bg) 88%);
} }
.log-row--context { .log-row--context {
border-color: color-mix(in oklab, var(--ui-border) 75%, transparent); background: color-mix(in oklab, var(--ui-bg-muted) 30%, transparent);
background: color-mix(in oklab, var(--ui-bg-muted) 30%, var(--ui-bg) 70%);
} }
.log-row:hover { .log-row:hover {
border-color: var(--ui-border-accented); background: color-mix(in oklab, var(--ui-bg-elevated) 70%, var(--ui-bg-muted) 30%);
background: color-mix(in oklab, var(--ui-bg-elevated) 65%, var(--ui-bg-muted) 35%);
} }
.log-timestamp { .log-timestamp {
display: inline-flex; display: flex;
min-width: 4.75rem; width: 5.5rem;
min-width: 5.5rem;
flex-shrink: 0; flex-shrink: 0;
align-items: center; align-items: center;
justify-content: center; justify-content: flex-end;
border-radius: 0.5rem; border-right: 1px solid color-mix(in oklab, var(--ui-border) 40%, transparent);
border: 1px solid color-mix(in oklab, var(--ui-border) 80%, transparent); background: color-mix(in oklab, var(--ui-bg-elevated) 55%, transparent);
background: color-mix(in oklab, var(--ui-bg-muted) 50%, var(--ui-bg) 50%); padding: 0.65rem 0.75rem;
padding: 0.2rem 0.55rem;
font-size: 11px; font-size: 11px;
font-weight: 600; font-weight: 600;
color: var(--ui-text-toned); color: var(--ui-text-toned);
} }
.log-content {
display: flex;
min-width: 0;
flex: 1;
align-items: flex-start;
gap: 0.65rem;
padding: 0.65rem 0.75rem;
line-height: 1.6;
}
.log-content--nowrap {
width: max-content;
min-width: calc(100% - 5.5rem);
}
.log-tone-dot {
display: inline-flex;
width: 0.5rem;
min-width: 0.5rem;
height: 0.5rem;
margin-top: 0.45rem;
border-radius: 9999px;
}
.log-tone-dot--default {
background: color-mix(in oklab, var(--ui-text-toned) 55%, transparent);
}
.log-tone-dot--info {
background: var(--ui-info);
}
.log-tone-dot--warning {
background: var(--ui-warning);
}
.log-tone-dot--error {
background: var(--ui-error);
}
.log-line { .log-line {
flex: 1; flex: 1;
min-width: 0; min-width: 0;