@vixoniccom/footbal-score 1.4.6-dev.1 → 1.4.6-dev.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vixoniccom/footbal-score",
   "alias": "Resultados Deportivos",
-  "version": "1.4.6-dev.1",
+  "version": "1.4.6-dev.2",
   "description": "Muestra resultados en vivo de fútbol.",
   "main": "main.js",
   "author": "",

package/src/App.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useRef, useState } from 'react'
 import localforage from 'localforage'
 import { FontLoader, FormattedText, Table } from './components'
-import { getFixture } from './helpers/getFixture'
+import { getFixture, resolvedTimezone } from './helpers/getFixture'
 
 export type Props = {
   data: VixonicData
@@ -142,9 +142,7 @@ export const App: React.FunctionComponent<Props> = ({ data, start }) => {
     fetchAndSchedule()
   }, [league])
 
-  const timezone = (() => {
-    try { return Intl.DateTimeFormat().resolvedOptions().timeZone } catch { return 'UTC' }
-  })()
+  const timezone = resolvedTimezone
 
   return (
     <>

package/src/components/Table/components/Time.tsx

@@ -1,17 +1,44 @@
-import moment from 'moment'
 import React from 'react'
 import { FormattedText } from '../../'
+import { resolvedTimezone } from '../../../helpers/getFixture'
 
 interface Props {
   time: number
   parameters: VixonicParameters
 }
 
+const timezone = resolvedTimezone
+
+const formatFixtureTime = (timestamp: number) => {
+  const date = new Date(timestamp * 1000)
+
+  const dateParts = new Intl.DateTimeFormat('es-ES', {
+    timeZone: timezone,
+    day: '2-digit',
+    month: '2-digit',
+  }).formatToParts(date)
+  const day = dateParts.find(p => p.type === 'day')?.value ?? ''
+  const month = dateParts.find(p => p.type === 'month')?.value ?? ''
+
+  const timeParts = new Intl.DateTimeFormat('en-US', {
+    timeZone: timezone,
+    hour: 'numeric',
+    minute: '2-digit',
+    hour12: true,
+  }).formatToParts(date)
+  const hour = timeParts.find(p => p.type === 'hour')?.value ?? ''
+  const minute = timeParts.find(p => p.type === 'minute')?.value ?? ''
+  const period = timeParts.find(p => p.type === 'dayPeriod')?.value?.toLowerCase() ?? ''
+
+  return { dateStr: `${day}-${month}`, timeStr: `${hour}:${minute} ${period}` }
+}
+
 export const Time: React.FunctionComponent<Props> = ({ time, parameters }) => {
+  const { dateStr, timeStr } = formatFixtureTime(time)
   return (
     <div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center' }}>
-      <FormattedText text={moment.unix(time).format('DD-MM')} format={parameters.timeFormat} />
-      <FormattedText text={moment.unix(time).format('h:mm a')} format={parameters.timeFormat} />
+      <FormattedText text={dateStr} format={parameters.timeFormat} />
+      <FormattedText text={timeStr} format={parameters.timeFormat} />
     </div>
   )
 }

package/src/helpers/getFixture.ts

@@ -11,6 +11,17 @@ const MILLISECONDS_PER_DAY = 24 * 60 * 60 * 1000
 
 const USE_MOCK = false
 
+export const resolvedTimezone = (() => {
+  try {
+    const tz = Intl.DateTimeFormat().resolvedOptions().timeZone
+    console.log(`[football-score] Timezone resolved: ${tz}`)
+    return tz
+  } catch (error) {
+    console.warn('[football-score] Failed to resolve timezone, defaulting to UTC', error)
+    return 'UTC'
+  }
+})()
+
 export const getFixture = async (league: string, yesterday?: boolean, tomorrow?: boolean) => {
   if (USE_MOCK) return mockFixtures
 
@@ -18,16 +29,7 @@ export const getFixture = async (league: string, yesterday?: boolean, tomorrow?:
   const year = moment().format('YYYY')
   const from = yesterday ? moment(Date.now() - MILLISECONDS_PER_DAY).format('YYYY-MM-DD') : today
   const to = tomorrow ? moment(Date.now() + MILLISECONDS_PER_DAY).format('YYYY-MM-DD') : today
-  const timezone = (() => {
-    try {
-      const tz = Intl.DateTimeFormat().resolvedOptions().timeZone
-      console.log(`[football-score] Timezone resolved: ${tz}`)
-      return tz
-    } catch (error) {
-      console.warn('[football-score] Failed to resolve timezone, defaulting to UTC', error)
-      return 'UTC'
-    }
-  })()
+  const timezone = resolvedTimezone
 
   const options = {
     method: 'GET',