Skip to content

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

fix routing for settings

Bill Yange1925731f875
diff --git a/client/src/app/settings/account/Account.tsx b/client/src/app/settings/account/components/AccountInner.tsx
similarity index 96%
rename from client/src/app/settings/account/Account.tsx
rename to client/src/app/settings/account/components/AccountInner.tsx
index 3e1ffead2..38dcfa97a 100644
--- a/client/src/app/settings/account/Account.tsx
+++ b/client/src/app/settings/account/components/AccountInner.tsx
@@ -1,19 +1,21 @@
+"use client";
+
import { authClient } from "@/lib/auth";
import { useState } from "react";
import { toast } from "sonner";
-import { Button } from "../../../components/ui/button";
+import { Button } from "../../../../components/ui/button";
import {
Card,
CardContent,
CardHeader,
CardTitle,
-} from "../../../components/ui/card";
-import { Input } from "../../../components/ui/input";
+} from "../../../../components/ui/card";
+import { Input } from "../../../../components/ui/input";
+import { IS_CLOUD } from "../../../../lib/const";
import { ChangePassword } from "./ChangePassword";
import { DeleteAccount } from "./DeleteAccount";
-import { IS_CLOUD } from "../../../lib/const";
-export function Account({
+export function AccountInner({
session,
}: {
session: ReturnType<typeof authClient.useSession>;
diff --git a/client/src/app/settings/account/ChangePassword.tsx b/client/src/app/settings/account/components/ChangePassword.tsx
similarity index 97%
rename from client/src/app/settings/account/ChangePassword.tsx
rename to client/src/app/settings/account/components/ChangePassword.tsx
index b439dcf08..789940802 100644
--- a/client/src/app/settings/account/ChangePassword.tsx
+++ b/client/src/app/settings/account/components/ChangePassword.tsx
@@ -1,6 +1,8 @@
+"use client";
+
import { useState, useEffect } from "react";
-import { Button } from "../../../components/ui/button";
-import { authClient } from "../../../lib/auth";
+import { Button } from "../../../../components/ui/button";
+import { authClient } from "../../../../lib/auth";
import {
Dialog,
DialogContent,
@@ -10,9 +12,9 @@ import {
DialogTitle,
DialogTrigger,
DialogClose,
-} from "../../../components/ui/dialog";
-import { Label } from "../../../components/ui/label";
-import { Input } from "../../../components/ui/input";
+} from "../../../../components/ui/dialog";
+import { Label } from "../../../../components/ui/label";
+import { Input } from "../../../../components/ui/input";
import {
KeyRound,
CheckCircle2,
diff --git a/client/src/app/settings/account/DeleteAccount.tsx b/client/src/app/settings/account/components/DeleteAccount.tsx
similarity index 92%
rename from client/src/app/settings/account/DeleteAccount.tsx
rename to client/src/app/settings/account/components/DeleteAccount.tsx
index 71c448e6f..a7478cce1 100644
--- a/client/src/app/settings/account/DeleteAccount.tsx
+++ b/client/src/app/settings/account/components/DeleteAccount.tsx
@@ -1,5 +1,7 @@
+"use client";
+
import { useState } from "react";
-import { Button } from "../../../components/ui/button";
+import { Button } from "../../../../components/ui/button";
import {
AlertDialog,
AlertDialogAction,
@@ -10,12 +12,12 @@ import {
AlertDialogHeader,
AlertDialogTitle,
AlertDialogTrigger,
-} from "../../../components/ui/alert-dialog";
-import { authClient } from "../../../lib/auth";
+} from "../../../../components/ui/alert-dialog";
+import { authClient } from "../../../../lib/auth";
import { AlertTriangle } from "lucide-react";
import { toast } from "sonner";
-import { Input } from "../../../components/ui/input";
-import { Label } from "../../../components/ui/label";
+import { Input } from "../../../../components/ui/input";
+import { Label } from "../../../../components/ui/label";
import { useRouter } from "next/navigation";
export function DeleteAccount() {
const [isDeleting, setIsDeleting] = useState(false);
diff --git a/client/src/app/settings/account/page.tsx b/client/src/app/settings/account/page.tsx
new file mode 100644
index 000000000..9403aaacb
--- /dev/null
+++ b/client/src/app/settings/account/page.tsx
@@ -0,0 +1,14 @@
+"use client";
+
+import { authClient } from "@/lib/auth";
+import { AccountInner } from "./components/AccountInner";
+
+export default function AccountPage() {
+ const session = authClient.useSession();
+
+ if (!session.data) {
+ return null;
+ }
+
+ return <AccountInner session={session} />;
+}
diff --git a/client/src/app/settings/layout.tsx b/client/src/app/settings/layout.tsx
new file mode 100644
index 000000000..411bac39c
--- /dev/null
+++ b/client/src/app/settings/layout.tsx
@@ -0,0 +1,58 @@
+"use client";
+
+import { useState } from "react";
+import { Button } from "../../components/ui/button";
+import { CreditCard, User, Users } from "lucide-react";
+import { useRouter } from "next/navigation";
+
+export default function SettingsLayout({
+ children,
+}: {
+ children: React.ReactNode;
+}) {
+ const router = useRouter();
+ const [selectedTab, setSelectedTab] = useState<
+ "account" | "settings" | "organizations" | "subscription"
+ >("account");
+
+ return (
+ <div className="max-w-6xl grid grid-cols-[200px_1fr] gap-6">
+ <div className="flex flex-col gap-2">
+ <Button
+ variant={selectedTab === "account" ? "default" : "ghost"}
+ onClick={() => {
+ setSelectedTab("account");
+ router.push("/settings/account");
+ }}
+ className="justify-start"
+ >
+ <User size={16} />
+ Account
+ </Button>
+ <Button
+ variant={selectedTab === "organizations" ? "default" : "ghost"}
+ onClick={() => {
+ setSelectedTab("organizations");
+ router.push("/settings/organizations");
+ }}
+ className="justify-start"
+ >
+ <Users size={16} />
+ Organizations
+ </Button>
+ <Button
+ variant={selectedTab === "subscription" ? "default" : "ghost"}
+ onClick={() => {
+ setSelectedTab("subscription");
+ router.push("/settings/subscription");
+ }}
+ className="justify-start"
+ >
+ <CreditCard size={16} />
+ Subscription
+ </Button>
+ </div>
+ {children}
+ </div>
+ );
+}
diff --git a/client/src/app/settings/organizations/AddUser.tsx b/client/src/app/settings/organizations/components/AddUser.tsx
similarity index 89%
rename from client/src/app/settings/organizations/AddUser.tsx
rename to client/src/app/settings/organizations/components/AddUser.tsx
index ed2f32846..d11233de5 100644
--- a/client/src/app/settings/organizations/AddUser.tsx
+++ b/client/src/app/settings/organizations/components/AddUser.tsx
@@ -1,6 +1,7 @@
+import { AlertCircle } from "lucide-react";
import { useState } from "react";
-import { Button } from "../../../components/ui/button";
-import { authClient } from "../../../lib/auth";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import { Button } from "@/components/ui/button";
import {
Dialog,
DialogContent,
@@ -8,18 +9,12 @@ import {
DialogHeader,
DialogTitle,
DialogTrigger,
-} from "../../../components/ui/dialog";
-import {
- Alert,
- AlertDescription,
- AlertTitle,
-} from "../../../components/ui/alert";
-import { AlertCircle } from "lucide-react";
-import { Label } from "../../../components/ui/label";
-import { Input } from "../../../components/ui/input";
-import { Switch } from "../../../components/ui/switch";
-import { authedFetch } from "../../../hooks/utils";
-import { BACKEND_URL } from "../../../lib/const";
+} from "@/components/ui/dialog";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { Switch } from "@/components/ui/switch";
+import { authedFetch } from "@/hooks/utils";
+import { BACKEND_URL } from "@/lib/const";
export function AddUser({ refetch }: { refetch: () => void }) {
const [open, setOpen] = useState(false);
diff --git a/client/src/app/settings/organizations/DeleteOrganizationDialog.tsx b/client/src/app/settings/organizations/components/DeleteOrganizationDialog.tsx
similarity index 80%
rename from client/src/app/settings/organizations/DeleteOrganizationDialog.tsx
rename to client/src/app/settings/organizations/components/DeleteOrganizationDialog.tsx
index b90a4888c..b97d28745 100644
--- a/client/src/app/settings/organizations/DeleteOrganizationDialog.tsx
+++ b/client/src/app/settings/organizations/components/DeleteOrganizationDialog.tsx
@@ -1,19 +1,19 @@
"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 { 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 { AlertTriangle, Trash } from "lucide-react";
-import { authClient } from "../../../lib/auth";
+import { authClient } from "@/lib/auth";
import { toast } from "sonner";
-import { Organization } from "./Organizations";
+import { Organization } from "../page";
interface DeleteOrganizationDialogProps {
organization: Organization;
diff --git a/client/src/app/settings/organizations/DeleteUser.tsx b/client/src/app/settings/organizations/components/DeleteUser.tsx
similarity index 80%
rename from client/src/app/settings/organizations/DeleteUser.tsx
rename to client/src/app/settings/organizations/components/DeleteUser.tsx
index 52e11edc9..eae36a4e9 100644
--- a/client/src/app/settings/organizations/DeleteUser.tsx
+++ b/client/src/app/settings/organizations/components/DeleteUser.tsx
@@ -1,8 +1,8 @@
import { useState } from "react";
-import { ConfirmationModal } from "../../../components/ConfirmationModal";
-import { Button } from "../../../components/ui/button";
+import { ConfirmationModal } from "@/components/ConfirmationModal";
+import { Button } from "@/components/ui/button";
import { UserWithRole } from "better-auth/plugins/admin";
-import { authClient } from "../../../lib/auth";
+import { authClient } from "@/lib/auth";
export function DeleteUser({
user,
diff --git a/client/src/app/settings/organizations/EditOrganizationDialog.tsx b/client/src/app/settings/organizations/components/EditOrganizationDialog.tsx
similarity index 77%
rename from client/src/app/settings/organizations/EditOrganizationDialog.tsx
rename to client/src/app/settings/organizations/components/EditOrganizationDialog.tsx
index b7f208f15..0a20210a1 100644
--- a/client/src/app/settings/organizations/EditOrganizationDialog.tsx
+++ b/client/src/app/settings/organizations/components/EditOrganizationDialog.tsx
@@ -1,20 +1,20 @@
"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 "@/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 { Edit } from "lucide-react";
-import { authClient } from "../../../lib/auth";
+import { authClient } from "@/lib/auth";
import { toast } from "sonner";
-import { Organization } from "./Organizations";
+import { Organization } from "../page";
interface EditOrganizationDialogProps {
organization: Organization;
diff --git a/client/src/app/settings/organizations/InviteMemberDialog.tsx b/client/src/app/settings/organizations/components/InviteMemberDialog.tsx
similarity index 75%
rename from client/src/app/settings/organizations/InviteMemberDialog.tsx
rename to client/src/app/settings/organizations/components/InviteMemberDialog.tsx
index 8292c84bf..db65c04fe 100644
--- a/client/src/app/settings/organizations/InviteMemberDialog.tsx
+++ b/client/src/app/settings/organizations/components/InviteMemberDialog.tsx
@@ -1,23 +1,23 @@
"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 { Select } from "../../../components/ui/select";
-import { SelectContent } from "../../../components/ui/select";
-import { SelectItem } from "../../../components/ui/select";
-import { SelectTrigger } from "../../../components/ui/select";
-import { SelectValue } from "../../../components/ui/select";
+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 { Select } from "@/components/ui/select";
+import { SelectContent } from "@/components/ui/select";
+import { SelectItem } from "@/components/ui/select";
+import { SelectTrigger } from "@/components/ui/select";
+import { SelectValue } from "@/components/ui/select";
import { UserPlus } from "lucide-react";
-import { authClient } from "../../../lib/auth";
+import { authClient } from "@/lib/auth";
import { toast } from "sonner";
interface InviteMemberDialogProps {
diff --git a/client/src/app/settings/organizations/RemoveMemberDialog.tsx b/client/src/app/settings/organizations/components/RemoveMemberDialog.tsx
similarity index 78%
rename from client/src/app/settings/organizations/RemoveMemberDialog.tsx
rename to client/src/app/settings/organizations/components/RemoveMemberDialog.tsx
index 4e97a08af..4e577186f 100644
--- a/client/src/app/settings/organizations/RemoveMemberDialog.tsx
+++ b/client/src/app/settings/organizations/components/RemoveMemberDialog.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 { 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 { UserMinus } from "lucide-react";
-import { authClient } from "../../../lib/auth";
+import { authClient } from "@/lib/auth";
import { toast } from "sonner";
-import { Member } from "./Organizations";
+import { Member } from "../page";
interface RemoveMemberDialogProps {
member: Member;
diff --git a/client/src/app/settings/organizations/Organizations.tsx b/client/src/app/settings/organizations/page.tsx
similarity index 93%
rename from client/src/app/settings/organizations/Organizations.tsx
rename to client/src/app/settings/organizations/page.tsx
index 95d53dc2c..ff0910119 100644
--- a/client/src/app/settings/organizations/Organizations.tsx
+++ b/client/src/app/settings/organizations/page.tsx
@@ -18,10 +18,10 @@ import { useOrganizationMembers } from "../../../hooks/api";
import { authClient } from "../../../lib/auth";
// Import the separated dialog components
-import { DeleteOrganizationDialog } from "./DeleteOrganizationDialog";
-import { EditOrganizationDialog } from "./EditOrganizationDialog";
-import { RemoveMemberDialog } from "./RemoveMemberDialog";
-import { InviteMemberDialog } from "./InviteMemberDialog";
+import { DeleteOrganizationDialog } from "./components/DeleteOrganizationDialog";
+import { EditOrganizationDialog } from "./components/EditOrganizationDialog";
+import { InviteMemberDialog } from "./components/InviteMemberDialog";
+import { RemoveMemberDialog } from "./components/RemoveMemberDialog";
// Types for our component
export type Organization = {
@@ -163,7 +163,7 @@ function OrganizationsInner({
}
// Main Organizations component
-export function Organizations() {
+export default function Organizations() {
const userOrganizations = authClient.useListOrganizations();
if (userOrganizations.isPending) {
diff --git a/client/src/app/settings/page.tsx b/client/src/app/settings/page.tsx
deleted file mode 100644
index b2bce73a0..000000000
--- a/client/src/app/settings/page.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-"use client";
-
-import { Button } from "@/components/ui/button";
-import { CreditCard, User, Users as Users_ } from "@phosphor-icons/react";
-import { useRouter } from "next/navigation";
-import { useState } from "react";
-import { authClient } from "../../lib/auth";
-
-import { Account } from "./account/Account";
-import { Organizations } from "./organizations/Organizations";
-import SubscriptionPage from "./subscription/page";
-
-export default function SettingsPage() {
- const session = authClient.useSession();
- const router = useRouter();
- const [selectedTab, setSelectedTab] = useState<
- "account" | "settings" | "organizations" | "subscription"
- >("account");
-
- return (
- <div className="max-w-6xl">
- <div className="grid grid-cols-[200px_1fr] gap-6">
- <div className="flex flex-col gap-2">
- <Button
- variant={selectedTab === "account" ? "default" : "ghost"}
- onClick={() => setSelectedTab("account")}
- className="justify-start"
- >
- <User size={16} weight="bold" />
- Account
- </Button>
- <Button
- variant={selectedTab === "organizations" ? "default" : "ghost"}
- onClick={() => setSelectedTab("organizations")}
- className="justify-start"
- >
- <Users_ size={16} weight="bold" />
- Organizations
- </Button>
- <Button
- variant={selectedTab === "subscription" ? "default" : "ghost"}
- onClick={() => setSelectedTab("subscription")}
- className="justify-start"
- >
- <CreditCard size={16} weight="bold" />
- Subscription
- </Button>
- </div>
- {selectedTab === "account" && session.data?.user && (
- <Account session={session} />
- )}
- {selectedTab === "organizations" && <Organizations />}
- {selectedTab === "subscription" && <SubscriptionPage />}
- </div>
- </div>
- );
-}