create-nextblock 0.12.13 → 0.12.15

package/templates/nextblock-template/app/layout.tsx

@@ -33,6 +33,13 @@ import {
   resolveSupabaseUrl,
 } from '../lib/setup/env-status';
 import { resolveMediaBaseUrl } from '../lib/storage/provider';
+import {
+  LANGUAGE_DETECTION_SETTING_KEY,
+  LANGUAGE_DETECTION_CACHE_TAG,
+  DEFAULT_LANGUAGE_DETECTION_SETTINGS,
+  normalizeLanguageDetectionSettings,
+  type LanguageDetectionSettings,
+} from '../lib/i18n/detection';
 
 const defaultUrl = process.env.NEXT_PUBLIC_URL || 'http://localhost:3000';
 
@@ -83,6 +90,25 @@ const getCachedLanguages = unstable_cache(
   { revalidate: PUBLIC_LAYOUT_REVALIDATE_SECONDS }
 );
 
+const getCachedLanguageDetectionSettings = unstable_cache(
+  async (): Promise<LanguageDetectionSettings> => {
+    const supabase = createStaticSupabaseClient();
+    const { data, error } = await supabase
+      .from('site_settings')
+      .select('value')
+      .eq('key', LANGUAGE_DETECTION_SETTING_KEY)
+      .maybeSingle();
+
+    // Absent row or read error = defaults (browser detection, remembered choice).
+    if (error) {
+      return { ...DEFAULT_LANGUAGE_DETECTION_SETTINGS };
+    }
+    return normalizeLanguageDetectionSettings(data?.value);
+  },
+  ['public-language-detection'],
+  { revalidate: PUBLIC_LAYOUT_REVALIDATE_SECONDS, tags: [LANGUAGE_DETECTION_CACHE_TAG] }
+);
+
 const getCachedCopyrightSettings = unstable_cache(
   async (): Promise<Record<string, string>> => {
     const supabase = createStaticSupabaseClient();
@@ -274,6 +300,7 @@ async function loadLayoutData() {
       globalCss: '',
       privacySettings: DEFAULT_PRIVACY_SETTINGS,
       footerAttributionEnabled: true,
+      rememberVisitorChoice: DEFAULT_LANGUAGE_DETECTION_SETTINGS.rememberVisitorChoice,
     };
   }
 
@@ -300,6 +327,7 @@ async function loadLayoutData() {
     translationsResult,
     isEcommerceActive,
     privacySettings,
+    languageDetectionSettings,
   ] = await Promise.all([
     supabase.auth.getUser(),
     getCachedLanguages().catch(() => getActiveLanguagesServerSide().catch(() => [])),
@@ -311,9 +339,19 @@ async function loadLayoutData() {
     getCachedTranslations().catch(() => []),
     verifyPackageOnline('ecommerce').catch(() => false),
     getPrivacySettings().catch(() => DEFAULT_PRIVACY_SETTINGS),
+    getCachedLanguageDetectionSettings().catch(() => ({
+      ...DEFAULT_LANGUAGE_DETECTION_SETTINGS,
+    })),
   ]);
 
-  const availableLanguages: Language[] = availableLanguagesResult;
+  // Serve only active languages, matching the proxy's detection set (is_active
+  // null counts as active). getCachedLanguages / getActiveLanguagesServerSide
+  // both return every row, so filtering here keeps the public switcher and
+  // LanguageProvider in step with the locales the proxy will actually honor —
+  // otherwise picking a deactivated language would ping-pong against the proxy.
+  const availableLanguages: Language[] = availableLanguagesResult.filter(
+    (lang) => lang.is_active !== false,
+  );
   const availableCurrencies: StoreCurrency[] = currenciesResult;
   const defaultLanguage: Language | null =
     availableLanguages.find((lang) => lang.is_default) ?? availableLanguages[0] ?? null;
@@ -368,6 +406,7 @@ async function loadLayoutData() {
     globalCss,
     privacySettings,
     footerAttributionEnabled,
+    rememberVisitorChoice: languageDetectionSettings.rememberVisitorChoice,
   };
 }
 
@@ -449,6 +488,7 @@ export default async function RootLayout({
     globalCss,
     privacySettings,
     footerAttributionEnabled,
+    rememberVisitorChoice,
   } = await loadLayoutData();
   const draft = await draftMode();
   // GTM container id comes solely from the privacy settings row (site_settings).
@@ -502,6 +542,7 @@ export default async function RootLayout({
           initialCurrencyCode={serverCurrencyCode}
           initialAvailableLanguages={availableLanguages}
           initialDefaultLanguage={defaultLanguage}
+          rememberVisitorChoice={rememberVisitorChoice}
           translations={translations}
           nonce={nonce}
         >

package/templates/nextblock-template/app/product/[slug]/page.tsx

@@ -111,8 +111,12 @@ export async function generateMetadata({ params }: ProductPageProps): Promise<Me
   if (!preferredLocale) {
     try {
       const hdrs = await headers();
-      const al = hdrs.get("accept-language");
-      if (al) preferredLocale = al.split(",")[0]?.split("-")[0];
+      // Proxy-detected locale first: it honors the CMS language-detection settings.
+      preferredLocale = hdrs.get("x-user-locale") || undefined;
+      if (!preferredLocale) {
+        const al = hdrs.get("accept-language");
+        if (al) preferredLocale = al.split(",")[0]?.split("-")[0];
+      }
     } catch {
       // ignore
     }
@@ -206,8 +210,12 @@ export default async function ProductPage({ params }: ProductPageProps) {
   if (!preferredLocale) {
     try {
       const hdrs = await headers();
-      const al = hdrs.get("accept-language");
-      if (al) preferredLocale = al.split(",")[0]?.split("-")[0];
+      // Proxy-detected locale first: it honors the CMS language-detection settings.
+      preferredLocale = hdrs.get("x-user-locale") || undefined;
+      if (!preferredLocale) {
+        const al = hdrs.get("accept-language");
+        if (al) preferredLocale = al.split(",")[0]?.split("-")[0];
+      }
     } catch {
       // ignore
     }

package/templates/nextblock-template/app/profile/ProfileAccountSidebar.tsx

@@ -27,7 +27,7 @@ export function ProfileAccountSidebar({
 }: ProfileAccountSidebarProps) {
   const { t } = useTranslations();
   const displayName =
-    profile.full_name || profile.github_username || user.email || 'User';
+    profile.full_name || user.email || 'User';
 
   return (
     <Card className="h-fit">

package/templates/nextblock-template/app/profile/account-data.ts

@@ -18,7 +18,7 @@ export async function requireProfileAccountContext(redirectTo: string) {
 
   const { data: profile } = await supabase
     .from('profiles')
-    .select('id, avatar_url, full_name, github_username')
+    .select('id, avatar_url, full_name')
     .eq('id', user.id)
     .maybeSingle();
 

package/templates/nextblock-template/app/profile/account-types.ts

@@ -7,5 +7,4 @@ export interface ProfileAccountSummary {
   id: string;
   avatar_url: string | null;
   full_name: string | null;
-  github_username: string | null;
 }

package/templates/nextblock-template/app/profile/page.tsx

@@ -36,7 +36,6 @@ export default async function ProfilePage() {
             full_name: profile.full_name || '',
             avatar_url: profile.avatar_url || '',
             website: profile.website || '',
-            github_username: profile.github_username || '',
             phone: profile.phone || '',
             billing_address: billingAddress,
             shipping_address: shippingAddress,

package/templates/nextblock-template/app/providers.tsx

@@ -44,6 +44,7 @@ export function Providers({ children, ...props }: { children: React.ReactNode;[k
     initialCurrencyCode,
     initialAvailableLanguages,
     initialDefaultLanguage,
+    rememberVisitorChoice,
     translations,
     nonce
   } = props;
@@ -54,6 +55,7 @@ export function Providers({ children, ...props }: { children: React.ReactNode;[k
         serverLocale={serverLocale}
         initialAvailableLanguages={initialAvailableLanguages}
         initialDefaultLanguage={initialDefaultLanguage}
+        rememberVisitorChoice={rememberVisitorChoice}
       >
         <CurrencyProvider
           initialCurrencies={initialCurrencies}

package/templates/nextblock-template/components/PostCommentsSection.tsx

@@ -77,7 +77,7 @@ export default function PostCommentsSection({ postId }: PostCommentsSectionProps
     try {
       const { data, error: dbError } = await supabase
         .from("cms_interactions" as any)
-        .select("*, profiles(full_name, avatar_url, github_username)")
+        .select("*, profiles(full_name, avatar_url)")
         .eq("post_id", postId)
         .eq("type", "comment")
         .eq("status", "approved")
@@ -280,7 +280,7 @@ export default function PostCommentsSection({ postId }: PostCommentsSectionProps
           optimisticComments.map((comment) => {
             const hasLiked = likedIds.includes(comment.id) || comment.tempHasReacted;
             const likeCount = (comment.reactions as Record<string, number>)?.likes || 0;
-            const commenterName = comment.profiles?.full_name || comment.profiles?.github_username || "Anonymous";
+            const commenterName = comment.profiles?.full_name || "Anonymous";
             const dateStr = new Date(comment.created_at).toLocaleDateString(lang, {
               year: "numeric",
               month: "long",

package/templates/nextblock-template/components/ProductReviewsSection.tsx

@@ -79,7 +79,7 @@ export default function ProductReviewsSection({ productId }: ProductReviewsSecti
     try {
       const { data, error: dbError } = await supabase
         .from("cms_interactions" as any)
-        .select("*, profiles(full_name, avatar_url, github_username)")
+        .select("*, profiles(full_name, avatar_url)")
         .eq("product_id", productId)
         .eq("type", "review")
         .eq("status", "approved")
@@ -317,7 +317,7 @@ export default function ProductReviewsSection({ productId }: ProductReviewsSecti
           optimisticReviews.map((review) => {
             const hasLiked = likedIds.includes(review.id) || review.tempHasReacted;
             const likeCount = (review.reactions as Record<string, number>)?.likes || 0;
-            const reviewerName = review.profiles?.full_name || review.profiles?.github_username || "Anonymous";
+            const reviewerName = review.profiles?.full_name || "Anonymous";
             const dateStr = new Date(review.created_at).toLocaleDateString(lang, {
               year: "numeric",
               month: "long",

package/templates/nextblock-template/components/header-auth.tsx

@@ -20,7 +20,7 @@ import { User, LogOut, LayoutDashboard } from "lucide-react";
 export default function AuthButton() {
   const { user, profile, isAdmin, isWriter } = useAuth();
   const { t } = useTranslations();
-  const displayName = profile?.full_name || profile?.github_username || user?.email || null;
+  const displayName = profile?.full_name || user?.email || null;
   const showAdminLink = isAdmin || isWriter;
 
   const handleSignOut = async () => {

package/templates/nextblock-template/context/LanguageContext.tsx

@@ -27,13 +27,15 @@ interface LanguageProviderProps {
   serverLocale?: string; // Locale determined on the server (from X-User-Locale header)
   initialAvailableLanguages?: Language[]; // Languages fetched on the server
   initialDefaultLanguage?: Language | null; // Default language determined on the server
+  rememberVisitorChoice?: boolean; // CMS language-detection setting: persist locale for a year vs session-only
 }
 
 export const LanguageProvider = ({
   children,
   serverLocale,
   initialAvailableLanguages,
-  initialDefaultLanguage
+  initialDefaultLanguage,
+  rememberVisitorChoice = true
 }: LanguageProviderProps) => {
 
   const [currentLocale, _setCurrentLocale] = useState<string>(() => {
@@ -124,10 +126,18 @@ export const LanguageProvider = ({
       if (isMounted) { // Check mount status before final state updates
         _setCurrentLocale(effectiveLocale);
         if (typeof window !== 'undefined') {
-          localStorage.setItem(LANGUAGE_STORAGE_KEY, effectiveLocale);
+          // Mirror the cookie's persistence: when "remember" is off, keep no
+          // durable client-side record (and purge any left from a prior session)
+          // so the setting's "session only" promise holds on the client too.
+          if (rememberVisitorChoice) {
+            localStorage.setItem(LANGUAGE_STORAGE_KEY, effectiveLocale);
+          } else {
+            localStorage.removeItem(LANGUAGE_STORAGE_KEY);
+          }
           document.documentElement.lang = effectiveLocale;
         }
-        Cookies.set(LANGUAGE_COOKIE_KEY, effectiveLocale, { path: '/', expires: 365, sameSite: 'Lax' });
+        // Omitting `expires` makes it a session cookie, so detection re-runs next session.
+        Cookies.set(LANGUAGE_COOKIE_KEY, effectiveLocale, { path: '/', ...(rememberVisitorChoice ? { expires: 365 } : {}), sameSite: 'Lax' });
         setIsLoadingLanguages(false); // Done loading/initializing
       }
     };
@@ -137,7 +147,7 @@ export const LanguageProvider = ({
     return () => {
       isMounted = false; // Cleanup function to set isMounted to false
     };
-  }, [serverLocale, initialAvailableLanguages, initialDefaultLanguage, clientSelectedLocale]);
+  }, [serverLocale, initialAvailableLanguages, initialDefaultLanguage, clientSelectedLocale, rememberVisitorChoice]);
 
   const setCurrentLocaleCallback = useCallback(async (localeCode: string) => { // Add async here
     let localeToSet = DEFAULT_FALLBACK_LOCALE;
@@ -159,10 +169,15 @@ export const LanguageProvider = ({
 
     _setCurrentLocale(localeToSet);
     if (typeof window !== 'undefined') {
-      localStorage.setItem(LANGUAGE_STORAGE_KEY, localeToSet);
+      // Match the cookie's persistence (see the init effect): no durable record when off.
+      if (rememberVisitorChoice) {
+        localStorage.setItem(LANGUAGE_STORAGE_KEY, localeToSet);
+      } else {
+        localStorage.removeItem(LANGUAGE_STORAGE_KEY);
+      }
       document.documentElement.lang = localeToSet;
     }
-    Cookies.set(LANGUAGE_COOKIE_KEY, localeToSet, { path: '/', expires: 365, sameSite: 'Lax' });
+    Cookies.set(LANGUAGE_COOKIE_KEY, localeToSet, { path: '/', ...(rememberVisitorChoice ? { expires: 365 } : {}), sameSite: 'Lax' });
 
     // The LanguageSwitcher component is responsible for navigation (push or refresh).
     // We only set the clientSelectedLocale here to ensure the main useEffect
@@ -172,7 +187,7 @@ export const LanguageProvider = ({
       setClientSelectedLocale(localeToSet);
     }
     // router.refresh(); // REMOVED: LanguageSwitcher will handle navigation/refresh.
-  }, [availableLanguages]);
+  }, [availableLanguages, rememberVisitorChoice]);
 
   useEffect(() => {
     if (currentLocale && typeof window !== 'undefined') {