Skip to content

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

Enhance Countries component with cities tab and update Skeleton styles

Bill Yang7672bc87c2a7
diff --git a/client/src/app/[site]/components/shared/StandardSection/Skeleton.tsx b/client/src/app/[site]/components/shared/StandardSection/Skeleton.tsx
index 3dd693746..a60dd664b 100644
--- a/client/src/app/[site]/components/shared/StandardSection/Skeleton.tsx
+++ b/client/src/app/[site]/components/shared/StandardSection/Skeleton.tsx
@@ -34,7 +34,7 @@ export const Skeleton = memo(() => {
<div className="h-3 bg-neutral-800 rounded animate-pulse w-12"></div>
</div>
{Array.from({ length: 10 }).map((_, index) => (
- <div key={index} className="relative h-7 flex items-center">
+ <div key={index} className="relative h-6 flex items-center">
<div
className="absolute inset-0 bg-neutral-800 py-2 rounded-md animate-pulse"
style={{ width: `${widths[index]}%` }}
diff --git a/client/src/app/[site]/main/components/sections/Countries.tsx b/client/src/app/[site]/main/components/sections/Countries.tsx
index 25a0f29c4..9cc3e029d 100644
--- a/client/src/app/[site]/main/components/sections/Countries.tsx
+++ b/client/src/app/[site]/main/components/sections/Countries.tsx
@@ -64,6 +64,7 @@ export function Countries({ isRealtime = false }: { isRealtime?: boolean }) {
<TabsList>
<TabsTrigger value="countries">Countries</TabsTrigger>
<TabsTrigger value="regions">Regions</TabsTrigger>
+ <TabsTrigger value="cities">Cities</TabsTrigger>
<TabsTrigger value="languages">Languages</TabsTrigger>
</TabsList>
<TabsContent value="countries">
@@ -110,6 +111,20 @@ export function Countries({ isRealtime = false }: { isRealtime?: boolean }) {
}}
/>
</TabsContent>
+ <TabsContent value="cities">
+ <ComponentToUse
+ filterParameter="city"
+ title="Cities"
+ getValue={(e) => e.value}
+ getKey={(e) => e.value}
+ getLabel={(e) => {
+ if (!e.value) {
+ return "Unknown";
+ }
+ return <div className="flex gap-2 items-center">{e.value}</div>;
+ }}
+ />
+ </TabsContent>
<TabsContent value="languages">
<ComponentToUse
filterParameter="language"
diff --git a/server/src/api/getSingleCol.ts b/server/src/api/getSingleCol.ts
index c41148c67..f9b5849b9 100644
--- a/server/src/api/getSingleCol.ts
+++ b/server/src/api/getSingleCol.ts
@@ -58,6 +58,8 @@ const getQuery = (request: GenericRequest["Querystring"]) => {
FROM pageviews
WHERE
site_id = ${site}
+ AND event_name IS NOT NULL
+ AND event_name <> ''
${filterStatement}
${getTimeStatement(
minutes
@@ -99,6 +101,7 @@ const getQuery = (request: GenericRequest["Querystring"]) => {
// AND type = 'pageview'
GROUP BY session_id
) AS query
+ WHERE pathname IS NOT NULL AND pathname <> ''
GROUP BY value ORDER BY count desc
${limit ? `LIMIT ${limit}` : ""};`;
}
@@ -111,6 +114,8 @@ const getQuery = (request: GenericRequest["Querystring"]) => {
FROM pageviews
WHERE
site_id = ${site}
+ AND ${geSqlParam(parameter)} IS NOT NULL
+ AND ${geSqlParam(parameter)} <> ''
${filterStatement}
${getTimeStatement(
minutes