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.

Sign up for GitHub

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

Use Brand with Script Link component on services with variants #4948

Merged
merged 52 commits into from
Jan 8, 2020
Merged

Use Brand with Script Link component on services with variants #4948

Show file tree
Hide file tree
Changes from 32 commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
d159bfc
Merge branch 'latest' of github.com:bbc/simorgh into integrate-new-na…
Dec 9, 2019
9e4456d
Merge branch 'latest' of github.com:bbc/simorgh into integrate-new-na…
Dec 10, 2019
c51d079
Merge branch 'integrate-new-navigation' of github.com:bbc/simorgh int…
Dec 11, 2019
a98596a
Merge branch 'latest' of github.com:bbc/simorgh into integrate-new-na…
Dec 11, 2019
0a76f50
Add variants to config.
Dec 11, 2019
57f5822
Update psammead-brand version.
Dec 11, 2019
648cf71
Add ScriptLink and Skiplink to Brand. Add variantOffscreenText to con…
Dec 11, 2019
102a9b0
Update snapshots.
Dec 11, 2019
116cc6a
Merge branch 'integrate-new-navigation' of github.com:bbc/simorgh int…
Dec 11, 2019
07bc279
Add test.
Dec 12, 2019
76d445d
Rename variant to scriptLinkVariant. Make scriptLinkVariant the varia…
Dec 13, 2019
95244b4
Merge branch 'integrate-new-navigation' of github.com:bbc/simorgh int…
Dec 13, 2019
8cd21cb
Add setCookie() to ScriptLink.
Dec 13, 2019
e3392a5
Add comments.
Dec 13, 2019
7ce2db0
Fix setCookie() not working correctly.
Dec 16, 2019
c05c501
Merge branch 'integrate-new-navigation' of github.com:bbc/simorgh int…
Dec 16, 2019
311f06e
Add tests.
Dec 16, 2019
377fe57
Remove setCookie(), use setPreferredVariantCookie(). Remove getPrefer…
Dec 17, 2019
0cb8ddd
Add skipLinkText translations. Update snapshots. Update tests.
Dec 17, 2019
4c04a31
Merge branch 'integrate-new-navigation' of github.com:bbc/simorgh int…
Dec 17, 2019
5d88225
Update serbian, ukchina, zhongwen configs. Create getOtherVariant(), …
Dec 18, 2019
e545ed3
Update renderScriptLink().
Dec 18, 2019
93ea66f
Get setPreferredVariantCookie from UserContext.
Dec 18, 2019
a199c72
Update tests. Remove useParams() hook.
Dec 19, 2019
946d5c4
Merge branch 'integrate-new-navigation' of github.com:bbc/simorgh int…
Dec 19, 2019
378eeee
Add tests.
Dec 19, 2019
eab7017
Apply suggestions from code review
Dec 19, 2019
c475745
Apply suggestions from code review.
Dec 19, 2019
f6e82e1
Merge branch '4009-use-brand-with-script-link' of github.com:bbc/simo…
Dec 19, 2019
b25b61b
Merge branch 'integrate-new-navigation' of github.com:bbc/simorgh int…
Dec 20, 2019
4e80017
Update serbian, ukchina, zhongwen configs. Update scriptLink switchin…
Dec 20, 2019
ef88a23
Update test.
Dec 20, 2019
7630067
Use RequestContext.
Dec 24, 2019
eb90bec
Undo .env changes.
Dec 24, 2019
634ac86
Merge branch '4009-use-brand-with-script-link' of github.com:bbc/simo…
Dec 24, 2019
cc2a3e7
Merge branch 'latest' of github.com:bbc/simorgh into 4009-use-brand-w…
Dec 24, 2019
6c8c5d2
Update test.
Dec 24, 2019
24af7be
Revert "Use RequestContext."
Dec 24, 2019
b4b07ae
Update renderScriptLink
Dec 24, 2019
7f0da7a
Merge branch 'integrate-new-navigation' of github.com:bbc/simorgh int…
Dec 24, 2019
c5ca93a
Update variant configs.
Dec 24, 2019
430ce88
Update bundleSizeConfig.
Dec 27, 2019
7ef5256
Update e2es.
Dec 27, 2019
eecd6d1
Merge branch 'integrate-new-navigation' of github.com:bbc/simorgh int…
Jan 2, 2020
c5d68db
Update snapshots.
Jan 2, 2020
31c1417
Revert scriptLink config editing.
Jan 3, 2020
d9b325f
Remove reassignment.
Jan 6, 2020
3d0d842
Merge branch 'integrate-new-navigation' of github.com:bbc/simorgh int…
Jan 6, 2020
4e8089f
Merge branch 'integrate-new-navigation' of github.com:bbc/simorgh int…
Jan 6, 2020
2ac6c6c
Merge branch 'integrate-new-navigation' of github.com:bbc/simorgh int…
Jan 6, 2020
39c5785
Merge branch 'integrate-new-navigation' into 4009-use-brand-with-scri…
tochwill Jan 8, 2020
3e608cd
Update snapshots
tochwill Jan 8, 2020
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
15 changes: 12 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@
"@bbc/moment-timezone-include": "^1.1.2",
"@bbc/psammead-amp-geo": "^1.1.2",
"@bbc/psammead-assets": "^2.10.3",
"@bbc/psammead-brand": "^5.0.11",
"@bbc/psammead-bulleted-list": "1.0.0",
"@bbc/psammead-brand": "^5.1.0-alpha.7",
"@bbc/psammead-bulletin": "^1.0.0",
"@bbc/psammead-bulleted-list": "1.0.0",
"@bbc/psammead-calendars": "^2.0.3",
"@bbc/psammead-caption": "^2.2.20",
"@bbc/psammead-consent-banner": "^2.3.22",
Expand All @@ -78,6 +78,7 @@
"@bbc/psammead-navigation": "^6.0.0-alpha.15",
"@bbc/psammead-paragraph": "^2.2.20",
"@bbc/psammead-rich-text-transforms": "^2.0.0",
"@bbc/psammead-script-link": "^1.0.0-alpha.13",
"@bbc/psammead-section-label": "^3.0.8",
"@bbc/psammead-sitewide-links": "^4.0.2",
"@bbc/psammead-story-promo": "^2.7.18",
Expand Down
Loading