UHF-9511: Merge branch 'main' of https://github.com/City-of-Helsinki/…

…drupal-hdbt into UHF-9511
City-of-Helsinki · Oct 11, 2024 · df780cf · df780cf
2 parents dfcd7c5 + 4971d98
commit df780cf
Show file tree

Hide file tree

Showing 18 changed files with 438 additions and 105 deletions.
diff --git a/.github/workflows/visual.yml b/.github/workflows/visual.yml
@@ -112,6 +112,7 @@ jobs:
           node-version-file: .nvmrc
 
       - name: NPM Install
+        working-directory: ${{ env.THEME_FOLDER }}
         run: |
           npm install
 
@@ -166,7 +167,7 @@ jobs:
         if: steps.evaluate-reference-images.outputs.generate-references != 'true'
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ${{ env.THEME_FOLDER }}/backstop/full/
+          publish_dir: ${{ env.THEME_FOLDER }}/backstop/full
           destination_dir: pull/${{github.event.number}}
 
       - name: Update comment

diff --git a/backstop/backstop_dynamic_config.js b/backstop/backstop_dynamic_config.js
@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 const processArgs = process.argv.slice(2);
 const envPath = '../../../../.env';
-require('dotenv').config({ path: envPath }); // Get environment from instance .env file
+require('@dotenvx/dotenvx').config({ path: envPath }); // Get environment from instance .env file
 const backstop = require('backstopjs');
 
 const TYPE = {
@@ -257,7 +257,7 @@ function getConfig(hostname, protocol, type) {
           'url': `${protocol}://${hostname}/en/dc-components/dc-announcements`,
           'removeSelectors': removeDefault,
           'selectors': [
-            '#block-hdbt-subtheme-announcements'
+            '#block-announcements'
           ],
           'selectorExpansion': expandComponents,
         },

diff --git a/dist/css/styles.min.css b/dist/css/styles.min.css
diff --git a/dist/js/district-and-project-search.min.js b/dist/js/district-and-project-search.min.js
diff --git a/dist/js/health-station-search.min.js b/dist/js/health-station-search.min.js
diff --git a/dist/js/job-search.min.js b/dist/js/job-search.min.js
diff --git a/dist/js/linkedevents.min.js b/dist/js/linkedevents.min.js
diff --git a/dist/js/maternity-and-child-health-clinic-search.min.js b/dist/js/maternity-and-child-health-clinic-search.min.js
diff --git a/dist/js/news-archive.min.js b/dist/js/news-archive.min.js
diff --git a/dist/js/ploughing-schedule.min.js b/dist/js/ploughing-schedule.min.js
diff --git a/dist/js/school-search.min.js b/dist/js/school-search.min.js