🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Fix script tag formatting in NoData and Signup components; update conditional rendering in BaseStandardSection; adjust layout in Countries, Devices, Pages, and Referrers sections for improved alignment and consistency.
Bill Yang88a365ad2f31
diff --git a/client/src/app/[site]/components/Header/NoData.tsx b/client/src/app/[site]/components/Header/NoData.tsxindex f4710e8fc..7ed4908db 100644--- a/client/src/app/[site]/components/Header/NoData.tsx+++ b/client/src/app/[site]/components/Header/NoData.tsx@@ -29,7 +29,7 @@ export function NoData() {</div><CodeSnippetlanguage="HTML"- code={`<script\n src="${BACKEND_URL}/script.js"\n site-id="${siteMetadata?.siteId}"\n defer\n/>`}+ code={`<script\n src="${BACKEND_URL}/script.js"\n site-id="${siteMetadata?.siteId}"\n defer\n></script>`}className="text-xs"/></div>diff --git a/client/src/app/[site]/components/shared/StandardSection/BaseStandardSection.tsx b/client/src/app/[site]/components/shared/StandardSection/BaseStandardSection.tsxindex 7c2809372..4be93b192 100644--- a/client/src/app/[site]/components/shared/StandardSection/BaseStandardSection.tsx+++ b/client/src/app/[site]/components/shared/StandardSection/BaseStandardSection.tsx@@ -172,7 +172,7 @@ export function BaseStandardSection({)}</div>)}- {!isLoading && !hasError && data?.data?.length && (+ {!isLoading && !hasError && data?.data?.length ? (<div className="flex flex-row gap-2 justify-between items-center"><BaseStandardSectionDialogtitle={title}@@ -189,7 +189,7 @@ export function BaseStandardSection({close={close}/></div>- )}+ ) : null}</div>);}diff --git a/client/src/app/[site]/main/components/sections/Countries.tsx b/client/src/app/[site]/main/components/sections/Countries.tsxindex f0187cfce..66cd4c5cd 100644--- a/client/src/app/[site]/main/components/sections/Countries.tsx+++ b/client/src/app/[site]/main/components/sections/Countries.tsx@@ -42,7 +42,7 @@ export function Countries() {value={tab}onValueChange={(value) => setTab(value as Tab)}>- <div className="flex flex-row gap-2 justify-between items-start">+ <div className="flex flex-row gap-2 justify-between items-center"><TabsList><TabsTrigger value="countries">Countries</TabsTrigger><TabsTrigger value="regions">Regions</TabsTrigger>@@ -51,13 +51,11 @@ export function Countries() {<TabsTrigger value="map">Map</TabsTrigger></TabsList>{tab !== "map" && (- <Button- variant="outline"- size="smIcon"- onClick={() => setExpanded(!expanded)}- >- <Expand className="w-4 h-4" />- </Button>+ <div>+ <Button size="smIcon" onClick={() => setExpanded(!expanded)}>+ <Expand className="w-4 h-4" />+ </Button>+ </div>)}</div><TabsContent value="countries">diff --git a/client/src/app/[site]/main/components/sections/Devices.tsx b/client/src/app/[site]/main/components/sections/Devices.tsxindex 3f6029402..a9a44e589 100644--- a/client/src/app/[site]/main/components/sections/Devices.tsx+++ b/client/src/app/[site]/main/components/sections/Devices.tsx@@ -31,7 +31,7 @@ export function Devices() {value={tab}onValueChange={(value) => setTab(value as Tab)}>- <div className="flex flex-row gap-2 justify-between items-start">+ <div className="flex flex-row gap-2 justify-between items-center"><div className="overflow-x-auto pb-1"><TabsList><TabsTrigger value="browsers">Browsers</TabsTrigger>@@ -40,13 +40,11 @@ export function Devices() {<TabsTrigger value="dimensions">Screen Dimensions</TabsTrigger></TabsList></div>- <Button- variant="outline"- size="smIcon"- onClick={() => setExpanded(!expanded)}- >- <Expand />- </Button>+ <div>+ <Button size="smIcon" onClick={() => setExpanded(!expanded)}>+ <Expand />+ </Button>+ </div></div><TabsContent value="devices"><StandardSectiondiff --git a/client/src/app/[site]/main/components/sections/Pages.tsx b/client/src/app/[site]/main/components/sections/Pages.tsxindex b86b79efb..a51edf921 100644--- a/client/src/app/[site]/main/components/sections/Pages.tsx+++ b/client/src/app/[site]/main/components/sections/Pages.tsx@@ -32,17 +32,13 @@ export function Pages() {value={tab}onValueChange={(value) => setTab(value as Tab)}>- <div className="flex flex-row gap-2 justify-between items-start">+ <div className="flex flex-row gap-2 justify-between items-center"><TabsList><TabsTrigger value="pages">Pages</TabsTrigger><TabsTrigger value="entry_pages">Entry Pages</TabsTrigger><TabsTrigger value="exit_pages">Exit Pages</TabsTrigger></TabsList>- <Button- variant="outline"- size="smIcon"- onClick={() => setExpanded(!expanded)}- >+ <Button size="smIcon" onClick={() => setExpanded(!expanded)}><Expand className="w-4 h-4" /></Button></div>diff --git a/client/src/app/[site]/main/components/sections/Referrers.tsx b/client/src/app/[site]/main/components/sections/Referrers.tsxindex 4b76e72fc..620a60884 100644--- a/client/src/app/[site]/main/components/sections/Referrers.tsx+++ b/client/src/app/[site]/main/components/sections/Referrers.tsx@@ -35,7 +35,7 @@ export function Referrers() {value={tab}onValueChange={(value) => setTab(value as Tab)}>- <div className="flex flex-row gap-2 justify-between items-start">+ <div className="flex flex-row gap-2 justify-between items-center"><div className="overflow-x-auto pb-1"><TabsList><TabsTrigger value="referrers">Referrers</TabsTrigger>@@ -47,13 +47,11 @@ export function Referrers() {<TabsTrigger value="utm_content">Content</TabsTrigger></TabsList></div>- <Button- variant="outline"- size="smIcon"- onClick={() => setExpanded(!expanded)}- >- <Expand className="w-4 h-4" />- </Button>+ <div>+ <Button size="smIcon" onClick={() => setExpanded(!expanded)}>+ <Expand className="w-4 h-4" />+ </Button>+ </div></div><TabsContent value="referrers"><StandardSectiondiff --git a/client/src/app/signup/page.tsx b/client/src/app/signup/page.tsxindex 7e92a073f..a0e90a748 100644--- a/client/src/app/signup/page.tsx+++ b/client/src/app/signup/page.tsx@@ -447,7 +447,7 @@ export default function SignupPage() {<div className="border border-neutral-700 rounded-lg overflow-hidden"><CodeSnippetlanguage="HTML"- code={`<script\n src="${BACKEND_URL}/script.js"\n site-id="${siteId}"\n defer\n/>`}+ code={`<script\n src="${BACKEND_URL}/script.js"\n site-id="${siteId}"\n defer\n></script>`}/></div></div>