⚡️⚡️⚡️ 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
bug fix
daniel31x131d854e16aade
diff --git a/components/ProfileDropdown.tsx b/components/ProfileDropdown.tsxindex 80d51192..609a97e8 100644--- a/components/ProfileDropdown.tsx+++ b/components/ProfileDropdown.tsx@@ -5,13 +5,16 @@ import Link from "next/link";import { signOut } from "next-auth/react";import { useTranslation } from "next-i18next";import { useUser } from "@/hooks/store/user";+import { useConfig } from "@/hooks/store/config";export default function ProfileDropdown() {const { t } = useTranslation();const { settings, updateSettings } = useLocalSettingsStore();const { data: user = {} } = useUser();- const isAdmin = user.id === Number(process.env.NEXT_PUBLIC_ADMIN || 1);+ const { data: config } = useConfig();++ const isAdmin = user.id === (config?.ADMIN || 1);const handleToggle = () => {const newTheme = settings.theme === "dark" ? "light" : "dark";diff --git a/hooks/store/config.tsx b/hooks/store/config.tsxnew file mode 100644index 00000000..dcc64c7c--- /dev/null+++ b/hooks/store/config.tsx@@ -0,0 +1,24 @@+import { useQuery } from "@tanstack/react-query";++export type Config = {+ DISABLE_REGISTRATION: boolean | null;+ ADMIN: number | null;+ RSS_POLLING_INTERVAL_MINUTES: number | null;+ EMAIL_PROVIDER: boolean | null;+ MAX_FILE_BUFFER: number | null;+ AI_ENABLED: boolean | null;+};++const useConfig = () => {+ return useQuery({+ queryKey: ["config"],+ queryFn: async () => {+ const response = await fetch("/api/v1/config");+ const data = await response.json();++ return data.response as Config;+ },+ });+};++export { useConfig };diff --git a/hooks/useInitialData.tsx b/hooks/useInitialData.tsxindex d1b96b3a..9bda699c 100644--- a/hooks/useInitialData.tsx+++ b/hooks/useInitialData.tsx@@ -1,24 +1,12 @@import { useEffect } from "react";import { useSession } from "next-auth/react";import useLocalSettingsStore from "@/store/localSettings";-import { Config } from "@/store/config";-import useConfigStore from "@/store/config";-type UseInitialDataProps = {- initialConfig: Config;-};--export default function useInitialData({ initialConfig }: UseInitialDataProps) {+export default function useInitialData() {const { status, data } = useSession();const { setSettings } = useLocalSettingsStore();- const { config, setConfig } = useConfigStore();-useEffect(() => {setSettings();-- if (!config.ADMIN) {- setConfig(initialConfig);- }}, [status, data]);return status;diff --git a/layouts/AuthRedirect.tsx b/layouts/AuthRedirect.tsxindex 8d76c3de..969427e7 100644--- a/layouts/AuthRedirect.tsx+++ b/layouts/AuthRedirect.tsx@@ -3,24 +3,20 @@ import { useRouter } from "next/router";import { useSession } from "next-auth/react";import useInitialData from "@/hooks/useInitialData";import { useUser } from "@/hooks/store/user";-import { GetServerSideProps } from "next";-import { getEnvData } from "@/pages/api/v1/config";-import { Config } from "@/store/config";interface Props {children: ReactNode;- initialConfig: Config;}const stripeEnabled = process.env.NEXT_PUBLIC_STRIPE === "true";-export default function AuthRedirect({ children, initialConfig }: Props) {+export default function AuthRedirect({ children }: Props) {const router = useRouter();const { status } = useSession();const [shouldRenderChildren, setShouldRenderChildren] = useState(false);const { data: user = {} } = useUser();- useInitialData({ initialConfig });+ useInitialData();useEffect(() => {const isLoggedIn = status === "authenticated";@@ -84,13 +80,3 @@ export default function AuthRedirect({ children, initialConfig }: Props) {return <></>;}}--export const getServerSideProps: GetServerSideProps = async (context) => {- const config = getEnvData();-- return {- props: {- initialConfig: config,- },- };-};diff --git a/pages/api/v1/config/index.ts b/pages/api/v1/config/index.tsindex cc8ca2d8..72a337ed 100644--- a/pages/api/v1/config/index.ts+++ b/pages/api/v1/config/index.ts@@ -2,20 +2,18 @@ import type { NextApiRequest, NextApiResponse } from "next";import * as process from "process";export default function handler(req: NextApiRequest, res: NextApiResponse) {- res.json(getEnvData());+ return res.status(200).json({ response: getEnvData() });}export const getEnvData = () => {return {DISABLE_REGISTRATION:- process.env.NEXT_PUBLIC_DISABLE_REGISTRATION === "true" || undefined,- ADMIN: Number(process.env.NEXT_PUBLIC_ADMIN) || undefined,+ process.env.NEXT_PUBLIC_DISABLE_REGISTRATION === "true" || null,+ ADMIN: Number(process.env.NEXT_PUBLIC_ADMIN) || null,RSS_POLLING_INTERVAL_MINUTES:- Number(process.env.NEXT_PUBLIC_RSS_POLLING_INTERVAL_MINUTES) || undefined,- EMAIL_PROVIDER:- process.env.NEXT_PUBLIC_EMAIL_PROVIDER === "true" || undefined,- MAX_FILE_BUFFER:- Number(process.env.NEXT_PUBLIC_MAX_FILE_BUFFER) || undefined,- AI_ENABLED: process.env.AI_ENABLED === "true" || undefined,+ Number(process.env.NEXT_PUBLIC_RSS_POLLING_INTERVAL_MINUTES) || null,+ EMAIL_PROVIDER: process.env.NEXT_PUBLIC_EMAIL_PROVIDER === "true" || null,+ MAX_FILE_BUFFER: Number(process.env.NEXT_PUBLIC_MAX_FILE_BUFFER) || null,+ AI_ENABLED: process.env.AI_ENABLED === "true" || null,};};diff --git a/store/config.ts b/store/config.tsdeleted file mode 100644index 9e3b447f..00000000--- a/store/config.ts+++ /dev/null@@ -1,37 +0,0 @@-// store/localSettings.ts-import { create } from "zustand";--export type Config = {- DISABLE_REGISTRATION?: boolean;- ADMIN?: number;- RSS_POLLING_INTERVAL_MINUTES?: number;- EMAIL_PROVIDER?: boolean;- MAX_FILE_BUFFER?: number;- AI_ENABLED?: boolean;-};--type ConfigStore = {- config: Config;- setConfig: (data: Config) => void;-};--const useConfigStore = create<ConfigStore>((set) => ({- config: {- DISABLE_REGISTRATION: false,- ADMIN: 0,- RSS_POLLING_INTERVAL_MINUTES: 60,- EMAIL_PROVIDER: false,- MAX_FILE_BUFFER: 0,- AI_ENABLED: false,- },- setConfig: (data) => {- set((state) => ({- config: {- ...state.config,- ...data,- },- }));- },-}));--export default useConfigStore;