feat: continued improvements

This commit is contained in:
LukeGus
2026-05-14 00:55:12 -05:00
parent 2a45cfea9a
commit c26288e024
51 changed files with 2933 additions and 9103 deletions
@@ -1,13 +1,5 @@
import React, { useState } from "react";
import {
Card,
CardContent,
CardDescription,
CardHeader,
CardTitle,
} from "@/components/card.tsx";
import { Button } from "@/components/button.tsx";
import { Alert, AlertDescription, AlertTitle } from "@/components/alert.tsx";
import { Shield, AlertTriangle, Copy, Check } from "lucide-react";
import { useTranslation } from "react-i18next";
@@ -57,9 +49,8 @@ export function HostKeyVerificationDialog({
}
};
const formatFingerprint = (fp: string) => {
return fp.match(/.{1,2}/g)?.join(":") || fp;
};
const formatFingerprint = (fp: string) =>
fp.match(/.{1,2}/g)?.join(":") || fp;
return (
<div className="absolute inset-0 flex items-center justify-center z-500 animate-in fade-in duration-200">
@@ -67,119 +58,125 @@ export function HostKeyVerificationDialog({
className="absolute inset-0 bg-canvas rounded-md"
style={{ backgroundColor: backgroundColor || undefined }}
/>
<Card className="w-full max-w-2xl mx-4 border-2 relative z-10 animate-in fade-in zoom-in-95 duration-200">
<CardHeader>
<div className="bg-card border border-border w-full max-w-lg mx-4 relative z-10 animate-in fade-in zoom-in-95 duration-200">
<div className="p-4 border-b border-border">
<div className="flex items-center gap-2">
{scenario === "new" ? (
<Shield className="w-5 h-5" />
<Shield className="size-4 text-accent-brand" />
) : (
<AlertTriangle className="w-5 h-5 text-destructive" />
<AlertTriangle className="size-4 text-destructive" />
)}
<CardTitle>
<h3 className="text-xs font-bold uppercase tracking-widest">
{scenario === "new"
? t("hostKey.verifyNewHost")
: t("hostKey.keyChangedWarning")}
</CardTitle>
</h3>
</div>
<CardDescription>
<p className="text-[10px] font-mono font-bold tracking-tight text-muted-foreground mt-1">
{hostname || ip}:{port}
</CardDescription>
</CardHeader>
</p>
</div>
<CardContent className="space-y-4">
<div className="p-4 flex flex-col gap-4">
{scenario === "new" ? (
<>
<Alert>
<Shield className="h-4 w-4" />
<AlertTitle>{t("hostKey.firstConnectionTitle")}</AlertTitle>
<AlertDescription>
{t("hostKey.firstConnectionDescription")}
</AlertDescription>
</Alert>
<div className="space-y-2">
<div className="text-sm font-medium">
{t("hostKey.fingerprint")} ({algorithm.toUpperCase()})
<div className="flex items-start gap-3 p-3 border border-border bg-muted/10">
<Shield className="size-4 text-accent-brand shrink-0 mt-0.5" />
<div>
<p className="text-[10px] font-bold uppercase tracking-widest">
{t("hostKey.firstConnectionTitle")}
</p>
<p className="text-xs text-muted-foreground mt-1">
{t("hostKey.firstConnectionDescription")}
</p>
</div>
</div>
<div className="flex flex-col gap-1.5">
<p className="text-[10px] font-bold uppercase tracking-widest text-muted-foreground">
{t("hostKey.fingerprint")} ({algorithm.toUpperCase()})
</p>
<div className="flex items-center gap-2">
<div className="flex-1 rounded-md bg-muted p-3 font-mono text-xs break-all">
<div className="flex-1 bg-muted/50 border border-border p-3 font-mono text-xs break-all">
{formatFingerprint(fingerprint)}
</div>
<Button
variant="ghost"
size="sm"
size="icon"
onClick={() => copyToClipboard(fingerprint)}
className="shrink-0"
className="rounded-none shrink-0"
>
{copiedFingerprint ? (
<Check className="h-4 w-4" />
<Check className="size-4 text-accent-brand" />
) : (
<Copy className="h-4 w-4" />
<Copy className="size-4" />
)}
</Button>
</div>
</div>
<Alert>
<AlertDescription>
{t("hostKey.verifyInstructions")}
</AlertDescription>
</Alert>
<p className="text-[10px] text-muted-foreground">
{t("hostKey.verifyInstructions")}
</p>
</>
) : (
<>
<Alert variant="destructive">
<AlertTriangle className="h-4 w-4" />
<AlertTitle>{t("hostKey.securityWarning")}</AlertTitle>
<AlertDescription>
{t("hostKey.keyChangedDescription")}
</AlertDescription>
</Alert>
<div className="flex items-start gap-3 p-3 border border-destructive/20 bg-destructive/10">
<AlertTriangle className="size-4 text-destructive shrink-0 mt-0.5" />
<div>
<p className="text-[10px] font-bold uppercase tracking-widest text-destructive">
{t("hostKey.securityWarning")}
</p>
<p className="text-xs text-destructive/80 mt-1">
{t("hostKey.keyChangedDescription")}
</p>
</div>
</div>
<div className="space-y-3">
<div className="space-y-2">
<div className="text-sm font-medium">
<div className="flex flex-col gap-3">
<div className="flex flex-col gap-1.5">
<p className="text-[10px] font-bold uppercase tracking-widest text-muted-foreground">
{t("hostKey.previousKey")}
</div>
</p>
<div className="flex items-center gap-2">
<div className="flex-1 rounded-md bg-muted p-3 font-mono text-xs break-all">
<div className="flex-1 bg-muted/50 border border-border p-3 font-mono text-xs break-all">
{formatFingerprint(oldFingerprint || "")}
</div>
<Button
variant="ghost"
size="sm"
size="icon"
onClick={() =>
copyToClipboard(oldFingerprint || "", true)
}
className="shrink-0"
className="rounded-none shrink-0"
>
{copiedOldFingerprint ? (
<Check className="h-4 w-4" />
<Check className="size-4 text-accent-brand" />
) : (
<Copy className="h-4 w-4" />
<Copy className="size-4" />
)}
</Button>
</div>
</div>
<div className="space-y-2">
<div className="text-sm font-medium">
<div className="flex flex-col gap-1.5">
<p className="text-[10px] font-bold uppercase tracking-widest text-muted-foreground">
{t("hostKey.newFingerprint")}
</div>
</p>
<div className="flex items-center gap-2">
<div className="flex-1 rounded-md bg-muted p-3 font-mono text-xs break-all">
<div className="flex-1 bg-muted/50 border border-border p-3 font-mono text-xs break-all">
{formatFingerprint(fingerprint)}
</div>
<Button
variant="ghost"
size="sm"
size="icon"
onClick={() => copyToClipboard(fingerprint)}
className="shrink-0"
className="rounded-none shrink-0"
>
{copiedFingerprint ? (
<Check className="h-4 w-4" />
<Check className="size-4 text-accent-brand" />
) : (
<Copy className="h-4 w-4" />
<Copy className="size-4" />
)}
</Button>
</div>
@@ -187,29 +184,33 @@ export function HostKeyVerificationDialog({
</div>
</>
)}
</div>
<div className="flex gap-3 pt-4">
<Button
type="button"
variant="outline"
onClick={onReject}
className="flex-1"
>
{t("common.cancel")}
</Button>
<Button
type="button"
onClick={onAccept}
variant={scenario === "changed" ? "destructive" : "default"}
className="flex-1"
>
{scenario === "new"
? t("hostKey.acceptAndContinue")
: t("hostKey.acceptNewKey")}
</Button>
</div>
</CardContent>
</Card>
<div className="p-4 border-t border-border flex justify-end gap-2">
<Button
type="button"
variant="ghost"
onClick={onReject}
className="rounded-none text-[10px] font-bold uppercase tracking-widest"
>
{t("common.cancel")}
</Button>
<Button
type="button"
onClick={onAccept}
variant="outline"
className={
scenario === "changed"
? "border-destructive/40 text-destructive hover:bg-destructive/10 rounded-none text-[10px] font-bold uppercase tracking-widest"
: "border-accent-brand/40 text-accent-brand hover:bg-accent-brand/10 rounded-none text-[10px] font-bold uppercase tracking-widest"
}
>
{scenario === "new"
? t("hostKey.acceptAndContinue")
: t("hostKey.acceptNewKey")}
</Button>
</div>
</div>
</div>
);
}
+70 -52
View File
@@ -28,6 +28,7 @@ export function OPKSSHDialog({
backgroundColor,
}: OPKSSHDialogProps) {
const { t } = useTranslation();
if (!isOpen) return null;
return (
@@ -36,30 +37,34 @@ export function OPKSSHDialog({
className="absolute inset-0 bg-canvas rounded-md"
style={{ backgroundColor: backgroundColor || undefined }}
/>
<div className="bg-elevated border-2 border-edge rounded-lg p-6 max-w-xl w-full mx-4 relative z-10 animate-in fade-in zoom-in-95 duration-200">
<div className="mb-4 flex items-center gap-2">
<Shield className="w-5 h-5 text-primary" />
<h3 className="text-lg font-semibold">
{t("terminal.opksshAuthRequired")}
</h3>
<div className="bg-card border border-border w-full max-w-md mx-4 relative z-10 animate-in fade-in zoom-in-95 duration-200">
<div className="p-4 border-b border-border">
<div className="flex items-center gap-2">
<Shield className="size-4 text-accent-brand" />
<h3 className="text-xs font-bold uppercase tracking-widest">
{t("terminal.opksshAuthRequired")}
</h3>
</div>
{stage === "chooser" && (
<p className="text-[10px] font-bold uppercase tracking-tight text-muted-foreground mt-1">
{t("terminal.opksshAuthDescription")}
</p>
)}
</div>
<div className="space-y-4">
<div className="p-4 flex flex-col gap-4">
{stage === "chooser" && (
<>
<p className="text-muted-foreground">
{t("terminal.opksshAuthDescription")}
</p>
{providers && providers.length > 0 && onSelectProvider ? (
<div className="space-y-2">
<div className="flex flex-col gap-2">
{providers.map((provider) => (
<Button
key={provider.alias}
type="button"
variant="outline"
onClick={() => onSelectProvider(provider.alias)}
className="w-full flex items-center justify-center gap-2"
className="border-accent-brand/40 text-accent-brand hover:bg-accent-brand/10 rounded-none text-[10px] font-bold uppercase tracking-widest w-full flex items-center gap-2"
>
<ExternalLink className="w-4 h-4" />
<ExternalLink className="size-3.5" />
{t("terminal.opksshSignInWith", {
provider:
provider.alias.charAt(0).toUpperCase() +
@@ -67,61 +72,74 @@ export function OPKSSHDialog({
})}
</Button>
))}
<Button
type="button"
variant="outline"
className="w-full"
onClick={onCancel}
>
{t("common.cancel")}
</Button>
</div>
) : authUrl ? (
<div>
<div className="flex gap-2 pt-2">
<Button
type="button"
onClick={onOpenUrl}
className="flex-1 flex items-center justify-center gap-2"
>
<ExternalLink className="w-4 h-4" />
{t("terminal.opksshOpenBrowser")}
</Button>
<Button type="button" variant="outline" onClick={onCancel}>
{t("common.cancel")}
</Button>
</div>
</div>
<Button
type="button"
variant="outline"
onClick={onOpenUrl}
className="border-accent-brand/40 text-accent-brand hover:bg-accent-brand/10 rounded-none text-[10px] font-bold uppercase tracking-widest w-full flex items-center gap-2"
>
<ExternalLink className="size-3.5" />
{t("terminal.opksshOpenBrowser")}
</Button>
) : null}
<div className="flex justify-end">
<Button
type="button"
variant="ghost"
onClick={onCancel}
className="rounded-none text-[10px] font-bold uppercase tracking-widest"
>
{t("common.cancel")}
</Button>
</div>
</>
)}
{(stage === "waiting" || stage === "authenticating") && (
<div className="flex items-center gap-3 py-4">
<Loader2 className="w-5 h-5 animate-spin text-primary" />
<p className="text-muted-foreground">
{stage === "waiting"
? t("terminal.opksshWaitingForAuth")
: t("terminal.opksshAuthenticating")}
</p>
</div>
<>
<div className="flex items-center gap-3 py-2">
<Loader2 className="size-4 animate-spin text-accent-brand shrink-0" />
<p className="text-xs text-muted-foreground">
{stage === "waiting"
? t("terminal.opksshWaitingForAuth")
: t("terminal.opksshAuthenticating")}
</p>
</div>
<div className="flex justify-end">
<Button
type="button"
variant="ghost"
onClick={onCancel}
className="rounded-none text-[10px] font-bold uppercase tracking-widest"
>
{t("common.cancel")}
</Button>
</div>
</>
)}
{stage === "error" && error && (
<>
<div className="flex items-start gap-3 p-4 bg-destructive/10 border border-destructive/20 rounded-md">
<AlertCircle className="w-5 h-5 text-destructive flex-shrink-0 mt-0.5" />
<div className="flex-1">
<p className="text-sm font-medium text-destructive">
<div className="flex items-start gap-3 p-3 border border-destructive/20 bg-destructive/10">
<AlertCircle className="size-4 text-destructive shrink-0 mt-0.5" />
<div className="flex-1 min-w-0">
<p className="text-[10px] font-bold uppercase tracking-widest text-destructive">
{t("common.error")}
</p>
<p className="text-sm text-destructive/90 mt-1 whitespace-pre-wrap break-words">
<p className="text-xs text-destructive/90 mt-1 whitespace-pre-wrap break-words">
{error}
</p>
</div>
</div>
<div className="flex justify-end pt-2">
<Button type="button" variant="outline" onClick={onCancel}>
<div className="flex justify-end">
<Button
type="button"
variant="ghost"
onClick={onCancel}
className="rounded-none text-[10px] font-bold uppercase tracking-widest"
>
{t("common.close")}
</Button>
</div>
+33 -29
View File
@@ -1,7 +1,6 @@
import React from "react";
import { Button } from "@/components/button.tsx";
import { PasswordInput } from "@/components/password-input.tsx";
import { Label } from "@/components/label.tsx";
import { KeyRound } from "lucide-react";
import { useTranslation } from "react-i18next";
@@ -28,58 +27,63 @@ export function PassphraseDialog({
? `${hostInfo.name} (${hostInfo.username}@${hostInfo.ip}:${hostInfo.port})`
: `${hostInfo.username}@${hostInfo.ip}:${hostInfo.port}`;
const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
e.preventDefault();
const input = e.currentTarget.elements.namedItem(
"passphrase",
) as HTMLInputElement;
if (input?.value) {
onSubmit(input.value);
}
};
return (
<div className="absolute inset-0 flex items-center justify-center z-500 animate-in fade-in duration-200">
<div
className="absolute inset-0 bg-canvas rounded-md"
style={{ backgroundColor: backgroundColor || undefined }}
/>
<div className="bg-elevated border-2 border-edge rounded-lg p-6 max-w-md w-full mx-4 relative z-10 animate-in fade-in zoom-in-95 duration-200">
<div className="mb-4">
<div className="bg-card border border-border w-full max-w-sm mx-4 relative z-10 animate-in fade-in zoom-in-95 duration-200">
<div className="p-4 border-b border-border">
<div className="flex items-center gap-2">
<KeyRound className="w-5 h-5 text-primary" />
<h3 className="text-lg font-semibold">
<KeyRound className="size-4 text-accent-brand" />
<h3 className="text-xs font-bold uppercase tracking-widest">
{t("auth.passphraseRequired")}
</h3>
</div>
<p className="text-sm text-muted-foreground mt-1">{hostDisplay}</p>
<p className="text-[10px] font-mono font-bold tracking-tight text-muted-foreground mt-1">
{hostDisplay}
</p>
</div>
<form
onSubmit={(e) => {
e.preventDefault();
const input = e.currentTarget.elements.namedItem(
"passphrase",
) as HTMLInputElement;
if (input && input.value) {
onSubmit(input.value);
}
}}
className="space-y-4"
>
<div>
<Label htmlFor="passphrase">
{t("auth.passphraseRequiredDescription")}
</Label>
<form onSubmit={handleSubmit} className="p-4 flex flex-col gap-4">
<div className="flex flex-col gap-1.5">
<PasswordInput
id="passphrase"
name="passphrase"
autoFocus
placeholder={t("placeholders.keyPassword")}
className="mt-1.5"
className="rounded-none bg-muted/50 border-border text-xs"
/>
<p className="text-[10px] text-muted-foreground">
{t("auth.passphraseRequiredDescription")}
</p>
</div>
<div className="flex gap-2">
<Button type="submit" className="flex-1">
{t("common.connect")}
</Button>
<div className="flex justify-end gap-2">
<Button
type="button"
variant="outline"
variant="ghost"
onClick={onCancel}
className="flex-1"
className="rounded-none text-[10px] font-bold uppercase tracking-widest"
>
{t("common.cancel")}
</Button>
<Button
type="submit"
variant="outline"
className="border-accent-brand/40 text-accent-brand hover:bg-accent-brand/10 rounded-none text-[10px] font-bold uppercase tracking-widest"
>
{t("common.connect")}
</Button>
</div>
</form>
</div>
+132 -121
View File
@@ -1,15 +1,7 @@
import React, { useState } from "react";
import {
Card,
CardContent,
CardDescription,
CardHeader,
CardTitle,
} from "@/components/card.tsx";
import { Button } from "@/components/button.tsx";
import { PasswordInput } from "@/components/password-input.tsx";
import { Label } from "@/components/label.tsx";
import { Alert, AlertDescription, AlertTitle } from "@/components/alert.tsx";
import {
Tabs,
TabsContent,
@@ -46,7 +38,7 @@ export function SSHAuthDialog({
onSubmit,
onCancel,
hostInfo,
backgroundColor = "var(--bg-base)",
backgroundColor,
}: SSHAuthDialogProps) {
const { t } = useTranslation();
const [authTab, setAuthTab] = useState<"password" | "key">("password");
@@ -57,6 +49,10 @@ export function SSHAuthDialog({
if (!isOpen) return null;
const hostDisplay = hostInfo.name
? `${hostInfo.name} (${hostInfo.username}@${hostInfo.ip}:${hostInfo.port})`
: `${hostInfo.username}@${hostInfo.ip}:${hostInfo.port}`;
const getReasonMessage = () => {
switch (reason) {
case "no_keyboard":
@@ -83,30 +79,26 @@ export function SSHAuthDialog({
}
};
const canSubmit = () =>
authTab === "password" ? password !== "" : sshKey.trim() !== "";
const handleSubmit = async (e: React.FormEvent) => {
e.preventDefault();
setLoading(true);
try {
const credentials: {
password?: string;
sshKey?: string;
keyPassword?: string;
} = {};
if (authTab === "password") {
if (password !== "") {
credentials.password = password;
}
if (password !== "") credentials.password = password;
} else {
if (sshKey.trim()) {
credentials.sshKey = sshKey;
if (keyPassword.trim()) {
credentials.keyPassword = keyPassword;
}
if (keyPassword.trim()) credentials.keyPassword = keyPassword;
}
}
onSubmit(credentials);
} finally {
setLoading(false);
@@ -119,110 +111,128 @@ export function SSHAuthDialog({
const file = e.target.files?.[0];
if (file) {
try {
const fileContent = await file.text();
setSshKey(fileContent);
setSshKey(await file.text());
} catch (error) {
console.error("Failed to read SSH key file:", error);
}
}
};
const canSubmit = () => {
if (authTab === "password") {
return password !== "";
} else {
return sshKey.trim() !== "";
}
};
const hostDisplay = hostInfo.name
? `${hostInfo.name} (${hostInfo.username}@${hostInfo.ip}:${hostInfo.port})`
: `${hostInfo.username}@${hostInfo.ip}:${hostInfo.port}`;
return (
<div
className="absolute inset-0 z-9999 flex items-center justify-center bg-canvas animate-in fade-in duration-200"
style={{ backgroundColor }}
>
<Card className="w-full max-w-2xl mx-4 border-2 animate-in fade-in zoom-in-95 duration-200">
<CardHeader>
<CardTitle className="flex items-center gap-2">
<Shield className="w-5 h-5" />
{t("auth.sshAuthenticationRequired")}
</CardTitle>
<CardDescription>{hostDisplay}</CardDescription>
</CardHeader>
<CardContent className="space-y-4">
<Alert variant={reason === "auth_failed" ? "destructive" : "default"}>
<AlertCircle className="h-4 w-4" />
<AlertTitle>{getReasonMessage()}</AlertTitle>
<AlertDescription>{getReasonDescription()}</AlertDescription>
</Alert>
<div className="absolute inset-0 flex items-center justify-center z-500 animate-in fade-in duration-200">
<div
className="absolute inset-0 bg-canvas rounded-md"
style={{ backgroundColor: backgroundColor || undefined }}
/>
<div className="bg-card border border-border w-full max-w-xl mx-4 relative z-10 animate-in fade-in zoom-in-95 duration-200">
<div className="p-4 border-b border-border">
<div className="flex items-center gap-2">
<Shield className="size-4 text-accent-brand" />
<h3 className="text-xs font-bold uppercase tracking-widest">
{t("auth.sshAuthenticationRequired")}
</h3>
</div>
<p className="text-[10px] font-mono font-bold tracking-tight text-muted-foreground mt-1">
{hostDisplay}
</p>
</div>
<form onSubmit={handleSubmit}>
<div className="p-4 flex flex-col gap-4">
<div
className={`flex items-start gap-3 p-3 border ${
reason === "auth_failed"
? "border-destructive/20 bg-destructive/10"
: "border-border bg-muted/10"
}`}
>
<AlertCircle
className={`size-4 shrink-0 mt-0.5 ${reason === "auth_failed" ? "text-destructive" : "text-accent-brand"}`}
/>
<div>
<p
className={`text-[10px] font-bold uppercase tracking-widest ${reason === "auth_failed" ? "text-destructive" : ""}`}
>
{getReasonMessage()}
</p>
<p
className={`text-xs mt-1 ${reason === "auth_failed" ? "text-destructive/80" : "text-muted-foreground"}`}
>
{getReasonDescription()}
</p>
</div>
</div>
<form onSubmit={handleSubmit} className="space-y-4">
<Tabs
value={authTab}
onValueChange={(v) => setAuthTab(v as "password" | "key")}
>
<TabsList className="grid w-full grid-cols-2">
<TabsTrigger value="password">
<TabsList className="w-full rounded-none">
<TabsTrigger
value="password"
className="flex-1 rounded-none text-[10px] font-bold uppercase tracking-widest"
>
{t("credentials.password")}
</TabsTrigger>
<TabsTrigger value="key">{t("credentials.sshKey")}</TabsTrigger>
<TabsTrigger
value="key"
className="flex-1 rounded-none text-[10px] font-bold uppercase tracking-widest"
>
{t("credentials.sshKey")}
</TabsTrigger>
</TabsList>
<TabsContent value="password" className="space-y-4 mt-4">
<div className="space-y-2">
<Label htmlFor="ssh-password">
{t("credentials.password")}
</Label>
<PasswordInput
id="ssh-password"
placeholder={t("placeholders.enterPassword")}
value={password}
onChange={(e) => setPassword(e.target.value)}
autoFocus
/>
<p className="text-sm text-muted-foreground">
{t("auth.sshPasswordDescription")}
</p>
</div>
<TabsContent
value="password"
className="mt-3 flex flex-col gap-2"
>
<Label className="text-[10px] font-bold uppercase tracking-widest text-muted-foreground">
{t("credentials.password")}
</Label>
<PasswordInput
placeholder={t("placeholders.enterPassword")}
value={password}
onChange={(e) => setPassword(e.target.value)}
autoFocus
className="rounded-none bg-muted/50 border-border text-xs"
/>
<p className="text-[10px] text-muted-foreground">
{t("auth.sshPasswordDescription")}
</p>
</TabsContent>
<TabsContent value="key" className="space-y-4 mt-4">
<div className="space-y-2">
<Label htmlFor="ssh-key">
<TabsContent value="key" className="mt-3 flex flex-col gap-3">
<div className="flex flex-col gap-2">
<Label className="text-[10px] font-bold uppercase tracking-widest text-muted-foreground">
{t("credentials.sshPrivateKey")}
</Label>
<div className="mb-2">
<div className="relative inline-block w-full">
<input
id="key-upload"
type="file"
accept="*,.pem,.key,.txt,.ppk"
onChange={handleKeyFileUpload}
className="absolute inset-0 w-full h-full opacity-0 cursor-pointer"
/>
<Button
type="button"
variant="outline"
className="w-full justify-start text-left"
>
<Upload className="w-4 h-4 mr-2" />
<span className="truncate">
{t("credentials.uploadPrivateKeyFile")}
</span>
</Button>
</div>
<div className="relative">
<input
id="key-upload"
type="file"
accept="*,.pem,.key,.txt,.ppk"
onChange={handleKeyFileUpload}
className="absolute inset-0 w-full h-full opacity-0 cursor-pointer"
/>
<Button
type="button"
variant="outline"
className="w-full justify-start rounded-none text-[10px] font-bold uppercase tracking-widest border-border"
>
<Upload className="size-3.5 mr-2" />
<span className="truncate">
{t("credentials.uploadPrivateKeyFile")}
</span>
</Button>
</div>
<CodeMirror
value={sshKey}
onChange={(value) => setSshKey(value)}
placeholder={t("placeholders.pastePrivateKey")}
theme={oneDark}
className="border border-input rounded-md"
minHeight="200px"
maxHeight="300px"
className="border border-border text-xs"
minHeight="160px"
maxHeight="260px"
basicSetup={{
lineNumbers: true,
foldGutter: false,
@@ -245,44 +255,45 @@ export function SSHAuthDialog({
/>
</div>
<div className="space-y-2">
<Label htmlFor="ssh-key-password">
<div className="flex flex-col gap-2">
<Label className="text-[10px] font-bold uppercase tracking-widest text-muted-foreground">
{t("credentials.keyPassword")} ({t("common.optional")})
</Label>
<PasswordInput
id="ssh-key-password"
placeholder={t("placeholders.keyPassword")}
value={keyPassword}
onChange={(e) => setKeyPassword(e.target.value)}
className="rounded-none bg-muted/50 border-border text-xs"
/>
<p className="text-sm text-muted-foreground">
<p className="text-[10px] text-muted-foreground">
{t("auth.sshKeyPasswordDescription")}
</p>
</div>
</TabsContent>
</Tabs>
</div>
<div className="flex gap-3 pt-4">
<Button
type="button"
variant="outline"
onClick={onCancel}
disabled={loading}
className="flex-1"
>
{t("common.cancel")}
</Button>
<Button
type="submit"
disabled={!canSubmit() || loading}
className="flex-1"
>
{loading ? t("common.connecting") : t("common.connect")}
</Button>
</div>
</form>
</CardContent>
</Card>
<div className="p-4 border-t border-border flex justify-end gap-2">
<Button
type="button"
variant="ghost"
onClick={onCancel}
disabled={loading}
className="rounded-none text-[10px] font-bold uppercase tracking-widest"
>
{t("common.cancel")}
</Button>
<Button
type="submit"
variant="outline"
disabled={!canSubmit() || loading}
className="border-accent-brand/40 text-accent-brand hover:bg-accent-brand/10 rounded-none text-[10px] font-bold uppercase tracking-widest"
>
{loading ? t("common.connecting") : t("common.connect")}
</Button>
</div>
</form>
</div>
</div>
);
}
+39 -37
View File
@@ -1,7 +1,6 @@
import React from "react";
import { Button } from "@/components/button.tsx";
import { Input } from "@/components/input.tsx";
import { Label } from "@/components/label.tsx";
import { Shield } from "lucide-react";
import { useTranslation } from "react-i18next";
@@ -23,59 +22,62 @@ export function TOTPDialog({
if (!isOpen) return null;
const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
e.preventDefault();
const input = e.currentTarget.elements.namedItem(
"totpCode",
) as HTMLInputElement;
if (input?.value.trim()) {
onSubmit(input.value.trim());
}
};
return (
<div className="absolute inset-0 flex items-center justify-center z-500 animate-in fade-in duration-200">
<div
className="absolute inset-0 bg-canvas rounded-md"
style={{ backgroundColor: backgroundColor || undefined }}
/>
<div className="bg-elevated border-2 border-edge rounded-lg p-6 max-w-md w-full mx-4 relative z-10 animate-in fade-in zoom-in-95 duration-200">
<div className="mb-4">
<div className="bg-card border border-border w-full max-w-sm mx-4 relative z-10 animate-in fade-in zoom-in-95 duration-200">
<div className="p-4 border-b border-border">
<div className="flex items-center gap-2">
<Shield className="w-5 h-5 text-primary" />
<h3 className="text-lg font-semibold">
<Shield className="size-4 text-accent-brand" />
<h3 className="text-xs font-bold uppercase tracking-widest">
{t("terminal.totpRequired")}
</h3>
</div>
<p className="text-[10px] font-bold uppercase tracking-tight text-muted-foreground mt-1">
{t("terminal.totpCodeLabel")}
</p>
</div>
<form
onSubmit={(e) => {
e.preventDefault();
const input = e.currentTarget.elements.namedItem(
"totpCode",
) as HTMLInputElement;
if (input && input.value.trim()) {
onSubmit(input.value.trim());
}
}}
className="space-y-4"
>
<div>
<Label htmlFor="totpCode">{t("terminal.totpCodeLabel")}</Label>
<Input
id="totpCode"
name="totpCode"
type="text"
autoFocus
maxLength={6}
pattern="[0-9]*"
inputMode="numeric"
placeholder="000000"
className="text-center text-lg tracking-widest mt-1.5"
/>
</div>
<div className="flex gap-2">
<Button type="submit" className="flex-1">
{t("terminal.totpVerify")}
</Button>
<form onSubmit={handleSubmit} className="p-4 flex flex-col gap-4">
<Input
id="totpCode"
name="totpCode"
type="text"
autoFocus
maxLength={6}
pattern="[0-9]*"
inputMode="numeric"
placeholder="000000"
className="rounded-none bg-muted/50 border-border text-center text-sm tracking-widest"
/>
<div className="flex justify-end gap-2">
<Button
type="button"
variant="outline"
variant="ghost"
onClick={onCancel}
className="flex-1"
className="rounded-none text-[10px] font-bold uppercase tracking-widest"
>
{t("common.cancel")}
</Button>
<Button
type="submit"
variant="outline"
className="border-accent-brand/40 text-accent-brand hover:bg-accent-brand/10 rounded-none text-[10px] font-bold uppercase tracking-widest"
>
{t("terminal.totpVerify")}
</Button>
</div>
</form>
</div>
+26 -19
View File
@@ -1,3 +1,4 @@
import React from "react";
import { Button } from "@/components/button.tsx";
import { Terminal, Monitor, Users, Clock } from "lucide-react";
import { useTranslation } from "react-i18next";
@@ -56,34 +57,32 @@ export function TmuxSessionPicker({
className="absolute inset-0 bg-canvas rounded-md"
style={{ backgroundColor: backgroundColor || undefined }}
/>
<div className="bg-elevated border-2 border-edge rounded-lg p-6 max-w-md w-full mx-4 relative z-10 animate-in fade-in zoom-in-95 duration-200">
<div className="mb-4">
<div className="bg-card border border-border w-full max-w-sm mx-4 relative z-10 animate-in fade-in zoom-in-95 duration-200">
<div className="p-4 border-b border-border">
<div className="flex items-center gap-2">
<Terminal className="w-5 h-5 text-primary" />
<h3 className="text-lg font-semibold">
<Terminal className="size-4 text-accent-brand" />
<h3 className="text-xs font-bold uppercase tracking-widest">
{t("terminal.tmuxSessionPickerTitle")}
</h3>
</div>
<p className="text-sm text-muted-foreground mt-1">
<p className="text-[10px] font-bold uppercase tracking-tight text-muted-foreground mt-1">
{t("terminal.tmuxSessionPickerDesc")}
</p>
</div>
<div className="space-y-2 mb-4 max-h-60 overflow-y-auto">
<div className="flex flex-col max-h-60 overflow-y-auto">
{sessions.map((session) => (
<button
key={session.name}
onClick={() => onSelect(session.name)}
className="w-full text-left px-3 py-3 rounded-md border border-edge hover:bg-muted transition-colors"
className="w-full text-left px-4 py-3 border-b border-border hover:bg-muted/50 transition-colors last:border-b-0"
>
<div className="font-mono text-sm font-medium">
{session.name}
</div>
<div className="flex gap-3 mt-1 text-xs text-muted-foreground">
<div className="font-mono text-xs font-bold">{session.name}</div>
<div className="flex gap-3 mt-1 text-[10px] text-muted-foreground">
<span
className="flex items-center gap-1"
title={t("terminal.tmuxWindows")}
>
<Monitor className="w-3 h-3" />
<Monitor className="size-3" />
{t("terminal.tmuxWindowCount", { count: session.windows })}
</span>
{session.attachedClients > 0 && (
@@ -91,7 +90,7 @@ export function TmuxSessionPicker({
className="flex items-center gap-1"
title={t("terminal.tmuxAttached")}
>
<Users className="w-3 h-3" />
<Users className="size-3" />
{t("terminal.tmuxAttachedCount", {
count: session.attachedClients,
})}
@@ -101,20 +100,28 @@ export function TmuxSessionPicker({
className="flex items-center gap-1"
title={t("terminal.tmuxLastActivity")}
>
<Clock className="w-3 h-3" />
<Clock className="size-3" />
{formatTimestamp(session.lastActivity, t)}
</span>
</div>
</button>
))}
</div>
<div className="flex gap-2">
<Button onClick={onCreateNew} variant="outline" className="flex-1">
{t("terminal.tmuxCreateNew")}
</Button>
<Button onClick={onCancel} variant="outline" className="flex-1">
<div className="p-4 border-t border-border flex justify-end gap-2">
<Button
onClick={onCancel}
variant="ghost"
className="rounded-none text-[10px] font-bold uppercase tracking-widest"
>
{t("common.cancel")}
</Button>
<Button
onClick={onCreateNew}
variant="outline"
className="border-accent-brand/40 text-accent-brand hover:bg-accent-brand/10 rounded-none text-[10px] font-bold uppercase tracking-widest"
>
{t("terminal.tmuxCreateNew")}
</Button>
</div>
</div>
</div>
+37 -32
View File
@@ -1,8 +1,7 @@
import React, { useState } from "react";
import { Button } from "@/components/button.tsx";
import { Input } from "@/components/input.tsx";
import { Label } from "@/components/label.tsx";
import { Shield, Copy, ExternalLink } from "lucide-react";
import { Shield, Copy, ExternalLink, Check } from "lucide-react";
import { useTranslation } from "react-i18next";
import { toast } from "sonner";
@@ -47,74 +46,80 @@ export function WarpgateDialog({
className="absolute inset-0 bg-canvas rounded-md"
style={{ backgroundColor: backgroundColor || undefined }}
/>
<div className="bg-elevated border-2 border-edge rounded-lg p-6 max-w-xl w-full mx-4 relative z-10 animate-in fade-in zoom-in-95 duration-200">
<div className="mb-4 flex items-center gap-2">
<Shield className="w-5 h-5 text-primary" />
<h3 className="text-lg font-semibold">
{t("terminal.warpgateAuthRequired")}
</h3>
<div className="bg-card border border-border w-full max-w-md mx-4 relative z-10 animate-in fade-in zoom-in-95 duration-200">
<div className="p-4 border-b border-border">
<div className="flex items-center gap-2">
<Shield className="size-4 text-accent-brand" />
<h3 className="text-xs font-bold uppercase tracking-widest">
{t("terminal.warpgateAuthRequired")}
</h3>
</div>
</div>
<div className="space-y-4">
<div>
<Label className="text-base font-semibold mb-2 block">
<div className="p-4 flex flex-col gap-4">
<div className="flex flex-col gap-1.5">
<p className="text-[10px] font-bold uppercase tracking-widest text-muted-foreground">
{t("terminal.warpgateSecurityKey")}
</Label>
<div className="bg-base border-2 border-accent rounded-md p-4 text-center">
<div className="text-3xl font-mono font-bold tracking-wider text-primary">
</p>
<div className="border border-border bg-muted/10 p-4 text-center">
<div className="text-2xl font-mono font-bold tracking-wider text-accent-brand">
{securityKey}
</div>
</div>
</div>
<div>
<Label htmlFor="warpgateUrl" className="text-base font-semibold">
<div className="flex flex-col gap-1.5">
<p className="text-[10px] font-bold uppercase tracking-widest text-muted-foreground">
{t("terminal.warpgateAuthUrl")}
</Label>
<div className="flex gap-2 mt-2">
</p>
<div className="flex gap-2">
<Input
id="warpgateUrl"
type="text"
value={url}
readOnly
className="flex-1 font-mono text-xs"
className="rounded-none bg-muted/50 border-border text-xs font-mono flex-1"
/>
<Button
type="button"
variant="outline"
size="icon"
onClick={handleCopyUrl}
className="rounded-none border-border shrink-0"
title={t("common.copy")}
>
<Copy className={`w-4 h-4 ${copied ? "text-success" : ""}`} />
{copied ? (
<Check className="size-4 text-accent-brand" />
) : (
<Copy className="size-4" />
)}
</Button>
</div>
</div>
<div className="flex flex-col sm:flex-row gap-2 pt-2">
<div className="flex flex-col sm:flex-row justify-end gap-2 pt-1">
<Button
type="button"
onClick={onOpenUrl}
className="flex-1 flex items-center justify-center gap-2"
variant="ghost"
onClick={onCancel}
className="rounded-none text-[10px] font-bold uppercase tracking-widest sm:mr-auto"
>
<ExternalLink className="w-4 h-4" />
{t("terminal.warpgateOpenBrowser")}
{t("common.cancel")}
</Button>
<Button
type="button"
variant="secondary"
variant="outline"
onClick={onContinue}
className="flex-1"
className="rounded-none text-[10px] font-bold uppercase tracking-widest"
>
{t("terminal.warpgateContinue")}
</Button>
<Button
type="button"
variant="outline"
onClick={onCancel}
className="sm:w-auto"
onClick={onOpenUrl}
className="border-accent-brand/40 text-accent-brand hover:bg-accent-brand/10 rounded-none text-[10px] font-bold uppercase tracking-widest flex items-center gap-1.5"
>
{t("common.cancel")}
<ExternalLink className="size-3.5" />
{t("terminal.warpgateOpenBrowser")}
</Button>
</div>
</div>