Skip to content

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

Wip

Bill Yang0e32b4edb63d
diff --git a/client/src/hooks/api.ts b/client/src/api/api.ts
similarity index 90%
rename from client/src/hooks/api.ts
rename to client/src/api/api.ts
index 9cd5454a2..040832d9a 100644
--- a/client/src/hooks/api.ts
+++ b/client/src/api/api.ts
@@ -1,14 +1,12 @@
+import { authClient } from "@/lib/auth";
import {
+ useInfiniteQuery,
useQuery,
UseQueryResult,
- useInfiniteQuery,
- useMutation,
- useQueryClient,
} from "@tanstack/react-query";
import { BACKEND_URL } from "../lib/const";
import { FilterParameter, useStore } from "../lib/store";
import { authedFetch, getStartAndEndDate } from "./utils";
-import { authClient } from "@/lib/auth";
export type APIResponse<T> = {
data: T;
@@ -91,40 +89,6 @@ export function useGenericQuery<T>(
});
}
-export function useGenericSiteDataQuery<T>(
- endpoint: string,
- periodTime?: PeriodTime
-): UseQueryResult<APIResponse<T>> {
- const { time, previousTime, site, filters } = useStore();
- const timeToUse = periodTime === "previous" ? previousTime : time;
- const { startDate, endDate } = getStartAndEndDate(timeToUse);
-
- return useQuery({
- queryKey: [endpoint, timeToUse, site, filters],
- queryFn: () => {
- const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
- return authedFetch(
- `${BACKEND_URL}/${endpoint}?${
- startDate ? `startDate=${startDate}&` : ""
- }${
- endDate ? `endDate=${endDate}&` : ""
- }timezone=${timezone}&site=${site}&filters=${JSON.stringify(filters)}`
- ).then((res) => res.json());
- },
- staleTime: Infinity,
- placeholderData: (_, query: any) => {
- if (!query?.queryKey) return undefined;
- const prevQueryKey = query.queryKey as [string, string, string];
- const [, , prevSite] = prevQueryKey;
-
- if (prevSite === site) {
- return query.state.data;
- }
- return undefined;
- },
- });
-}
-
export type GetOverviewBucketedResponse = {
time: string;
pageviews: number;
diff --git a/client/src/api/hooks.ts b/client/src/api/hooks.ts
new file mode 100644
index 000000000..d5da41325
--- /dev/null
+++ b/client/src/api/hooks.ts
@@ -0,0 +1,27 @@
+import { useQuery } from "@tanstack/react-query";
+import { BACKEND_URL } from "../lib/const";
+import { useGetSites } from "./api";
+import { authedFetch } from "./utils";
+
+export function useGetSiteMetadata(siteId: string | number) {
+ const { data, isLoading } = useGetSites();
+ return {
+ siteMetadata: data?.data?.find((site) => site.siteId === Number(siteId)),
+ isLoading,
+ };
+}
+
+export function useUserOrganizations() {
+ const { data: orgsData, isLoading: orgsLoading } = useQuery({
+ queryKey: ["userOrganizations"],
+ queryFn: () =>
+ authedFetch(`${BACKEND_URL}/user/organizations`).then((res) =>
+ res.json()
+ ),
+ });
+
+ return {
+ organizations: orgsData?.data || [],
+ isLoading: orgsLoading,
+ };
+}
diff --git a/client/src/hooks/utils.ts b/client/src/api/utils.ts
similarity index 100%
rename from client/src/hooks/utils.ts
rename to client/src/api/utils.ts
diff --git a/client/src/app/[site]/Header/Header.tsx b/client/src/app/[site]/Header/Header.tsx
index de5806b44..bfc7ce696 100644
--- a/client/src/app/[site]/Header/Header.tsx
+++ b/client/src/app/[site]/Header/Header.tsx
@@ -5,7 +5,7 @@ import { ChartBarDecreasing, ChartLine, Radio, User } from "lucide-react";
import Link from "next/link";
import { usePathname } from "next/navigation";
import { SiteSettings } from "../../../components/SiteSettings/SiteSettings";
-import { useGetLiveUsercount, useGetSites } from "../../../hooks/api";
+import { useGetLiveUsercount, useGetSites } from "../../../api/api";
export function Header() {
const { data } = useGetLiveUsercount();
diff --git a/client/src/app/[site]/components/NoData.tsx b/client/src/app/[site]/components/NoData.tsx
index d6a4ab34b..a281315d4 100644
--- a/client/src/app/[site]/components/NoData.tsx
+++ b/client/src/app/[site]/components/NoData.tsx
@@ -1,6 +1,6 @@
import { CodeSnippet } from "../../../components/CodeSnippet";
import { Card, CardContent, CardHeader } from "../../../components/ui/card";
-import { GetSitesResponse } from "../../../hooks/api";
+import { GetSitesResponse } from "../../../api/api";
import { BACKEND_URL } from "../../../lib/const";
export function NoData({
diff --git a/client/src/app/[site]/components/SubHeader/Filters/ValueFilter.tsx b/client/src/app/[site]/components/SubHeader/Filters/ValueFilter.tsx
index f092be81d..b83334d26 100644
--- a/client/src/app/[site]/components/SubHeader/Filters/ValueFilter.tsx
+++ b/client/src/app/[site]/components/SubHeader/Filters/ValueFilter.tsx
@@ -25,7 +25,7 @@ import {
import { FilterParameter, addFilter } from "../../../../../lib/store";
-import { useSingleCol } from "../../../../../hooks/api";
+import { useSingleCol } from "../../../../../api/api";
import { MultiSelect } from "../../../../../components/MultiSelect";
interface ValueFilterProps {
diff --git a/client/src/app/[site]/components/SubHeader/SubHeader.tsx b/client/src/app/[site]/components/SubHeader/SubHeader.tsx
index 627161327..ec7791f8b 100644
--- a/client/src/app/[site]/components/SubHeader/SubHeader.tsx
+++ b/client/src/app/[site]/components/SubHeader/SubHeader.tsx
@@ -7,7 +7,7 @@ import { ChevronLeft, ChevronRight } from "lucide-react";
import { DateTime } from "luxon";
import { usePathname } from "next/navigation";
-import { useGetSites } from "../../../../hooks/api";
+import { useGetSites } from "../../../../api/api";
import { DateSelector } from "./DateSelector";
const canGoForward = (time: Time) => {
diff --git a/client/src/app/[site]/components/shared/StandardCard.tsx b/client/src/app/[site]/components/shared/StandardCard.tsx
index 1c6d35949..c7fa9a867 100644
--- a/client/src/app/[site]/components/shared/StandardCard.tsx
+++ b/client/src/app/[site]/components/shared/StandardCard.tsx
@@ -20,7 +20,7 @@ import { ReactNode, useMemo } from "react";
import { addFilter, FilterParameter } from "../../../../lib/store";
import { formatter } from "../../../../lib/utils";
import { SquareArrowOutUpRight } from "lucide-react";
-import { SingleColResponse, useSingleCol } from "../../../../hooks/api";
+import { SingleColResponse, useSingleCol } from "../../../../api/api";
export function StandardCard({
title,
diff --git a/client/src/app/[site]/layout.tsx b/client/src/app/[site]/layout.tsx
index e7f11911e..759f1a65d 100644
--- a/client/src/app/[site]/layout.tsx
+++ b/client/src/app/[site]/layout.tsx
@@ -4,8 +4,8 @@ import { useEffect } from "react";
import { useStore } from "../../lib/store";
import { useSyncStateWithUrl } from "../../lib/urlParams";
import { Header } from "./Header/Header";
-import { useSiteHasData } from "../../hooks/api";
-import { useGetSiteMetadata } from "../../hooks/hooks";
+import { useSiteHasData } from "../../api/api";
+import { useGetSiteMetadata } from "../../api/hooks";
import { NoData } from "./components/NoData";
export default function SiteLayout({
diff --git a/client/src/app/[site]/main/components/MainSection/Chart.tsx b/client/src/app/[site]/main/components/MainSection/Chart.tsx
index 257b3a2ef..7d615566d 100644
--- a/client/src/app/[site]/main/components/MainSection/Chart.tsx
+++ b/client/src/app/[site]/main/components/MainSection/Chart.tsx
@@ -1,5 +1,5 @@
"use client";
-import { APIResponse, GetOverviewBucketedResponse } from "@/hooks/api";
+import { APIResponse, GetOverviewBucketedResponse } from "@/api/api";
import { nivoTheme } from "@/lib/nivo";
import { StatType, Time, TimeBucket, useStore } from "@/lib/store";
import { ResponsiveLine } from "@nivo/line";
diff --git a/client/src/app/[site]/main/components/MainSection/MainSection.tsx b/client/src/app/[site]/main/components/MainSection/MainSection.tsx
index 038f8e22a..46fa40f82 100644
--- a/client/src/app/[site]/main/components/MainSection/MainSection.tsx
+++ b/client/src/app/[site]/main/components/MainSection/MainSection.tsx
@@ -1,6 +1,6 @@
"use client";
import { Card, CardContent, CardLoader } from "@/components/ui/card";
-import { useGetOverview, useGetOverviewBucketed } from "@/hooks/api";
+import { useGetOverview, useGetOverviewBucketed } from "@/api/api";
import { BucketSelection } from "./BucketSelection";
import { Chart } from "./Chart";
import { Overview } from "./Overview";
diff --git a/client/src/app/[site]/main/components/MainSection/Overview.tsx b/client/src/app/[site]/main/components/MainSection/Overview.tsx
index aaee4f26a..285e131c5 100644
--- a/client/src/app/[site]/main/components/MainSection/Overview.tsx
+++ b/client/src/app/[site]/main/components/MainSection/Overview.tsx
@@ -2,7 +2,7 @@
import { Badge } from "@/components/ui/badge";
import { Skeleton } from "@/components/ui/skeleton";
-import { useGetOverview } from "@/hooks/api";
+import { useGetOverview } from "@/api/api";
import { cn, formatSecondsAsMinutesAndSeconds, formatter } from "@/lib/utils";
import { StatType, useStore } from "../../../../../lib/store";
diff --git a/client/src/app/[site]/main/components/MainSection/PreviousChart.tsx b/client/src/app/[site]/main/components/MainSection/PreviousChart.tsx
index d19c64086..8f5ea612e 100644
--- a/client/src/app/[site]/main/components/MainSection/PreviousChart.tsx
+++ b/client/src/app/[site]/main/components/MainSection/PreviousChart.tsx
@@ -1,5 +1,5 @@
"use client";
-import { APIResponse, GetOverviewBucketedResponse } from "@/hooks/api";
+import { APIResponse, GetOverviewBucketedResponse } from "@/api/api";
import { nivoTheme } from "@/lib/nivo";
import { Time, useStore } from "@/lib/store";
import { ResponsiveLine } from "@nivo/line";
diff --git a/client/src/app/[site]/main/components/sections/Chloropleth.tsx b/client/src/app/[site]/main/components/sections/Chloropleth.tsx
index b03b2ee9a..bf81fb325 100644
--- a/client/src/app/[site]/main/components/sections/Chloropleth.tsx
+++ b/client/src/app/[site]/main/components/sections/Chloropleth.tsx
@@ -1,6 +1,6 @@
"use client";
-import { useSingleCol } from "@/hooks/api";
+import { useSingleCol } from "@/api/api";
import { scaleLinear } from "d3-scale";
import { Feature, FeatureCollection } from "geojson";
import { LatLngExpression } from "leaflet";
diff --git a/client/src/app/[site]/main/components/sections/Map.tsx b/client/src/app/[site]/main/components/sections/Map.tsx
index 7a45c8d05..e63858998 100644
--- a/client/src/app/[site]/main/components/sections/Map.tsx
+++ b/client/src/app/[site]/main/components/sections/Map.tsx
@@ -1,11 +1,17 @@
"use client";
-import { Card, CardContent, CardHeader, CardLoader, CardTitle } from "@/components/ui/card";
+import {
+ Card,
+ CardContent,
+ CardHeader,
+ CardLoader,
+ CardTitle,
+} from "@/components/ui/card";
import * as CountryFlags from "country-flag-icons/react/3x2";
import { scaleLinear } from "d3-scale";
import React, { useEffect, useMemo, useState } from "react";
import { GeoJSON, MapContainer, useMapEvent } from "react-leaflet";
-import { useSingleCol } from "@/hooks/api";
+import { useSingleCol } from "@/api/api";
import { Layer } from "leaflet";
import { Feature, GeoJsonObject } from "geojson";
import "leaflet/dist/leaflet.css";
@@ -27,11 +33,12 @@ interface TooltipPosition {
export function Map() {
const { data: countryData, isLoading: isCountryLoading } = useSingleCol({
- parameter: "country"
- });
- const { data: subdivisionData, isLoading: isSubdivisionLoading } = useSingleCol({
- parameter: "iso_3166_2"
+ parameter: "country",
});
+ const { data: subdivisionData, isLoading: isSubdivisionLoading } =
+ useSingleCol({
+ parameter: "iso_3166_2",
+ });
const [dataVersion, setDataVersion] = useState<number>(0);
@@ -41,15 +48,24 @@ export function Map() {
}
}, [countryData, subdivisionData]);
- const [tooltipContent, setTooltipContent] = useState<TooltipContent | null>(null);
- const [tooltipPosition, setTooltipPosition] = useState<TooltipPosition>({ x: 0, y: 0 });
- const [mapView, setMapView] = useState<"countries" | "subdivisions">("countries");
+ const [tooltipContent, setTooltipContent] = useState<TooltipContent | null>(
+ null
+ );
+ const [tooltipPosition, setTooltipPosition] = useState<TooltipPosition>({
+ x: 0,
+ y: 0,
+ });
+ const [mapView, setMapView] = useState<"countries" | "subdivisions">(
+ "countries"
+ );
const colorScale = useMemo(() => {
if (mapView === "countries" && !countryData?.data) return () => "#eee";
- if (mapView === "subdivisions" && !subdivisionData?.data) return () => "#eee";
+ if (mapView === "subdivisions" && !subdivisionData?.data)
+ return () => "#eee";
- const dataToUse = mapView === "countries" ? countryData?.data : subdivisionData?.data;
+ const dataToUse =
+ mapView === "countries" ? countryData?.data : subdivisionData?.data;
const maxValue = Math.max(...(dataToUse?.map((d) => d.count) || [0]));
return scaleLinear<string>()
@@ -57,8 +73,10 @@ export function Map() {
.range(["rgba(232, 121, 249, 0.3)", "rgb(232, 121, 249)"]);
}, [countryData?.data, subdivisionData?.data, mapView]);
- const [countriesGeoData, setCountriesGeoData] = useState<GeoJsonObject | null>(null);
- const [subdivisionsGeoData, setSubdivisionsGeoData] = useState<GeoJsonObject | null>(null);
+ const [countriesGeoData, setCountriesGeoData] =
+ useState<GeoJsonObject | null>(null);
+ const [subdivisionsGeoData, setSubdivisionsGeoData] =
+ useState<GeoJsonObject | null>(null);
useEffect(() => {
fetch(countriesGeoUrl)
@@ -192,12 +210,14 @@ export function Map() {
tooltipContent.code &&
CountryFlags[tooltipContent.code as keyof typeof CountryFlags]
? React.createElement(
- CountryFlags[tooltipContent.code as keyof typeof CountryFlags],
- {
- title: tooltipContent.name,
- className: "w-4",
- }
- )
+ CountryFlags[
+ tooltipContent.code as keyof typeof CountryFlags
+ ],
+ {
+ title: tooltipContent.name,
+ className: "w-4",
+ }
+ )
: null}
{tooltipContent.name}
</div>
diff --git a/client/src/app/[site]/main/components/sections/Pages.tsx b/client/src/app/[site]/main/components/sections/Pages.tsx
index 961dc7c82..1ddfea0e2 100644
--- a/client/src/app/[site]/main/components/sections/Pages.tsx
+++ b/client/src/app/[site]/main/components/sections/Pages.tsx
@@ -1,6 +1,6 @@
"use client";
-import { GetSitesResponse } from "@/hooks/api";
+import { GetSitesResponse } from "@/api/api";
import { StandardCard } from "../../../components/shared/StandardCard";
export function Pages({
diff --git a/client/src/app/[site]/main/page.tsx b/client/src/app/[site]/main/page.tsx
index 493687c07..5926116ef 100644
--- a/client/src/app/[site]/main/page.tsx
+++ b/client/src/app/[site]/main/page.tsx
@@ -1,6 +1,6 @@
"use client";
-import { useSiteHasData } from "../../../hooks/api";
-import { useGetSiteMetadata } from "../../../hooks/hooks";
+import { useSiteHasData } from "../../../api/api";
+import { useGetSiteMetadata } from "../../../api/hooks";
import { useStore } from "../../../lib/store";
import { NoData } from "../components/NoData";
import { SubHeader } from "../components/SubHeader/SubHeader";
diff --git a/client/src/app/[site]/sessions/page.tsx b/client/src/app/[site]/sessions/page.tsx
index 9db2b15d8..f3c08a8ef 100644
--- a/client/src/app/[site]/sessions/page.tsx
+++ b/client/src/app/[site]/sessions/page.tsx
@@ -1,6 +1,6 @@
"use client";
-import { useGetSessionsInfinite } from "@/hooks/api";
+import { useGetSessionsInfinite } from "@/api/api";
import { useMemo } from "react";
import SessionsTable from "./components/SessionsTable";
import { SubHeader } from "../components/SubHeader/SubHeader";
diff --git a/client/src/app/[site]/user/[userId]/page.tsx b/client/src/app/[site]/user/[userId]/page.tsx
index 1e8e173d3..d4569c3f1 100644
--- a/client/src/app/[site]/user/[userId]/page.tsx
+++ b/client/src/app/[site]/user/[userId]/page.tsx
@@ -1,13 +1,13 @@
"use client";
-import { UserSessionsResponse, useGetUserSessions } from "@/hooks/api";
+import { UserSessionsResponse, useGetUserSessions } from "@/api/api";
import { useParams } from "next/navigation";
import { Skeleton } from "@/components/ui/skeleton";
import { Browser } from "../../components/shared/icons/Browser";
import { OperatingSystem } from "../../components/shared/icons/OperatingSystem";
import { CountryFlag } from "../../components/shared/icons/CountryFlag";
import { getCountryName } from "@/lib/utils";
-import { useGetSiteMetadata } from "../../../../hooks/hooks";
+import { useGetSiteMetadata } from "../../../../api/hooks";
import { useStore } from "../../../../lib/store";
import { DateTime } from "luxon";
diff --git a/client/src/app/components/AddSite.tsx b/client/src/app/components/AddSite.tsx
index 0324613d2..ae8f4a622 100644
--- a/client/src/app/components/AddSite.tsx
+++ b/client/src/app/components/AddSite.tsx
@@ -12,7 +12,7 @@ import {
import { useState, useEffect } from "react";
import { Label } from "../../components/ui/label";
import { Input } from "../../components/ui/input";
-import { addSite, useGetSites } from "../../hooks/api";
+import { addSite, useGetSites } from "../../api/api";
import { Alert, AlertDescription, AlertTitle } from "../../components/ui/alert";
import {
AlertCircle,
diff --git a/client/src/app/page.tsx b/client/src/app/page.tsx
index 2ccf234ca..95db42c34 100644
--- a/client/src/app/page.tsx
+++ b/client/src/app/page.tsx
@@ -2,7 +2,7 @@
import { useState, useEffect } from "react";
import { SiteCard } from "../components/SiteCard";
-import { useGetSites } from "../hooks/api";
+import { useGetSites } from "../api/api";
import { authClient } from "../lib/auth";
import { AddSite } from "./components/AddSite";
import { CreateOrganizationDialog } from "./components/CreateOrganizationDialog";
diff --git a/client/src/app/settings/organizations/components/AddUser.tsx b/client/src/app/settings/organizations/components/AddUser.tsx
index d11233de5..f26b66f8a 100644
--- a/client/src/app/settings/organizations/components/AddUser.tsx
+++ b/client/src/app/settings/organizations/components/AddUser.tsx
@@ -13,7 +13,7 @@ import {
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import { Switch } from "@/components/ui/switch";
-import { authedFetch } from "@/hooks/utils";
+import { authedFetch } from "@/api/utils";
import { BACKEND_URL } from "@/lib/const";
export function AddUser({ refetch }: { refetch: () => void }) {
diff --git a/client/src/app/settings/organizations/page.tsx b/client/src/app/settings/organizations/page.tsx
index ff0910119..57874e0a8 100644
--- a/client/src/app/settings/organizations/page.tsx
+++ b/client/src/app/settings/organizations/page.tsx
@@ -14,7 +14,7 @@ import {
TableHeader,
TableRow,
} from "../../../components/ui/table";
-import { useOrganizationMembers } from "../../../hooks/api";
+import { useOrganizationMembers } from "../../../api/api";
import { authClient } from "../../../lib/auth";
// Import the separated dialog components
@@ -22,6 +22,7 @@ import { DeleteOrganizationDialog } from "./components/DeleteOrganizationDialog"
import { EditOrganizationDialog } from "./components/EditOrganizationDialog";
import { InviteMemberDialog } from "./components/InviteMemberDialog";
import { RemoveMemberDialog } from "./components/RemoveMemberDialog";
+import { useUserOrganizations } from "../../../api/hooks";
// Types for our component
export type Organization = {
@@ -153,11 +154,6 @@ function OrganizationsInner({
{organizations?.map((organization) => (
<Organization key={organization.id} org={organization} />
))}
- {organizations.length === 0 && (
- <Card className="p-6 text-center text-muted-foreground">
- You don't have any organizations yet.
- </Card>
- )}
</div>
);
}
@@ -166,6 +162,10 @@ function OrganizationsInner({
export default function Organizations() {
const userOrganizations = authClient.useListOrganizations();
+ const { organizations, isLoading } = useUserOrganizations();
+
+ console.log(organizations);
+
if (userOrganizations.isPending) {
return (
<div className="flex justify-center py-8">
diff --git a/client/src/app/settings/subscription/components/ChangePlanDialog.tsx b/client/src/app/settings/subscription/components/ChangePlanDialog.tsx
index ec89d41ba..5572cc395 100644
--- a/client/src/app/settings/subscription/components/ChangePlanDialog.tsx
+++ b/client/src/app/settings/subscription/components/ChangePlanDialog.tsx
@@ -9,7 +9,7 @@ import {
DialogHeader,
DialogTitle,
} from "@/components/ui/dialog";
-import { Subscription } from "@/hooks/api";
+import { Subscription } from "@/api/api";
import { AlertCircle, Shield, Zap } from "lucide-react";
import { useEffect, useState } from "react";
diff --git a/client/src/app/settings/subscription/components/CurrentPlanCard.tsx b/client/src/app/settings/subscription/components/CurrentPlanCard.tsx
index 0311907dc..667f4fb22 100644
--- a/client/src/app/settings/subscription/components/CurrentPlanCard.tsx
+++ b/client/src/app/settings/subscription/components/CurrentPlanCard.tsx
@@ -11,7 +11,7 @@ import {
import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
import { Progress } from "@/components/ui/progress";
import { Separator } from "@/components/ui/separator";
-import { Subscription } from "@/hooks/api";
+import { Subscription } from "@/api/api";
import { PlanTemplate, formatDate } from "../utils/planUtils";
import { AlertCircle, ArrowRight, X } from "lucide-react";
diff --git a/client/src/app/settings/subscription/page.tsx b/client/src/app/settings/subscription/page.tsx
index 8e4306cba..f1d20fe98 100644
--- a/client/src/app/settings/subscription/page.tsx
+++ b/client/src/app/settings/subscription/page.tsx
@@ -14,7 +14,7 @@ import {
CardTitle,
} from "@/components/ui/card";
import { Skeleton } from "@/components/ui/skeleton";
-import { useSubscription } from "@/hooks/api";
+import { useSubscription } from "@/api/api";
import { AlertCircle, ArrowRight } from "lucide-react";
import { authClient } from "../../../lib/auth";
import { CurrentPlanCard } from "./components/CurrentPlanCard";
@@ -55,7 +55,7 @@ export default function SubscriptionPage() {
// Don't pass referenceId if it's the same as the user ID
// This is because Better Auth defaults to the user ID when no referenceId is provided
const { error } = await authClient.subscription.cancel({
- returnUrl: window.location.href,
+ returnUrl: globalThis.location.href,
});
if (error) {
@@ -96,8 +96,8 @@ export default function SubscriptionPage() {
// Better Auth defaults to the user ID when no referenceId is provided
const { error } = await authClient.subscription.upgrade({
plan: planId,
- successUrl: "/settings",
- cancelUrl: "/settings",
+ cancelUrl: globalThis.location.origin + "/settings/subscription",
+ successUrl: globalThis.location.origin + "/settings/subscription",
});
if (error) {
@@ -133,8 +133,8 @@ export default function SubscriptionPage() {
// with the same plan they currently have
const { error } = await authClient.subscription.upgrade({
plan: activeSubscription.plan,
- successUrl: window.location.origin + "/settings",
- cancelUrl: window.location.origin + "/settings",
+ successUrl: globalThis.location.origin + "/settings/subscription",
+ cancelUrl: globalThis.location.origin + "/settings/subscription",
});
if (error) {
diff --git a/client/src/app/subscribe/page.tsx b/client/src/app/subscribe/page.tsx
index 9d64c8708..d47cca600 100644
--- a/client/src/app/subscribe/page.tsx
+++ b/client/src/app/subscribe/page.tsx
@@ -150,8 +150,8 @@ export default function Subscribe() {
authClient.subscription
.upgrade({
plan: selectedPrice.name,
- successUrl: "/",
- cancelUrl: "/subscribe",
+ successUrl: globalThis.location.origin + "/",
+ cancelUrl: globalThis.location.origin + "/subscribe",
})
.catch((error) => {
console.error("Subscription error:", error);
diff --git a/client/src/components/SiteCard.tsx b/client/src/components/SiteCard.tsx
index 07b134910..c86304167 100644
--- a/client/src/components/SiteCard.tsx
+++ b/client/src/components/SiteCard.tsx
@@ -1,4 +1,4 @@
-import { useGetOverview, useGetOverviewBucketed } from "@/hooks/api";
+import { useGetOverview, useGetOverviewBucketed } from "@/api/api";
import { ArrowRight } from "lucide-react";
import Link from "next/link";
import { SiteSessionChart } from "./SiteSessionChart";
diff --git a/client/src/components/SiteSessionChart.tsx b/client/src/components/SiteSessionChart.tsx
index 153452552..33bafe44b 100644
--- a/client/src/components/SiteSessionChart.tsx
+++ b/client/src/components/SiteSessionChart.tsx
@@ -2,7 +2,7 @@ import { nivoTheme } from "@/lib/nivo";
import { ResponsiveLine } from "@nivo/line";
import { DateTime } from "luxon";
import { useMemo } from "react";
-import { GetOverviewBucketedResponse } from "../hooks/api";
+import { GetOverviewBucketedResponse } from "../api/api";
import { formatter } from "../lib/utils";
interface SiteSessionChartProps {
diff --git a/client/src/components/SiteSettings/SiteSettings.tsx b/client/src/components/SiteSettings/SiteSettings.tsx
index e7276269c..3194be512 100644
--- a/client/src/components/SiteSettings/SiteSettings.tsx
+++ b/client/src/components/SiteSettings/SiteSettings.tsx
@@ -35,9 +35,9 @@ import {
deleteSite,
GetSitesResponse,
useGetSites,
-} from "@/hooks/api";
+} from "@/api/api";
import { BACKEND_URL } from "@/lib/const";
-import { useGetSiteMetadata } from "../../hooks/hooks";
+import { useGetSiteMetadata } from "../../api/hooks";
interface SiteSettingsProps {
siteId: number;
diff --git a/client/src/components/TopBar.tsx b/client/src/components/TopBar.tsx
index ee3161d98..5f5dad1cb 100644
--- a/client/src/components/TopBar.tsx
+++ b/client/src/components/TopBar.tsx
@@ -58,11 +58,9 @@ export function TopBar() {
{session.data?.user.name}
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
- <DropdownMenuItem>
- <Link href="/settings" legacyBehavior passHref>
- Settings
- </Link>
- </DropdownMenuItem>
+ <Link href="/settings/account" legacyBehavior passHref>
+ <DropdownMenuItem>Settings</DropdownMenuItem>
+ </Link>
<DropdownMenuItem
onClick={async () => {
await authClient.signOut();
diff --git a/client/src/hooks/hooks.ts b/client/src/hooks/hooks.ts
deleted file mode 100644
index 1050140a5..000000000
--- a/client/src/hooks/hooks.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { useGetSites } from "./api";
-
-export function useGetSiteMetadata(siteId: string | number) {
- const { data, isLoading } = useGetSites();
- return {
- siteMetadata: data?.data?.find((site) => site.siteId === Number(siteId)),
- isLoading,
- };
-}
diff --git a/server/src/api/getUserOrganizations.ts b/server/src/api/getUserOrganizations.ts
new file mode 100644
index 000000000..faf89866a
--- /dev/null
+++ b/server/src/api/getUserOrganizations.ts
@@ -0,0 +1,38 @@
+import { FastifyRequest, FastifyReply } from "fastify";
+import { db } from "../db/postgres/postgres.js";
+import { eq } from "drizzle-orm";
+import { member, organization } from "../db/postgres/schema.js";
+import { getSession } from "../lib/auth-utils.js";
+
+export const getUserOrganizations = async (
+ request: FastifyRequest,
+ reply: FastifyReply
+) => {
+ try {
+ const session = await getSession(request);
+
+ if (!session?.user.id) {
+ return reply.status(401).send({ error: "Unauthorized" });
+ }
+
+ const userOrganizations = await db
+ .select({
+ organization: organization,
+ role: member.role,
+ })
+ .from(member)
+ .innerJoin(organization, eq(member.organizationId, organization.id))
+ .where(eq(member.userId, session?.user.id));
+
+ return reply.send({
+ success: true,
+ data: userOrganizations,
+ });
+ } catch (error) {
+ console.error("Error fetching user organizations:", error);
+ return reply.status(500).send({
+ success: false,
+ error: "Failed to fetch user organizations",
+ });
+ }
+};
diff --git a/server/src/index.ts b/server/src/index.ts
index fdfaab732..4fb7af8a5 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -27,6 +27,7 @@ import { auth } from "./lib/auth.js";
import { mapHeaders } from "./lib/auth-utils.js";
import { trackPageView } from "./tracker/trackPageView.js";
import { listOrganizationMembers } from "./api/listOrganizationMembers.js";
+import { getUserOrganizations } from "./api/getUserOrganizations.js";
const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);
@@ -136,6 +137,7 @@ server.get(
"/list-organization-members/:organizationId",
listOrganizationMembers
);
+server.get("/user/organizations", getUserOrganizations);
// Track pageview endpoint
server.post("/track/pageview", trackPageView);
diff --git a/server/src/lib/auth-utils.ts b/server/src/lib/auth-utils.ts
index c864a4085..984861643 100644
--- a/server/src/lib/auth-utils.ts
+++ b/server/src/lib/auth-utils.ts
@@ -15,6 +15,12 @@ export function mapHeaders(headers: any) {
return map;
}
+export async function getSession(req: FastifyRequest) {
+ const headers = new Headers(req.headers as any);
+ const session = await auth!.api.getSession({ headers });
+ return session;
+}
+
export async function getSitesUserHasAccessTo(req: FastifyRequest) {
const headers = new Headers(req.headers as any);
const session = await auth!.api.getSession({ headers });