Skip to content

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

Refactor padding and layout in funnel, retention, sessions, user, and users pages; update SessionCard for better responsiveness

Bill Yang6919fee208f0
diff --git a/client/src/app/[site]/funnels/page.tsx b/client/src/app/[site]/funnels/page.tsx
index c2b1c0dd7..db773df5b 100644
--- a/client/src/app/[site]/funnels/page.tsx
+++ b/client/src/app/[site]/funnels/page.tsx
@@ -28,7 +28,7 @@ export default function FunnelsPage() {
}
return (
- <div className="p-4 max-w-[1300px] mx-auto space-y-3">
+ <div className="p-2 md:p-4 max-w-[1300px] mx-auto space-y-3">
<div className="flex justify-between items-center mb-6">
<h1 className="text-2xl font-bold">Funnels</h1>
<CreateFunnelDialog />
diff --git a/client/src/app/[site]/retention/page.tsx b/client/src/app/[site]/retention/page.tsx
index bb7352465..983f64863 100644
--- a/client/src/app/[site]/retention/page.tsx
+++ b/client/src/app/[site]/retention/page.tsx
@@ -244,7 +244,7 @@ export default function RetentionPage() {
: [];
return (
- <div className="p-4 max-w-[1300px] mx-auto space-y-3">
+ <div className="p-2 md:p-4 max-w-[1300px] mx-auto space-y-3">
{/* Single Card containing both chart and grid */}
<Card>
<CardHeader className="flex flex-row items-center justify-between pb-2">
diff --git a/client/src/app/[site]/sessions/page.tsx b/client/src/app/[site]/sessions/page.tsx
index d63399590..38e36e38b 100644
--- a/client/src/app/[site]/sessions/page.tsx
+++ b/client/src/app/[site]/sessions/page.tsx
@@ -6,7 +6,7 @@ import SessionsList from "@/components/Sessions/SessionsList";
export default function SessionsPage() {
return (
- <div className="p-4 max-w-[1300px] mx-auto space-y-3">
+ <div className="p-2 md:p-4 max-w-[1300px] mx-auto space-y-3">
<SubHeader availableFilters={SESSION_PAGE_FILTERS} />
<SessionsList />
</div>
diff --git a/client/src/app/[site]/user/[userId]/page.tsx b/client/src/app/[site]/user/[userId]/page.tsx
index 6119ccf86..d61d346cd 100644
--- a/client/src/app/[site]/user/[userId]/page.tsx
+++ b/client/src/app/[site]/user/[userId]/page.tsx
@@ -32,7 +32,7 @@ export default function UserPage() {
const { getRegionName } = useGetRegionName();
return (
- <div className="p-4 max-w-[1300px] mx-auto space-y-3">
+ <div className="p-2 md:p-4 max-w-[1300px] mx-auto space-y-3">
<div className="mb-4">
<h1 className="text-2xl font-bold mb-4 flex items-center gap-2">
<Avatar
diff --git a/client/src/app/[site]/users/page.tsx b/client/src/app/[site]/users/page.tsx
index 044d38cbb..1e907a256 100644
--- a/client/src/app/[site]/users/page.tsx
+++ b/client/src/app/[site]/users/page.tsx
@@ -276,7 +276,7 @@ export default function UsersPage() {
}
return (
- <div className="p-4 max-w-[1400px] mx-auto space-y-3">
+ <div className="p-2 md:p-4 max-w-[1400px] mx-auto space-y-3">
<SubHeader availableFilters={USER_PAGE_FILTERS} />
<div className="rounded-md border border-neutral-800 bg-neutral-900">
<div className="relative overflow-x-auto">
diff --git a/client/src/components/Sessions/SessionCard.tsx b/client/src/components/Sessions/SessionCard.tsx
index 6e2f04d2f..58ee75477 100644
--- a/client/src/components/Sessions/SessionCard.tsx
+++ b/client/src/components/Sessions/SessionCard.tsx
@@ -3,7 +3,7 @@ import { DateTime } from "luxon";
import { Browser } from "../../app/[site]/components/shared/icons/Browser";
import { CountryFlag } from "../../app/[site]/components/shared/icons/CountryFlag";
import { OperatingSystem } from "../../app/[site]/components/shared/icons/OperatingSystem";
-import { getCountryName } from "../../lib/utils";
+import { formatter, getCountryName } from "../../lib/utils";
import {
Laptop,
Smartphone,
@@ -77,21 +77,14 @@ export function SessionCard({ session, onClick, userId }: SessionCardProps) {
<div className="mb-3 rounded-lg bg-neutral-900 border border-neutral-800 overflow-hidden">
<div className="p-3 cursor-pointer" onClick={handleCardClick}>
<div className="flex items-center gap-2">
- {/* Avatar and User ID */}
- <div className="flex items-center gap-2">
- {/* <Avatar
- name={session.user_id}
- colors={["#2c2b4b", "#a75293", "#9c7a9d", "#9ddacb", "#f8dcb4"]}
- variant="beam"
- size={24}
- /> */}
+ <div className="hidden md:flex items-center gap-2">
<span className="text-xs font-mono text-gray-400">
{truncatedUserId}
</span>
</div>
{/* Icons section */}
- <div className="flex space-x-2 items-center ml-3">
+ <div className="flex space-x-2 items-center md:ml-3">
{/* Country */}
{session.country && (
<Tooltip>
@@ -109,7 +102,7 @@ export function SessionCard({ session, onClick, userId }: SessionCardProps) {
{/* Browser */}
<Tooltip>
<TooltipTrigger asChild>
- <div>
+ <div className="flex-shrink-0">
<Browser browser={session.browser || "Unknown"} />
</div>
</TooltipTrigger>
@@ -121,7 +114,7 @@ export function SessionCard({ session, onClick, userId }: SessionCardProps) {
{/* OS */}
<Tooltip>
<TooltipTrigger asChild>
- <div>
+ <div className="flex-shrink-0">
<OperatingSystem os={session.operating_system || ""} />
</div>
</TooltipTrigger>
@@ -149,7 +142,7 @@ export function SessionCard({ session, onClick, userId }: SessionCardProps) {
className="flex items-center gap-1 bg-neutral-800 text-gray-300"
>
<FileText className="w-4 h-4 text-blue-500" />
- <span>{session.pageviews}</span>
+ <span>{formatter(session.pageviews)}</span>
</Badge>
</TooltipTrigger>
<TooltipContent>Pageviews</TooltipContent>
@@ -161,7 +154,7 @@ export function SessionCard({ session, onClick, userId }: SessionCardProps) {
className="flex items-center gap-1 bg-neutral-800 text-gray-300"
>
<MousePointerClick className="w-4 h-4 text-amber-500" />
- <span>{session.events}</span>
+ <span>{formatter(session.events)}</span>
</Badge>
</TooltipTrigger>
<TooltipContent>Events</TooltipContent>
@@ -169,7 +162,7 @@ export function SessionCard({ session, onClick, userId }: SessionCardProps) {
</div>
{/* Pages section with tooltips for long paths */}
- <div className="flex items-center ml-3 flex-1 min-w-0">
+ <div className="items-center ml-3 flex-1 min-w-0 hidden md:flex">
<Tooltip>
<TooltipTrigger asChild>
<span className="text-xs text-gray-400 truncate max-w-[200px] inline-block">
@@ -203,11 +196,11 @@ export function SessionCard({ session, onClick, userId }: SessionCardProps) {
"MMM d, h:mm a"
)}
</span>
- <span>{durationFormatted}</span>
+ <span className="hidden md:block">{durationFormatted}</span>
</div>
{/* Expand/Collapse icon */}
- <div className="ml-2 flex-shrink-0">
+ <div className="ml-2 flex-shrink-0 hidden md:flex">
{expanded ? (
<ChevronDown className="w-4 h-4 text-gray-400" />
) : (
@@ -261,16 +254,15 @@ export const SessionCardSkeleton = memo(() => {
<div className="p-3">
<div className="flex items-center gap-2">
{/* Avatar and User ID */}
- <div className="flex items-center gap-2">
- <Skeleton className="h-6 w-6 rounded-full" />
+ <div className="hidden md:flex items-center gap-2">
<Skeleton className="h-3 w-14" />
</div>
{/* Icons */}
- <div className="flex space-x-2 items-center ml-3">
- <Skeleton className="h-4 w-4 rounded-sm" />
- <Skeleton className="h-4 w-4 rounded-sm" />
+ <div className="flex space-x-2 items-center md:ml-3">
<Skeleton className="h-4 w-4 rounded-sm" />
+ <Skeleton className="h-4 w-4 rounded-sm flex-shrink-0" />
+ <Skeleton className="h-4 w-4 rounded-sm flex-shrink-0" />
<Skeleton className="h-4 w-4 rounded-sm" />
{/* Badge skeleton for pageviews */}
<Skeleton className="h-4 w-8 rounded-sm" />
@@ -279,7 +271,7 @@ export const SessionCardSkeleton = memo(() => {
</div>
{/* Entry/Exit paths with randomized widths */}
- <div className="flex items-center ml-3 flex-1 min-w-0">
+ <div className="items-center ml-3 flex-1 min-w-0 hidden md:flex">
<Skeleton className={`h-3 max-w-[200px] ${getRandomWidth()}`} />
<div className="mx-2 flex-shrink-0">
<Skeleton className="h-3 w-3" />
@@ -288,16 +280,18 @@ export const SessionCardSkeleton = memo(() => {
</div>
{/* Time */}
- <div className="flex items-center gap-4 ml-3">
+ <div className="flex items-center gap-4">
{/* Date/time skeleton */}
<Skeleton className={`h-3 ${getRandomTimeWidth()}`} />
{/* Duration skeleton */}
- <Skeleton className={`h-3 ${getRandomDurationWidth()}`} />
+ <Skeleton
+ className={`h-3 ${getRandomDurationWidth()} hidden md:block`}
+ />
</div>
{/* Expand icon */}
- <div className="ml-2 flex-shrink-0">
+ <div className="ml-2 flex-shrink-0 hidden md:flex">
<Skeleton className="h-4 w-4" />
</div>
</div>