diff --git a/app/configurations/config.default.js b/app/configurations/config.default.js index 4eabfb6032..f3c75d6b93 100644 --- a/app/configurations/config.default.js +++ b/app/configurations/config.default.js @@ -409,7 +409,7 @@ export default { locale: 'en_US', image: { - url: '/img/default-social-share.png', + url: 'img/default-social-share.png', width: 2400, height: 1260, }, diff --git a/app/configurations/config.hameenlinna.js b/app/configurations/config.hameenlinna.js index c49274bf71..53127131a9 100644 --- a/app/configurations/config.hameenlinna.js +++ b/app/configurations/config.hameenlinna.js @@ -27,6 +27,11 @@ export default configMerger(walttiConfig, { twitter: { site: '@hmlkaupunki', }, + image: { + url: 'assets/hameenlinna-logo.png', + width: 800, + height: 352, + }, }, title: APP_TITLE, @@ -34,7 +39,7 @@ export default configMerger(walttiConfig, { favicon: './app/configurations/images/hameenlinna/hameenlinna-favicon.png', // Navbar logo - logo: 'hameenlinna/logo.png', + logo: 'hameenlinna/hameenlinna-logo.png', secondaryLogo: 'hameenlinna/secondary-logo.png', feedIds: ['Hameenlinna'], diff --git a/app/configurations/config.hsl.js b/app/configurations/config.hsl.js index 81ed8a347c..a2d3a9e251 100644 --- a/app/configurations/config.hsl.js +++ b/app/configurations/config.hsl.js @@ -204,7 +204,7 @@ export default { description: APP_DESCRIPTION, image: { - url: '/img/hsl-social-share.png', + url: 'img/hsl-social-share.png', width: 400, height: 400, }, diff --git a/app/configurations/config.joensuu.js b/app/configurations/config.joensuu.js index 1a1a629c80..e0b526911c 100644 --- a/app/configurations/config.joensuu.js +++ b/app/configurations/config.joensuu.js @@ -37,6 +37,11 @@ export default configMerger(walttiConfig, { socialMedia: { title: APP_TITLE, description: APP_DESCRIPTION, + image: { + url: 'assets/joensuu-favicon.png', + width: 346, + height: 80, + }, }, areaPolygon: [ diff --git a/app/configurations/config.jyvaskyla.js b/app/configurations/config.jyvaskyla.js index e8655bd233..6251d706fd 100644 --- a/app/configurations/config.jyvaskyla.js +++ b/app/configurations/config.jyvaskyla.js @@ -57,6 +57,11 @@ export default configMerger(walttiConfig, { socialMedia: { title: APP_TITLE, description: APP_DESCRIPTION, + image: { + url: 'assets/jyvaskyla-favicon.png', + width: 443, + height: 443, + }, }, title: APP_TITLE, diff --git a/app/configurations/config.kouvola.js b/app/configurations/config.kouvola.js index d7fc4a340d..bc6a8ed692 100644 --- a/app/configurations/config.kouvola.js +++ b/app/configurations/config.kouvola.js @@ -77,6 +77,11 @@ export default configMerger(walttiConfig, { twitter: { site: '@kouvolakaupunki', }, + image: { + url: 'assets/social-share-kouvola.png', + width: 134, + height: 134, + }, }, title: APP_TITLE, diff --git a/app/configurations/config.kuopio.js b/app/configurations/config.kuopio.js index f1e9a6e0d1..994b585277 100644 --- a/app/configurations/config.kuopio.js +++ b/app/configurations/config.kuopio.js @@ -22,6 +22,11 @@ export default configMerger(walttiConfig, { socialMedia: { title: APP_TITLE, description: APP_DESCRIPTION, + image: { + url: 'img/social-share-kuopio.png', + width: 760, + height: 224, + }, }, title: APP_TITLE, @@ -30,7 +35,7 @@ export default configMerger(walttiConfig, { // Navbar logo logo: 'kuopio/logo.png', - secondaryLogo: 'kuopio/secondary-logo.png', + secondaryLogo: 'kuopio/kuopio-secondary-logo.png', feedIds: ['Kuopio', 'digitraffic'], diff --git a/app/configurations/config.lahti.js b/app/configurations/config.lahti.js index 0273d7ab87..188ecf925a 100644 --- a/app/configurations/config.lahti.js +++ b/app/configurations/config.lahti.js @@ -28,6 +28,11 @@ export default configMerger(walttiConfig, { twitter: { site: '@LSL_fi', }, + image: { + url: 'assets/secondary-lahti-logo.png', + width: 751, + height: 301, + }, }, title: APP_TITLE, diff --git a/app/configurations/config.lappeenranta.js b/app/configurations/config.lappeenranta.js index b10e6fa24e..74e1cdfab7 100644 --- a/app/configurations/config.lappeenranta.js +++ b/app/configurations/config.lappeenranta.js @@ -21,6 +21,11 @@ export default configMerger(walttiConfig, { socialMedia: { title: APP_TITLE, description: APP_DESCRIPTION, + image: { + url: 'assets/lappeenranta-favicon.jpg', + width: 591, + height: 591, + }, }, title: APP_TITLE, diff --git a/app/configurations/config.matka.js b/app/configurations/config.matka.js index 6bb38e07fc..d90cb75803 100644 --- a/app/configurations/config.matka.js +++ b/app/configurations/config.matka.js @@ -46,6 +46,11 @@ export default { title: APP_TITLE, description: APP_DESCRIPTION, locale: 'fi_FI', + image: { + url: 'img/social-share-matka.png', + width: 505, + height: 84, + }, }, title: APP_TITLE, diff --git a/app/configurations/config.oulu.js b/app/configurations/config.oulu.js index 873041508b..6d3b72a390 100644 --- a/app/configurations/config.oulu.js +++ b/app/configurations/config.oulu.js @@ -36,6 +36,11 @@ export default configMerger(walttiConfig, { twitter: { site: '@oulunkaupunki', }, + image: { + url: 'assets/secondary-oulu-logo.png', + width: 1181, + height: 472, + }, }, title: APP_TITLE, diff --git a/app/configurations/config.pori.js b/app/configurations/config.pori.js index cf35465d29..d613f130b6 100644 --- a/app/configurations/config.pori.js +++ b/app/configurations/config.pori.js @@ -25,6 +25,11 @@ export default configMerger(walttiConfig, { socialMedia: { title: APP_TITLE, description: APP_DESCRIPTION, + image: { + url: 'assets/social-share-pori.png', + width: 400, + height: 116, + }, }, title: APP_TITLE, diff --git a/app/configurations/config.raasepori.js b/app/configurations/config.raasepori.js index f38026be61..41b641aeb7 100644 --- a/app/configurations/config.raasepori.js +++ b/app/configurations/config.raasepori.js @@ -29,6 +29,11 @@ export default configMerger(walttiConfig, { socialMedia: { title: APP_TITLE, description: APP_DESCRIPTION, + image: { + url: 'assets/raasepori_logo_musta.png', + width: 1528, + height: 650, + }, }, title: APP_TITLE, diff --git a/app/configurations/config.rovaniemi.js b/app/configurations/config.rovaniemi.js index f76d445be7..b6c38d8e6b 100644 --- a/app/configurations/config.rovaniemi.js +++ b/app/configurations/config.rovaniemi.js @@ -24,6 +24,11 @@ export default configMerger(walttiConfig, { socialMedia: { title: APP_TITLE, description: APP_DESCRIPTION, + image: { + url: 'assets/rovaniemi-favicon.png', + width: 504, + height: 426, + }, }, title: APP_TITLE, diff --git a/app/configurations/config.tampere.js b/app/configurations/config.tampere.js index 403dd876b1..6b14576b38 100644 --- a/app/configurations/config.tampere.js +++ b/app/configurations/config.tampere.js @@ -33,6 +33,11 @@ export default configMerger(walttiConfig, { socialMedia: { title: APP_TITLE, description: APP_DESCRIPTION, + image: { + url: 'img/social-share-tampere.png', + width: 400, + height: 400, + }, }, title: APP_TITLE, diff --git a/app/configurations/config.turku.js b/app/configurations/config.turku.js index d218f20314..412a8ff9e0 100644 --- a/app/configurations/config.turku.js +++ b/app/configurations/config.turku.js @@ -69,6 +69,11 @@ export default configMerger(walttiConfig, { twitter: { site: '@Turkukaupunki', }, + image: { + url: 'img/social-share-foli.png', + width: 339, + height: 78, + }, }, meta: { diff --git a/app/configurations/config.vaasa.js b/app/configurations/config.vaasa.js index 1769a00259..d5b85c84a1 100644 --- a/app/configurations/config.vaasa.js +++ b/app/configurations/config.vaasa.js @@ -33,6 +33,11 @@ export default configMerger(walttiConfig, { socialMedia: { title: APP_TITLE, description: APP_DESCRIPTION, + image: { + url: 'img/social-share-vaasa.png', + width: 1280, + height: 400, + }, twitter: { site: '@vaasavasa', @@ -42,7 +47,7 @@ export default configMerger(walttiConfig, { title: APP_TITLE, logo: 'vaasa/vaasa-favicon.png', - secondaryLogo: 'vaasa/secondary-logo.png', + secondaryLogo: 'vaasa/vaasa-secondary-logo.png', feedIds: ['Vaasa'], diff --git a/app/configurations/config.varely.js b/app/configurations/config.varely.js index bcf1c713c1..59b0e6301b 100644 --- a/app/configurations/config.varely.js +++ b/app/configurations/config.varely.js @@ -49,6 +49,11 @@ export default configMerger(walttiConfig, { socialMedia: { title: APP_TITLE, description: APP_DESCRIPTION, + image: { + url: 'assets/social-share-seutuplus.png', + width: 611, + height: 225, + }, }, meta: { diff --git a/app/configurations/config.walttiOpas.js b/app/configurations/config.walttiOpas.js index 6affbf8117..c64728075b 100644 --- a/app/configurations/config.walttiOpas.js +++ b/app/configurations/config.walttiOpas.js @@ -32,6 +32,11 @@ export default configMerger(walttiConfig, { socialMedia: { title: APP_TITLE, description: APP_DESCRIPTION, + image: { + url: 'assets/waltti-logo-secondary.png', + width: 1795, + height: 1313, + }, }, title: APP_TITLE, diff --git a/app/configurations/images/hameenlinna/logo.png b/app/configurations/images/hameenlinna/hameenlinna-logo.png similarity index 100% rename from app/configurations/images/hameenlinna/logo.png rename to app/configurations/images/hameenlinna/hameenlinna-logo.png diff --git a/app/configurations/images/kouvola/social-share-kouvola.png b/app/configurations/images/kouvola/social-share-kouvola.png new file mode 100644 index 0000000000..67ac6e2b64 Binary files /dev/null and b/app/configurations/images/kouvola/social-share-kouvola.png differ diff --git a/app/configurations/images/matka/social-share-matka.png b/app/configurations/images/matka/social-share-matka.png new file mode 100755 index 0000000000..5958e1f6f6 Binary files /dev/null and b/app/configurations/images/matka/social-share-matka.png differ diff --git a/app/configurations/images/pori/social-share-pori.png b/app/configurations/images/pori/social-share-pori.png new file mode 100644 index 0000000000..609aac7b21 Binary files /dev/null and b/app/configurations/images/pori/social-share-pori.png differ diff --git a/app/configurations/images/vaasa/secondary-logo.png b/app/configurations/images/vaasa/vaasa-secondary-logo.png similarity index 100% rename from app/configurations/images/vaasa/secondary-logo.png rename to app/configurations/images/vaasa/vaasa-secondary-logo.png diff --git a/app/configurations/images/varely/social-share-seutuplus.png b/app/configurations/images/varely/social-share-seutuplus.png new file mode 100644 index 0000000000..535e5d5529 Binary files /dev/null and b/app/configurations/images/varely/social-share-seutuplus.png differ diff --git a/app/meta.js b/app/meta.js index 07de056d6c..dc4d42e1ce 100644 --- a/app/meta.js +++ b/app/meta.js @@ -3,6 +3,15 @@ export default function getMetadata(lang, host, url, config) { const path = config.iconPath || 'icons'; const iconPath = `${root}/${path}`; const imageHost = config.URL.ASSET_URL || `https://${host}`; + let manifest = {}; + try { + // eslint-disable-next-line global-require, import/no-unresolved + manifest = require('../manifest.json'); + } catch (e) { + manifest = {}; + } + const socialImage = + manifest?.[config.socialMedia.image.url] || config.socialMedia.image.url; const baseData = { title: config.title, @@ -51,7 +60,7 @@ export default function getMetadata(lang, host, url, config) { }, { property: 'og:image', - content: `${imageHost}${config.socialMedia.image.url}`, + content: `${imageHost}/${socialImage}`, }, { property: 'og:image:width', @@ -87,7 +96,7 @@ export default function getMetadata(lang, host, url, config) { }, { property: 'twitter:image', - content: `${imageHost}${config.socialMedia.image.url}`, + content: `${imageHost}/${socialImage}`, }, ], link: [ diff --git a/static/img/hsl-social-share.png b/static/img/hsl-social-share.png old mode 100644 new mode 100755 index b68bbd0035..aabcfdc0f8 Binary files a/static/img/hsl-social-share.png and b/static/img/hsl-social-share.png differ diff --git a/static/img/social-share-foli.png b/static/img/social-share-foli.png new file mode 100644 index 0000000000..0cf76d963e Binary files /dev/null and b/static/img/social-share-foli.png differ diff --git a/static/img/social-share-kuopio.png b/static/img/social-share-kuopio.png new file mode 100755 index 0000000000..e0255cbee7 Binary files /dev/null and b/static/img/social-share-kuopio.png differ diff --git a/static/img/social-share-matka.png b/static/img/social-share-matka.png new file mode 100755 index 0000000000..5958e1f6f6 Binary files /dev/null and b/static/img/social-share-matka.png differ diff --git a/static/img/social-share-tampere.png b/static/img/social-share-tampere.png new file mode 100644 index 0000000000..19ff65ad16 Binary files /dev/null and b/static/img/social-share-tampere.png differ diff --git a/static/img/social-share-vaasa.png b/static/img/social-share-vaasa.png new file mode 100755 index 0000000000..979086e65f Binary files /dev/null and b/static/img/social-share-vaasa.png differ