Merge branch 'dev-1.10.0' into _100-LightMode
This commit is contained in:
Luke Gustafson
GitHub
@@ -219,7 +219,9 @@ function QuickActionItem({
|
||||
placeholder={t("hosts.quickActionName")}
|
||||
value={quickAction.name}
|
||||
onChange={(e) => onUpdate(e.target.value, quickAction.snippetId)}
|
||||
onBlur={(e) => onUpdate(e.target.value.trim(), quickAction.snippetId)}
|
||||
onBlur={(e) =>
|
||||
onUpdate(e.target.value.trim(), quickAction.snippetId)
|
||||
}
|
||||
className="flex-1"
|
||||
/>
|
||||
</div>
|
||||
@@ -1895,10 +1897,12 @@ export function HostManagerEditor({
|
||||
</FormLabel>
|
||||
<FormControl>
|
||||
<Input
|
||||
placeholder="proxy.example.com"
|
||||
placeholder={t("placeholders.socks5Host")}
|
||||
{...field}
|
||||
onBlur={(e) => {
|
||||
field.onChange(e.target.value.trim());
|
||||
field.onChange(
|
||||
e.target.value.trim(),
|
||||
);
|
||||
field.onBlur();
|
||||
}}
|
||||
/>
|
||||
@@ -1921,7 +1925,7 @@ export function HostManagerEditor({
|
||||
<FormControl>
|
||||
<Input
|
||||
type="number"
|
||||
placeholder="1080"
|
||||
placeholder={t("placeholders.socks5Port")}
|
||||
{...field}
|
||||
onChange={(e) =>
|
||||
field.onChange(
|
||||
@@ -1943,15 +1947,16 @@ export function HostManagerEditor({
|
||||
render={({ field }) => (
|
||||
<FormItem>
|
||||
<FormLabel>
|
||||
{t("hosts.socks5Username")} (
|
||||
{t("hosts.optional")})
|
||||
{t("hosts.socks5Username")} {t("hosts.optional")}
|
||||
</FormLabel>
|
||||
<FormControl>
|
||||
<Input
|
||||
placeholder={t("hosts.username")}
|
||||
{...field}
|
||||
onBlur={(e) => {
|
||||
field.onChange(e.target.value.trim());
|
||||
field.onChange(
|
||||
e.target.value.trim(),
|
||||
);
|
||||
field.onBlur();
|
||||
}}
|
||||
/>
|
||||
@@ -1966,8 +1971,7 @@ export function HostManagerEditor({
|
||||
render={({ field }) => (
|
||||
<FormItem>
|
||||
<FormLabel>
|
||||
{t("hosts.socks5Password")} (
|
||||
{t("hosts.optional")})
|
||||
{t("hosts.socks5Password")} {t("hosts.optional")}
|
||||
</FormLabel>
|
||||
<FormControl>
|
||||
<PasswordInput
|
||||
@@ -2055,7 +2059,7 @@ export function HostManagerEditor({
|
||||
{t("hosts.socks5Host")}
|
||||
</FormLabel>
|
||||
<Input
|
||||
placeholder="proxy.example.com"
|
||||
placeholder={t("placeholders.socks5Host")}
|
||||
value={node.host}
|
||||
onChange={(e) => {
|
||||
const currentChain =
|
||||
@@ -2100,7 +2104,7 @@ export function HostManagerEditor({
|
||||
</FormLabel>
|
||||
<Input
|
||||
type="number"
|
||||
placeholder="1080"
|
||||
placeholder={t("placeholders.socks5Port")}
|
||||
value={node.port}
|
||||
onChange={(e) => {
|
||||
const currentChain =
|
||||
@@ -2151,10 +2155,10 @@ export function HostManagerEditor({
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="4">
|
||||
SOCKS4
|
||||
{t("hosts.socks4")}
|
||||
</SelectItem>
|
||||
<SelectItem value="5">
|
||||
SOCKS5
|
||||
{t("hosts.socks5")}
|
||||
</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
@@ -2163,8 +2167,7 @@ export function HostManagerEditor({
|
||||
<div className="grid grid-cols-2 gap-3">
|
||||
<div className="space-y-2">
|
||||
<FormLabel>
|
||||
{t("hosts.socks5Username")} (
|
||||
{t("hosts.optional")})
|
||||
{t("hosts.socks5Username")} {t("hosts.optional")}
|
||||
</FormLabel>
|
||||
<Input
|
||||
placeholder={t("hosts.username")}
|
||||
@@ -2208,8 +2211,7 @@ export function HostManagerEditor({
|
||||
|
||||
<div className="space-y-2">
|
||||
<FormLabel>
|
||||
{t("hosts.socks5Password")} (
|
||||
{t("hosts.optional")})
|
||||
{t("hosts.socks5Password")} {t("hosts.optional")}
|
||||
</FormLabel>
|
||||
<PasswordInput
|
||||
placeholder={t("hosts.password")}
|
||||
@@ -2716,7 +2718,7 @@ export function HostManagerEditor({
|
||||
</PopoverContent>
|
||||
</Popover>
|
||||
<FormDescription>
|
||||
Execute a snippet when the terminal connects
|
||||
{t("hosts.executeSnippetOnConnect")}
|
||||
</FormDescription>
|
||||
</FormItem>
|
||||
);
|
||||
@@ -2729,9 +2731,9 @@ export function HostManagerEditor({
|
||||
render={({ field }) => (
|
||||
<FormItem className="flex flex-row items-center justify-between rounded-lg border p-3 bg-elevated dark:bg-input/30">
|
||||
<div className="space-y-0.5">
|
||||
<FormLabel>Auto-MOSH</FormLabel>
|
||||
<FormLabel>{t("hosts.autoMosh")}</FormLabel>
|
||||
<FormDescription>
|
||||
Automatically run MOSH command on connect
|
||||
{t("hosts.autoMoshDesc")}
|
||||
</FormDescription>
|
||||
</div>
|
||||
<FormControl>
|
||||
@@ -2750,11 +2752,10 @@ export function HostManagerEditor({
|
||||
name="terminalConfig.moshCommand"
|
||||
render={({ field }) => (
|
||||
<FormItem>
|
||||
<FormLabel>MOSH Command</FormLabel>
|
||||
<FormLabel>{t("hosts.moshCommand")}</FormLabel>
|
||||
<FormControl>
|
||||
<Input
|
||||
placeholder="mosh user@server"
|
||||
{...field}
|
||||
placeholder={t("placeholders.moshCommand")} {...field}
|
||||
onBlur={(e) => {
|
||||
field.onChange(e.target.value.trim());
|
||||
field.onBlur();
|
||||
@@ -2762,7 +2763,7 @@ export function HostManagerEditor({
|
||||
/>
|
||||
</FormControl>
|
||||
<FormDescription>
|
||||
The MOSH command to execute
|
||||
{t("hosts.moshCommandDesc")}
|
||||
</FormDescription>
|
||||
</FormItem>
|
||||
)}
|
||||
@@ -2815,11 +2816,10 @@ export function HostManagerEditor({
|
||||
|
||||
<div className="space-y-2">
|
||||
<label className="text-sm font-medium">
|
||||
Environment Variables
|
||||
{t("hosts.environmentVariables")}
|
||||
</label>
|
||||
<FormDescription>
|
||||
Set custom environment variables for the terminal
|
||||
session
|
||||
{t("hosts.environmentVariablesDesc")}
|
||||
</FormDescription>
|
||||
{form
|
||||
.watch("terminalConfig.environmentVariables")
|
||||
@@ -2832,10 +2832,12 @@ export function HostManagerEditor({
|
||||
<FormItem className="flex-1">
|
||||
<FormControl>
|
||||
<Input
|
||||
placeholder="Variable name"
|
||||
placeholder={t("hosts.variableName")}
|
||||
{...field}
|
||||
onBlur={(e) => {
|
||||
field.onChange(e.target.value.trim());
|
||||
field.onChange(
|
||||
e.target.value.trim(),
|
||||
);
|
||||
field.onBlur();
|
||||
}}
|
||||
/>
|
||||
@@ -2850,10 +2852,12 @@ export function HostManagerEditor({
|
||||
<FormItem className="flex-1">
|
||||
<FormControl>
|
||||
<Input
|
||||
placeholder="Value"
|
||||
placeholder={t("hosts.variableValue")}
|
||||
{...field}
|
||||
onBlur={(e) => {
|
||||
field.onChange(e.target.value.trim());
|
||||
field.onChange(
|
||||
e.target.value.trim(),
|
||||
);
|
||||
field.onBlur();
|
||||
}}
|
||||
/>
|
||||
@@ -2895,7 +2899,7 @@ export function HostManagerEditor({
|
||||
}}
|
||||
>
|
||||
<Plus className="h-4 w-4 mr-2" />
|
||||
Add Variable
|
||||
{t("hosts.addVariable")}
|
||||
</Button>
|
||||
</div>
|
||||
</AccordionContent>
|
||||
@@ -2908,7 +2912,7 @@ export function HostManagerEditor({
|
||||
name="enableDocker"
|
||||
render={({ field }) => (
|
||||
<FormItem>
|
||||
<FormLabel>Enable Docker</FormLabel>
|
||||
<FormLabel>{t("hosts.enableDocker")}</FormLabel>
|
||||
<FormControl>
|
||||
<Switch
|
||||
checked={field.value}
|
||||
@@ -2916,7 +2920,7 @@ export function HostManagerEditor({
|
||||
/>
|
||||
</FormControl>
|
||||
<FormDescription>
|
||||
Enable Docker integration for this host
|
||||
{t("hosts.enableDockerDesc")}
|
||||
</FormDescription>
|
||||
</FormItem>
|
||||
)}
|
||||
@@ -3067,7 +3071,7 @@ export function HostManagerEditor({
|
||||
</FormLabel>
|
||||
<FormControl>
|
||||
<Input
|
||||
placeholder="22"
|
||||
placeholder={t("placeholders.defaultPort")}
|
||||
{...sourcePortField}
|
||||
/>
|
||||
</FormControl>
|
||||
@@ -3086,7 +3090,7 @@ export function HostManagerEditor({
|
||||
</FormLabel>
|
||||
<FormControl>
|
||||
<Input
|
||||
placeholder="224"
|
||||
placeholder={t("placeholders.defaultEndpointPort")}
|
||||
{...endpointPortField}
|
||||
/>
|
||||
</FormControl>
|
||||
@@ -3134,7 +3138,9 @@ export function HostManagerEditor({
|
||||
);
|
||||
}}
|
||||
onBlur={(e) => {
|
||||
endpointHostField.onChange(e.target.value.trim());
|
||||
endpointHostField.onChange(
|
||||
e.target.value.trim(),
|
||||
);
|
||||
endpointHostField.onBlur();
|
||||
}}
|
||||
/>
|
||||
|
||||
Reference in New Issue
Block a user