Skip to content

Commit

Permalink
Merge pull request #4880 from HSLdevcom/DT-6001
Browse files Browse the repository at this point in the history
DT-6001 incorrect favicons shown
  • Loading branch information
vesameskanen authored Nov 3, 2023
2 parents 8cb1f77 + 2b58807 commit 507c68c
Show file tree
Hide file tree
Showing 35 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion app/configurations/config.hameenlinna.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default configMerger(walttiConfig, {

title: APP_TITLE,

favicon: './app/configurations/images/hameenlinna/favicon.png',
favicon: './app/configurations/images/hameenlinna/hameenlinna-favicon.png',

// Navbar logo
logo: 'hameenlinna/logo.png',
Expand Down
2 changes: 1 addition & 1 deletion app/configurations/config.hsl.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export default {
defaultLanguage: 'fi',
passLanguageToRootLink: true,

favicon: './app/configurations/images/hsl/favicon.png',
favicon: './app/configurations/images/hsl/hsl-favicon.png',

// Navbar logo
logo: 'hsl/reittiopas-logo.svg',
Expand Down
2 changes: 1 addition & 1 deletion app/configurations/config.joensuu.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default configMerger(walttiConfig, {

title: APP_TITLE,

favicon: './app/configurations/images/joensuu/favicon.png',
favicon: './app/configurations/images/joensuu/joensuu-favicon.png',

// Navbar logo
logo: 'joensuu/jojo-logo.png',
Expand Down
4 changes: 2 additions & 2 deletions app/configurations/config.jyvaskyla.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ export default configMerger(walttiConfig, {

title: APP_TITLE,

favicon: './app/configurations/images/jyvaskyla/favicon.png',
favicon: './app/configurations/images/jyvaskyla/jyvaskyla-favicon.png',

// Navbar logo
logo: 'jyvaskyla/favicon.png',
logo: 'jyvaskyla/jyvaskyla-favicon.png',

vehicles: true,
showVehiclesOnStopPage: true,
Expand Down
2 changes: 1 addition & 1 deletion app/configurations/config.kela.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default configMerger(matkaConfig, {
},
},

favicon: './app/configurations/images/default/favicon.png',
favicon: './app/configurations/images/default/default-favicon.png',
feedIds: ['kela', 'matkahuolto'],
textLogo: true,
logo: null, // override default logo from matka config
Expand Down
2 changes: 1 addition & 1 deletion app/configurations/config.kouvola.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export default configMerger(walttiConfig, {
logo: 'kouvola/logo.png',
secondaryLogo: 'kouvola/secondary-logo.png',

favicon: './app/configurations/images/kouvola/favicon.png',
favicon: './app/configurations/images/kouvola/kouvola-favicon.png',

feedIds: ['Kouvola'],

Expand Down
2 changes: 1 addition & 1 deletion app/configurations/config.kuopio.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default configMerger(walttiConfig, {

title: APP_TITLE,

favicon: './app/configurations/images/kuopio/favicon.png',
favicon: './app/configurations/images/kuopio/kuopio-favicon.png',

// Navbar logo
logo: 'kuopio/logo.png',
Expand Down
2 changes: 1 addition & 1 deletion app/configurations/config.lahti.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default configMerger(walttiConfig, {

title: APP_TITLE,

favicon: './app/configurations/images/lahti/favicon.png',
favicon: './app/configurations/images/lahti/lahti-favicon.png',

// Navbar logo
logo: 'lahti/lahti-logo.png',
Expand Down
2 changes: 1 addition & 1 deletion app/configurations/config.matka.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default {
// Navbar logo
logo: 'matka/matka-logo.svg',

favicon: './app/configurations/images/matka/favicon.svg',
favicon: './app/configurations/images/matka/matka-favicon.svg',

colors: {
primary: '#002c74',
Expand Down
2 changes: 1 addition & 1 deletion app/configurations/config.oulu.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export default configMerger(walttiConfig, {

title: APP_TITLE,

favicon: './app/configurations/images/oulu/favicon.png',
favicon: './app/configurations/images/oulu/oulu-favicon.png',

// Navbar logo
logo: 'oulu/oulu-logo.png',
Expand Down
2 changes: 1 addition & 1 deletion app/configurations/config.pori.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default configMerger(walttiConfig, {

title: APP_TITLE,

favicon: './app/configurations/images/pori/favicon.png',
favicon: './app/configurations/images/pori/pori-favicon.png',

// Navbar logo
logo: 'pori/pori_logo.svg',
Expand Down
2 changes: 1 addition & 1 deletion app/configurations/config.raasepori.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default configMerger(walttiConfig, {
// Navbar logo
logo: 'raasepori/raasepori_logo_valkoinen.png',
secondaryLogo: 'raasepori/raasepori_logo_musta.png',
favicon: './app/configurations/images/raasepori/favicon.png',
favicon: './app/configurations/images/raasepori/raasepori-favicon.png',

useSearchPolygon: true,

Expand Down
2 changes: 1 addition & 1 deletion app/configurations/config.rovaniemi.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default configMerger(walttiConfig, {
},

title: APP_TITLE,
favicon: './app/configurations/images/rovaniemi/favicon.png',
favicon: './app/configurations/images/rovaniemi/rovaniemi-favicon.png',
// Navbar logo
logo: 'rovaniemi/rovaniemi-logo.svg',
feedIds: ['Rovaniemi'],
Expand Down
2 changes: 1 addition & 1 deletion app/configurations/config.tampere.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default configMerger(walttiConfig, {
// Navbar logo
logo: 'tampere/tampere-logo.png',

favicon: './app/configurations/images/tampere/favicon.png',
favicon: './app/configurations/images/tampere/tampere-favicon.png',

feedIds: ['tampere', 'digitraffic', 'tampereDRT'],

Expand Down
2 changes: 1 addition & 1 deletion app/configurations/config.turku.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export default configMerger(walttiConfig, {

title: APP_TITLE,

favicon: './app/configurations/images/turku/favicon.png',
favicon: './app/configurations/images/turku/turku-favicon.png',

// Navbar logo
logo: 'turku/foli-logo.png',
Expand Down
2 changes: 1 addition & 1 deletion app/configurations/config.varely.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export default configMerger(walttiConfig, {

// Navbar logo
logo: 'varely/seutuplus-logo-white.svg',
favicon: './app/configurations/images/varely/favicon.png',
favicon: './app/configurations/images/varely/varely-favicon.png',

transportModes: {
bus: {
Expand Down
2 changes: 1 addition & 1 deletion app/configurations/config.walttiOpas.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export default configMerger(walttiConfig, {

// Navbar logo
logo: 'walttiOpas/waltti-logo.png',
favicon: './app/configurations/images/walttiOpas/favicon.png',
favicon: './app/configurations/images/walttiOpas/walttiOpas-favicon.png',

feedIds: ['Salo', 'Kajaani'],

Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
4 changes: 2 additions & 2 deletions build/contextHelper.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ function getAllThemeEntries() {
function faviconPluginFromConfig(config) {
let logo =
config.favicon ||
`./app/configurations/images/${config.CONFIG}/favicon.png`;
`./app/configurations/images/${config.CONFIG}/${config.CONFIG}-favicon.png`;
if (!fs.existsSync(logo)) {
logo = './app/configurations/images/default/favicon.png';
logo = './app/configurations/images/default/default-favicon.png';
}

return new FaviconsWebpackPlugin({
Expand Down

0 comments on commit 507c68c

Please sign in to comment.