Merge branch 'release/1.0.8'

brdgm · Feb 17, 2024 · fb69e7c · fb69e7c
2 parents 86c61a9 + 605db26
commit fb69e7c
Show file tree

Hide file tree

Showing 14 changed files with 3,090 additions and 8,517 deletions.
diff --git a/.eslintrc.js → .eslintrc.cjs b/.eslintrc.js → .eslintrc.cjs
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,9 +22,15 @@ jobs:
       with:
         fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
+    - name: Read properties from package.json
+      id: package_json
+      uses: zoexx/[email protected]
+      with:
+        file_path: package.json
+
     - uses: actions/setup-node@v3
       with:
-        node-version: 18
+        node-version: 20
         cache: npm
 
     - run: npm install
@@ -36,3 +42,5 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{ env.SONARCLOUD_TOKEN }}
+      with:
+        args: -Dsonar.projectVersion=${{steps.package_json.outputs.version}}
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -11,14 +11,20 @@ jobs:
     runs-on: ubuntu-latest
     environment:
       name: Production
-      url: "https://brdgm.me/${{ vars.APP_NAME }}"
+      url: "https://brdgm.me/${{ steps.package_json.outputs.appDeployName }}"
 
     steps:
     - uses: actions/checkout@v3
 
+    - name: Read properties from package.json
+      id: package_json
+      uses: zoexx/[email protected]
+      with:
+        file_path: package.json
+
     - uses: actions/setup-node@v3
       with:
-        node-version: 18
+        node-version: 20
         cache: npm
 
     - run: npm install
@@ -37,5 +43,5 @@ jobs:
         user-email: ${{ secrets.GH_SITE_DEPLOY_EMAIL }}
         user-name: ${{ secrets.GH_SITE_DEPLOY_NAME }}
         target-branch: main
-        commit-message: deploy ${{ vars.APP_NAME }}
-        target-directory: ${{ vars.APP_NAME }}
+        commit-message: deploy ${{ steps.package_json.outputs.appDeployName }} ${{ steps.package_json.outputs.version }}
+        target-directory: ${{ steps.package_json.outputs.appDeployName }}
diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 # Stroganov Solo Helper
 
+[![Build](https://github.com/brdgm/stroganov-solo-helper/workflows/Build/badge.svg?branch=develop)](https://github.com/brdgm/stroganov-solo-helper/actions?query=workflow%3ABuild+branch%3Adevelop)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=brdgm_stroganov-solo-helper&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=brdgm_stroganov-solo-helper)
 
 
@@ -20,7 +21,7 @@ npm install
 
 ### Compiles and hot-reloads for development
 ```
-npm run serve
+npm run dev
 ```
 
 ### Compiles and minifies for production

diff --git a/index.html b/index.html
@@ -10,6 +10,18 @@
     <link rel="icon" type="image/svg+xml" href="/img/icons/favicon.svg">
     <link rel="apple-touch-icon" href="/img/icons/apple-touch-icon-180x180.png" sizes="180x180">
     <link rel="mask-icon" href="/img/icons/maskable-icon-512x512.png" color="#fff">
+    <!-- Matomo Tracking: Cookie-less and GDPR-conformant -->
+    <script>
+      var _paq = window._paq = window._paq || [];
+      (function() {
+        var u="//matomo.brdgm.me/";
+        _paq.push(['setTrackerUrl', u+'matomo.php']);
+        _paq.push(['setSiteId', '2']);
+        var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+        g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+      })();
+    </script>
+    <!-- End Matomo Code -->
   </head>
   <body>
     <noscript>