@vixoniccom/footbal-score 1.0.1-beta.7 → 1.0.1-beta.8

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.0.1-beta.8](https://gitlab.com/mandomedio/vixonic/football-score/compare/v1.0.1-beta.7...v1.0.1-beta.8) (2022-11-21)
+
+### [1.0.1-beta.6](https://gitlab.com/mandomedio/vixonic/football-score/compare/v1.0.1-beta.7...v1.0.1-beta.6) (2022-11-21)
+
 ### [1.0.1-beta.7](https://gitlab.com/mandomedio/vixonic/football-score/compare/v1.0.1-beta.6...v1.0.1-beta.7) (2022-11-21)
 
 ### [1.0.1-beta.6](https://gitlab.com/mandomedio/vixonic/football-score/compare/v1.0.1-beta.5...v1.0.1-beta.6) (2022-11-21)

package/configuration.json

@@ -11,14 +11,42 @@
           "label": "Datos"
         },
         {
-          "id": "timeRequest",
-          "type": "number-input",
-          "range": "[60000:12000000]",
-          "required": false,
-          "label": "Tiempo de actualización app",
-          "description": "Por defecto son 60000 ms (1 minutos)",
-          "defaultValue":"60000"
-        },
+					"id": "updateTime",
+					"type": "select-input",
+					"required": true,
+					"label": "Actualización",
+					"defaultValue": 300000,
+					"items": [
+            {
+							"label": "5 minutos",
+							"value": 300000
+						},
+						{
+							"label": "10 minutos",
+							"value": 600000
+						},
+						{
+							"label": "30 minutos",
+							"value": 1800000
+						},
+						{
+							"label": "1 hora",
+							"value": 3600000
+						},
+						{
+							"label": "6 horas",
+							"value": 21600000
+						},
+						{
+							"label": "12 horas",
+							"value": 43200000
+						},
+						{
+							"label": "Diario",
+							"value": 86400000
+						}
+					]
+				},
         {
           "type": "switch",
           "id": "titleEnabled",

package/package.json

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

package/src/App.tsx

@@ -10,7 +10,7 @@ type Props = {
 }
 
 export const App = ({ data, start }: Props) => {
-  const [dataFixture, setDataFixture] = useState([]);
+   const [dataFixture, setDataFixture] = useState([]);
 
   const { configureState, addConfiguration } = useContext(ConfigureContext)
 
@@ -19,34 +19,33 @@ export const App = ({ data, start }: Props) => {
   const { backgroundImage,
     padding,
     msj0 = '',
-    timeRequest
+    updateTime
   } = parameters
-    console.log("🚀 ~ file: App.tsx ~ line 24 ~ App ~ timeRequest", timeRequest)
-  
+    console.log("🚀 ~ file: App.tsx ~ line 24 ~ App ~ updateTime", updateTime)
+
   let backgroundImageState = backgroundImage && backgroundImage.filename
     ? `url("${downloadsPath}/${backgroundImage.filename}")`
     : ''
 
   const getData = async () => {
     const data = await getFixture();
-    console.log("🚀 ~ file: App.tsx ~ line 32 ~ getData ~ data", data)
     setDataFixture(data);
   }
 
-  //Request data every 5 minutes
-  useEffect(() => {
-    const interval = setInterval(() => {
-      console.log('start', start)
-      if (start) getData()
-    }, timeRequest || 60000)
-    return () => clearInterval(interval)
-  }, [timeRequest])
 
   useEffect(() => {
+    console.log('entro aquí')
     if (start) getData()
     addConfiguration(data)
   }, [data])
 
+  //Request data every 5 minutes
+  useEffect(() => {
+    const interval = setInterval(() => {
+      getData()
+    }, updateTime || 300000)
+    return () => clearInterval(interval)
+  }, [updateTime])
 
 
 

package/src/components/table-fixture/Results.tsx

@@ -6,8 +6,7 @@ export const Results = (goals: any) => {
 
   const { configureState } = useContext(ConfigureContext)
   const { parameters } = configureState
-  console.log("🚀 ~ file: Results.tsx ~ line 9 ~ Results ~ parameters", parameters.goalsFormat)
-
+ 
 
   return (
     <div style={{

package/src/components/table-fixture/Row.tsx

@@ -4,6 +4,7 @@ import { Time } from './Time';
 import { FormattedText } from '../FormattedText';
 import { ConfigureContext } from '../../contex/configureContext/ConfigureContext';
 import { Status } from './Status';
+import { translateTeams } from '../../helpers/translateTeams';
 
 export const Row = (item: any) => {
 
@@ -21,13 +22,14 @@ export const Row = (item: any) => {
         columnGap,
         rowGap,
         widthStatus,
-        widthTime,
-        goalsFormat
+        widthTime    
     } = parameters
 
     let gridColumns = descriptionEnabled ? `${widthTime || "200px"} ${widthStatus || "200px"} ${widthDescription || "200px"}  ${widthImage || "300px"} ${widthScore || "100px"} ${widthImage || "300px"} ${widthDescription || "200px"}` :
         ` ${widthTime || "100px"} ${widthStatus || "100px"} ${widthImage || "300px"} ${widthScore || "100px"} ${widthImage || "300px"}`
 
+    let nameHome = translateTeams(teams.home.name)   
+    let nameAway = translateTeams(teams.away.name)
 
     return (
         <div
@@ -53,7 +55,7 @@ export const Row = (item: any) => {
                     display: 'flex',
                     justifyContent: 'flex-end',
                 }}>
-                    <FormattedText text={teams.home.name} format={descriptionFormat} />
+                    <FormattedText text={nameHome} format={descriptionFormat} />
                 </div>
             }
             <div style={{
@@ -67,9 +69,9 @@ export const Row = (item: any) => {
                 display: 'flex',
                 justifyContent: 'center',
             }}>
-                <FormattedText text={goals.home ? goals.home : 0} format={goalsFormat} />
-                <FormattedText text={"-"} format={goalsFormat} />
-                <FormattedText text={goals.away ? goals.away : 0} format={goalsFormat} />
+                <FormattedText text={goals.home ? goals.home : 0} format={descriptionFormat} />
+                <FormattedText text={"-"} format={descriptionFormat} />
+                <FormattedText text={goals.away ? goals.away : 0} format={descriptionFormat} />
             </div>
 
             <div
@@ -82,7 +84,7 @@ export const Row = (item: any) => {
             </div>
             {
                 descriptionEnabled &&
-                <FormattedText text={teams.away.name} format={descriptionFormat} />
+                <FormattedText text={nameAway} format={descriptionFormat} />
             }
         </div >
     )

package/src/contex/configureContext/ConfigureProvider.tsx

@@ -50,7 +50,7 @@ const INITIAL_STATE: VixonicData = {
         template: "",
         textAlignment: "center",
         textPosition: 0,
-        updateTime: 0,
+        updateTime: 300000,
         urlBaseApi: "",
         imageMargin: "",
         textMargin: "",
@@ -63,8 +63,7 @@ const INITIAL_STATE: VixonicData = {
         rowGap: "30px",
         widthStatus: "200px",
         widthTime: "200px",
-        timeRequest: 60000
-    }
+     }
 }
 
 interface props {

package/src/contex/configureContext/configureReducer.ts

@@ -51,8 +51,7 @@ export const parameterReducer = (state: VixonicData, action: ConfigureAction) =>
                     rowGap: parameters.rowGap,
                     widthTime: parameters.widthTime,
                     widthStatus: parameters.widthStatus,
-                    timeRequest: parameters.timeRequest,
-                }
+                 }
             }
         default:
             return state;

package/src/helpers/getFixture.ts

@@ -15,6 +15,12 @@ export const getFixture = async () => {
             'X-RapidAPI-Host': 'api-football-v1.p.rapidapi.com'
         }
     };
-    const response = await axios.request(options)
-    return response.data.response
+    try {
+        const response = await axios.request(options)
+        return response.data.response
+    } catch (error) {
+        console.error(error);
+        return []
+    }
+
 }

package/src/helpers/translateTeams.ts

@@ -0,0 +1,89 @@
+
+export const translateTeams = (team: string) => {
+    switch (team) {
+        case 'England':
+            return 'Inglaterra'
+        case 'Spain':
+            return 'España'
+        case 'Italy':
+            return 'Italia'
+        case 'Germany':
+            return 'Alemania'
+        case 'France':
+            return 'Francia'
+        case 'Portugal':
+            return 'Portugal'
+        case 'Netherlands':
+            return 'Holanda'
+        case 'Belgium':
+            return 'Bélgica'
+        case 'Russia':
+            return 'Rusia'
+        case 'Turkey':
+            return 'Turquía'
+        case 'Ukraine':
+            return 'Ucrania'
+        case 'Czech Republic':
+            return 'República Checa'
+        case 'Sweden':
+            return 'Suecia'
+        case 'Poland':
+            return 'Polonia'
+        case 'Austria':
+            return 'Austria'
+        case 'Switzerland':
+            return 'Suiza'
+        case 'Denmark':
+            return 'Dinamarca'
+        case 'Hungary':
+            return 'Hungría'
+        case 'Romania':
+            return 'Rumanía'
+        case 'Croatia':
+            return 'Croacia'
+        case 'Scotland':
+            return 'Escocia'
+        case 'Wales':
+            return 'Gales'
+        case 'Northern Ireland':
+            return 'Irlanda del Norte'
+        case 'Slovakia':
+            return 'Eslovaquia'
+        case 'Norway':
+            return 'Noruega'
+        case 'Finland':
+            return 'Finlandia'
+        case 'Bulgaria':
+            return 'Bulgaria'
+        case 'North Macedonia':
+            return 'Macedonia del Norte'
+        case 'Iceland':
+            return 'Islandia'
+        case 'Iran':
+            return 'Irán'
+        case 'United States':
+            return 'Estados Unidos'
+        case 'Mexico':
+            return 'México'
+        case 'Tunisia':
+            return 'Túnez'
+        case 'Japan':
+            return 'Japón'
+        case 'Argentina':
+            return 'Argentina'
+        case 'Canada':
+            return 'Canadá'
+        case 'Morocco':
+            return 'Marruecos'
+        case 'Brazil':
+            return 'Brasil'
+        case 'Cameroon':
+            return 'Camerún'
+        case 'Ghana':
+            return 'Ghana'
+        case 'South Korea':        
+            return 'Corea del Sur'
+        default:
+            return team
+    }
+}

package/src/parameters.d.ts

@@ -25,7 +25,7 @@ declare type VixonicParameters = Partial<{
   dateDayFormat: DateFormat
   timeFormat: DateFormat
   goalsFormat: DateFormat
-  timeRequest: number
+  updateTime: number
   dateEnabled: boolean
   title0: string
   titleEnabled: boolean