1
0
mirror of https://github.com/amir20/dozzle.git synced 2025-12-21 13:23:07 +01:00

feat: adds support for compact mode. fixes #2710 (#2712)

This commit is contained in:
Amir Raminfar
2024-01-18 09:04:58 -08:00
committed by GitHub
parent 0c33d0f921
commit 82765f4b68
12 changed files with 24 additions and 1 deletions

View File

@@ -20,6 +20,7 @@ declare global {
const autoResetRef: typeof import('@vueuse/core')['autoResetRef'] const autoResetRef: typeof import('@vueuse/core')['autoResetRef']
const automaticRedirect: typeof import('./stores/settings')['automaticRedirect'] const automaticRedirect: typeof import('./stores/settings')['automaticRedirect']
const collapseNav: typeof import('./stores/settings')['collapseNav'] const collapseNav: typeof import('./stores/settings')['collapseNav']
const compact: typeof import('./stores/settings')['compact']
const computed: typeof import('vue')['computed'] const computed: typeof import('vue')['computed']
const computedAsync: typeof import('@vueuse/core')['computedAsync'] const computedAsync: typeof import('@vueuse/core')['computedAsync']
const computedEager: typeof import('@vueuse/core')['computedEager'] const computedEager: typeof import('@vueuse/core')['computedEager']
@@ -375,6 +376,7 @@ declare module 'vue' {
readonly autoResetRef: UnwrapRef<typeof import('@vueuse/core')['autoResetRef']> readonly autoResetRef: UnwrapRef<typeof import('@vueuse/core')['autoResetRef']>
readonly automaticRedirect: UnwrapRef<typeof import('./stores/settings')['automaticRedirect']> readonly automaticRedirect: UnwrapRef<typeof import('./stores/settings')['automaticRedirect']>
readonly collapseNav: UnwrapRef<typeof import('./stores/settings')['collapseNav']> readonly collapseNav: UnwrapRef<typeof import('./stores/settings')['collapseNav']>
readonly compact: UnwrapRef<typeof import('./stores/settings')['compact']>
readonly computed: UnwrapRef<typeof import('vue')['computed']> readonly computed: UnwrapRef<typeof import('vue')['computed']>
readonly computedAsync: UnwrapRef<typeof import('@vueuse/core')['computedAsync']> readonly computedAsync: UnwrapRef<typeof import('@vueuse/core')['computedAsync']>
readonly computedEager: UnwrapRef<typeof import('@vueuse/core')['computedEager']> readonly computedEager: UnwrapRef<typeof import('@vueuse/core')['computedEager']>
@@ -722,6 +724,7 @@ declare module '@vue/runtime-core' {
readonly autoResetRef: UnwrapRef<typeof import('@vueuse/core')['autoResetRef']> readonly autoResetRef: UnwrapRef<typeof import('@vueuse/core')['autoResetRef']>
readonly automaticRedirect: UnwrapRef<typeof import('./stores/settings')['automaticRedirect']> readonly automaticRedirect: UnwrapRef<typeof import('./stores/settings')['automaticRedirect']>
readonly collapseNav: UnwrapRef<typeof import('./stores/settings')['collapseNav']> readonly collapseNav: UnwrapRef<typeof import('./stores/settings')['collapseNav']>
readonly compact: UnwrapRef<typeof import('./stores/settings')['compact']>
readonly computed: UnwrapRef<typeof import('vue')['computed']> readonly computed: UnwrapRef<typeof import('vue')['computed']>
readonly computedAsync: UnwrapRef<typeof import('@vueuse/core')['computedAsync']> readonly computedAsync: UnwrapRef<typeof import('@vueuse/core')['computedAsync']>
readonly computedEager: UnwrapRef<typeof import('@vueuse/core')['computedEager']> readonly computedEager: UnwrapRef<typeof import('@vueuse/core')['computedEager']>

View File

@@ -1,5 +1,5 @@
<template> <template>
<ul class="events group py-4" :class="{ 'disable-wrap': !softWrap, [size]: true }"> <ul class="events group py-4" :class="{ 'disable-wrap': !softWrap, [size]: true, compact }">
<li <li
v-for="item in messages" v-for="item in messages"
:key="item.id" :key="item.id"
@@ -57,5 +57,11 @@ defineProps<{
&.large { &.large {
@apply text-lg; @apply text-lg;
} }
&.compact {
> li {
@apply py-0;
}
}
} }
</style> </style>

View File

@@ -21,6 +21,8 @@
<section class="grid-cols-2 gap-4 @3xl:grid"> <section class="grid-cols-2 gap-4 @3xl:grid">
<div class="flex flex-col gap-2 text-balance @3xl:pr-8"> <div class="flex flex-col gap-2 text-balance @3xl:pr-8">
<toggle v-model="compact"> {{ $t("settings.compact") }} </toggle>
<toggle v-model="smallerScrollbars"> {{ $t("settings.small-scrollbars") }} </toggle> <toggle v-model="smallerScrollbars"> {{ $t("settings.small-scrollbars") }} </toggle>
<toggle v-model="showTimestamp">{{ $t("settings.show-timesamps") }}</toggle> <toggle v-model="showTimestamp">{{ $t("settings.show-timesamps") }}</toggle>
@@ -139,6 +141,7 @@ import { ComplexLogEntry, SimpleLogEntry } from "@/models/LogEntry";
import { import {
automaticRedirect, automaticRedirect,
compact,
hourStyle, hourStyle,
dateLocale, dateLocale,
lightTheme, lightTheme,

View File

@@ -3,6 +3,7 @@ import { toRefs } from "@vueuse/core";
export type Settings = { export type Settings = {
search: boolean; search: boolean;
size: "small" | "medium" | "large"; size: "small" | "medium" | "large";
compact: boolean;
menuWidth: number; menuWidth: number;
smallerScrollbars: boolean; smallerScrollbars: boolean;
showTimestamp: boolean; showTimestamp: boolean;
@@ -18,6 +19,7 @@ export type Settings = {
}; };
export const DEFAULT_SETTINGS: Settings = { export const DEFAULT_SETTINGS: Settings = {
search: true, search: true,
compact: false,
size: "medium", size: "medium",
menuWidth: 15, menuWidth: 15,
smallerScrollbars: false, smallerScrollbars: false,
@@ -37,6 +39,7 @@ export const settings = useProfileStorage("settings", DEFAULT_SETTINGS);
export const { export const {
collapseNav, collapseNav,
compact,
softWrap, softWrap,
hourStyle, hourStyle,
dateLocale, dateLocale,

View File

@@ -30,6 +30,7 @@ type Settings struct {
CollapseNav bool `json:"collapseNav"` CollapseNav bool `json:"collapseNav"`
AutomaticRedirect bool `json:"automaticRedirect"` AutomaticRedirect bool `json:"automaticRedirect"`
Size string `json:"size,omitempty"` Size string `json:"size,omitempty"`
Compact bool `json:"compact"`
LightTheme string `json:"lightTheme,omitempty"` LightTheme string `json:"lightTheme,omitempty"`
HourStyle string `json:"hourStyle,omitempty"` HourStyle string `json:"hourStyle,omitempty"`
DateLocale string `json:"dateLocale,omitempty"` DateLocale string `json:"dateLocale,omitempty"`

View File

@@ -80,6 +80,7 @@ settings:
Eine neue Version ist verfügbar! Aktualisiere auf <a href="{href}" target="_blank" rel="noreferrer noopener">{nextVersion}</a>. Eine neue Version ist verfügbar! Aktualisiere auf <a href="{href}" target="_blank" rel="noreferrer noopener">{nextVersion}</a>.
show-std: Zeige stdout und stderr Labels show-std: Zeige stdout und stderr Labels
automatic-redirect: Automatische Weiterleitung zu neuen Containern mit demselben Namen automatic-redirect: Automatische Weiterleitung zu neuen Containern mit demselben Namen
compact: Aktiviere den kompakten Modus für Logs
releases: releases:
features: Ein neues Feature | {count} Features features: Ein neues Feature | {count} Features
bugFixes: Ein Bug Fix | {count} Fixes bugFixes: Ein Bug Fix | {count} Fixes

View File

@@ -82,6 +82,7 @@ settings:
rel="noreferrer noopener">{nextVersion}</a>. rel="noreferrer noopener">{nextVersion}</a>.
show-std: Show stdout and stderr labels show-std: Show stdout and stderr labels
automatic-redirect: Automatically redirect to new containers with the same name automatic-redirect: Automatically redirect to new containers with the same name
compact: Enable compact mode for logs
releases: releases:
features: one new feature | {count} features features: one new feature | {count} features
bugFixes: one bug fix | {count} fixes bugFixes: one bug fix | {count} fixes

View File

@@ -82,6 +82,7 @@ settings:
<a href="{href}" target="_blank" rel="noreferrer noopener">{nextVersion}</a>. <a href="{href}" target="_blank" rel="noreferrer noopener">{nextVersion}</a>.
show-std: Mostrar etiquetas de salida estándar y salida de error estándar show-std: Mostrar etiquetas de salida estándar y salida de error estándar
automatic-redirect: Redireccionar automáticamente a nuevos contenedores con el mismo nombre automatic-redirect: Redireccionar automáticamente a nuevos contenedores con el mismo nombre
compact: Modo compacto
releases: releases:
features: Características features: Características
bugFixes: Correcciones de errores bugFixes: Correcciones de errores

View File

@@ -77,3 +77,4 @@ settings:
<a href="{href}" target="_blank" rel="noreferrer noopener">{nextVersion}</a>. <a href="{href}" target="_blank" rel="noreferrer noopener">{nextVersion}</a>.
show-std: Mostrar etiquetas de saída padrão e saída de erro padrão show-std: Mostrar etiquetas de saída padrão e saída de erro padrão
automatic-redirect: Redirecionar automaticamente para novos contentores com o mesmo nome automatic-redirect: Redirecionar automaticamente para novos contentores com o mesmo nome
compact: Compactar a interface do utilizador

View File

@@ -75,3 +75,4 @@ settings:
Доступна новая версия! Обновить до <a href="{href}" target="_blank" rel="noreferrer noopener">{nextVersion}</a>. Доступна новая версия! Обновить до <a href="{href}" target="_blank" rel="noreferrer noopener">{nextVersion}</a>.
show-std: Показывать метки stdout и stderr show-std: Показывать метки stdout и stderr
automatic-redirect: Автоматическое перенаправление на новые контейнеры с тем же именем. automatic-redirect: Автоматическое перенаправление на новые контейнеры с тем же именем.
compact: Компактный режим

View File

@@ -57,3 +57,4 @@ settings:
update-available: >- update-available: >-
有新版本可用!請更新至 <a href="{href}" target="_blank" rel="noreferrer noopener">{nextVersion}</a>。 有新版本可用!請更新至 <a href="{href}" target="_blank" rel="noreferrer noopener">{nextVersion}</a>。
show-std: 顯示 stdout 和 stderr 標籤 show-std: 顯示 stdout 和 stderr 標籤
compact: 緊湊模式

View File

@@ -75,5 +75,6 @@ settings:
新版本可用!更新到 <a href="{href}" rel="noreferrer noopener">{nextVersion}</a>。 新版本可用!更新到 <a href="{href}" rel="noreferrer noopener">{nextVersion}</a>。
show-std: 显示stdout和stderr标签 show-std: 显示stdout和stderr标签
automatic-redirect: 自动重定向到同名的新容器 automatic-redirect: 自动重定向到同名的新容器
compact: 紧凑模式
log_actions: log_actions:
copy_log: 复制日志 copy_log: 复制日志