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
Use shared Spinner and move db tables check API route
+56
-40
app/api/db/tables/route.ts
app/api/blob/check/route.ts
app/api/db/tables/route.ts
app/api/blob/check/route.ts
app/at-oauth/page.tsx
app/(auth)/at-oauth/page.tsx
app/at-oauth/page.tsx
app/(auth)/at-oauth/page.tsx
+2
-13
components/app/event/event-preview.tsx
+2
-13
components/app/event/event-preview.tsx
···
33
33
} from "@/components/ui/dialog";
34
34
import { Input } from "@/components/ui/input";
35
35
import { Label } from "@/components/ui/label";
36
+
import { Spinner } from "@/components/ui/spinner";
36
37
import { toast } from "sonner";
37
38
import QRCodeStyling from "qr-code-styling";
38
39
import { useUser } from "@clerk/nextjs";
···
681
682
>
682
683
{isSharing ? (
683
684
<span className="flex items-center">
684
-
<svg
685
-
className="animate-spin -ml-1 mr-2 h-4 w-4 text-white"
686
-
xmlns="http://www.w3.org/2000/svg"
687
-
fill="none"
688
-
viewBox="0 0 24 24"
689
-
>
690
-
<circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"></circle>
691
-
<path
692
-
className="opacity-75"
693
-
fill="currentColor"
694
-
d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
695
-
></path>
696
-
</svg>
685
+
<Spinner className="mr-2" />
697
686
{t.shareSharing}
698
687
</span>
699
688
) : (
+17
-7
components/app/profile/settings.tsx
+17
-7
components/app/profile/settings.tsx
···
67
67
const timeZoneName = parts.find((part) => part.type === "timeZoneName")?.value ?? ""
68
68
69
69
if (timeZoneName === "GMT" || timeZoneName === "UTC") {
70
-
return "UTC+00:00"
70
+
return { offsetString: "UTC+00:00", offsetMinutes: 0 }
71
71
}
72
72
73
73
const match = timeZoneName.match(/(?:GMT|UTC)([+-])(\d{1,2})(?::?(\d{2}))?/)
74
74
if (!match) {
75
-
return "UTC+00:00"
75
+
return { offsetString: "UTC+00:00", offsetMinutes: 0 }
76
76
}
77
77
78
78
const [, sign, hours, minutes = "00"] = match
79
-
return `UTC${sign}${hours.padStart(2, "0")}:${minutes}`
79
+
const parsedHours = Number.parseInt(hours, 10)
80
+
const parsedMinutes = Number.parseInt(minutes, 10)
81
+
const totalMinutes = parsedHours * 60 + parsedMinutes
82
+
const offsetMinutes = sign === "-" ? -totalMinutes : totalMinutes
83
+
84
+
return {
85
+
offsetString: `UTC${sign}${hours.padStart(2, "0")}:${minutes}`,
86
+
offsetMinutes,
87
+
}
80
88
}
81
89
82
90
return timezones
83
91
.map((tz) => {
84
92
try {
85
-
const offsetString = getUTCOffset(tz)
93
+
const { offsetString, offsetMinutes } = getUTCOffset(tz)
86
94
87
95
return {
88
96
value: tz,
89
-
label: `${tz} (${offsetString})`,
97
+
label: `${offsetString} · ${tz}`,
98
+
offsetMinutes,
90
99
}
91
100
} catch {
92
101
return {
93
102
value: tz,
94
-
label: tz,
103
+
label: `UTC+00:00 · ${tz}`,
104
+
offsetMinutes: 0,
95
105
}
96
106
}
97
107
})
98
-
.sort((a, b) => a.label.localeCompare(b.label))
108
+
.sort((a, b) => a.offsetMinutes - b.offsetMinutes || a.value.localeCompare(b.value))
99
109
}
100
110
101
111
const gmtTimezones = getGMTTimezones()
+16
components/ui/spinner.tsx
+16
components/ui/spinner.tsx
···
1
+
import { LoaderIcon } from "lucide-react"
2
+
3
+
import { cn } from "@/lib/utils"
4
+
5
+
function Spinner({ className, ...props }: React.ComponentProps<"svg">) {
6
+
return (
7
+
<LoaderIcon
8
+
role="status"
9
+
aria-label="Loading"
10
+
className={cn("size-4 animate-spin", className)}
11
+
{...props}
12
+
/>
13
+
)
14
+
}
15
+
16
+
export { Spinner }