Merge pull request #20 from ChouquetteCorp/develop

BilelJegham · web-flow · commit 15d0c856fbbd · 2024-06-13T13:31:36.000+02:00
Release 1.2.0
diff --git a/.github/configApiSport/default.json b/.github/configApiSport/default.json
@@ -11,41 +11,41 @@
         "rugby": [
             {
                 "league": 52,
-                "season": 2022
+                "season": 2024
             },
             {
                 "league": 54,
-                "season": 2022
+                "season": 2024
             },
             {
                 "league": 16,
-                "season": 2022
+                "season": 2024
             },
             {
                 "league": 69,
-                "season": 2023
+                "season": 2024
             }
         ],
         "handball": [
             {
                 "league": 132,
-                "season": 2023
+                "season": 2024
             },
             {
                 "league": 32,
-                "season": 2023
+                "season": 2024
             },
             {
                 "league": 35,
-                "season": 2023
+                "season": 2024
             },
             {
                 "league": 29,
-                "season": 2023
+                "season": 2024
             },
             {
                 "league": 34,
-                "season": 2023
+                "season": 2024
             }
          ]
     }
diff --git a/.github/configApiSport/football.json b/.github/configApiSport/football.json
@@ -13,31 +13,51 @@
         "football": [
             {
                 "league": 66,
-                "season": 2023
+                "season": 2024
             },
             {
                 "league": 64,
-                "season": 2023
+                "season": 2024
             },
             {
                 "league": 61,
-                "season": 2023
+                "season": 2024
             },
             {
                 "league": 2,
-                "season": 2023
+                "season": 2024
             },
             {
                 "league": 525,
-                "season": 2023
+                "season": 2024
             },
             {
                 "league": 3,
-                "season": 2023
+                "season": 2024
             },
             {
                 "league": 8,
-                "season": 2023
+                "season": 2024
+            },
+            {
+                "league": 4,
+                "season": 2024
+            },
+            {
+                "league": 10,
+                "season": 2024
+            },
+            {
+                "league": 6110,
+                "season": 2024
+            },
+            {
+                "league": 6111,
+                "season": 2024
+            },
+            {
+                "league": 5932,
+                "season": 2024
             }
         ]
     }
diff --git a/.github/workflows/cd_production.yml b/.github/workflows/cd_production.yml
@@ -19,8 +19,8 @@ jobs:
       PROJECT_ID: ${{ secrets.PRODUCTION_PROJECT_ID }}
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
         id: cache
         with:
           path: ~/.npm          
diff --git a/.github/workflows/cd_staging.yml b/.github/workflows/cd_staging.yml
@@ -19,8 +19,8 @@ jobs:
       STAGING_PROJECT_ID: ${{ secrets.STAGING_PROJECT_ID }}
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
         id: cache
         with:
           path: ~/.npm          
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,8 +9,8 @@ jobs:
   integration:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/cache@v3
+    - uses: actions/checkout@v4
+    - uses: actions/cache@v4
       id: cache
       with:
         path: ~/.npm          
@@ -29,16 +29,16 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install dependencies
-        uses: cypress-io/github-action@v5
+        uses: cypress-io/github-action@v6
         with:
           # just perform install
           runTests: false
       - name: Start server in the background
         run: npm run supabase:start -- -x studio,imgproxy,inbucket,pgadmin-schema-diff,migra,postgres-meta,vector,pgbouncer,logflare
       - name: Cypress run
-        uses: cypress-io/github-action@v5
+        uses: cypress-io/github-action@v6
         with:
           install: false
           start: npm run dev:emulator
diff --git a/.github/workflows/getmatchs.yml b/.github/workflows/getmatchs.yml
@@ -10,14 +10,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get Matches
         run: |
           npx --yes api-sport-cli get-matchs -c .github/configApiSport/football.json -s matchs.football.sql -j matchs.football.json -u api_id
           npx --yes api-sport-cli get-matchs -c .github/configApiSport/default.json -s matchs.sql -j matchs.json -u api_id
         env:
           SPORT_API_KEY: ${{ secrets.SPORT_API_KEY }}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: matchs
           path: |
@@ -33,16 +33,18 @@ jobs:
           sudo apt-get install -y postgresql-15
       - name: Add matchs.sql to database Staging 
         run: |
