+
{gm.label}
-+
{def.soglie[g]}
{def.unita}
@@ -130,7 +134,7 @@ export function BadgeDrawer({ return (Vinto
++ Vinto +
{conteggio}{" "} @@ -246,4 +253,4 @@ export function CollezioneBadge({
{s.def.descrizione}
-
@@ -137,4 +136,4 @@ export function VotoSocial({ matchId }: { matchId: string }) { })} ); -} \ No newline at end of file +} diff --git a/src/components/crapp/ui-bits.tsx b/src/components/crapp/ui-bits.tsx index c55d517..6532173 100644 --- a/src/components/crapp/ui-bits.tsx +++ b/src/components/crapp/ui-bits.tsx @@ -62,7 +62,7 @@ export function StatoBadge({ stato, className }: { stato: Stato; className?: str className, )} > -{meta.label} + {meta.label}
); } @@ -87,4 +87,4 @@ export function StatTile({ {hint ?{hint}
: null} ); -} \ No newline at end of file +} diff --git a/src/components/motion/Barra.tsx b/src/components/motion/Barra.tsx index 082f20e..291f2fc 100644 --- a/src/components/motion/Barra.tsx +++ b/src/components/motion/Barra.tsx @@ -22,4 +22,4 @@ export function Barra({ /> ); -} \ No newline at end of file +} diff --git a/src/components/motion/Numero.tsx b/src/components/motion/Numero.tsx index aed09bb..b64b489 100644 --- a/src/components/motion/Numero.tsx +++ b/src/components/motion/Numero.tsx @@ -17,4 +17,4 @@ export function Numero({ {suffisso} ); -} \ No newline at end of file +} diff --git a/src/components/motion/Reveal.tsx b/src/components/motion/Reveal.tsx index 47d2211..34ce949 100644 --- a/src/components/motion/Reveal.tsx +++ b/src/components/motion/Reveal.tsx @@ -26,4 +26,4 @@ export function Reveal({ {children} ); -} \ No newline at end of file +} diff --git a/src/integrations/lovable/index.ts b/src/integrations/lovable/index.ts index ccf28b5..5fe6340 100644 --- a/src/integrations/lovable/index.ts +++ b/src/integrations/lovable/index.ts @@ -11,7 +11,10 @@ type SignInOptions = { export const lovable = { auth: { - signInWithOAuth: async (provider: "google" | "apple" | "microsoft" | "lovable", opts?: SignInOptions) => { + signInWithOAuth: async ( + provider: "google" | "apple" | "microsoft" | "lovable", + opts?: SignInOptions, + ) => { const result = await lovableAuth.signInWithOAuth(provider, { redirect_uri: opts?.redirect_uri ?? window.location.origin, extraParams: { diff --git a/src/integrations/supabase/auth-attacher.ts b/src/integrations/supabase/auth-attacher.ts index 5bc57b7..cbedca6 100644 --- a/src/integrations/supabase/auth-attacher.ts +++ b/src/integrations/supabase/auth-attacher.ts @@ -1,15 +1,15 @@ // This file is automatically generated. Do not edit it directly. -import { createMiddleware } from '@tanstack/react-start' -import { supabase } from './client' +import { createMiddleware } from "@tanstack/react-start"; +import { supabase } from "./client"; // Must be registered as a global `functionMiddleware` in `src/start.ts`; otherwise // the browser never attaches the bearer token to serverFn RPCs. -export const attachSupabaseAuth = createMiddleware({ type: 'function' }).client( +export const attachSupabaseAuth = createMiddleware({ type: "function" }).client( async ({ next }) => { - const { data } = await supabase.auth.getSession() - const token = data.session?.access_token + const { data } = await supabase.auth.getSession(); + const token = data.session?.access_token; return next({ headers: token ? { Authorization: `Bearer ${token}` } : {}, - }) + }); }, -) +); diff --git a/src/integrations/supabase/auth-middleware.ts b/src/integrations/supabase/auth-middleware.ts index a6bc029..24daf97 100644 --- a/src/integrations/supabase/auth-middleware.ts +++ b/src/integrations/supabase/auth-middleware.ts @@ -1,19 +1,17 @@ // This file is automatically generated. Do not edit it directly. -import { createMiddleware } from '@tanstack/react-start' -import { getRequest } from '@tanstack/react-start/server' -import { createClient } from '@supabase/supabase-js' -import type { Database } from './types' - - +import { createMiddleware } from "@tanstack/react-start"; +import { getRequest } from "@tanstack/react-start/server"; +import { createClient } from "@supabase/supabase-js"; +import type { Database } from "./types"; function isNewSupabaseApiKey(value: string): boolean { - return value.startsWith('sb_publishable_') || value.startsWith('sb_secret_'); + return value.startsWith("sb_publishable_") || value.startsWith("sb_secret_"); } function createSupabaseFetch(supabaseKey: string): typeof fetch { return (input, init) => { const headers = new Headers( - typeof Request !== 'undefined' && input instanceof Request ? input.headers : undefined, + typeof Request !== "undefined" && input instanceof Request ? input.headers : undefined, ); if (init?.headers) { @@ -21,81 +19,79 @@ function createSupabaseFetch(supabaseKey: string): typeof fetch { } // New Supabase API keys are opaque strings, not bearer JWTs. - if (isNewSupabaseApiKey(supabaseKey) && headers.get('Authorization') === `Bearer ${supabaseKey}`) { - headers.delete('Authorization'); + if ( + isNewSupabaseApiKey(supabaseKey) && + headers.get("Authorization") === `Bearer ${supabaseKey}` + ) { + headers.delete("Authorization"); } - headers.set('apikey', supabaseKey); + headers.set("apikey", supabaseKey); return fetch(input, { ...init, headers }); }; } -export const requireSupabaseAuth = createMiddleware({ type: 'function' }).server( +export const requireSupabaseAuth = createMiddleware({ type: "function" }).server( async ({ next }) => { - - const SUPABASE_URL = process.env['SUPABASE_URL']; - const SUPABASE_PUBLISHABLE_KEY = process.env['SUPABASE_PUBLISHABLE_KEY']; + const SUPABASE_URL = process.env["SUPABASE_URL"]; + const SUPABASE_PUBLISHABLE_KEY = process.env["SUPABASE_PUBLISHABLE_KEY"]; if (!SUPABASE_URL || !SUPABASE_PUBLISHABLE_KEY) { const missing = [ - ...(!SUPABASE_URL ? ['SUPABASE_URL'] : []), - ...(!SUPABASE_PUBLISHABLE_KEY ? ['SUPABASE_PUBLISHABLE_KEY'] : []), + ...(!SUPABASE_URL ? ["SUPABASE_URL"] : []), + ...(!SUPABASE_PUBLISHABLE_KEY ? ["SUPABASE_PUBLISHABLE_KEY"] : []), ]; - const message = `Missing Supabase environment variable(s): ${missing.join(', ')}. Connect Supabase in Lovable Cloud.`; + const message = `Missing Supabase environment variable(s): ${missing.join(", ")}. Connect Supabase in Lovable Cloud.`; console.error(`[Supabase] ${message}`); throw new Error(message); } - + const request = getRequest(); if (!request?.headers) { - throw new Error('Unauthorized: No request headers available'); + throw new Error("Unauthorized: No request headers available"); } - const authHeader = request.headers.get('authorization'); + const authHeader = request.headers.get("authorization"); if (!authHeader) { - throw new Error('Unauthorized: No authorization header provided'); + throw new Error("Unauthorized: No authorization header provided"); } - if (!authHeader.startsWith('Bearer ')) { - throw new Error('Unauthorized: Only Bearer tokens are supported'); + if (!authHeader.startsWith("Bearer ")) { + throw new Error("Unauthorized: Only Bearer tokens are supported"); } - const token = authHeader.replace('Bearer ', ''); + const token = authHeader.replace("Bearer ", ""); if (!token) { - throw new Error('Unauthorized: No token provided'); + throw new Error("Unauthorized: No token provided"); } - if (token.split('.').length !== 3) { - throw new Error('Unauthorized: Invalid token'); + if (token.split(".").length !== 3) { + throw new Error("Unauthorized: Invalid token"); } - const supabase = createClient+ Classifica non ancora disponibile. +
+ ) : ( + classifica.map((r) => { + const noi = isNostraSquadra(r.squadra) || r.squadra === "CRAP Volley"; + return ( +- {m.casa ? "CRAP Volley" : m.avversario} — {m.casa ? m.avversario : "CRAP Volley"} -
- - {m.casa ? `${m.setNostri}-${m.setLoro}` : `${m.setLoro}-${m.setNostri}`} - -+ Nessun risultato disponibile. +
+ ) : ( ++ {m.casa ? "CRAP Volley" : m.avversario} — {m.casa ? m.avversario : "CRAP Volley"} +
+ + {m.casa ? `${m.setNostri}-${m.setLoro}` : `${m.setLoro}-${m.setNostri}`} + +{e.titolo}
diff --git a/src/routes/index.tsx b/src/routes/index.tsx index 544b6cd..e7bdb4e 100644 --- a/src/routes/index.tsx +++ b/src/routes/index.tsx @@ -8,10 +8,13 @@ import { CompletaProfilo } from "@/components/crapp/ProfiloAmministrativo"; import { Reveal } from "@/components/motion/Reveal"; import { Barra } from "@/components/motion/Barra"; import { Numero } from "@/components/motion/Numero"; -import { classifica, storicoMatch } from "@/lib/crapp-data"; import { microcopyObiettivo, progressoObiettivo } from "@/lib/obiettivi"; import { useEventi, type Evento } from "@/lib/eventi"; import { useIo, useObiettivi } from "@/lib/rosa"; +import { useCsi } from "@/lib/csi"; +import { isNostraSquadra, matchDaPartitaCsi, partiteGiocate } from "@/lib/csi-core"; +import { useScoutMatches } from "@/lib/scout-store"; +import { useVotiMvp, vincitoriMvp } from "@/lib/mvp-voti"; export const Route = createFileRoute("/")({ head: () => ({ @@ -40,8 +43,17 @@ function Index() { const prossimi: Evento[] = eventi.filter((e) => e.data >= oggi).slice(0, 3); const prossimo = prossimi[0] ?? null; const linkProssimo = prossimo ? linkPerEvento(prossimo) : null; - const noi = classifica.find((r) => r.squadra === "CRAP Volley")!; - const ultima = storicoMatch[0]!; + const { data: csi } = useCsi(); + const noi = csi?.classifica.find((r) => isNostraSquadra(r.squadra)); + const scoutMatches = useScoutMatches(); + const votiMvp = useVotiMvp(); + const mvpPerMatch = vincitoriMvp(votiMvp.data ?? []); + const csiGiocate = csi ? partiteGiocate(csi.partite) : []; + const ultima = csiGiocate[0] + ? { ...matchDaPartitaCsi(csiGiocate[0]), mvp: mvpPerMatch[csiGiocate[0].id] ?? "" } + : scoutMatches[0] + ? { ...scoutMatches[0], mvp: mvpPerMatch[scoutMatches[0].id] ?? scoutMatches[0].mvp } + : null; const obiettivi = useObiettivi(); const obiettivo = obiettivi.find((o) => progressoObiettivo(o) < 100) ?? obiettivi[0] ?? null; @@ -62,12 +74,12 @@ function Index() {
{noi.pos}º
+{noi ? `${noi.pos}º` : "—"}
In classifica
- {noi.vinte}-{noi.perse} + {noi ? `${noi.vinte}-${noi.perse}` : "—"}
Bilancio
CRAP Volley vs {ultima.avversario}
-- {ultima.casa ? "In casa" : "Trasferta"} · MVP {ultima.mvp} + {ultima ? ( +
CRAP Volley vs {ultima.avversario}
++ {ultima.casa ? "In casa" : "Trasferta"} + {ultima.mvp ? ` · MVP ${ultima.mvp}` : ""} +
++ {ultima.setNostri}-{ultima.setLoro}
- {ultima.setNostri}-{ultima.setLoro} -
++ Nessun risultato disponibile. +
+ )}- La partita non è ancora stata disputata. Torna qui dopo il fischio finale per vedere il risultato. + La partita non è ancora stata disputata. Torna qui dopo il fischio finale per vedere il + risultato.
-
{s.v}
@@ -201,9 +218,16 @@ function Squadra() {
{b.def.nome}
{b.valore} {b.def.unita} - {b.prossimaSoglia ? ` · ${b.prossimaSoglia} per ${gradoMeta[b.prossimo!].label.toLowerCase()}` : ""} + {b.prossimaSoglia + ? ` · ${b.prossimaSoglia} per ${gradoMeta[b.prossimo!].label.toLowerCase()}` + : ""}
-+
{meta.label}