@vixoniccom/footbal-score 1.4.0-dev.1 → 1.4.0-dev.3

package/build/test/parameters.json

@@ -4,6 +4,7 @@
     "timeStart": "1 am",
     "timeEnd": "11 pm",
     "matchesYesterday": true,
-    "matchesTomorrow": true
+    "matchesTomorrow": true,
+    "itemsPerPage": 2
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vixoniccom/footbal-score",
   "alias": "Resultados Deportivos",
-  "version": "1.4.0-dev.1",
+  "version": "1.4.0-dev.3",
   "description": "Muestra resultados en vivo de fútbol.",
   "main": "main.js",
   "author": "",
@@ -24,7 +24,6 @@
     "react-dom": "^18.3.1"
   },
   "devDependencies": {
-    "@types/node": "^12.20.37",
     "@types/react": "^18.3.23",
     "@types/react-dom": "^18.3.7",
     "@vixoniccom/module-packager": "^2.13.0-dev.1",

package/src/App.tsx

@@ -11,9 +11,9 @@ export type Props = {
 
 export const App: React.FunctionComponent<Props> = ({ data, start }) => {
   const [dataFixture, setDataFixture] = useState<any[]>([])
-  const [league, setLeague] = useState<string>('')
+  const [leagueState, setLeagueState] = useState<string>('')
   const { parameters, downloadsPath } = data
-  const { backgroundImage, padding, msj0 = '', updateTime } = parameters
+  const { backgroundImage, padding, msj0 = '', updateTime = 300000, league = '9' } = parameters
   const backgroundImageState = backgroundImage?.filename
     ? `url("${downloadsPath}/${backgroundImage.filename}")`
     : ''
@@ -27,7 +27,7 @@ export const App: React.FunctionComponent<Props> = ({ data, start }) => {
     const endTime = moment(parameters.timeEnd, 'h:mma')
 
     if (momentLocalStorage == undefined || (timeNow.isBetween(startTime, endTime) && momentLocalStorage > updateTime!)) {
-      const dataRequest = await getFixture(parameters.league!, parameters.matchesYesterday, parameters.matchesTomorrow)
+      const dataRequest = await getFixture(league, parameters.matchesYesterday, parameters.matchesTomorrow)
       setDataLocal(dataRequest)
       setDataFixture(dataRequest)
     } else {
@@ -37,24 +37,24 @@ export const App: React.FunctionComponent<Props> = ({ data, start }) => {
 
   useEffect(() => {
     if (start) {
-      setLeague(data.parameters.league!)
+      setLeagueState(league)
       getData()
     }
   }, [data])
 
   useEffect(() => {
-    if (league !== data.parameters.league) {
-      setLeague(data.parameters.league!)
+    if (leagueState !== league) {
+      setLeagueState(league)
       localforage.clear()
       getData()
     }
-  }, [data.parameters.league])
+  }, [league])
 
   //Request data every 5 minutes
   useEffect(() => {
     const interval = setInterval(() => {
       getData()
-    }, updateTime! || 300000);
+    }, updateTime)
     return () => clearInterval(interval)
   }, [updateTime, data])
 

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

@@ -9,7 +9,7 @@ interface Props {
 
 export const Time: React.FunctionComponent<Props> = ({ time, parameters }) => {
   return (
-    <div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', }}>
+    <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} />
     </div>

package/src/helpers/getFixture.ts

@@ -6,16 +6,13 @@ if (!process.env.FOOTBALL_API_KEY || !process.env.FOOTBALL_API_HOST || !process.
 const FOOTBALL_API_KEY = process.env.FOOTBALL_API_KEY
 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
 
 export const getFixture = async (league: string, yesterday?: boolean, tomorrow?: boolean) => {
   const today = moment().format('YYYY-MM-DD')
-  let year = moment().format('YYYY')
-  year = '2023'
-  let from = yesterday ? moment(Date.now() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD') : today
-  from = '2023-12-05'
-  let to = tomorrow ? moment(Date.now() + 24 * 60 * 60 * 1000).format('YYYY-MM-DD') : today
-  to = '2023-12-10'
-
+  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 = Intl.DateTimeFormat().resolvedOptions().timeZone
 
   const options = {

package/src/style.css

@@ -9,7 +9,7 @@ body {
 }
 
 :root {
-  --font: 'Raleway', sans-serif;
+  --font: 'Raleway', 'sans-serif';
   --background-color: #00141e00;
   --background-color-header: #0f2d37;
   --color-text: #000;

package/src/test/parameters.json

@@ -4,6 +4,7 @@
     "timeStart": "1 am",
     "timeEnd": "11 pm",
     "matchesYesterday": true,
-    "matchesTomorrow": true
+    "matchesTomorrow": true,
+    "itemsPerPage": 2
   }
 }