Skip to content

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

Refactor page components to utilize Suspense for improved loading handling

Bill Yangc8c330644f0f
diff --git a/client/src/app/[site]/gsc/select-property/page.tsx b/client/src/app/[site]/gsc/select-property/page.tsx
index a01579c12..ce7d78880 100644
--- a/client/src/app/[site]/gsc/select-property/page.tsx
+++ b/client/src/app/[site]/gsc/select-property/page.tsx
@@ -1,7 +1,7 @@
"use client";
import { useParams, useRouter } from "next/navigation";
-import { useState } from "react";
+import { Suspense, useState } from "react";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
@@ -10,7 +10,7 @@ import { toast } from "sonner";
import { authedFetch } from "@/api/utils";
import { useQueryState, parseAsJson } from "nuqs";
-export default function SelectGSCPropertyPage() {
+function SelectGSCPropertyPageContent() {
const params = useParams();
const router = useRouter();
const site = params.site as string;
@@ -114,3 +114,11 @@ export default function SelectGSCPropertyPage() {
</div>
);
}
+
+export default function SelectGSCPropertyPage() {
+ return (
+ <Suspense fallback={null}>
+ <SelectGSCPropertyPageContent />
+ </Suspense>
+ );
+}
diff --git a/client/src/app/as/callback/page.tsx b/client/src/app/as/callback/page.tsx
index 5dd488786..c5b028ad8 100644
--- a/client/src/app/as/callback/page.tsx
+++ b/client/src/app/as/callback/page.tsx
@@ -10,18 +10,17 @@ import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import { motion } from "framer-motion";
import { ArrowRight, Check } from "lucide-react";
-import Image from "next/image";
import Link from "next/link";
import { useRouter } from "next/navigation";
-import React, { useEffect, useState } from "react";
+import { parseAsInteger, parseAsString, useQueryStates } from "nuqs";
+import React, { Suspense, useEffect, useState } from "react";
import { addSite } from "../../../api/admin/sites";
-import { useQueryStates, parseAsInteger, parseAsString } from "nuqs";
+import { RybbitTextLogo } from "../../../components/RybbitLogo";
import { useSetPageTitle } from "../../../hooks/useSetPageTitle";
import { authClient } from "../../../lib/auth";
import { IS_CLOUD } from "../../../lib/const";
import { userStore } from "../../../lib/userStore";
import { cn, isValidDomain, normalizeDomain } from "../../../lib/utils";
-import { RybbitTextLogo } from "../../../components/RybbitLogo";
// Animation variants for step transitions
const contentVariants = {
@@ -29,7 +28,7 @@ const contentVariants = {
visible: { opacity: 1, x: 0, transition: { duration: 0.3 } },
};
-export default function AppSumoSignupPage() {
+function AppSumoSignupPageContent() {
useSetPageTitle("Rybbit · AppSumo Signup");
const [currentStep, setCurrentStep] = useState(1);
@@ -434,3 +433,11 @@ export default function AppSumoSignupPage() {
</div>
);
}
+
+export default function AppSumoSignupPage() {
+ return (
+ <Suspense fallback={null}>
+ <AppSumoSignupPageContent />
+ </Suspense>
+ );
+}