⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.
TypeScript bookmarkbookmark-managercollaborationnextjsreact-nativeread-it-laterself-hostedtypescript
feat(web): add system theme + bug fix
daniel31x1396e3c820c199
diff --git a/apps/web/components/Announcement.tsx b/apps/web/components/Announcement.tsxindex b7b9e843..a8a0b032 100644--- a/apps/web/components/Announcement.tsx+++ b/apps/web/components/Announcement.tsx@@ -11,6 +11,8 @@ export default function Announcement({ toggleAnnouncementBar }: Props) {const announcementId = localStorage.getItem("announcementId");const announcementMessage = localStorage.getItem("announcementMessage");+ if (!announcementId && !announcementMessage) return null;+return (<div className="fixed mx-auto bottom-20 sm:bottom-10 w-full pointer-events-none p-5 z-30"><div className="mx-auto pointer-events-auto p-2 flex justify-between gap-2 items-center border border-primary shadow-xl rounded-xl bg-base-300 backdrop-blur-sm bg-opacity-80 max-w-md">diff --git a/apps/web/components/ProfileDropdown.tsx b/apps/web/components/ProfileDropdown.tsxindex 8e6606a5..c46611b6 100644--- a/apps/web/components/ProfileDropdown.tsx+++ b/apps/web/components/ProfileDropdown.tsx@@ -43,10 +43,11 @@ export default function ProfileDropdown({const isAdmin = user?.id === (config?.ADMIN || 1);- const handleToggle = () => {- const newTheme = user?.theme === "dark" ? "light" : "dark";- updateUserPreference.mutate({ theme: newTheme });- };+ const themeOptions = [+ { value: "auto", label: t("system"), icon: "bi-circle-half" },+ { value: "dark", label: t("dark"), icon: "bi-moon-fill" },+ { value: "light", label: t("light"), icon: "bi-sun-fill" },+ ] as const;const trigger = (<DropdownMenuTrigger>@@ -129,18 +130,35 @@ export default function ProfileDropdown({</DropdownMenuItem>)}- <DropdownMenuItem asChild>- <div onClick={() => handleToggle()} className="whitespace-nowrap">- {user?.theme === "light" ? (- <i className="bi-moon-fill"></i>- ) : (- <i className="bi-sun-fill"></i>- )}- {t("switch_to", {- theme: user?.theme === "light" ? t("dark") : t("light"),- })}- </div>- </DropdownMenuItem>+ <DropdownMenuSub>+ <DropdownMenuSubTrigger>+ <i+ className={+ themeOptions.find((option) => option.value === user?.theme)+ ?.icon || "bi-circle-half"+ }+ ></i>+ {t("theme")}+ </DropdownMenuSubTrigger>+ <DropdownMenuPortal>+ <DropdownMenuSubContent>+ {themeOptions.map((option) => (+ <DropdownMenuItem+ key={option.value}+ onSelect={() =>+ updateUserPreference.mutate({ theme: option.value })+ }+ >+ <i className={option.icon}></i>+ {option.label}+ {user?.theme === option.value && (+ <i className="bi-check2 ml-auto"></i>+ )}+ </DropdownMenuItem>+ ))}+ </DropdownMenuSubContent>+ </DropdownMenuPortal>+ </DropdownMenuSub><DropdownMenuSub><DropdownMenuSubTrigger>diff --git a/apps/web/hooks/useTheme.ts b/apps/web/hooks/useTheme.tsnew file mode 100644index 00000000..e07debdb--- /dev/null+++ b/apps/web/hooks/useTheme.ts@@ -0,0 +1,31 @@+import { useEffect, useState } from "react";+import { useUser } from "@linkwarden/router/user";++export default function useTheme() {+ const { data: user } = useUser();++ const [systemTheme, setSystemTheme] = useState<"dark" | "light">(() =>+ typeof window !== "undefined" &&+ window.matchMedia("(prefers-color-scheme: dark)").matches+ ? "dark"+ : "light"+ );++ useEffect(() => {+ const media = window.matchMedia("(prefers-color-scheme: dark)");+ const handleChange = () => setSystemTheme(media.matches ? "dark" : "light");++ handleChange();+ media.addEventListener("change", handleChange);+ return () => media.removeEventListener("change", handleChange);+ }, []);++ const theme = user?.theme === "auto" ? systemTheme : user?.theme;++ useEffect(() => {+ if (theme)+ document.querySelector("html")?.setAttribute("data-theme", theme);+ }, [theme]);++ return theme as "dark" | "light" | undefined;+}diff --git a/apps/web/layouts/AuthRedirect.tsx b/apps/web/layouts/AuthRedirect.tsxindex baece77e..8715fa6f 100644--- a/apps/web/layouts/AuthRedirect.tsx+++ b/apps/web/layouts/AuthRedirect.tsx@@ -2,6 +2,7 @@ import { ReactNode, useEffect, useState } from "react";import { useRouter } from "next/router";import { useSession } from "next-auth/react";import useInitialData from "@/hooks/useInitialData";+import useTheme from "@/hooks/useTheme";import { useUser } from "@linkwarden/router/user";interface Props {@@ -19,6 +20,7 @@ export default function AuthRedirect({ children }: Props) {const { data: user } = useUser();useInitialData();+ useTheme();useEffect(() => {const isLoggedIn = status === "authenticated";diff --git a/apps/web/layouts/MainLayout.tsx b/apps/web/layouts/MainLayout.tsxindex 1aaeeb7f..3f97ecef 100644--- a/apps/web/layouts/MainLayout.tsx+++ b/apps/web/layouts/MainLayout.tsx@@ -14,7 +14,7 @@ export default function MainLayout({ children }: Props) {const showAnnouncementBar = localStorage.getItem("showAnnouncementBar");const [showAnnouncement, setShowAnnouncement] = useState(- showAnnouncementBar ? showAnnouncementBar === "true" : true+ showAnnouncementBar === "true");const { sidebarIsCollapsed, toggleSidebar } = useSidebarCollapse();diff --git a/apps/web/lib/api/getTokenFromRequest.ts b/apps/web/lib/api/getTokenFromRequest.tsnew file mode 100644index 00000000..c8e51fd8--- /dev/null+++ b/apps/web/lib/api/getTokenFromRequest.ts@@ -0,0 +1,20 @@+import { NextApiRequest } from "next";+import { JWT, getToken } from "next-auth/jwt";++// next-auth's getToken reads the session cookie before the Authorization+// header, so a stale cookie (e.g. one sitting in a mobile client's native+// cookie jar) silently outranks the Bearer token an API client explicitly+// sends. When a Bearer token is present, resolve the request from it alone;+// cookie-based auth stays untouched for requests without one (the web app).+export default async function getTokenFromRequest(+ req: NextApiRequest+): Promise<JWT | null> {+ const authorization = req.headers.authorization;++ if (authorization?.startsWith("Bearer "))+ return getToken({+ req: { headers: { authorization }, cookies: {} } as NextApiRequest,+ });++ return getToken({ req });+}diff --git a/apps/web/lib/api/isAuthenticatedRequest.ts b/apps/web/lib/api/isAuthenticatedRequest.tsindex 17ba467b..c477c32e 100644--- a/apps/web/lib/api/isAuthenticatedRequest.ts+++ b/apps/web/lib/api/isAuthenticatedRequest.ts@@ -1,6 +1,6 @@import { NextApiRequest } from "next";-import { getToken } from "next-auth/jwt";import { prisma } from "@linkwarden/prisma";+import getTokenFromRequest from "./getTokenFromRequest";const STRIPE_SECRET_KEY = process.env.STRIPE_SECRET_KEY;@@ -9,7 +9,7 @@ type Props = {};export default async function isAuthenticatedRequest({ req }: Props) {- const token = await getToken({ req });+ const token = await getTokenFromRequest(req);const userId = token?.id;if (!userId) {diff --git a/apps/web/lib/api/verifyToken.ts b/apps/web/lib/api/verifyToken.tsindex fa850028..c0c391c5 100644--- a/apps/web/lib/api/verifyToken.ts+++ b/apps/web/lib/api/verifyToken.ts@@ -1,6 +1,7 @@import { NextApiRequest } from "next";-import { JWT, getToken } from "next-auth/jwt";+import { JWT } from "next-auth/jwt";import { prisma } from "@linkwarden/prisma";+import getTokenFromRequest from "./getTokenFromRequest";type Props = {req: NextApiRequest;@@ -9,7 +10,7 @@ type Props = {export default async function verifyToken({req,}: Props): Promise<JWT | string> {- const token = await getToken({ req });+ const token = await getTokenFromRequest(req);const userId = token?.id;if (!userId) {diff --git a/apps/web/pages/api/v1/payment/index.ts b/apps/web/pages/api/v1/payment/index.tsindex 450ad9a9..8c7eb7c1 100644--- a/apps/web/pages/api/v1/payment/index.ts+++ b/apps/web/pages/api/v1/payment/index.ts@@ -1,15 +1,15 @@import type { NextApiRequest, NextApiResponse } from "next";import paymentCheckout from "@/lib/api/paymentCheckout";import { Plan } from "@linkwarden/types/global";-import { getToken } from "next-auth/jwt";import { prisma } from "@linkwarden/prisma";+import getTokenFromRequest from "@/lib/api/getTokenFromRequest";export default async function users(req: NextApiRequest, res: NextApiResponse) {const STRIPE_SECRET_KEY = process.env.STRIPE_SECRET_KEY;const MONTHLY_PRICE_ID = process.env.MONTHLY_PRICE_ID;const YEARLY_PRICE_ID = process.env.YEARLY_PRICE_ID;- const token = await getToken({ req });+ const token = await getTokenFromRequest(req);if (!STRIPE_SECRET_KEY || !MONTHLY_PRICE_ID || !YEARLY_PRICE_ID)return res.status(400).json({ response: "Payment is disabled." });diff --git a/apps/web/pages/collections/[id].tsx b/apps/web/pages/collections/[id].tsxindex c15266b1..3350a219 100644--- a/apps/web/pages/collections/[id].tsx+++ b/apps/web/pages/collections/[id].tsx@@ -10,6 +10,7 @@ import React, { ReactElement, useEffect, useState } from "react";import MainLayout from "@/layouts/MainLayout";import ProfilePhoto from "@/components/ProfilePhoto";import usePermissions from "@/hooks/usePermissions";+import useTheme from "@/hooks/useTheme";import NoLinksFound from "@/components/NoLinksFound";import getPublicUserData from "@/lib/client/getPublicUserData";import EditCollectionModal from "@/components/ModalContent/EditCollectionModal";@@ -68,6 +69,7 @@ const Page: NextPageWithLayout = () => {}, [router, collections]);const { data: user } = useUser();+ const theme = useTheme();const [collectionOwner, setCollectionOwner] = useState<Partial<AccountSettings>@@ -116,8 +118,8 @@ const Page: NextPageWithLayout = () => {className="p-5 flex gap-3 flex-col"style={{backgroundImage: `linear-gradient(${activeCollection?.color}20 0%, ${- user?.theme === "dark" ? "#262626" : "#f3f4f6"- } 13rem, ${user?.theme === "dark" ? "#171717" : "#ffffff"} 100%)`,+ theme === "dark" ? "#262626" : "#f3f4f6"+ } 13rem, ${theme === "dark" ? "#171717" : "#ffffff"} 100%)`,}}>{activeCollection && (diff --git a/apps/web/pages/public/collections/[id]/index.tsx b/apps/web/pages/public/collections/[id]/index.tsxindex 764ad55e..14b4d117 100644--- a/apps/web/pages/public/collections/[id]/index.tsx+++ b/apps/web/pages/public/collections/[id]/index.tsx@@ -29,13 +29,13 @@ import {TooltipProvider,TooltipTrigger,} from "@/components/ui/tooltip";-import { useUser } from "@linkwarden/router/user";+import useTheme from "@/hooks/useTheme";import { Separator } from "@/components/ui/separator";export default function PublicCollections() {const { t } = useTranslation();- const { data: user } = useUser();+ const theme = useTheme();const router = useRouter();@@ -104,8 +104,8 @@ export default function PublicCollections() {className="h-96"style={{backgroundImage: `linear-gradient(${collection?.color}30 10%, ${- user?.theme === "light" ? "#f3f4f6" : "#262626"- } 13rem, ${user?.theme === "light" ? "#ffffff" : "#171717"} 100%)`,+ theme === "light" ? "#f3f4f6" : "#262626"+ } 13rem, ${theme === "light" ? "#ffffff" : "#171717"} 100%)`,}}>{collection && (diff --git a/apps/web/pages/settings/preference.tsx b/apps/web/pages/settings/preference.tsxindex 5e827471..aaab04dc 100644--- a/apps/web/pages/settings/preference.tsx+++ b/apps/web/pages/settings/preference.tsx@@ -17,6 +17,7 @@ import { useTags, useUpsertTags } from "@linkwarden/router/tags";import TagSelection from "@/components/InputSelect/TagSelection";import { useArchivalTags } from "@/hooks/useArchivalTags";import { isArchivalTag } from "@linkwarden/lib/isArchivalTag";+import { resolveTheme } from "@linkwarden/lib/utils";import { Button } from "@/components/ui/button";import {Tooltip,@@ -252,8 +253,17 @@ const Page: NextPageWithLayout = () => {<div className="max-w-screen-sm w-full mx-auto"><div className="flex gap-3 w-full">{[+ {+ theme: "auto",+ label: t("system"),+ icon: "bi-circle-half",+ bgColor: "bg-[linear-gradient(110deg,#000_50%,#fff_50%)]",+ textColor: "text-white mix-blend-difference",+ activeColor: "text-white mix-blend-difference",+ },{theme: "dark",+ label: t("dark"),icon: "bi-moon-fill",bgColor: "bg-black",textColor: "text-white",@@ -261,32 +271,40 @@ const Page: NextPageWithLayout = () => {},{theme: "light",+ label: t("light"),icon: "bi-sun-fill",bgColor: "bg-white",textColor: "text-black",activeColor: "text-primary",},- ].map(({ theme, icon, bgColor, textColor, activeColor }) => (+ ].map(({ theme, label, icon, bgColor, textColor, activeColor }) => (<divkey={theme}className={`w-full text-center outline-solid outline-neutral-content outline h-20 duration-100 rounded-xl flex items-center justify-center cursor-pointer select-none ${bgColor} ${- account.theme === theme- ? `outline-primary ${activeColor}`- : textColor+ account.theme === theme ? "outline-primary" : ""}`}onClick={() => {updateUserPreference.mutate({ theme: theme as any });- document.documentElement.setAttribute("data-theme", theme);+ document.documentElement.setAttribute(+ "data-theme",+ resolveTheme(theme) || theme+ );}}>- <i className={`${icon} text-3xl`}></i>- <p className="ml-2 text-xl">{t(theme)}</p>+ <span+ className={`flex items-center ${+ account.theme === theme ? activeColor : textColor+ }`}+ >+ <i className={`${icon} sm:text-3xl text-lg`}></i>+ <p className="ml-2 sm:text-xl text-lg">{label}</p>+ </span></div>))}</div><div className="mt-3">- <div className="flex gap-3 w-3/4 mx-auto">+ <div className="flex gap-3 mx-auto">{["--default","--red",@@ -298,7 +316,7 @@ const Page: NextPageWithLayout = () => {].map((color) => (<divkey={color}- className="relative rounded-full w-full aspect-square cursor-pointer"+ className="relative rounded-xl h-10 w-20 cursor-pointer"style={{ backgroundColor: `oklch(var(${color}))` }}onClick={() => updateSettings({ color })}>diff --git a/apps/web/public/locales/en/common.json b/apps/web/public/locales/en/common.jsonindex fb47d638..da64fa62 100644--- a/apps/web/public/locales/en/common.json+++ b/apps/web/public/locales/en/common.json@@ -165,6 +165,7 @@"select_theme": "Select Theme","dark": "Dark","light": "Light",+ "system": "System","archive_settings": "Archive Settings","formats_to_archive": "Formats to Archive/Preserve webpages:","screenshot": "Screenshot",diff --git a/packages/lib/utils.ts b/packages/lib/utils.tsindex cba641b2..2d0adc68 100644--- a/packages/lib/utils.ts+++ b/packages/lib/utils.ts@@ -17,3 +17,11 @@ export function delay(sec: number) {export function cn(...inputs: ClassValue[]) {return twMerge(clsx(inputs));}++export function resolveTheme(theme?: string | null) {+ if (theme !== "auto") return theme || undefined;+ if (typeof window === "undefined") return "dark";+ return window.matchMedia("(prefers-color-scheme: dark)").matches+ ? "dark"+ : "light";+}diff --git a/packages/router/user.tsx b/packages/router/user.tsxindex a4b91be4..2f4368df 100644--- a/packages/router/user.tsx+++ b/packages/router/user.tsx@@ -1,4 +1,5 @@import { UpdateUserPreferenceSchemaType } from "@linkwarden/lib/schemaValidation";+import { resolveTheme } from "@linkwarden/lib/utils";import {DashboardSection,Subscription,@@ -43,7 +44,9 @@ const useUser = (auth?: MobileAuth) => {const data = (await response.json()).response as GetUserByIdResponse;if (!auth)- document.querySelector("html")?.setAttribute("data-theme", data.theme);+ document+ .querySelector("html")+ ?.setAttribute("data-theme", resolveTheme(data.theme) || "dark");return data;},@@ -119,7 +122,9 @@ const useUpdateUserPreference = () => {},onSuccess: (data) => {queryClient.setQueryData(["user"], data);- document.querySelector("html")?.setAttribute("data-theme", data.theme);+ document+ .querySelector("html")+ ?.setAttribute("data-theme", resolveTheme(data.theme) || "dark");},onMutate: async (user) => {await queryClient.cancelQueries({ queryKey: ["user"] });