pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-02-17 02:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor fixes for release

Browse Source
This commit is contained in:
miloschwartz
2025-07-16 18:09:17 -07:00
parent 92c09b8843
commit 665ef08733
6 changed files with 88 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/app/[orgId]/settings/resources/[resourceId]/general/page.tsx
View File

@@ -122,7 +122,20 @@ export default function GeneralForm() {
enabled: z.boolean(),
subdomain: z.string().optional(),
name: z.string().min(1).max(255),
domainId: z.string().optional()
domainId: z.string().optional(),
proxyPort: z.number().int().min(1).max(65535).optional()
}).refine((data) => {
// For non-HTTP resources, proxyPort should be defined
if (!resource.http) {
return data.proxyPort !== undefined;
}
// For HTTP resources, proxyPort should be undefined
return data.proxyPort === undefined;
}, {
message: !resource.http
? "Port number is required for non-HTTP resources"
: "Port number should not be set for HTTP resources",
path: ["proxyPort"]
});
type GeneralFormValues = z.infer<typeof GeneralFormSchema>;
@@ -133,7 +146,8 @@ export default function GeneralForm() {
enabled: resource.enabled,
name: resource.name,
subdomain: resource.subdomain ? resource.subdomain : undefined,
domainId: resource.domainId || undefined
domainId: resource.domainId || undefined,
proxyPort: resource.proxyPort || undefined
},
mode: "onChange"
});
@@ -196,7 +210,8 @@ export default function GeneralForm() {
enabled: data.enabled,
name: data.name,
subdomain: data.subdomain,
domainId: data.domainId
domainId: data.domainId,
proxyPort: data.proxyPort
}
)
.catch((e) => {
@@ -222,7 +237,8 @@ export default function GeneralForm() {
enabled: data.enabled,
name: data.name,
subdomain: data.subdomain,
fullDomain: resource.fullDomain
fullDomain: resource.fullDomain,
proxyPort: data.proxyPort
});
router.refresh();
@@ -333,6 +349,39 @@ export default function GeneralForm() {
)}
/>
{!resource.http && (
<>
<FormField
control={form.control}
name="proxyPort"
render={({ field }) => (
<FormItem>
<FormLabel>
{t("resourcePortNumber")}
</FormLabel>
<FormControl>
<Input
type="number"
value={field.value ?? ""}
onChange={(e) =>
field.onChange(
e.target.value
? parseInt(e.target.value)
: undefined
)
}
/>
</FormControl>
<FormMessage />
<FormDescription>
{t("resourcePortNumberDescription")}
</FormDescription>
</FormItem>
)}
/>
</>
)}
{resource.http && (
<div className="space-y-2">
<Label>Domain</Label>

33
src/app/[orgId]/settings/sites/[niceId]/SiteInfoCard.tsx
View File

@@ -25,32 +25,34 @@ export default function SiteInfoCard({}: SiteInfoCardProps) {
} else if (type === "wireguard") {
return "WireGuard";
} else if (type === "local") {
return t('local');
return t("local");
} else {
return t('unknown');
return t("unknown");
}
};
return (
<Alert>
<InfoIcon className="h-4 w-4" />
<AlertTitle className="font-semibold">{t('siteInfo')}</AlertTitle>
<AlertTitle className="font-semibold">{t("siteInfo")}</AlertTitle>
<AlertDescription className="mt-4">
<InfoSections cols={env.flags.enableClients ? 3 : 2}>
{(site.type == "newt" || site.type == "wireguard") && (
<>
<InfoSection>
<InfoSectionTitle>{t('status')}</InfoSectionTitle>
<InfoSectionTitle>
{t("status")}
</InfoSectionTitle>
<InfoSectionContent>
{site.online ? (
<div className="text-green-500 flex items-center space-x-2">
<div className="w-2 h-2 bg-green-500 rounded-full"></div>
<span>{t('online')}</span>
<span>{t("online")}</span>
</div>
) : (
<div className="text-neutral-500 flex items-center space-x-2">
<div className="w-2 h-2 bg-gray-500 rounded-full"></div>
<span>{t('offline')}</span>
<span>{t("offline")}</span>
</div>
)}
</InfoSectionContent>
@@ -58,17 +60,22 @@ export default function SiteInfoCard({}: SiteInfoCardProps) {
</>
)}
<InfoSection>
<InfoSectionTitle>{t('connectionType')}</InfoSectionTitle>
<InfoSectionTitle>
{t("connectionType")}
</InfoSectionTitle>
<InfoSectionContent>
{getConnectionTypeString(site.type)}
</InfoSectionContent>
</InfoSection>
<InfoSection>
<InfoSectionTitle>Address</InfoSectionTitle>
<InfoSectionContent>
{site.address?.split("/")[0]}
</InfoSectionContent>
</InfoSection>
{env.flags.enableClients && (
<InfoSection>
<InfoSectionTitle>Address</InfoSectionTitle>
<InfoSectionContent>
{site.address?.split("/")[0]}
</InfoSectionContent>
</InfoSection>
)}
</InfoSections>
</AlertDescription>
</Alert>

43
src/app/[orgId]/settings/sites/create/page.tsx
View File

@@ -894,49 +894,6 @@ WantedBy=default.target`
)}
</AlertDescription>
</Alert>
<Form {...form}>
<form
className="space-y-4"
id="create-site-form"
>
<FormField
control={form.control}
name="copied"
render={({ field }) => (
<FormItem>
<div className="flex items-center space-x-2">
<Checkbox
id="terms"
defaultChecked={
form.getValues(
"copied"
) as boolean
}
onCheckedChange={(
e
) => {
form.setValue(
"copied",
e as boolean
);
}}
/>
<label
htmlFor="terms"
className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
>
{t(
"siteConfirmCopy"
)}
</label>
</div>
<FormMessage />
</FormItem>
)}
/>
</form>
</Form>
</SettingsSectionBody>
</SettingsSection>
)}