One Calendar is a privacy-first calendar web app built with Next.js. It has modern security features, including e2ee, password-protected sharing, and self-destructing share links 📅
calendar.xyehr.cn
Merge pull request #144 from EvanTechDev/codex/fix-user-profile-image-loading-bug
Fix profile avatar loading and auth splash timing
authored by
Evan Huang
and committed by
GitHub
30f078c5
2b3d5ab7
+37
-7
+22
-3
app/(app)/app/page.tsx
+22
-3
app/(app)/app/page.tsx
···
3
3
import Calendar from "@/components/app/calendar"
4
4
import AuthWaitingLoading from "@/components/app/auth-waiting-loading"
5
5
import { useUser } from "@clerk/nextjs"
6
-
import { useMemo, useState } from "react"
6
+
import { useEffect, useMemo, useState } from "react"
7
7
8
8
function hasClerkSessionCookie() {
9
9
if (typeof document === "undefined") return false
···
15
15
16
16
export default function Home() {
17
17
const { isLoaded } = useUser()
18
-
const [hasSessionCookie] = useState(hasClerkSessionCookie)
18
+
const [hasSessionCookie, setHasSessionCookie] = useState(hasClerkSessionCookie)
19
+
const [minimumWaitDone, setMinimumWaitDone] = useState(false)
20
+
21
+
useEffect(() => {
22
+
const waitTimer = window.setTimeout(() => {
23
+
setMinimumWaitDone(true)
24
+
}, 500)
25
+
26
+
const cookieCheckTimer = window.setInterval(() => {
27
+
if (hasClerkSessionCookie()) {
28
+
setHasSessionCookie(true)
29
+
}
30
+
}, 50)
31
+
32
+
return () => {
33
+
window.clearTimeout(waitTimer)
34
+
window.clearInterval(cookieCheckTimer)
35
+
}
36
+
}, [])
19
37
20
38
const shouldShowAuthWait = useMemo(() => {
39
+
if (!minimumWaitDone) return true
21
40
return hasSessionCookie && !isLoaded
22
-
}, [hasSessionCookie, isLoaded])
41
+
}, [minimumWaitDone, hasSessionCookie, isLoaded])
23
42
24
43
if (shouldShowAuthWait) {
25
44
return <AuthWaitingLoading />