Skip to content

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

Refactor SubHeader and Filters components for improved layout and responsiveness

Bill Yang55bb7cb5116f
diff --git a/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx b/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx
index f3236c268..30cb30ce3 100644
--- a/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx
+++ b/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx
@@ -28,7 +28,7 @@ export function Filters({
const { getRegionName } = useGetRegionName();
return (
- <div className="flex gap-2">
+ <div className="flex gap-2 flex-wrap">
<NewFilterButton />
{filters.map((filter, i) => {
const disabled =
diff --git a/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx b/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx
index 3a5bc1058..811954bb8 100644
--- a/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx
+++ b/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx
@@ -70,7 +70,10 @@ export function NewFilterButton() {
Filter
</Button>
</DropdownMenuTrigger>
- <DropdownMenuContent align="start" className="flex flex-col p-0">
+ <DropdownMenuContent
+ align="start"
+ className="flex flex-col p-0 max-w-[95vw]"
+ >
<div className="flex flex-col gap-2 p-3">
{localFilters.map((filter, index) => (
<FilterComponent
diff --git a/client/src/app/[site]/components/SubHeader/SubHeader.tsx b/client/src/app/[site]/components/SubHeader/SubHeader.tsx
index a2416d4c6..61299cc1d 100644
--- a/client/src/app/[site]/components/SubHeader/SubHeader.tsx
+++ b/client/src/app/[site]/components/SubHeader/SubHeader.tsx
@@ -43,27 +43,34 @@ export function SubHeader({
const { time, setTime } = useStore();
return (
- <div className="flex gap-2 mb-3 justify-between">
- <div className="flex items-center gap-2">
- <MobileSidebar />
- <Filters availableFilters={availableFilters} />
- </div>
- <div className="flex items-center gap-2">
- <DateSelector time={time} setTime={setTime} />
- <div className="flex items-center">
- <Button variant="default" size="icon" onClick={goBack}>
- <ChevronLeft />
- </Button>
- <Button
- variant="default"
- size="icon"
- onClick={goForward}
- disabled={!canGoForward(time)}
- >
- <ChevronRight />
- </Button>
+ <div>
+ <div className="flex gap-2 mb-2 justify-between">
+ <div className="flex items-center gap-2">
+ <MobileSidebar />
+ <div className="hidden md:block">
+ <Filters availableFilters={availableFilters} />
+ </div>
+ </div>
+ <div className="flex items-center gap-2">
+ <DateSelector time={time} setTime={setTime} />
+ <div className="flex items-center">
+ <Button variant="default" size="icon" onClick={goBack}>
+ <ChevronLeft />
+ </Button>
+ <Button
+ variant="default"
+ size="icon"
+ onClick={goForward}
+ disabled={!canGoForward(time)}
+ >
+ <ChevronRight />
+ </Button>
+ </div>
</div>
</div>
+ <div className=" md:hidden">
+ <Filters availableFilters={availableFilters} />
+ </div>
</div>
);
}
diff --git a/client/src/app/[site]/components/shared/Filters/FilterComponent.tsx b/client/src/app/[site]/components/shared/Filters/FilterComponent.tsx
index 708d9f20f..59ac6e1c2 100644
--- a/client/src/app/[site]/components/shared/Filters/FilterComponent.tsx
+++ b/client/src/app/[site]/components/shared/Filters/FilterComponent.tsx
@@ -26,7 +26,7 @@ export function FilterComponent({
updateFilter: (filter: Filter | null, index: number) => void;
}) {
return (
- <div className="flex gap-2">
+ <div className="grid grid-cols-[220px_auto] md:grid-cols-[160px_100px_250px_auto] gap-2">
<Select
onValueChange={(value) => {
updateFilter(
diff --git a/client/src/app/[site]/components/shared/StandardSection/BaseStandardSectionDialog.tsx b/client/src/app/[site]/components/shared/StandardSection/BaseStandardSectionDialog.tsx
index ddb463636..76d7c6811 100644
--- a/client/src/app/[site]/components/shared/StandardSection/BaseStandardSectionDialog.tsx
+++ b/client/src/app/[site]/components/shared/StandardSection/BaseStandardSectionDialog.tsx
@@ -59,7 +59,7 @@ export function BaseStandardSectionDialog({
<DialogTrigger asChild>
<Button variant="outline">View All</Button>
</DialogTrigger>
- <DialogContent className="max-h-[95vh] max-w-[95vw] w-[600px]">
+ <DialogContent className="max-h-[80vh] max-w-[95vw] w-[600px]">
<DialogHeader>
<DialogTitle>{title}</DialogTitle>
</DialogHeader>
diff --git a/client/src/app/[site]/main/components/MainSection/Overview.tsx b/client/src/app/[site]/main/components/MainSection/Overview.tsx
index 870be4750..3b07b9fe0 100644
--- a/client/src/app/[site]/main/components/MainSection/Overview.tsx
+++ b/client/src/app/[site]/main/components/MainSection/Overview.tsx
@@ -33,7 +33,7 @@ const ChangePercentage = ({
return (
<div
className={cn(
- "text-sm flex items-center gap-1",
+ "text-xs flex items-center gap-1",
change > 0 ? "text-green-400" : "text-red-400"
)}
>
@@ -154,7 +154,7 @@ export function Overview() {
overviewDataPrevious?.data?.session_duration ?? 0;
return (
- <div className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-6 gap-0 items-center">
+ <div className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-6 gap-0 items-center">
<Stat
title="Unique Users"
id="users"
diff --git a/client/src/components/MultiSelect.tsx b/client/src/components/MultiSelect.tsx
index 778bd44cf..228030273 100644
--- a/client/src/components/MultiSelect.tsx
+++ b/client/src/components/MultiSelect.tsx
@@ -25,7 +25,7 @@ export const MultiSelect = forwardRef<any, MultiSelectProps<any>>(
classNames={{
control: ({ isFocused }) =>
cn(
- "flex w-[300px] min-h-[36px] rounded-md px-3 py-[3px] text-sm shadow-sm transition-colors ",
+ "flex min-h-[36px] rounded-md px-3 py-[3px] text-sm shadow-sm transition-colors ",
"placeholder:text-muted-foreground ",
"disabled:cursor-not-allowed disabled:opacity-50",
isFocused && "ring-1 ring-ring",