mirror of
https://github.com/fosrl/pangolin.git
synced 2026-06-26 09:09:05 +00:00
💄 Show GeoIp flag in site details page
This commit is contained in:
@@ -10,6 +10,7 @@ import logger from "@server/logger";
|
|||||||
import stoi from "@server/lib/stoi";
|
import stoi from "@server/lib/stoi";
|
||||||
import { fromError } from "zod-validation-error";
|
import { fromError } from "zod-validation-error";
|
||||||
import { OpenAPITags, registry } from "@server/openApi";
|
import { OpenAPITags, registry } from "@server/openApi";
|
||||||
|
import { getCountryCodeForIp } from "@server/lib/geoip";
|
||||||
|
|
||||||
const getSiteSchema = z.strictObject({
|
const getSiteSchema = z.strictObject({
|
||||||
siteId: z
|
siteId: z
|
||||||
@@ -47,6 +48,7 @@ type SiteQueryRow = NonNullable<Awaited<ReturnType<typeof query>>>;
|
|||||||
export type GetSiteResponse = SiteQueryRow["sites"] & {
|
export type GetSiteResponse = SiteQueryRow["sites"] & {
|
||||||
newtId: string | null;
|
newtId: string | null;
|
||||||
newtVersion: string | null;
|
newtVersion: string | null;
|
||||||
|
countryCode: string | null;
|
||||||
};
|
};
|
||||||
|
|
||||||
registry.registerPath({
|
registry.registerPath({
|
||||||
@@ -134,7 +136,10 @@ export async function getSite(
|
|||||||
const data: GetSiteResponse = {
|
const data: GetSiteResponse = {
|
||||||
...site.sites,
|
...site.sites,
|
||||||
newtId: site.newt ? site.newt.newtId : null,
|
newtId: site.newt ? site.newt.newtId : null,
|
||||||
newtVersion: site.newt?.version ?? null
|
newtVersion: site.newt?.version ?? null,
|
||||||
|
countryCode: site.sites.endpoint
|
||||||
|
? ((await getCountryCodeForIp(site.sites.endpoint)) ?? null)
|
||||||
|
: null
|
||||||
};
|
};
|
||||||
|
|
||||||
return response<GetSiteResponse>(res, {
|
return response<GetSiteResponse>(res, {
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import {
|
|||||||
InfoSectionTitle
|
InfoSectionTitle
|
||||||
} from "@app/components/InfoSection";
|
} from "@app/components/InfoSection";
|
||||||
import { useTranslations } from "next-intl";
|
import { useTranslations } from "next-intl";
|
||||||
|
import { countryCodeToFlagEmoji } from "@app/lib/countryCodeToFlagEmoji";
|
||||||
|
|
||||||
type SiteInfoCardProps = {};
|
type SiteInfoCardProps = {};
|
||||||
|
|
||||||
@@ -52,7 +53,11 @@ export default function SiteInfoCard({}: SiteInfoCardProps) {
|
|||||||
<InfoSection>
|
<InfoSection>
|
||||||
<InfoSectionTitle>{t("publicIpEndpoint")}</InfoSectionTitle>
|
<InfoSectionTitle>{t("publicIpEndpoint")}</InfoSectionTitle>
|
||||||
<InfoSectionContent>
|
<InfoSectionContent>
|
||||||
{formatPublicEndpoint(site.endpoint)}
|
{formatPublicEndpoint(site.endpoint)}
|
||||||
|
<span className="text-lg">
|
||||||
|
{site.countryCode &&
|
||||||
|
countryCodeToFlagEmoji(site.countryCode)}
|
||||||
|
</span>
|
||||||
</InfoSectionContent>
|
</InfoSectionContent>
|
||||||
</InfoSection>
|
</InfoSection>
|
||||||
) : null;
|
) : null;
|
||||||
|
|||||||
Reference in New Issue
Block a user