mirror of
https://github.com/TheRealOwenRees/echecsfrance.git
synced 2026-11-18 07:22:06 +00:00
upgrade Nodemailer to v10
fix dead code with knip upgrade TS to v6 and fix linting errors auto apply oxfmt rules fix linting errors - unused deps etc ignore file remove all ignored files in knip add knip - dead code analysis tool swap prettier and eslint of oxfmt and oxlint fix: fix map rendering in react strict mode fix: headlessUI float replace fix: disable Matomo if not URL and SITE ID exist upgrade: 1st pass upgrade to Next.js v16 deps: upgrade react to v19
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
"use client";
|
||||
|
||||
import { useEffect } from "react";
|
||||
import { useEffect, type ReactNode } from "react";
|
||||
|
||||
import { useSession } from "next-auth/react";
|
||||
import { useLocale } from "next-intl";
|
||||
@@ -10,11 +10,11 @@ import { setUserLocale } from "@/server/setUserLocale";
|
||||
import { usePathname, useRouter } from "@/utils/routing";
|
||||
|
||||
type LocaleCheckerProps = {
|
||||
children?: React.ReactNode;
|
||||
children?: ReactNode;
|
||||
};
|
||||
|
||||
export const LocaleChecker = ({ children }: LocaleCheckerProps) => {
|
||||
const { data: sessionData, status, update } = useSession();
|
||||
const { data: sessionData, status } = useSession();
|
||||
const router = useRouter();
|
||||
const pathname = usePathname();
|
||||
const params = useParams();
|
||||
@@ -30,23 +30,14 @@ export const LocaleChecker = ({ children }: LocaleCheckerProps) => {
|
||||
|
||||
// If the user is authenticated and has a preferred locale that is different from the user's locale,
|
||||
// then we update redirect to the user's preference
|
||||
if (
|
||||
status === "authenticated" &&
|
||||
userLocale !== undefined &&
|
||||
userLocale !== locale
|
||||
) {
|
||||
if (status === "authenticated" && userLocale !== undefined && userLocale !== locale) {
|
||||
router.push({ pathname, params: params as any }, { locale: userLocale });
|
||||
}
|
||||
}, [locale, sessionData, status, params, pathname, router, userLocale]);
|
||||
|
||||
// To avoid flickering, we don't render the children until we have the user's locale
|
||||
if (status === "loading") return null;
|
||||
if (
|
||||
status === "authenticated" &&
|
||||
userLocale !== undefined &&
|
||||
userLocale !== locale
|
||||
)
|
||||
return null;
|
||||
if (status === "authenticated" && userLocale !== undefined && userLocale !== locale) return null;
|
||||
|
||||
return children;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user