Country selector in the header, auto-detected and remembered

Replaces the left sidebar with a header dropdown (flag + name), like
1xbet's region picker. The shown country resolves as: saved choice
(cookie, then the member's profile so it follows them across devices),
else Cloudflare's CF-IPCountry (Canada maps to Québec), else Québec.
favoriteCountry becomes nullable so geo-detection isn't overridden by
a default nobody chose. Emoji flags render as letters on Windows, so
flags are now SVGs in /public/flags; country names are in French.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Nazim Kri
2026-10-30 09:58:33 -04:00
co-authored by Claude Opus 5.5
parent 2eafbfd3d7
commit e97b2e54ad
21 changed files with 200 additions and 162 deletions
+19
View File
@@ -1,8 +1,27 @@
"use server"
import { revalidatePath } from "next/cache"
import { cookies } from "next/headers"
import { prisma } from "@/lib/db"
import { getCurrentMember } from "@/lib/member-auth"
import { followPick, unfollowPick } from "@/lib/follows"
import { COUNTRY_COOKIE, isKnownCountry } from "@/lib/country-pref"
export async function setCountryAction(code: string) {
if (!isKnownCountry(code)) return { ok: false as const }
const jar = await cookies()
jar.set(COUNTRY_COOKIE, code, {
httpOnly: true,
sameSite: "lax",
secure: process.env.NODE_ENV === "production",
maxAge: 365 * 24 * 3600,
path: "/",
})
const member = await getCurrentMember()
if (member) await prisma.user.update({ where: { id: member.id }, data: { favoriteCountry: code } })
revalidatePath("/", "layout")
return { ok: true as const }
}
export async function toggleFollowAction(lotteryId: string, country: string, targetDrawDate: string, isFollowing: boolean) {
const member = await getCurrentMember()
+3 -2
View File
@@ -8,6 +8,7 @@ import { NumberFrequencyChart } from "@/components/number-frequency-chart"
import { PerformanceChart } from "@/components/performance-chart"
import { DrawTimeline } from "@/components/draw-timeline"
import { Badge } from "@/components/ui/badge"
import { Flag } from "@/components/flag"
export const instant = false
@@ -35,8 +36,8 @@ export default async function LotteryStatsPage({ params }: { params: Promise<{ i
<div className="mx-auto w-full max-w-4xl flex-1 px-4 py-6 sm:px-6">
<div className="flex flex-wrap items-center gap-2">
<h1 className="text-2xl font-bold tracking-tight">{entry.name}</h1>
<Badge variant="secondary">
{theme.flagEmoji} {theme.name}
<Badge variant="secondary" className="gap-1.5">
<Flag code={theme.code} /> {theme.name}
</Badge>
</div>
<p className="mt-1 text-sm text-muted-foreground">
+40 -63
View File
@@ -3,34 +3,29 @@ import { COUNTRIES, countryTheme } from "@/lib/countries"
import { getArmyFeed } from "@/lib/lokilab-feed"
import { getCurrentMember } from "@/lib/member-auth"
import { listFollowedPicks } from "@/lib/follows"
import { CountryNav, CountryNavMobile } from "@/components/country-nav"
import { resolveCountry } from "@/lib/country-pref"
import { LotteryResultsPanel } from "@/components/lottery-results-panel"
import { AppHeader } from "@/components/app-header"
import { Hero } from "@/components/hero"
import { Flag } from "@/components/flag"
import { Skeleton } from "@/components/ui/skeleton"
export const instant = false
export default async function Home({
searchParams,
}: {
searchParams: Promise<{ country?: string }>
}) {
const sp = await searchParams
const activeCode = sp.country && COUNTRIES.some((c) => c.code === sp.country) ? sp.country : "CA-QC"
export default function Home() {
return (
<main className="flex flex-1 flex-col">
<AppHeader />
<Suspense fallback={<HomeSkeleton />}>
<HomeContent activeCode={activeCode} />
<HomeContent />
</Suspense>
</main>
)
}
async function HomeContent({ activeCode }: { activeCode: string }) {
async function HomeContent() {
const [feed, member] = await Promise.all([getArmyFeed(), getCurrentMember()])
const activeCode = await resolveCountry(member)
const theme = countryTheme(activeCode)
const lotteries = feed.lotteries.filter((l) => l.country === activeCode)
const totalWins = lotteries.reduce((sum, l) => sum + l.lifetime.wins, 0)
@@ -51,54 +46,41 @@ async function HomeContent({ activeCode }: { activeCode: string }) {
/>
<div
style={{ "--accent": theme.accent, "--accent-soft": theme.accentSoft } as React.CSSProperties}
className="mx-auto w-full max-w-6xl flex-1 px-4 py-4 sm:px-6"
className="mx-auto w-full max-w-6xl flex-1 space-y-3 px-4 py-6 sm:px-6"
>
<div className="sm:hidden mb-3">
<CountryNavMobile active={activeCode} />
<div className="flex flex-wrap items-baseline justify-between gap-x-3 gap-y-1">
<h2 className="flex items-center gap-2 font-display text-2xl">
<Flag code={theme.code} className="h-[18px] w-[27px]" />
{theme.name}
</h2>
<p className="text-xs text-muted-foreground">
{lotteries.length} loterie{lotteries.length === 1 ? "" : "s"} suivie
{lotteries.length === 1 ? "" : "s"} · changez de pays en haut à droite
</p>
</div>
<div className="flex gap-5">
<aside className="hidden w-[200px] shrink-0 sm:block">
<CountryNav active={activeCode} />
</aside>
<div className="flex h-11 items-center divide-x divide-border overflow-x-auto rounded-md border border-border bg-panel px-4 text-sm">
<Stat value={feed.army.total.toLocaleString("fr-CA")} label="Armée (global)" />
<Stat value={countryMembers.toLocaleString("fr-CA")} label={`Membres — ${theme.name}`} />
<Stat value={totalTracked > 0 ? `${totalWins} / ${totalTracked}` : "—"} label="Grilles gagnantes" />
</div>
<div className="min-w-0 flex-1 space-y-3">
<div className="flex flex-wrap items-baseline justify-between gap-x-3 gap-y-1">
<h2 className="text-[22px] font-bold tracking-tight">{theme.name}</h2>
<p className="text-xs text-muted-foreground">
{lotteries.length} loterie{lotteries.length === 1 ? "" : "s"} suivie
{lotteries.length === 1 ? "" : "s"}
</p>
</div>
<div className="flex h-11 items-center divide-x divide-border rounded-md border border-border/60 bg-panel px-4 text-sm">
<Stat value={feed.army.total.toLocaleString("fr-CA")} label="Armée (global)" />
<Stat value={countryMembers.toLocaleString("fr-CA")} label={`Membres — ${theme.name}`} />
<Stat
value={totalTracked > 0 ? `${totalWins} / ${totalTracked}` : "—"}
label="Grilles gagnantes"
/>
</div>
{lotteries.length > 0 ? (
<LotteryResultsPanel
lotteries={lotteries}
country={activeCode}
followedKeys={followedKeys}
isAuthenticated={!!member}
/>
) : (
<div className="rounded-md border border-dashed border-border py-16 text-center text-sm text-muted-foreground">
Aucune loterie suivie pour {theme.name} pour le moment.
</div>
)}
<p className="text-[11px] text-muted-foreground">
Données fournies par LokiLab. Statistiques descriptives seulement — aucune garantie
de gain.
</p>
{lotteries.length > 0 ? (
<LotteryResultsPanel
lotteries={lotteries}
country={activeCode}
followedKeys={followedKeys}
isAuthenticated={!!member}
/>
) : (
<div className="rounded-md border border-dashed border-border py-16 text-center text-sm text-muted-foreground">
Les loteries de {theme.name} arrivent bientôt dans l&apos;univers de Loki.
</div>
</div>
)}
<p className="text-[11px] text-muted-foreground">
Données fournies par LokiLab. Statistiques descriptives seulement — aucune garantie de gain.
</p>
</div>
</>
)
@@ -115,15 +97,10 @@ function Stat({ value, label }: { value: string; label: string }) {
function HomeSkeleton() {
return (
<div className="mx-auto w-full max-w-6xl px-4 py-4 sm:px-6">
<div className="flex gap-5">
<Skeleton className="hidden h-96 w-[200px] shrink-0 sm:block" />
<div className="min-w-0 flex-1 space-y-3">
<Skeleton className="h-7 w-48" />
<Skeleton className="h-11 w-full" />
<Skeleton className="h-64 w-full" />
</div>
</div>
<div className="mx-auto w-full max-w-6xl space-y-3 px-4 py-6 sm:px-6">
<Skeleton className="h-[520px] w-full" />
<Skeleton className="h-11 w-full" />
<Skeleton className="h-64 w-full" />
</div>
)
}
+2 -1
View File
@@ -6,6 +6,7 @@ import { countryTheme } from "@/lib/countries"
import { AppHeader } from "@/components/app-header"
import { NicknameForm } from "@/components/nickname-form"
import { Badge } from "@/components/ui/badge"
import { Flag } from "@/components/flag"
export const metadata: Metadata = { title: "Mon profil — LokiLoto" }
export const instant = false
@@ -47,7 +48,7 @@ export default async function ProfilePage() {
return (
<div key={f.id} className="flex items-center justify-between px-4 py-2.5 text-sm">
<span className="flex items-center gap-2">
<span aria-hidden>{theme.flagEmoji}</span>
<Flag code={theme.code} />
{f.lotteryId}
</span>
<span className="text-xs text-muted-foreground">{f.targetDrawDate}</span>