Skip to content

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

Refactor organization handling and improve user experience in subscription and home pages

Bill Yang7f536512ed01
diff --git a/client/src/app/layout.tsx b/client/src/app/layout.tsx
index dc6253db6..e68382875 100644
--- a/client/src/app/layout.tsx
+++ b/client/src/app/layout.tsx
@@ -80,10 +80,6 @@ export default function RootLayout({
) {
redirect("/login");
}
-
- if (user && publicRoutes.includes(pathname)) {
- redirect("/");
- }
}, [isPending, user, pathname, isCheckingPublic, isPublicSite]);
return (
diff --git a/client/src/app/page.tsx b/client/src/app/page.tsx
index 9f4c2fb97..302d097c6 100644
--- a/client/src/app/page.tsx
+++ b/client/src/app/page.tsx
@@ -1,16 +1,16 @@
"use client";
-import { Building, Plus } from "lucide-react";
+import { Plus } from "lucide-react";
import { useState } from "react";
+import { useUserOrganizations } from "../api/admin/organizations";
import { useGetSites } from "../api/admin/sites";
+import { NoOrganization } from "../components/NoOrganization";
import { SiteCard } from "../components/SiteCard";
+import { StandardPage } from "../components/StandardPage";
import { Button } from "../components/ui/button";
import { Card, CardDescription, CardTitle } from "../components/ui/card";
-import { authClient } from "../lib/auth";
import { AddSite } from "./components/AddSite";
-import { CreateOrganizationDialog } from "./components/CreateOrganizationDialog";
-import { StandardPage } from "../components/StandardPage";
-import { useUserOrganizations } from "../api/admin/organizations";
+import { CreateOrganizationDialog } from "../components/CreateOrganizationDialog";
export default function Home() {
const {
@@ -18,8 +18,11 @@ export default function Home() {
refetch: refetchSites,
isLoading: isLoadingSites,
} = useGetSites();
- const userOrganizations = authClient.useListOrganizations();
- const { data: userOrganizationsData } = useUserOrganizations();
+ const {
+ data: userOrganizationsData,
+ isLoading: isLoadingOrganizations,
+ refetch: refetchOrganizations,
+ } = useUserOrganizations();
const disabled =
!userOrganizationsData?.[0] || userOrganizationsData?.[0].role === "member";
@@ -28,13 +31,13 @@ export default function Home() {
// Check if the user has no organizations and is not in a loading state
const hasNoOrganizations =
- !userOrganizations.isPending &&
- Array.isArray(userOrganizations.data) &&
- userOrganizations.data.length === 0;
+ !isLoadingOrganizations &&
+ Array.isArray(userOrganizationsData) &&
+ userOrganizationsData.length === 0;
// Handle successful organization creation
const handleOrganizationCreated = () => {
- userOrganizations.refetch();
+ refetchOrganizations();
refetchSites();
};
@@ -47,26 +50,7 @@ export default function Home() {
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
{/* Organization required message */}
- {hasNoOrganizations && (
- <Card className="col-span-full p-6 flex flex-col items-center text-center">
- <div className="mx-auto w-12 h-12 rounded-full bg-primary/10 flex items-center justify-center mb-4">
- <Building className="h-6 w-6 text-primary" />
- </div>
- <CardTitle className="mb-2 text-xl">
- Organization Required
- </CardTitle>
- <CardDescription className="mb-6">
- You need to create an organization before you add a website
- </CardDescription>
- <Button
- onClick={() => setCreateOrgDialogOpen(true)}
- className="max-w-xs"
- >
- <Plus className="mr-2 h-4 w-4" />
- Create an Organization
- </Button>
- </Card>
- )}
+ {hasNoOrganizations && <NoOrganization />}
{/* Sites list */}
@@ -83,7 +67,7 @@ export default function Home() {
{/* No websites message */}
{!hasNoOrganizations &&
(!sites || sites.length === 0) &&
- !userOrganizations.isPending &&
+ !isLoadingOrganizations &&
!isLoadingSites && (
<Card className="col-span-full p-6 flex flex-col items-center text-center">
<CardTitle className="mb-2 text-xl">No websites yet</CardTitle>
diff --git a/client/src/app/settings/subscription/page.tsx b/client/src/app/settings/subscription/page.tsx
index c0b3dc6ac..f5c31deb3 100644
--- a/client/src/app/settings/subscription/page.tsx
+++ b/client/src/app/settings/subscription/page.tsx
@@ -5,14 +5,19 @@ import { Skeleton } from "@/components/ui/skeleton";
import { FreePlan } from "./components/FreePlan";
import { ProPlan } from "./components/ProPlan";
import { useStripeSubscription } from "./utils/useStripeSubscription";
+import { useUserOrganizations } from "../../../api/admin/organizations";
+import { NoOrganization } from "../../../components/NoOrganization";
export default function SubscriptionPage() {
- const {
- data: activeSubscription,
- isLoading,
- error: subscriptionError,
- refetch,
- } = useStripeSubscription();
+ const { data: activeSubscription, isLoading: isLoadingSubscription } =
+ useStripeSubscription();
+
+ const { data: organizations, isLoading: isLoadingOrganizations } =
+ useUserOrganizations();
+
+ const hasOrganization = !!organizations?.length;
+
+ const isLoading = isLoadingSubscription || isLoadingOrganizations;
return (
<div className=" py-2">
@@ -36,7 +41,11 @@ export default function SubscriptionPage() {
</CardContent>
</Card>
) : !activeSubscription ? (
- <FreePlan />
+ hasOrganization ? (
+ <FreePlan />
+ ) : (
+ <NoOrganization />
+ )
) : (
<ProPlan />
)}
diff --git a/client/src/app/components/CreateOrganizationDialog.tsx b/client/src/components/CreateOrganizationDialog.tsx
similarity index 88%
rename from client/src/app/components/CreateOrganizationDialog.tsx
rename to client/src/components/CreateOrganizationDialog.tsx
index 1f00c430e..d862ea1e2 100644
--- a/client/src/app/components/CreateOrganizationDialog.tsx
+++ b/client/src/components/CreateOrganizationDialog.tsx
@@ -1,18 +1,18 @@
"use client";
import { useState } from "react";
-import { Button } from "../../components/ui/button";
-import { Dialog } from "../../components/ui/dialog";
-import { DialogContent } from "../../components/ui/dialog";
-import { DialogHeader } from "../../components/ui/dialog";
-import { DialogTitle } from "../../components/ui/dialog";
-import { DialogTrigger } from "../../components/ui/dialog";
-import { DialogFooter } from "../../components/ui/dialog";
-import { DialogDescription } from "../../components/ui/dialog";
-import { Input } from "../../components/ui/input";
-import { Label } from "../../components/ui/label";
+import { Button } from "./ui/button";
+import { Dialog } from "./ui/dialog";
+import { DialogContent } from "./ui/dialog";
+import { DialogHeader } from "./ui/dialog";
+import { DialogTitle } from "./ui/dialog";
+import { DialogTrigger } from "./ui/dialog";
+import { DialogFooter } from "./ui/dialog";
+import { DialogDescription } from "./ui/dialog";
+import { Input } from "./ui/input";
+import { Label } from "./ui/label";
import { Building2 } from "lucide-react";
-import { authClient } from "../../lib/auth";
+import { authClient } from "../lib/auth";
import { toast } from "sonner";
import { useMutation } from "@tanstack/react-query";
diff --git a/client/src/components/NoOrganization.tsx b/client/src/components/NoOrganization.tsx
new file mode 100644
index 000000000..8ac291b14
--- /dev/null
+++ b/client/src/components/NoOrganization.tsx
@@ -0,0 +1,43 @@
+import { Building, Plus } from "lucide-react";
+import { useState } from "react";
+import { useUserOrganizations } from "../api/admin/organizations";
+import { useGetSites } from "../api/admin/sites";
+import { CreateOrganizationDialog } from "./CreateOrganizationDialog";
+import { Button } from "./ui/button";
+import { Card, CardDescription, CardTitle } from "./ui/card";
+
+export function NoOrganization() {
+ const [createOrgDialogOpen, setCreateOrgDialogOpen] = useState(false);
+ const { refetch: refetchSites } = useGetSites();
+ const { refetch: refetchOrganizations } = useUserOrganizations();
+
+ const handleOrganizationCreated = () => {
+ refetchOrganizations();
+ refetchSites();
+ };
+ return (
+ <>
+ <Card className="col-span-full p-6 flex flex-col items-center text-center">
+ <div className="mx-auto w-12 h-12 rounded-full bg-primary/10 flex items-center justify-center mb-4">
+ <Building className="h-6 w-6 text-primary" />
+ </div>
+ <CardTitle className="mb-2 text-xl">Organization Required</CardTitle>
+ <CardDescription className="mb-6">
+ You need to create an organization before you add a website
+ </CardDescription>
+ <Button
+ onClick={() => setCreateOrgDialogOpen(true)}
+ className="max-w-xs"
+ >
+ <Plus className="mr-2 h-4 w-4" />
+ Create an Organization
+ </Button>
+ </Card>
+ <CreateOrganizationDialog
+ open={createOrgDialogOpen}
+ onOpenChange={setCreateOrgDialogOpen}
+ onSuccess={handleOrganizationCreated}
+ />
+ </>
+ );
+}