🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Enhance Filters and Event Log components with new icons and options
Bill Yang4c8712308de1
diff --git a/client/src/app/[site]/components/shared/Filters/const.tsx b/client/src/app/[site]/components/shared/Filters/const.tsxindex 0fbe7c6ea..6bc4b7ae6 100644--- a/client/src/app/[site]/components/shared/Filters/const.tsx+++ b/client/src/app/[site]/components/shared/Filters/const.tsx@@ -10,6 +10,7 @@ import {Link,LogIn,LogOut,+ MapPin,MapPinHouse,MapPinned,Maximize,@@ -156,6 +157,16 @@ export const FilterOptions: {value: "utm_term",icon: <Tag className="h-4 w-4" />,},+ {+ label: "Lat",+ value: "lat",+ icon: <MapPin className="h-4 w-4" />,+ },+ {+ label: "Lon",+ value: "lon",+ icon: <MapPin className="h-4 w-4" />,+ },];export const OperatorOptions = [diff --git a/client/src/app/[site]/events/components/EventLogItem.tsx b/client/src/app/[site]/events/components/EventLogItem.tsxindex f496e2363..1d3a29050 100644--- a/client/src/app/[site]/events/components/EventLogItem.tsx+++ b/client/src/app/[site]/events/components/EventLogItem.tsx@@ -2,7 +2,7 @@import { Badge } from "@/components/ui/badge";import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";-import { ExternalLink, FileText, Laptop, MousePointerClick, Smartphone } from "lucide-react";+import { ExternalLink, Eye, Laptop, MousePointerClick, Smartphone } from "lucide-react";import { DateTime } from "luxon";import Link from "next/link";import { useParams } from "next/navigation";@@ -71,7 +71,7 @@ export function EventLogItem({ event }: EventLogItemProps) {{/* Event type icon */}<div className="flex-shrink-0">{isPageview ? (- <FileText className="w-4 h-4 text-blue-500" />+ <Eye className="w-4 h-4 text-blue-500" />) : isOutbound ? (<ExternalLink className="w-4 h-4 text-purple-500" />) : (diff --git a/client/src/app/[site]/funnels/components/FunnelRow.tsx b/client/src/app/[site]/funnels/components/FunnelRow.tsxindex 22ed2f86a..f7b17dda6 100644--- a/client/src/app/[site]/funnels/components/FunnelRow.tsx+++ b/client/src/app/[site]/funnels/components/FunnelRow.tsx@@ -4,7 +4,7 @@ import { ConfirmationModal } from "@/components/ConfirmationModal";import { Button } from "@/components/ui/button";import { Card } from "@/components/ui/card";import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";-import { ArrowRight, ChevronDown, ChevronUp, Edit, FileText, MousePointerClick, Trash2 } from "lucide-react";+import { ArrowRight, ChevronDown, ChevronUp, Edit, Eye, MousePointerClick, Trash2 } from "lucide-react";import { useState } from "react";import { toast } from "sonner";import { useDeleteFunnel } from "../../../../api/analytics/funnels/useDeleteFunnel";@@ -77,7 +77,7 @@ export function FunnelRow({ funnel, index }: FunnelRowProps) {<TooltipTrigger asChild><span className="rounded bg-neutral-100 dark:bg-neutral-800 px-1.5 py-0.5 whitespace-nowrap overflow-hidden text-ellipsis flex items-center cursor-default">{step.type === "page" ? (- <FileText className="h-3 w-3 mr-1 text-blue-400" />+ <Eye className="h-3 w-3 mr-1 text-blue-400" />) : (<MousePointerClick className="h-3 w-3 mr-1 text-amber-400" />)}diff --git a/client/src/app/[site]/globe/components/GlobeSessions.tsx b/client/src/app/[site]/globe/components/GlobeSessions.tsxindex 7a50cbd2c..b96c59d34 100644--- a/client/src/app/[site]/globe/components/GlobeSessions.tsx+++ b/client/src/app/[site]/globe/components/GlobeSessions.tsx@@ -1,4 +1,4 @@-import { ArrowRight, ChevronDown, ChevronUp, ExternalLink, FileText, MousePointerClick } from "lucide-react";+import { ArrowRight, ChevronDown, ChevronUp, ExternalLink, Eye, MousePointerClick } from "lucide-react";import { DateTime } from "luxon";import Link from "next/link";import { useMemo, useState } from "react";@@ -13,10 +13,10 @@ import {OperatingSystemTooltipIcon,} from "../../../../components/TooltipIcons/TooltipIcons";import { Badge } from "../../../../components/ui/badge";+import { Button } from "../../../../components/ui/button";import { Tooltip, TooltipContent, TooltipTrigger } from "../../../../components/ui/tooltip";import { formatShortDuration, hour12, userLocale } from "../../../../lib/dateTimeUtils";import { cn, formatter } from "../../../../lib/utils";-import { Button } from "../../../../components/ui/button";// Function to truncate path for displayfunction truncatePath(path: string, maxLength: number = 32) {@@ -115,7 +115,7 @@ function SessionCard({ session }: { session: GetSessionsResponse[number] }) {<Tooltip><TooltipTrigger asChild><Badge className="flex items-center gap-1 bg-neutral-800 text-gray-300">- <FileText className="w-4 h-4 text-blue-500" />+ <Eye className="w-4 h-4 text-blue-500" /><span>{formatter(session.pageviews)}</span></Badge></TooltipTrigger>diff --git a/client/src/app/[site]/goals/components/GoalCard.tsx b/client/src/app/[site]/goals/components/GoalCard.tsxindex 453fc43e8..d6b6bbf9d 100644--- a/client/src/app/[site]/goals/components/GoalCard.tsx+++ b/client/src/app/[site]/goals/components/GoalCard.tsx@@ -1,8 +1,9 @@"use client";-import { FileText, MousePointerClick, Edit, Trash2 } from "lucide-react";+import { Edit, Eye, MousePointerClick, Trash2 } from "lucide-react";import { useState } from "react";import { useDeleteGoal } from "../../../../api/analytics/goals/useDeleteGoal";+import { Goal } from "../../../../api/analytics/goals/useGetGoals";import {AlertDialog,AlertDialogAction,@@ -14,9 +15,8 @@ import {AlertDialogTitle,} from "../../../../components/ui/alert-dialog";import { Button } from "../../../../components/ui/button";-import GoalFormModal from "./GoalFormModal";import { Tooltip, TooltipContent, TooltipTrigger } from "../../../../components/ui/tooltip";-import { Goal } from "../../../../api/analytics/goals/useGetGoals";+import GoalFormModal from "./GoalFormModal";interface GoalCardProps {goal: Goal;@@ -46,7 +46,7 @@ export default function GoalCard({ goal, siteId }: GoalCardProps) {{goal.goalType === "path" ? (<Tooltip><TooltipTrigger asChild>- <FileText className="w-4 h-4 text-blue-400" />+ <Eye className="w-4 h-4 text-blue-400" /></TooltipTrigger><TooltipContent><p>Page Goal</p>diff --git a/client/src/app/[site]/goals/components/GoalFormModal.tsx b/client/src/app/[site]/goals/components/GoalFormModal.tsxindex b7b6a5943..e2a91d4d7 100644--- a/client/src/app/[site]/goals/components/GoalFormModal.tsx+++ b/client/src/app/[site]/goals/components/GoalFormModal.tsx@@ -1,12 +1,14 @@"use client";import { zodResolver } from "@hookform/resolvers/zod";-import { FileText, MousePointerClick } from "lucide-react";-import { useState, useEffect } from "react";+import { Eye, MousePointerClick } from "lucide-react";+import { useEffect, useState } from "react";import { useForm } from "react-hook-form";import * as z from "zod";import { useCreateGoal } from "../../../../api/analytics/goals/useCreateGoal";import { Goal } from "../../../../api/analytics/goals/useGetGoals";+import { useUpdateGoal } from "../../../../api/analytics/goals/useUpdateGoal";+import { useSingleCol } from "../../../../api/analytics/useSingleCol";import { Button } from "../../../../components/ui/button";import {Dialog,@@ -18,12 +20,10 @@ import {} from "../../../../components/ui/dialog";import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "../../../../components/ui/form";import { Input } from "../../../../components/ui/input";+import { InputWithSuggestions, SuggestionOption } from "../../../../components/ui/input-with-suggestions";import { Label } from "../../../../components/ui/label";import { Switch } from "../../../../components/ui/switch";import { cn } from "../../../../lib/utils";-import { useUpdateGoal } from "../../../../api/analytics/goals/useUpdateGoal";-import { InputWithSuggestions, SuggestionOption } from "../../../../components/ui/input-with-suggestions";-import { useSingleCol } from "../../../../api/analytics/useSingleCol";// Define form schemaconst formSchema = z@@ -229,7 +229,7 @@ export default function GoalFormModal({ siteId, goal, trigger }: GoalFormModalPr<div className="flex items-center gap-2 mt-1">{field.value === "path" ? (<div className="flex items-center gap-1 bg-neutral-800/50 py-2 px-3 rounded">- <FileText className="w-4 h-4 text-blue-500" />+ <Eye className="w-4 h-4 text-blue-500" /><span>Page Goal</span></div>) : (@@ -251,7 +251,7 @@ export default function GoalFormModal({ siteId, goal, trigger }: GoalFormModalPr)}onClick={() => field.onChange("path")}>- <FileText className="w-4 h-4 text-blue-500" />+ <Eye className="w-4 h-4 text-blue-500" /><span>Page Goal</span></Button><Buttondiff --git a/client/src/app/[site]/realtime/RealtimeEvents/RealtimeEvents.tsx b/client/src/app/[site]/realtime/RealtimeEvents/RealtimeEvents.tsxindex f3cc3f82f..3243cd19a 100644--- a/client/src/app/[site]/realtime/RealtimeEvents/RealtimeEvents.tsx+++ b/client/src/app/[site]/realtime/RealtimeEvents/RealtimeEvents.tsx@@ -1,5 +1,5 @@import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";-import { FileText, Laptop, MousePointerClick, Smartphone } from "lucide-react";+import { Eye, Laptop, MousePointerClick, Smartphone } from "lucide-react";import { DateTime } from "luxon";import Link from "next/link";import { Event, useGetEvents } from "../../../../api/analytics/events/useGetEvents";@@ -46,7 +46,7 @@ function EventCard({ event }: { event: Event }) {<div className="flex items-center gap-2 text-sm text-neutral-100 mb-2"><div className="flex items-center gap-2">{isPageview ? (- <FileText className="w-4 h-4 text-blue-500" />+ <Eye className="w-4 h-4 text-blue-500" />) : (<MousePointerClick className="w-4 h-4 text-amber-500" />)}diff --git a/client/src/app/[site]/user/[userId]/page.tsx b/client/src/app/[site]/user/[userId]/page.tsxindex 5a3826e00..ad2c12b23 100644--- a/client/src/app/[site]/user/[userId]/page.tsx+++ b/client/src/app/[site]/user/[userId]/page.tsx@@ -6,8 +6,8 @@ import {Calendar,CalendarCheck,Clock,+ Eye,Files,- FileText,Monitor,MousePointerClick,Smartphone,@@ -17,19 +17,19 @@ import { DateTime } from "luxon";import { useParams, useRouter } from "next/navigation";import { useUserInfo } from "../../../../api/analytics/userInfo";import { useGetUserSessionCount } from "../../../../api/analytics/userSessions";+import { Avatar } from "../../../../components/Avatar";+import { Badge } from "../../../../components/ui/badge";import { Button } from "../../../../components/ui/button";import { Skeleton } from "../../../../components/ui/skeleton";import { useSetPageTitle } from "../../../../hooks/useSetPageTitle";+import { formatDuration } from "../../../../lib/dateTimeUtils";import { useGetRegionName } from "../../../../lib/geo";import { getCountryName, getLanguageName } from "../../../../lib/utils";-import { formatDuration } from "../../../../lib/dateTimeUtils";import { Browser } from "../../components/shared/icons/Browser";import { CountryFlag } from "../../components/shared/icons/CountryFlag";import { OperatingSystem } from "../../components/shared/icons/OperatingSystem";-import { VisitCalendar } from "./components/Calendar";-import { Avatar } from "../../../../components/Avatar";import { MobileSidebar } from "../../components/Sidebar/MobileSidebar";-import { Badge } from "../../../../components/ui/badge";+import { VisitCalendar } from "./components/Calendar";export default function UserPage() {useSetPageTitle("Rybbit · User");@@ -177,7 +177,7 @@ export default function UserPage() {</div><div className="bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-800 flex-grow"><div className="text-xs text-neutral-400 flex items-center gap-1">- <FileText className="w-4 h-4" />+ <Eye className="w-4 h-4" />Pageviews</div><div className="font-semibold">{data?.pageviews}</div>diff --git a/client/src/components/Sessions/SessionCard.tsx b/client/src/components/Sessions/SessionCard.tsxindex 553da661f..6d7294aad 100644--- a/client/src/components/Sessions/SessionCard.tsx+++ b/client/src/components/Sessions/SessionCard.tsx@@ -1,19 +1,13 @@import { Skeleton } from "@/components/ui/skeleton";import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";-import {- ArrowRight,- ChevronDown,- ChevronRight,- ExternalLink,- FileText,- MousePointerClick,- TriangleAlert,-} from "lucide-react";+import { ArrowRight, ChevronDown, ChevronRight, Eye, MousePointerClick } from "lucide-react";import { DateTime } from "luxon";import { memo, useState } from "react";import { GetSessionsResponse } from "../../api/analytics/userSessions";import { formatDuration, hour12, userLocale } from "../../lib/dateTimeUtils";import { cn, formatter } from "../../lib/utils";+import { Avatar } from "../Avatar";+import { Channel } from "../Channel";import {BrowserTooltipIcon,CountryFlagTooltipIcon,@@ -22,8 +16,6 @@ import {} from "../TooltipIcons/TooltipIcons";import { Badge } from "../ui/badge";import { SessionDetails } from "./SessionDetails";-import { Avatar } from "../Avatar";-import { Channel } from "../Channel";interface SessionCardProps {session: GetSessionsResponse[number];@@ -84,7 +76,7 @@ export function SessionCard({ session, onClick, userId }: SessionCardProps) {<Tooltip><TooltipTrigger asChild><Badge className="flex items-center gap-1 bg-neutral-800 text-gray-300">- <FileText className="w-4 h-4 text-blue-500" />+ <Eye className="w-4 h-4 text-blue-500" /><span>{formatter(session.pageviews)}</span></Badge></TooltipTrigger>diff --git a/client/src/components/Sessions/SessionDetails.tsx b/client/src/components/Sessions/SessionDetails.tsxindex 17cb32bc2..cee376bf3 100644--- a/client/src/components/Sessions/SessionDetails.tsx+++ b/client/src/components/Sessions/SessionDetails.tsx@@ -3,11 +3,12 @@ import { Alert, AlertDescription } from "@/components/ui/alert";import { Badge } from "@/components/ui/badge";import { Skeleton } from "@/components/ui/skeleton";import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";import {ArrowRight,Clock,ExternalLink,- FileText,+ Eye,Loader2,Monitor,MousePointerClick,@@ -23,13 +24,11 @@ import { GetSessionsResponse, SessionEvent, useGetSessionDetailsInfinite } fromimport { 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 { cn, getCountryName, getLanguageName } from "../../lib/utils";-import { formatDuration } from "../../lib/dateTimeUtils";-import { Button } from "../ui/button";-import { hour12 } from "../../lib/dateTimeUtils";+import { formatDuration, hour12 } from "../../lib/dateTimeUtils";import { useGetRegionName } from "../../lib/geo";+import { cn, getCountryName, getLanguageName } from "../../lib/utils";import { Avatar } from "../Avatar";-import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";+import { Button } from "../ui/button";// Component to display a single pageview or eventfunction PageviewItem({@@ -97,7 +96,7 @@ function PageviewItem({) : isOutbound ? (<ExternalLink className="w-4 h-4 text-purple-500" />) : (- <FileText className="w-4 h-4 text-blue-500" />+ <Eye className="w-4 h-4 text-blue-500" />)}</div>diff --git a/docs-v2/src/components/Cards/RealTimeAnalytics.tsx b/docs-v2/src/components/Cards/RealTimeAnalytics.tsxindex 911904fd4..d6f4c675b 100644--- a/docs-v2/src/components/Cards/RealTimeAnalytics.tsx+++ b/docs-v2/src/components/Cards/RealTimeAnalytics.tsx@@ -1,12 +1,11 @@"use client";-import { Clock, FileText, MousePointerClick } from "lucide-react";-import { CountryFlag } from "../Country";+import { Clock, Eye, Laptop, MousePointerClick, Smartphone } from "lucide-react";+import { useEffect, useState } from "react";import { Browser } from "../Browser";+import { CountryFlag } from "../Country";import { OperatingSystem } from "../OperatingSystem";-import { Laptop, Smartphone } from "lucide-react";import { Card } from "./Card";-import { useState, useEffect } from "react";// Mock event templatesconst eventTemplates = [@@ -109,20 +108,18 @@ function EventCard({ event, index, isNew }: { event: Event; index: number; isNew}, [isNew]);return (- <div+ <divclassName="absolute w-full rounded-lg bg-neutral-800/50 overflow-hidden p-3 flex flex-col transition-all duration-500"style={{- transform: isAnimating && index === 0- ? `translateY(-82px)`- : `translateY(${index * 82}px)`,- opacity: isAnimating && index === 0 ? 0 : (index < 4 ? 1 : 0),+ transform: isAnimating && index === 0 ? `translateY(-82px)` : `translateY(${index * 82}px)`,+ opacity: isAnimating && index === 0 ? 0 : index < 4 ? 1 : 0,zIndex: 10 - index,}}><div className="flex items-center gap-2 text-sm text-neutral-100 mb-2"><div className="flex items-center gap-2">{isPageview ? (- <FileText className="w-4 h-4 text-blue-500" />+ <Eye className="w-4 h-4 text-blue-500" />) : (<MousePointerClick className="w-4 h-4 text-amber-500" />)}@@ -143,11 +140,7 @@ function EventCard({ event, index, isNew }: { event: Event; index: number; isNew<OperatingSystem os={event.operating_system || ""} /></div><div>- {event.device_type === "Mobile" ? (- <Smartphone className="w-4 h-4" />- ) : (- <Laptop className="w-4 h-4" />- )}+ {event.device_type === "Mobile" ? <Smartphone className="w-4 h-4" /> : <Laptop className="w-4 h-4" />}</div></div>@@ -176,24 +169,21 @@ export function RealTimeAnalytics() {isNew: true,};- setEvents((prevEvents) => {+ setEvents(prevEvents => {// Add new event at the beginning and keep only last 4 eventsconst updatedEvents = [newEvent, ...prevEvents.slice(0, 3)].map((event, index) => ({...event,isNew: index === 0,// Update timestamps- timestamp: index === 0 ? "just now" :- index === 1 ? "30 sec ago" :- index === 2 ? "1 min ago" :- "2 min ago"+ timestamp: index === 0 ? "just now" : index === 1 ? "30 sec ago" : index === 2 ? "1 min ago" : "2 min ago",}));return updatedEvents;});- setNextId((prev) => prev + 1);-+ setNextId(prev => prev + 1);+// Randomly update online count- setOnlineCount((prev) => {+ setOnlineCount(prev => {const change = Math.random() > 0.5 ? 1 : -1;return Math.max(15, Math.min(45, prev + change));});@@ -223,4 +213,4 @@ export function RealTimeAnalytics() {</div></Card>);-}\ No newline at end of file+}diff --git a/docs-v2/src/components/Cards/UserSessions.tsx b/docs-v2/src/components/Cards/UserSessions.tsxindex af7c7b789..1f8f9897f 100644--- a/docs-v2/src/components/Cards/UserSessions.tsx+++ b/docs-v2/src/components/Cards/UserSessions.tsx@@ -1,8 +1,8 @@-import { Clock, FileText, MousePointerClick, Laptop } from "lucide-react";-import { CountryFlag } from "../Country";+import Avatar from "boring-avatars";+import { Clock, Eye, Laptop, MousePointerClick } from "lucide-react";import { Browser } from "../Browser";+import { CountryFlag } from "../Country";import { OperatingSystem } from "../OperatingSystem";-import Avatar from "boring-avatars";import { Card } from "./Card";export function UserSessions() {@@ -22,9 +22,7 @@ export function UserSessions() {/><div><div className="text-sm">2c49ae3</div>- <div className="text-xs text-neutral-400">- Today, 14:22 - 14:36 (14m)- </div>+ <div className="text-xs text-neutral-400">Today, 14:22 - 14:36 (14m)</div></div></div><div className="flex items-center gap-2">@@ -37,7 +35,7 @@ export function UserSessions() {{/*<div className="flex gap-2 mb-3"><div className="flex items-center gap-1 text-xs bg-blue-500/20 text-blue-400 px-2 py-1 rounded">- <FileText className="w-3 h-3" />+ <Eye className="w-3 h-3" /><span>Pageviews: 5</span></div><div className="flex items-center gap-1 text-xs bg-amber-500/20 text-amber-400 px-2 py-1 rounded">@@ -59,7 +57,7 @@ export function UserSessions() {<div className="flex flex-col ml-3 flex-1"><div className="flex items-center flex-1 py-1">- <FileText className="w-4 h-4 text-blue-500 mr-3" />+ <Eye className="w-4 h-4 text-blue-500 mr-3" /><div className="flex-1 min-w-0 mr-4"><div className="text-sm truncate">/home</div></div>@@ -93,15 +91,11 @@ export function UserSessions() {<div className="flex items-center pl-7 mt-1"><div className="flex flex-wrap gap-2"><div className="px-1.5 py-0 h-5 text-xs bg-neutral-800 rounded border border-neutral-700">- <span className="text-neutral-400 font-light mr-1">- button_id:- </span>+ <span className="text-neutral-400 font-light mr-1">button_id:</span><span>pricing</span></div><div className="px-1.5 py-0 h-5 text-xs bg-neutral-800 rounded border border-neutral-700">- <span className="text-neutral-400 font-light mr-1">- section:- </span>+ <span className="text-neutral-400 font-light mr-1">section:</span><span>features</span></div></div>@@ -120,7 +114,7 @@ export function UserSessions() {<div className="flex flex-col ml-3 flex-1"><div className="flex items-center flex-1 py-1">- <FileText className="w-4 h-4 text-blue-500 mr-3" />+ <Eye className="w-4 h-4 text-blue-500 mr-3" /><div className="flex-1 min-w-0 mr-4"><div className="text-sm truncate">/pricing</div></div>@@ -155,15 +149,11 @@ export function UserSessions() {<div className="flex items-center pl-7 mt-1"><div className="flex flex-wrap gap-2"><div className="px-1.5 py-0 h-5 text-xs bg-neutral-800 rounded border border-neutral-700">- <span className="text-neutral-400 font-light mr-1">- form_id:- </span>+ <span className="text-neutral-400 font-light mr-1">form_id:</span><span>contact-form</span></div><div className="px-1.5 py-0 h-5 text-xs bg-neutral-800 rounded border border-neutral-700">- <span className="text-neutral-400 font-light mr-1">- success:- </span>+ <span className="text-neutral-400 font-light mr-1">success:</span><span>true</span></div></div>@@ -174,4 +164,4 @@ export function UserSessions() {</div></Card>);-}\ No newline at end of file+}