Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[email protected] Update supported country list & change redirection from twitter to X platform #2530

Merged
merged 7 commits into from
May 22, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions packages/components/organisms/f-footer/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## v8.8.0

_May 21, 2024_

### Changed

- Stop Portugal, Romania, and New Zealand support.
- Redirect user from Twitter to X Just Eat page.

## v8.7.0

_March 13, 2024_
Expand Down
2 changes: 1 addition & 1 deletion packages/components/organisms/f-footer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@justeat/f-footer",
"version": "8.7.0",
"version": "8.8.0",
"main": "dist/f-footer.umd.min.js",
"maxBundleSize": "80kB",
"files": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ import {
// Social icons
import {
SocialFacebookIcon as FacebookIcon,
SocialTwitterIcon as TwitterIcon,
// TODO: Replace with correct icon for X platform when available
SocialTwitterIcon as XIcon,
SocialYoutubeIcon as YoutubeIcon,
SocialPinterestIcon as PinterestIcon,
SocialInstagramIcon as InstagramIcon,
Expand All @@ -32,7 +33,7 @@ import iconPropsMixin from '../mixins/iconProps.mixin';
export default {
components: {
FacebookIcon,
TwitterIcon,
XIcon,
YoutubeIcon,
PinterestIcon,
InstagramIcon,
Expand Down
24 changes: 0 additions & 24 deletions packages/components/organisms/f-footer/src/tenants/countryList.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,6 @@ export default [
siteUrl: 'https://www.thuisbezorgd.nl',
gtm: 'click_country_nl'
},
{
key: 'nz',
dataTestKey: 'nz',
lang: 'en',
localisedName: 'New Zealand',
siteUrl: 'https://www.menulog.co.nz',
gtm: 'click_country_nz'
},
{
key: 'no',
dataTestKey: 'no',
Expand All @@ -143,22 +135,6 @@ export default [
siteUrl: 'https://www.pyszne.pl',
gtm: 'click_country_pl'
},
{
key: 'pt',
dataTestKey: 'pt',
lang: 'pt',
localisedName: 'Portugal',
siteUrl: 'https://www.takeaway.com/pt',
gtm: 'click_country_pt'
},
{
key: 'ro',
dataTestKey: 'ro',
lang: 'ro',
localisedName: 'România',
siteUrl: 'https://www.takeaway.com/ro',
gtm: 'click_country_ro'
},
{
key: 'es',
dataTestKey: 'es',
Expand Down
6 changes: 3 additions & 3 deletions packages/components/organisms/f-footer/src/tenants/en-AU.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ export default {
gtm: 'click_follow_instagram'
},
{
url: 'https://twitter.com/menulog',
name: 'twitter',
alt: 'Menu Log on Twitter (leads to external site)',
url: 'https://www.x.com/menulog',
name: 'X',
alt: 'Menu Log on X (leads to external site)',
gtm: 'click_follow_twitter'
}
],
Expand Down
6 changes: 3 additions & 3 deletions packages/components/organisms/f-footer/src/tenants/en-GB.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ export default {
gtm: 'click_follow_instagram'
},
{
url: 'https://twitter.com/JustEatUK',
name: 'twitter',
alt: 'Just Eat on Twitter (leads to external site)',
url: 'https://www.x.com/JustEatUK',
name: 'X',
alt: 'Just Eat on X (leads to external site)',
gtm: 'click_follow_twitter'
},
{
Expand Down
6 changes: 3 additions & 3 deletions packages/components/organisms/f-footer/src/tenants/en-IE.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ export default {
gtm: 'click_follow_pinterest'
},
{
url: 'https://www.twitter.com/JustEatIE',
name: 'twitter',
alt: 'Just Eat on Twitter (leads to external site)',
url: 'https://www.x.com/JustEatIE',
name: 'X',
alt: 'Just Eat on X (leads to external site)',
gtm: 'click_follow_twitter'
}
],
Expand Down
6 changes: 3 additions & 3 deletions packages/components/organisms/f-footer/src/tenants/en-NZ.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ export default {
gtm: 'click_follow_facebook'
},
{
url: 'https://twitter.com/Menulog',
name: 'twitter',
alt: 'Menu Log on Twitter (leads to external site)',
url: 'https://www.x.com/Menulog',
name: 'X',
alt: 'Menu Log on X (leads to external site)',
gtm: 'click_follow_twitter'
},
{
Expand Down
6 changes: 3 additions & 3 deletions packages/components/organisms/f-footer/src/tenants/es-ES.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ export default {
gtm: 'click_follow_instagram'
},
{
url: 'https://twitter.com/JustEat_es',
name: 'twitter',
alt: 'Twitter',
url: 'https://www.x.com/JustEat_es',
name: 'X',
alt: 'X',
gtm: 'click_follow_twitter'
}
],
Expand Down
6 changes: 3 additions & 3 deletions packages/components/organisms/f-footer/src/tenants/it-IT.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ export default {
gtm: 'click_follow_facebook'
},
{
url: 'https://twitter.com/JustEat_it',
name: 'twitter',
alt: 'Twitter',
url: 'https://www.x.com/JustEat_it',
name: 'X',
alt: 'X',
gtm: 'click_follow_twitter'
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ describe('Desktop - f-footer component tests', () => {
{ icon: 'ios', expectedUrl: 'apple' },
{ icon: 'android', expectedUrl: 'google' },
{ icon: 'huawei', expectedUrl: 'appgallery' },
{ icon: 'twitter', expectedUrl: 'twitter.com' },
{ icon: 'X', expectedUrl: 'x.com' },
{ icon: 'facebook', expectedUrl: 'facebook.com' },
{ icon: 'youtube', expectedUrl: 'youtube.com' }
];
Expand Down Expand Up @@ -37,11 +37,8 @@ describe('Desktop - f-footer component tests', () => {
{ country: 'it', expectedUrl: 'justeat.it' },
{ country: 'lu', expectedUrl: 'takeaway.com/lu' },
{ country: 'nl', expectedUrl: 'thuisbezorgd.nl' },
{ country: 'nz', expectedUrl: 'menulog.co.nz' },
{ country: 'no', expectedUrl: 'just-eat.no' },
{ country: 'pl', expectedUrl: 'pyszne.pl' },
{ country: 'pt', expectedUrl: 'takeaway.com/pt' },
{ country: 'ro', expectedUrl: 'takeaway.com/ro' },
{ country: 'es', expectedUrl: 'just-eat.es' },
{ country: 'ch_ch', expectedUrl: 'eat.ch' },
{ country: 'ch_en', expectedUrl: 'eat.ch/en' },
Expand Down
Loading