Skip to content

Commit

Permalink
v1.19.0 - Updated AU/NZ country selector and some other links (#85)
Browse files Browse the repository at this point in the history
* v1.19.0 - Fix country selector lists for AU and NZ
Update some old and http footer links

* v1.19.0 - Update Norway restaurant signup link

* v1.19.0 - Add data-test-ids for country selector
  • Loading branch information
xander-marjoram authored Apr 30, 2019
1 parent 81ef44c commit df6bc37
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 20 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,21 @@ 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).


v1.19.0
------------------------------
*April 30, 2019*

### Added
- United Kingdom to Australia and New Zealand's country selectors

### Removed
- New Zealand from New Zealand's country selector
- Australia from Australia's country selector

### Updated
- Old (http) or dead links in footer.


v1.18.1
------------------------------
*April 15, 2019*
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@justeat/f-footer",
"description": "Fozzie footer – Footer Component for Just Eat projects",
"version": "1.18.1",
"version": "1.19.0",
"main": "dist/js/index.js",
"files": [
"dist",
Expand Down
4 changes: 2 additions & 2 deletions src/templates/footer/partials/country-selector.hbs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div class="c-countrySelector">
<button type="button" class="o-btn o-btnLink c-countrySelector-link c-countrySelector-link--selected" data-toggle-target="countrySelector-list" aria-label="{{ i18n "changeCurrentCountry" }}">
<button type="button" class="o-btn o-btnLink c-countrySelector-link c-countrySelector-link--selected" data-toggle-target="countrySelector-list" data-test-id="countrySelector-button" aria-label="{{ i18n "changeCurrentCountry" }}">
{{!-- temporarily return back previos img solution untill WH-692 is fixed --}}
{{!-- {{> je-svg-sprite cssClass="c-icon--flag--small" spriteUrl=(concat svgSpriteModel.iconsSpritePath '#icons-flags-flag.' (i18n "currentCountryFlagKey")) }} --}}
<img class="c-icon--flag--small" src="{{ miscIconPaths.currentCountryFlagIconUrl }}" alt="" />
<p>{{ i18n "currentCountryLocalisedName" }}</p>
<p data-test-id="countrySelector-current-country">{{ i18n "currentCountryLocalisedName" }}</p>
{{!-- {{> je-svg-sprite cssClass="c-countrySelector-chevron c-icon--chevron--small" spriteUrl=(concat svgSpriteModel.iconsSpritePath "#icons-arrows-chevron") }} --}}
<img class="c-countrySelector-chevron c-icon--chevron--small" src="{{ miscIconPaths.chevronIconUrl }}" alt="" />
</button>
Expand Down
34 changes: 17 additions & 17 deletions src/templates/resources/footer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"text": "Firmaaftale"
},
{
"url": "http://blog.just-eat.dk/",
"url": "/blog",
"text": "Just Eat Blog"
},
{
Expand Down Expand Up @@ -101,7 +101,7 @@
"aboutUs": "Om os",
"aboutUsLinks": [
{
"url": "http://justeat-partner.dk/",
"url": "https://restaurants.just-eat.dk/",
"text": "Restaurant påmelding"
},
{
Expand Down Expand Up @@ -1000,12 +1000,6 @@
"currentCountryLocalisedName": "Australia",
"currentCountryFlagKey": "au",
"countries": [
{
"key": "au",
"flagUrl": "australiaFlagIconUrl",
"localisedName": "Australia",
"siteUrl": "https://www.menulog.com.au"
},
{
"key": "br",
"flagUrl": "brasilFlagIconUrl",
Expand Down Expand Up @@ -1065,6 +1059,12 @@
"flagUrl": "switzerlandFlagIconUrl",
"localisedName": "Switzerland",
"siteUrl": "https://www.eat.ch"
},
{
"key": "gb",
"flagUrl": "ukFlagIconUrl",
"localisedName": "United Kingdom",
"siteUrl": "https://www.just-eat.co.uk"
}
]
},
Expand Down Expand Up @@ -1249,12 +1249,6 @@
"localisedName": "Italy",
"siteUrl": "https://www.justeat.it"
},
{
"key": "nz",
"flagUrl": "newzealandFlagIconUrl",
"localisedName": "New Zealand",
"siteUrl": "https://www.menulog.co.nz"
},
{
"key": "no",
"flagUrl": "norwayFlagIconUrl",
Expand All @@ -1272,6 +1266,12 @@
"flagUrl": "switzerlandFlagIconUrl",
"localisedName": "Switzerland",
"siteUrl": "https://www.eat.ch"
},
{
"key": "gb",
"flagUrl": "ukFlagIconUrl",
"localisedName": "United Kingdom",
"siteUrl": "https://www.just-eat.co.uk"
}
]
},
Expand Down Expand Up @@ -1545,7 +1545,7 @@
"text": "Price Promise"
},
{
"url": "http://www.getmoreorders.ie/",
"url": "https://restaurants.just-eat.ie/",
"text": "Restaurant sign-up"
},
{
Expand Down Expand Up @@ -1847,7 +1847,7 @@
"aboutUs": "Om oss",
"aboutUsLinks": [
{
"url": "https://www.just-eat.no/take-away/bedrift-overtidsmat",
"url": "/take-away/bedrift-overtidsmat",
"text": "Restaurant påmelding"
},
{
Expand Down Expand Up @@ -1895,7 +1895,7 @@
"altText": ""
},
{
"url": "http://blog.just-eat.no/",
"url": "/blog",
"key": "rss",
"iconSrc": "rssIconUrl",
"altText": ""
Expand Down

0 comments on commit df6bc37

Please sign in to comment.