- ..is under early testing, don't use this app in production.
+ ..is under early testing, don{`'`}t use this app in production.
{links.map((link) => {
diff --git a/src/components/ui/Avatar.tsx b/src/components/ui/Avatar.tsx
index f4b0ad34..1d334598 100644
--- a/src/components/ui/Avatar.tsx
+++ b/src/components/ui/Avatar.tsx
@@ -1,5 +1,6 @@
import clsx from "clsx"
import React, { useMemo } from "react"
+import Image from "next/image"
export const Avatar: React.FC<
{
@@ -60,7 +61,7 @@ export const Avatar: React.FC<
height: `${size}px`,
}}
>
-
{
+export default function middleware(req: NextRequest) {
const { pathname } = req.nextUrl
if (!IS_PROD && pathname.startsWith("/dev-s3-proxy")) {
diff --git a/src/pages/dashboard/[subdomain]/account/profile.tsx b/src/pages/dashboard/[subdomain]/account/profile.tsx
index 16645da0..c03b6eb4 100644
--- a/src/pages/dashboard/[subdomain]/account/profile.tsx
+++ b/src/pages/dashboard/[subdomain]/account/profile.tsx
@@ -40,7 +40,7 @@ export default function AccountProfilePage() {
email: viewer.data.email,
})
}
- }, [viewer.data])
+ }, [viewer.data, form])
return (
diff --git a/src/pages/dashboard/[subdomain]/editor.tsx b/src/pages/dashboard/[subdomain]/editor.tsx
index 93e7faa9..971c12b7 100644
--- a/src/pages/dashboard/[subdomain]/editor.tsx
+++ b/src/pages/dashboard/[subdomain]/editor.tsx
@@ -71,7 +71,7 @@ export default function SubdomainEditor() {
}`
)
}
- }, [createOrUpdatePage])
+ }, [createOrUpdatePage, isPost, router, subdomain, trpcContext])
useEffect(() => {
if (!page) return
diff --git a/src/pages/dashboard/[subdomain]/settings/domains.tsx b/src/pages/dashboard/[subdomain]/settings/domains.tsx
index bb11b378..48f80763 100644
--- a/src/pages/dashboard/[subdomain]/settings/domains.tsx
+++ b/src/pages/dashboard/[subdomain]/settings/domains.tsx
@@ -18,27 +18,6 @@ export default function SettingsDomainsPage() {
const ctx = trpc.useContext()
const updateSite = trpc.useMutation("site.updateSite")
- useEffect(() => {
- if (updateSite.isSuccess && updateSite.data) {
- toast.success("Saved!")
- updateSite.reset()
- ctx.invalidateQueries()
- if (updateSite.data.subdomainUpdated) {
- router.replace(
- `/dashboard/${updateSite.data.site.subdomain}/settings/domains`
- )
- }
- }
- }, [updateSite])
-
- useEffect(() => {
- if (siteResult.data) {
- form.setValues({
- subdomain: siteResult.data.subdomain,
- })
- }
- }, [siteResult.data])
-
const form = useFormik({
initialValues: {
subdomain: "",
@@ -51,6 +30,27 @@ export default function SettingsDomainsPage() {
},
})
+ useEffect(() => {
+ if (updateSite.isSuccess && updateSite.data) {
+ toast.success("Saved!")
+ updateSite.reset()
+ ctx.invalidateQueries()
+ if (updateSite.data.subdomainUpdated) {
+ router.replace(
+ `/dashboard/${updateSite.data.site.subdomain}/settings/domains`
+ )
+ }
+ }
+ }, [ctx, router, updateSite])
+
+ useEffect(() => {
+ if (siteResult.data) {
+ form.setValues({
+ subdomain: siteResult.data.subdomain,
+ })
+ }
+ }, [form, siteResult.data])
+
return (
diff --git a/src/pages/dashboard/[subdomain]/settings/general.tsx b/src/pages/dashboard/[subdomain]/settings/general.tsx
index b0c2c0a1..2aa2b9aa 100644
--- a/src/pages/dashboard/[subdomain]/settings/general.tsx
+++ b/src/pages/dashboard/[subdomain]/settings/general.tsx
@@ -41,7 +41,7 @@ export default function SiteSettingsGeneralPage() {
description: site.description || "",
})
}
- }, [site])
+ }, [form, site])
useEffect(() => {
if (updateSite.isSuccess && updateSite.data) {
diff --git a/src/pages/dashboard/index.ts b/src/pages/dashboard/index.tsx
similarity index 85%
rename from src/pages/dashboard/index.ts
rename to src/pages/dashboard/index.tsx
index e89e7361..9c42065e 100644
--- a/src/pages/dashboard/index.ts
+++ b/src/pages/dashboard/index.tsx
@@ -15,4 +15,6 @@ export const getServerSideProps = serverSidePropsHandler(async (ctx) => {
return redirect(`/dashboard/${site.subdomain}`)
})
-export default () => null
+export default function Dashboard() {
+ return You should never see this
+}
diff --git a/src/pages/dashboard/new-site.tsx b/src/pages/dashboard/new-site.tsx
index 0418f9b6..3025e00b 100644
--- a/src/pages/dashboard/new-site.tsx
+++ b/src/pages/dashboard/new-site.tsx
@@ -31,7 +31,7 @@ export default function NewSitePage() {
createSite.reset()
router.push(`/dashboard/${createSite.data.subdomain}`)
}
- }, [createSite])
+ }, [createSite, router])
return (