Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Add link to standardcard

Bill Yang380e54e6e992
diff --git a/client/src/app/[site]/components/sections/Browsers/Browsers.tsx b/client/src/app/[site]/components/sections/Browsers/Browsers.tsx
index 5812a2582..231401bf3 100644
--- a/client/src/app/[site]/components/sections/Browsers/Browsers.tsx
+++ b/client/src/app/[site]/components/sections/Browsers/Browsers.tsx
@@ -54,13 +54,13 @@ const BROWSER_TO_LOGO: Record<string, string> = {
};
export function Browsers() {
- const { data, isLoading } = useSingleCol({ parameter: "browser" });
+ const { data, isFetching } = useSingleCol({ parameter: "browser" });
return (
<StandardCard
title="Browsers"
data={data}
- isLoading={isLoading}
+ isFetching={isFetching}
getKey={(e) => e.value}
getLabel={(e) => (
<div className="flex gap-2 items-center">
diff --git a/client/src/app/[site]/components/sections/Countries/Countries.tsx b/client/src/app/[site]/components/sections/Countries/Countries.tsx
index 31fb0b310..6c8d67dbe 100644
--- a/client/src/app/[site]/components/sections/Countries/Countries.tsx
+++ b/client/src/app/[site]/components/sections/Countries/Countries.tsx
@@ -7,13 +7,13 @@ import React from "react";
import { StandardCard } from "../../shared/StandardCard";
export function Countries() {
- const { data, isLoading } = useSingleCol({ parameter: "country" });
+ const { data, isFetching } = useSingleCol({ parameter: "country" });
return (
<StandardCard
title="Countries"
data={data}
- isLoading={isLoading}
+ isFetching={isFetching}
getKey={(e) => e.value}
getLabel={(e) => (
<span className="flex items-center gap-2">
diff --git a/client/src/app/[site]/components/sections/Devices/Devices.tsx b/client/src/app/[site]/components/sections/Devices/Devices.tsx
index 8197a4cb6..acec797b0 100644
--- a/client/src/app/[site]/components/sections/Devices/Devices.tsx
+++ b/client/src/app/[site]/components/sections/Devices/Devices.tsx
@@ -4,11 +4,11 @@ import { useSingleCol } from "@/hooks/api";
import { StandardCard } from "../../shared/StandardCard";
export function Devices() {
- const { data, isLoading } = useSingleCol({ parameter: "device_type" });
+ const { data, isFetching } = useSingleCol({ parameter: "device_type" });
return (
<StandardCard
filterParameter="device_type"
- isLoading={isLoading}
+ isFetching={isFetching}
title="Devices"
data={data}
getValue={(e) => e.value}
diff --git a/client/src/app/[site]/components/sections/OperatingSystems/OperatingSystems.tsx b/client/src/app/[site]/components/sections/OperatingSystems/OperatingSystems.tsx
index ec33f8696..99c535b78 100644
--- a/client/src/app/[site]/components/sections/OperatingSystems/OperatingSystems.tsx
+++ b/client/src/app/[site]/components/sections/OperatingSystems/OperatingSystems.tsx
@@ -21,13 +21,13 @@ const OS_TO_LOGO: Record<string, string> = {
};
export function OperatingSystems() {
- const { data, isLoading } = useSingleCol({ parameter: "operating_system" });
+ const { data, isFetching } = useSingleCol({ parameter: "operating_system" });
return (
<StandardCard
title="Operating Systems"
data={data}
- isLoading={isLoading}
+ isFetching={isFetching}
getValue={(e) => e.value}
getKey={(e) => e.value}
getLabel={(e) => (
diff --git a/client/src/app/[site]/components/sections/Pages/Pages.tsx b/client/src/app/[site]/components/sections/Pages/Pages.tsx
index fcced0a6f..1a1d6d340 100644
--- a/client/src/app/[site]/components/sections/Pages/Pages.tsx
+++ b/client/src/app/[site]/components/sections/Pages/Pages.tsx
@@ -1,20 +1,25 @@
"use client";
-import { useSingleCol } from "@/hooks/api";
+import { GetSitesResponse, useSingleCol } from "@/hooks/api";
import { StandardCard } from "../../shared/StandardCard";
-export function Pages() {
- const { data, isLoading } = useSingleCol({ parameter: "pathname" });
+export function Pages({
+ siteMetadata,
+}: {
+ siteMetadata: GetSitesResponse[number];
+}) {
+ const { data, isFetching } = useSingleCol({ parameter: "pathname" });
return (
<StandardCard
filterParameter="pathname"
title="Pages"
data={data}
- isLoading={isLoading}
+ isFetching={isFetching}
getValue={(e) => e.value}
getKey={(e) => e.value}
getLabel={(e) => e.value || "Other"}
+ getLink={(e) => `https://${siteMetadata.domain}${e.value}`}
/>
);
}
diff --git a/client/src/app/[site]/components/sections/Referrers/Referrers.tsx b/client/src/app/[site]/components/sections/Referrers/Referrers.tsx
index d622af96d..2cf3fecbb 100644
--- a/client/src/app/[site]/components/sections/Referrers/Referrers.tsx
+++ b/client/src/app/[site]/components/sections/Referrers/Referrers.tsx
@@ -4,34 +4,22 @@ import { useSingleCol } from "@/hooks/api";
import { StandardCard } from "../../shared/StandardCard";
export function Referrers() {
- const { data, isLoading } = useSingleCol({ parameter: "referrer" });
+ const { data, isFetching } = useSingleCol({ parameter: "referrer" });
return (
<StandardCard
filterParameter="referrer"
title="Referrers"
data={data}
getKey={(e) => e.value}
- isLoading={isLoading}
+ isFetching={isFetching}
+ getLink={(e) => `https://${e.value}`}
getLabel={(e) => (
<div className="flex items-center">
<img
className="w-4 mr-2"
src={`https://www.google.com/s2/favicons?domain=${e.value}&sz=32`}
/>
- {e.value ? (
- <a
- href={`https://${e.value}`}
- target="_blank"
- className="hover:underline"
- onClick={(e) => {
- e.stopPropagation();
- }}
- >
- {e.value}
- </a>
- ) : (
- "Direct"
- )}
+ {e.value ? e.value : "Direct"}
</div>
)}
getValue={(e) => e.value}
diff --git a/client/src/app/[site]/components/shared/StandardCard.tsx b/client/src/app/[site]/components/shared/StandardCard.tsx
index b0be51f10..d68ef16f4 100644
--- a/client/src/app/[site]/components/shared/StandardCard.tsx
+++ b/client/src/app/[site]/components/shared/StandardCard.tsx
@@ -19,6 +19,7 @@ import { round } from "lodash";
import { ReactNode } from "react";
import { addFilter, FilterParameter } from "../../../../lib/store";
import { formatter } from "../../../../lib/utils";
+import { SquareArrowOutUpRight } from "lucide-react";
export function StandardCard<T extends { percentage: number; count: number }>({
title,
@@ -26,7 +27,8 @@ export function StandardCard<T extends { percentage: number; count: number }>({
getKey,
getLabel,
getValue,
- isLoading,
+ getLink,
+ isFetching,
filterParameter,
}: {
title: string;
@@ -36,10 +38,11 @@ export function StandardCard<T extends { percentage: number; count: number }>({
error?: string;
}
| undefined;
- isLoading?: boolean;
+ isFetching?: boolean;
getKey: (item: T) => string;
getLabel: (item: T) => ReactNode;
getValue: (item: T) => string;
+ getLink?: (item: T) => string;
filterParameter: FilterParameter;
}) {
const ratio = data?.data?.[0]?.percentage
@@ -48,7 +51,7 @@ export function StandardCard<T extends { percentage: number; count: number }>({
return (
<Card>
- {isLoading && <CardLoader />}
+ {isFetching && <CardLoader />}
<CardHeader>
<CardTitle>{title}</CardTitle>
</CardHeader>
@@ -70,7 +73,21 @@ export function StandardCard<T extends { percentage: number; count: number }>({
style={{ width: `${e.percentage * ratio}%` }}
></div>
<div className="z-10 mx-2 flex justify-between items-center text-sm w-full">
- <div>{getLabel(e)}</div>
+ <div className="flex items-center gap-1">
+ {getLabel(e)}
+ {getLink && (
+ <a
+ href={getLink(e)}
+ target="_blank"
+ onClick={(e) => e.stopPropagation()}
+ >
+ <SquareArrowOutUpRight
+ className="w-3 h-3 text-neutral-300 hover:text-neutral-100"
+ strokeWidth={3}
+ />
+ </a>
+ )}
+ </div>
<div className="text-sm flex gap-2">
<div className="hidden group-hover:block text-neutral-400">
{round(e.percentage, 1)}%
@@ -107,7 +124,21 @@ export function StandardCard<T extends { percentage: number; count: number }>({
style={{ width: `${e.percentage * ratio}%` }}
></div>
<div className="z-10 ml-2 mr-4 flex justify-between items-center text-sm w-full h-7">
- <div>{getLabel(e)}</div>
+ <div className="flex items-center gap-1">
+ {getLabel(e)}
+ {getLink && (
+ <a
+ href={getLink(e)}
+ target="_blank"
+ onClick={(e) => e.stopPropagation()}
+ >
+ <SquareArrowOutUpRight
+ className="w-3 h-3 text-neutral-300 hover:text-neutral-100"
+ strokeWidth={3}
+ />
+ </a>
+ )}
+ </div>
<div className="text-sm flex">
<div>{e.count.toLocaleString()}</div>
<div className="mx-2 bg-neutral-400 w-[1px] rounded-full h-5"></div>
diff --git a/client/src/app/[site]/page.tsx b/client/src/app/[site]/page.tsx
index c2f80a958..4f73422ab 100644
--- a/client/src/app/[site]/page.tsx
+++ b/client/src/app/[site]/page.tsx
@@ -14,6 +14,7 @@ import { OperatingSystems } from "./components/sections/OperatingSystems/Operati
import { Pages } from "./components/sections/Pages/Pages";
import { Referrers } from "./components/sections/Referrers/Referrers";
import { SubHeader } from "./components/SubHeader/SubHeader";
+import { useGetSiteMetadata } from "../../hooks/hooks";
export default function SitePage() {
const pathname = usePathname();
@@ -33,16 +34,16 @@ export default function SitePage() {
}
function SitePageInner({ site }: { site: string }) {
- const { data: allSites, isLoading: isLoadingAllSites } = useGetSites();
const { data: siteHasData, isLoading } = useSiteHasData(site);
- const siteMetadata = allSites?.data?.find((s) => s.site_id === Number(site));
+ const { siteMetadata, isLoading: isLoadingSiteMetadata } =
+ useGetSiteMetadata(site);
- if (isLoadingAllSites || isLoading) {
+ if (isLoadingSiteMetadata || isLoading || !siteMetadata) {
return null;
}
- if (!siteHasData?.data && !isLoading && !isLoadingAllSites) {
+ if (!siteHasData?.data && !isLoading && !isLoadingSiteMetadata) {
return <NoData siteMetadata={siteMetadata} />;
}
@@ -55,7 +56,7 @@ function SitePageInner({ site }: { site: string }) {
<OperatingSystems />
<Browsers />
<Devices />
- <Pages />
+ <Pages siteMetadata={siteMetadata} />
<Referrers />
<Countries />
<Map />
diff --git a/client/src/hooks/hooks.ts b/client/src/hooks/hooks.ts
new file mode 100644
index 000000000..63c3e3873
--- /dev/null
+++ b/client/src/hooks/hooks.ts
@@ -0,0 +1,9 @@
+import { useGetSites } from "./api";
+
+export function useGetSiteMetadata(siteId: string) {
+ const { data, isLoading } = useGetSites();
+ return {
+ siteMetadata: data?.data?.find((site) => site.site_id === Number(siteId)),
+ isLoading,
+ };
+}
diff --git a/client/src/lib/utils.ts b/client/src/lib/utils.ts
index b15b89823..398a8ee0d 100644
--- a/client/src/lib/utils.ts
+++ b/client/src/lib/utils.ts
@@ -6,12 +6,9 @@ export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs));
}
-export const formatter = (value: number) =>
- Intl.NumberFormat("en", {
- notation: "compact",
- })
- .format(value)
- .toLocaleLowerCase();
+export const formatter = Intl.NumberFormat("en", {
+ notation: "compact",
+}).format;
export function formatSecondsAsMinutesAndSeconds(value: number) {
const duration = Duration.fromMillis(value * 1000);