-          psql -h "db.$STAGING_PROJECT_ID.supabase.co" -p 5432 -d postgres -U postgres -f matchs.football.sql
-          psql -h "db.$STAGING_PROJECT_ID.supabase.co" -p 5432 -d postgres -U postgres -f matchs.sql
+          psql -h "$HOST" -p 5432 -d postgres -U "postgres.$STAGING_PROJECT_ID" -f matchs.football.sql
+          psql -h "$HOST" -p 5432 -d postgres -U "postgres.$STAGING_PROJECT_ID" -f matchs.sql
         env:
           PGPASSWORD: ${{ secrets.STAGING_DB_PASSWORD }}
+          HOST: ${{ secrets.STAGING_HOST }}
           STAGING_PROJECT_ID: ${{ secrets.STAGING_PROJECT_ID }}
 
       - name: Add matchs.sql to database Prod
         run: |
-          psql -h "db.$PRODUCTION_PROJECT_ID.supabase.co" -p 5432 -d postgres -U postgres -f matchs.football.sql
-          psql -h "db.$PRODUCTION_PROJECT_ID.supabase.co" -p 5432 -d postgres -U postgres -f matchs.sql
+          psql -h "$HOST" -p 5432 -d postgres -U "postgres.$PRODUCTION_PROJECT_ID" -f matchs.football.sql
+          psql -h "$HOST" -p 5432 -d postgres -U "postgres.$PRODUCTION_PROJECT_ID" -f matchs.sql
         env:
           PGPASSWORD: ${{ secrets.PRODUCTION_DB_PASSWORD }}
+          HOST: ${{ secrets.PRODUCTION_HOST }}
           PRODUCTION_PROJECT_ID: ${{ secrets.PRODUCTION_PROJECT_ID }}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "beerbet",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "scripts": {
     "dev": "vite --port 3000",
     "dev:emulator": "vite --port 3000 --mode=emulator",
diff --git a/src/lang/locales/es.json b/src/lang/locales/es.json
diff --git a/templates/chouquette/src/lang/locales/es.json b/templates/chouquette/src/lang/locales/es.json

Original file line number	Diff line number	Diff line change
`@@ -11,41 +11,41 @@`
`11`	`11`	`"rugby": [`
`12`	`12`	`{`
`13`	`13`	`"league": 52,`
`14`		`- "season": 2022`
	`14`	`+ "season": 2024`
`15`	`15`	`},`
`16`	`16`	`{`
`17`	`17`	`"league": 54,`
`18`		`- "season": 2022`
	`18`	`+ "season": 2024`
`19`	`19`	`},`
`20`	`20`	`{`
`21`	`21`	`"league": 16,`
`22`		`- "season": 2022`
	`22`	`+ "season": 2024`
`23`	`23`	`},`
`24`	`24`	`{`
`25`	`25`	`"league": 69,`
`26`		`- "season": 2023`
	`26`	`+ "season": 2024`
`27`	`27`	`}`
`28`	`28`	`],`
`29`	`29`	`"handball": [`
`30`	`30`	`{`
`31`	`31`	`"league": 132,`
`32`		`- "season": 2023`
	`32`	`+ "season": 2024`
`33`	`33`	`},`
`34`	`34`	`{`
`35`	`35`	`"league": 32,`
`36`		`- "season": 2023`
	`36`	`+ "season": 2024`
`37`	`37`	`},`
`38`	`38`	`{`
`39`	`39`	`"league": 35,`
`40`		`- "season": 2023`
	`40`	`+ "season": 2024`
`41`	`41`	`},`
`42`	`42`	`{`
`43`	`43`	`"league": 29,`
`44`		`- "season": 2023`
	`44`	`+ "season": 2024`
`45`	`45`	`},`
`46`	`46`	`{`
`47`	`47`	`"league": 34,`
`48`		`- "season": 2023`
	`48`	`+ "season": 2024`
`49`	`49`	`}`
`50`	`50`	`]`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "beerbet",`
`3`		`- "version": "1.1.0",`
	`3`	`+ "version": "1.2.0",`
`4`	`4`	`"scripts": {`
`5`	`5`	`"dev": "vite --port 3000",`
`6`	`6`	`"dev:emulator": "vite --port 3000 --mode=emulator",`