@vixoniccom/footbal-score 1.4.0 → 1.4.1

package/configuration/dataGroup/dataInputs.ts

@@ -13,7 +13,7 @@ export const dataInputs = [
       { label: 'Euro Copa', value: '4' },
       { label: 'Copa Oro (Concacaf)', value: '22' },
       { label: 'Mundial de clubes', value: '15' },
-      { label: 'Primera división Chile', value: '265' },
+      { label: 'Primera división Chile', value: '1220' },
       { label: 'Liga profesional Argentina', value: '128' },
     ],
     defaultValue: '9',

package/configuration.json

@@ -36,7 +36,7 @@
             },
             {
               "label": "Primera división Chile",
-              "value": "265"
+              "value": "1220"
             },
             {
               "label": "Liga profesional Argentina",

package/package.json

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

package/src/App.tsx

@@ -25,8 +25,13 @@ export const App: React.FunctionComponent<Props> = ({ data, start }) => {
     const timeNow = moment(timeNowFormat, 'h:mma')
     const startTime = moment(parameters.timeStart, 'h:mma')
     const endTime = moment(parameters.timeEnd, 'h:mma')
+    // When the end time is earlier than the start time the window crosses midnight,
+    // e.g. 10am-1am means [10am, midnight) plus [midnight, 1am)
+    const isWithinSchedule = endTime.isAfter(startTime)
+      ? timeNow.isBetween(startTime, endTime)
+      : timeNow.isSameOrAfter(startTime) || timeNow.isBefore(endTime)
 
-    if (momentLocalStorage == undefined || (timeNow.isBetween(startTime, endTime) && momentLocalStorage > updateTime!)) {
+    if (momentLocalStorage == undefined || (isWithinSchedule && momentLocalStorage > updateTime!)) {
       const dataRequest = await getFixture(league, parameters.matchesYesterday, parameters.matchesTomorrow)
       setDataLocal(dataRequest)
       setDataFixture(dataRequest)

package/src/helpers/getFixture.ts

@@ -1,5 +1,6 @@
 import moment from 'moment'
 import axios from 'axios'
+import { mockFixtures } from './mockFixtures'
 
 if (!process.env.FOOTBALL_API_KEY || !process.env.FOOTBALL_API_HOST || !process.env.FOOTBALL_API_URL)
   console.warn('Missing API credentials')
@@ -8,7 +9,11 @@ const FOOTBALL_API_HOST = process.env.FOOTBALL_API_HOST
 const FOOTBALL_API_URL = process.env.FOOTBALL_API_URL
 const MILLISECONDS_PER_DAY = 24 * 60 * 60 * 1000
 
+const USE_MOCK = false
+
 export const getFixture = async (league: string, yesterday?: boolean, tomorrow?: boolean) => {
+  if (USE_MOCK) return mockFixtures
+
   const today = moment().format('YYYY-MM-DD')
   const year = moment().format('YYYY')
   const from = yesterday ? moment(Date.now() - MILLISECONDS_PER_DAY).format('YYYY-MM-DD') : today

package/src/helpers/mockFixtures.ts

@@ -0,0 +1,74 @@
+export const mockFixtures = [
+  {
+    fixture: { id: 979139, timestamp: 1671375600, status: { short: 'PEN' } },
+    teams: {
+      home: { name: 'Argentina', logo: 'https://media.api-sports.io/football/teams/26.png' },
+      away: { name: 'France', logo: 'https://media.api-sports.io/football/teams/2.png' },
+    },
+    goals: { home: 3, away: 3 },
+    score: { penalty: { home: 4, away: 2 } },
+  },
+  {
+    fixture: { id: 855737, timestamp: 1669111200, status: { short: 'FT' } },
+    teams: {
+      home: { name: 'Argentina', logo: 'https://media.api-sports.io/football/teams/26.png' },
+      away: { name: 'Saudi Arabia', logo: 'https://media.api-sports.io/football/teams/23.png' },
+    },
+    goals: { home: 1, away: 2 },
+    score: { penalty: { home: null, away: null } },
+  },
+  {
+    fixture: { id: 871850, timestamp: 1669143600, status: { short: 'FT' } },
+    teams: {
+      home: { name: 'France', logo: 'https://media.api-sports.io/football/teams/2.png' },
+      away: { name: 'Australia', logo: 'https://media.api-sports.io/football/teams/20.png' },
+    },
+    goals: { home: 4, away: 1 },
+    score: { penalty: { home: null, away: null } },
+  },
+  {
+    fixture: { id: 855741, timestamp: 1669208400, status: { short: 'FT' } },
+    teams: {
+      home: { name: 'Germany', logo: 'https://media.api-sports.io/football/teams/25.png' },
+      away: { name: 'Japan', logo: 'https://media.api-sports.io/football/teams/12.png' },
+    },
+    goals: { home: 1, away: 2 },
+    score: { penalty: { home: null, away: null } },
+  },
+  {
+    fixture: { id: 871851, timestamp: 1669219200, status: { short: 'FT' } },
+    teams: {
+      home: { name: 'Spain', logo: 'https://media.api-sports.io/football/teams/9.png' },
+      away: { name: 'Costa Rica', logo: 'https://media.api-sports.io/football/teams/29.png' },
+    },
+    goals: { home: 7, away: 0 },
+    score: { penalty: { home: null, away: null } },
+  },
+  {
+    fixture: { id: 855746, timestamp: 1669316400, status: { short: 'FT' } },
+    teams: {
+      home: { name: 'Brazil', logo: 'https://media.api-sports.io/football/teams/6.png' },
+      away: { name: 'Serbia', logo: 'https://media.api-sports.io/football/teams/14.png' },
+    },
+    goals: { home: 2, away: 0 },
+    score: { penalty: { home: null, away: null } },
+  },
+  {
+    fixture: { id: 855735, timestamp: 1669035600, status: { short: 'FT' } },
+    teams: {
+      home: { name: 'England', logo: 'https://media.api-sports.io/football/teams/10.png' },
+      away: { name: 'Iran', logo: 'https://media.api-sports.io/football/teams/22.png' },
+    },
+    goals: { home: 6, away: 2 },
+    score: { penalty: { home: null, away: null } },
+  },
+  {
+    fixture: { id: 855745, timestamp: 1669305600, status: { short: 'FT' } },
+    teams: {
+      home: { name: 'Portugal', logo: 'https://media.api-sports.io/football/teams/27.png' },
+      away: { name: 'Ghana', logo: 'https://media.api-sports.io/football/teams/1504.png' },
+    },
+    goals: { home: 3, away: 2 },
+    score: { penalty: { home: null, away: null } },
+  },
+]

package/src/parameters.d.ts

@@ -1,115 +1,9 @@
 declare type VixonicData = {
   downloadsPath: string
-  services: { [key: string]: { data?: any; updatedAt?: number } }
+  services: { [key: string]: { data?: any, updatedAt?: number } }
   parameters: VixonicParameters
 }
 
 declare type VixonicParameters = Partial<{
-  league: '1' | '9' | '4' | '22' | '15' | '265' | '128'
-  matchesYesterday: boolean
-  matchesTomorrow: boolean
-  timeStart:
-    | '12m'
-    | '1m'
-    | '2m'
-    | '3m'
-    | '4m'
-    | '5m'
-    | '6m'
-    | '7m'
-    | '8m'
-    | '9m'
-    | '10m'
-    | '11m'
-    | '12pm'
-    | '1pm'
-    | '2pm'
-    | '3pm'
-    | '4pm'
-    | '5pm'
-    | '6pm'
-    | '7pm'
-    | '8pm'
-    | '9pm'
-    | '10pm'
-    | '11pm'
-  timeEnd:
-    | '12m'
-    | '1m'
-    | '2m'
-    | '3m'
-    | '4m'
-    | '5m'
-    | '6m'
-    | '7m'
-    | '8m'
-    | '9m'
-    | '10m'
-    | '11m'
-    | '12pm'
-    | '1pm'
-    | '2pm'
-    | '3pm'
-    | '4pm'
-    | '5pm'
-    | '6pm'
-    | '7pm'
-    | '8pm'
-    | '9pm'
-    | '10pm'
-    | '11pm'
-  updateTime: 300000 | 600000 | 1800000 | 3600000 | 21600000 | 43200000 | 86400000
-  titleEnabled: boolean
-  title0: string
-  titleFormat: {
-    fontSize?: number
-    fontColor?: string
-    alignment?: { horizontal?: 'left' | 'right' | 'center' }
-    font?: { filename: string; id: string; __isAsset: true }
-  }
-  msj0: string
-  formatMjs: {
-    fontSize?: number
-    fontColor?: string
-    alignment?: { horizontal?: 'left' | 'right' | 'center' }
-    font?: { filename: string; id: string; __isAsset: true }
-  }
-  alignVerticalMsj: 'flex-start' | 'center' | 'flex-end'
-  itemsPerPage: number
-  durationPerPage: number
-  backgroundImage: { id?: string; filename?: string; extension?: string }
-  padding: string
-  columnGap: string
-  rowGap: string
-  timeFormat: {
-    fontSize?: number
-    fontColor?: string
-    alignment?: { horizontal?: 'left' | 'right' | 'center' }
-    font?: { filename: string; id: string; __isAsset: true }
-  }
-  widthTime: string
-  statusFormat: {
-    fontSize?: number
-    fontColor?: string
-    alignment?: { horizontal?: 'left' | 'right' | 'center' }
-    font?: { filename: string; id: string; __isAsset: true }
-  }
-  widthStatus: string
-  goalsFormat: {
-    fontSize?: number
-    fontColor?: string
-    alignment?: { horizontal?: 'left' | 'right' | 'center' }
-    font?: { filename: string; id: string; __isAsset: true }
-  }
-  widthScore: string
-  descriptionEnabled: boolean
-  descriptionFormat: {
-    fontSize?: number
-    fontColor?: string
-    alignment?: { horizontal?: 'left' | 'right' | 'center' }
-    font?: { filename: string; id: string; __isAsset: true }
-  }
-  widthDescription: string
-  imageSize: number
-  widthImage: string
-}>
+  league: '1' | '9' | '4' | '22' | '15' | '1220' | '128' | '265', matchesYesterday: boolean, matchesTomorrow: boolean, timeStart: '12m' | '1m' | '2m' | '3m' | '4m' | '5m' | '6m' | '7m' | '8m' | '9m' | '10m' | '11m' | '12pm' | '1pm' | '2pm' | '3pm' | '4pm' | '5pm' | '6pm' | '7pm' | '8pm' | '9pm' | '10pm' | '11pm', timeEnd: '12m' | '1m' | '2m' | '3m' | '4m' | '5m' | '6m' | '7m' | '8m' | '9m' | '10m' | '11m' | '12pm' | '1pm' | '2pm' | '3pm' | '4pm' | '5pm' | '6pm' | '7pm' | '8pm' | '9pm' | '10pm' | '11pm', updateTime: 300000 | 600000 | 1800000 | 3600000 | 21600000 | 43200000 | 86400000, titleEnabled: boolean, title0: string, titleFormat: { fontSize?: number, fontColor?: string, alignment?: { horizontal?: 'left' | 'right' | 'center' }, font?: { filename: string, id: string, __isAsset: true } }, msj0: string, formatMjs: { fontSize?: number, fontColor?: string, alignment?: { horizontal?: 'left' | 'right' | 'center' }, font?: { filename: string, id: string, __isAsset: true } }, alignVerticalMsj: 'flex-start' | 'center' | 'flex-end', itemsPerPage: number, durationPerPage: number, backgroundImage: {id?: string, filename?: string, extension?: string}, padding: string, columnGap: string, rowGap: string, timeFormat: { fontSize?: number, fontColor?: string, alignment?: { horizontal?: 'left' | 'right' | 'center' }, font?: { filename: string, id: string, __isAsset: true } }, widthTime: string, statusFormat: { fontSize?: number, fontColor?: string, alignment?: { horizontal?: 'left' | 'right' | 'center' }, font?: { filename: string, id: string, __isAsset: true } }, widthStatus: string, goalsFormat: { fontSize?: number, fontColor?: string, alignment?: { horizontal?: 'left' | 'right' | 'center' }, font?: { filename: string, id: string, __isAsset: true } }, widthScore: string, descriptionEnabled: boolean, descriptionFormat: { fontSize?: number, fontColor?: string, alignment?: { horizontal?: 'left' | 'right' | 'center' }, font?: { filename: string, id: string, __isAsset: true } }, widthDescription: string, imageSize: number, widthImage: string
+}>