FelisMC/Felis
2
0 Fork 0
Code Issues Pull Requests 6 Actions Packages Projects Releases Wiki Activity

style(panel): resolve double borders and uneven padding in server console

Browse Source
This commit is contained in:
Lemon-miaow committed 2026-07-03 21:55:25 +08:00
1 parent a8701c1853
commit f749c2c606
2 files changed
+16 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

panel/src/components/LogConsole.tsx
+2 -2
View File
@@ -47,7 +47,7 @@ function StatusIndicator({ status }: { status: StreamStatus }) {
* read history it stops yanking you down and offers a "Jump to latest" pill;
* scrolling back to the bottom re-pins. The buffer is bounded by the controller.
*/
export function LogConsole({ url }: { url: string }) {
export function LogConsole({ url, className }: { url: string; className?: string }) {
const { t } = useTranslation("servers");
const { lines, status, clear, reconnect } = useLogStream(url);
const scrollRef = useRef<HTMLDivElement>(null);
@@ -72,7 +72,7 @@ export function LogConsole({ url }: { url: string }) {
const jumpToLatest = useCallback(() => setPinned(true), []);
return (
<div className="overflow-hidden rounded-md border border-border bg-zinc-950 flex-1 flex flex-col min-h-0">
<div className={cn("overflow-hidden rounded-md border border-border bg-zinc-950 flex-1 flex flex-col min-h-0", className)}>
{/* Toolbar */}
<div className="flex items-center justify-between gap-2 border-b border-zinc-800 bg-zinc-900/60 px-3 py-2 shrink-0">
<StatusIndicator status={status} />
panel/src/pages/ServerConsole.tsx
+14 -14
View File
@@ -2,7 +2,7 @@ import { useState, useRef, useCallback, useLayoutEffect, type KeyboardEvent } fr
import { Link, useParams } from "react-router-dom";
import { ArrowLeft, Terminal, Moon, ShieldAlert, HelpCircle, Loader2, Users, Archive, ChevronRight, type LucideIcon } from "lucide-react";
import { useTranslation } from "react-i18next";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Card, CardContent } from "@/components/ui/card";
import { Button } from "@/components/ui/button";
import { PhaseBadge } from "@/components/PhaseBadge";
import { LogConsole } from "@/components/LogConsole";
@@ -240,29 +240,29 @@ export function ServerConsole() {
<div className="grid grid-cols-1 gap-6 lg:grid-cols-4 flex-1 lg:min-h-0 min-h-0">
{/* Left/Main column: Console */}
<div className="lg:col-span-3 flex flex-col lg:min-h-0 min-h-0 h-full">
<Card className="flex flex-col flex-1 lg:min-h-0 min-h-0">
<CardHeader className="py-3.5 shrink-0">
<CardTitle className="flex items-center gap-2 text-base">
<Terminal className="h-4 w-4" /> {t("console_card_title")}
</CardTitle>
</CardHeader>
<CardContent className="space-y-3 flex-1 flex flex-col lg:min-h-0 min-h-0 pb-4">
<Card className="flex flex-col flex-1 lg:min-h-0 min-h-0 overflow-hidden">
<CardContent className="p-0 flex-1 flex flex-col lg:min-h-0 min-h-0">
{!streamable ? (
<div className="flex-1 flex flex-col justify-center">
<div className="flex-1 flex flex-col justify-center p-6">
<NotStreaming phase={data.phase} />
</div>
) : cfg ? (
<div className="flex-1 flex flex-col lg:min-h-0 min-h-0 gap-3">
{/* key on name so navigating between servers remounts the viewport
(fresh stream + scroll state). useLogStream also resets its
controller when the url changes, so this is belt-and-suspenders. */}
<LogConsole key={name} url={consoleStreamURL(cfg.apiBase, name)} />
<div className="flex-1 flex flex-col lg:min-h-0 min-h-0">
<LogConsole
key={name}
url={consoleStreamURL(cfg.apiBase, name)}
className="border-0 rounded-none bg-transparent"
/>
{data.phase === "Running" && (
<div className="p-3 bg-zinc-950/50 border-t border-zinc-800">
<CommandInput name={name} />
</div>
)}
</div>
) : (
<div className="p-6">
<Loading />
</div>
)}
</CardContent>
</Card>