Compare commits
19 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
12511689e8 | ||
|
|
f084393cc9 | ||
|
|
4035ff122c | ||
|
|
159b5a842e | ||
|
|
b06c8b5d01 | ||
|
|
c79da49208 | ||
|
|
82b3310a8f | ||
|
|
fcd641259b | ||
|
|
509276df12 | ||
|
|
4527baef5a | ||
|
|
8183143ae5 | ||
|
|
91311f25da | ||
|
|
ccef5de855 | ||
|
|
01fa97055f | ||
|
|
3cff0970a3 | ||
|
|
f2c879999d | ||
|
|
d206ecf3ad | ||
|
|
e0a634900d | ||
|
|
fb06f7d9f9 |
@@ -1,3 +1,4 @@
|
||||
// eslint-disable-next-line import/no-extraneous-dependencies
|
||||
const { createConfig } = require('@edx/frontend-build');
|
||||
|
||||
module.exports = createConfig('eslint');
|
||||
|
||||
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@@ -14,7 +14,7 @@ jobs:
|
||||
node: [16]
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Setup Nodejs
|
||||
|
||||
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
@@ -9,7 +9,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Setup Node.js
|
||||
|
||||
2
Makefile
2
Makefile
@@ -1,5 +1,5 @@
|
||||
transifex_resource = frontend-component-footer
|
||||
transifex_langs = "ar,fr,es_419,zh_CN"
|
||||
transifex_langs = "ar,fr,es_419,zh_CN,pt,it,de,uk,ru,hi,fr_CA"
|
||||
|
||||
transifex_utils = ./node_modules/.bin/transifex-utils.js
|
||||
i18n = ./src/i18n
|
||||
|
||||
54559
package-lock.json
generated
54559
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
14
package.json
14
package.json
@@ -34,21 +34,21 @@
|
||||
"homepage": "https://github.com/openedx/frontend-component-footer#readme",
|
||||
"devDependencies": {
|
||||
"@edx/brand": "npm:@edx/brand-openedx@1.1.0",
|
||||
"@edx/frontend-build": "9.2.2",
|
||||
"@edx/frontend-platform": "3.0.1",
|
||||
"@edx/frontend-build": "12.3.0",
|
||||
"@edx/frontend-platform": "^3.0.1",
|
||||
"@edx/paragon": "19.25.3",
|
||||
"enzyme": "3.11.0",
|
||||
"enzyme-adapter-react-16": "1.15.6",
|
||||
"enzyme-adapter-react-16": "1.15.7",
|
||||
"husky": "7.0.4",
|
||||
"prop-types": "15.8.1",
|
||||
"react": "16.14.0",
|
||||
"react-dom": "16.14.0",
|
||||
"react-redux": "7.2.8",
|
||||
"react-router-dom": "5.3.3",
|
||||
"react-redux": "7.2.9",
|
||||
"react-router-dom": "5.3.4",
|
||||
"react-test-renderer": "16.14.0",
|
||||
"reactifex": "1.1.1",
|
||||
"redux": "4.2.0",
|
||||
"semantic-release": "17.4.7"
|
||||
"semantic-release": "19.0.5"
|
||||
},
|
||||
"dependencies": {
|
||||
"@fortawesome/fontawesome-svg-core": "1.2.36",
|
||||
@@ -58,7 +58,7 @@
|
||||
"@fortawesome/react-fontawesome": "0.2.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@edx/frontend-platform": "^3.0.0",
|
||||
"@edx/frontend-platform": "^2.0.0 || ^3.0.0",
|
||||
"prop-types": "^15.5.10",
|
||||
"react": "^16.9.0",
|
||||
"react-dom": "^16.9.0"
|
||||
|
||||
@@ -22,6 +22,11 @@
|
||||
"pin"
|
||||
],
|
||||
"automerge": true
|
||||
},
|
||||
{
|
||||
"matchPackagePatterns": ["@edx"],
|
||||
"matchUpdateTypes": ["minor", "patch"],
|
||||
"automerge": true
|
||||
}
|
||||
],
|
||||
"timezone": "America/New_York"
|
||||
|
||||
@@ -23,14 +23,6 @@ class SiteFooter extends React.Component {
|
||||
this.externalLinkClickHandler = this.externalLinkClickHandler.bind(this);
|
||||
}
|
||||
|
||||
getLocalePrefix(locale) {
|
||||
const twoLetterPrefix = locale.substring(0, 2).toLowerCase();
|
||||
if (twoLetterPrefix === 'en') {
|
||||
return '';
|
||||
}
|
||||
return `/${twoLetterPrefix}`;
|
||||
}
|
||||
|
||||
externalLinkClickHandler(event) {
|
||||
const label = event.currentTarget.getAttribute('href');
|
||||
const eventName = EVENT_NAMES.FOOTER_LINK;
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import React from 'react';
|
||||
/* eslint-disable react/prop-types */
|
||||
import React, { useMemo } from 'react';
|
||||
import renderer from 'react-test-renderer';
|
||||
import { mount } from 'enzyme';
|
||||
import { IntlProvider } from '@edx/frontend-platform/i18n';
|
||||
@@ -6,71 +7,69 @@ import { AppContext } from '@edx/frontend-platform/react';
|
||||
|
||||
import Footer from './Footer';
|
||||
|
||||
const FooterWithContext = ({ locale = 'es' }) => {
|
||||
const contextValue = useMemo(() => ({
|
||||
authenticatedUser: null,
|
||||
config: {
|
||||
LOGO_TRADEMARK_URL: process.env.LOGO_TRADEMARK_URL,
|
||||
LMS_BASE_URL: process.env.LMS_BASE_URL,
|
||||
},
|
||||
}), []);
|
||||
|
||||
return (
|
||||
<IntlProvider locale={locale}>
|
||||
<AppContext.Provider
|
||||
value={contextValue}
|
||||
>
|
||||
<Footer />
|
||||
</AppContext.Provider>
|
||||
</IntlProvider>
|
||||
);
|
||||
};
|
||||
|
||||
const FooterWithLanguageSelector = ({ languageSelected = () => {} }) => {
|
||||
const contextValue = useMemo(() => ({
|
||||
authenticatedUser: null,
|
||||
config: {
|
||||
LOGO_TRADEMARK_URL: process.env.LOGO_TRADEMARK_URL,
|
||||
LMS_BASE_URL: process.env.LMS_BASE_URL,
|
||||
},
|
||||
}), []);
|
||||
|
||||
return (
|
||||
<IntlProvider locale="en">
|
||||
<AppContext.Provider
|
||||
value={contextValue}
|
||||
>
|
||||
<Footer
|
||||
onLanguageSelected={languageSelected}
|
||||
supportedLanguages={[
|
||||
{ label: 'English', value: 'en' },
|
||||
{ label: 'Español', value: 'es' },
|
||||
]}
|
||||
/>
|
||||
</AppContext.Provider>
|
||||
</IntlProvider>
|
||||
);
|
||||
};
|
||||
|
||||
describe('<Footer />', () => {
|
||||
describe('renders correctly', () => {
|
||||
it('renders without a language selector', () => {
|
||||
const tree = renderer
|
||||
.create((
|
||||
<IntlProvider locale="en">
|
||||
<AppContext.Provider
|
||||
value={{
|
||||
authenticatedUser: null,
|
||||
config: {
|
||||
LOGO_TRADEMARK_URL: process.env.LOGO_TRADEMARK_URL,
|
||||
LMS_BASE_URL: process.env.LMS_BASE_URL,
|
||||
},
|
||||
}}
|
||||
>
|
||||
<Footer />
|
||||
</AppContext.Provider>
|
||||
</IntlProvider>
|
||||
))
|
||||
.create(<FooterWithContext locale="en" />)
|
||||
.toJSON();
|
||||
expect(tree).toMatchSnapshot();
|
||||
});
|
||||
it('renders without a language selector in es', () => {
|
||||
const tree = renderer
|
||||
.create((
|
||||
<IntlProvider locale="es">
|
||||
<AppContext.Provider
|
||||
value={{
|
||||
authenticatedUser: null,
|
||||
config: {
|
||||
LOGO_TRADEMARK_URL: process.env.LOGO_TRADEMARK_URL,
|
||||
LMS_BASE_URL: process.env.LMS_BASE_URL,
|
||||
},
|
||||
}}
|
||||
>
|
||||
<Footer />
|
||||
</AppContext.Provider>
|
||||
</IntlProvider>
|
||||
))
|
||||
.create(<FooterWithContext locale="es" />)
|
||||
.toJSON();
|
||||
expect(tree).toMatchSnapshot();
|
||||
});
|
||||
it('renders with a language selector', () => {
|
||||
const tree = renderer
|
||||
.create((
|
||||
<IntlProvider locale="en">
|
||||
<AppContext.Provider
|
||||
value={{
|
||||
authenticatedUser: null,
|
||||
config: {
|
||||
LOGO_TRADEMARK_URL: process.env.LOGO_TRADEMARK_URL,
|
||||
LMS_BASE_URL: process.env.LMS_BASE_URL,
|
||||
},
|
||||
}}
|
||||
>
|
||||
<Footer
|
||||
onLanguageSelected={() => {}}
|
||||
supportedLanguages={[
|
||||
{ label: 'English', value: 'en' },
|
||||
{ label: 'Español', value: 'es' },
|
||||
]}
|
||||
/>
|
||||
</AppContext.Provider>
|
||||
</IntlProvider>
|
||||
))
|
||||
.create(<FooterWithLanguageSelector />)
|
||||
.toJSON();
|
||||
expect(tree).toMatchSnapshot();
|
||||
});
|
||||
@@ -79,27 +78,7 @@ describe('<Footer />', () => {
|
||||
describe('handles language switching', () => {
|
||||
it('calls onLanguageSelected prop when a language is changed', () => {
|
||||
const mockHandleLanguageSelected = jest.fn();
|
||||
const wrapper = mount((
|
||||
<IntlProvider locale="en">
|
||||
<AppContext.Provider
|
||||
value={{
|
||||
authenticatedUser: null,
|
||||
config: {
|
||||
LOGO_TRADEMARK_URL: process.env.LOGO_TRADEMARK_URL,
|
||||
LMS_BASE_URL: process.env.LMS_BASE_URL,
|
||||
},
|
||||
}}
|
||||
>
|
||||
<Footer
|
||||
onLanguageSelected={mockHandleLanguageSelected}
|
||||
supportedLanguages={[
|
||||
{ label: 'English', value: 'en' },
|
||||
{ label: 'Español', value: 'es' },
|
||||
]}
|
||||
/>
|
||||
</AppContext.Provider>
|
||||
</IntlProvider>
|
||||
));
|
||||
const wrapper = mount(<FooterWithLanguageSelector languageSelected={mockHandleLanguageSelected} />);
|
||||
|
||||
wrapper.find('form').simulate('submit', {
|
||||
target: {
|
||||
|
||||
@@ -1,31 +1,27 @@
|
||||
import arMessages from './messages/ar.json';
|
||||
import caMessages from './messages/ca.json';
|
||||
// no need to import en messages-- they are in the defaultMessage field
|
||||
import es419Messages from './messages/es_419.json';
|
||||
import frMessages from './messages/fr.json';
|
||||
import es419Messages from './messages/es_419.json';
|
||||
import zhcnMessages from './messages/zh_CN.json';
|
||||
import heMessages from './messages/he.json';
|
||||
import idMessages from './messages/id.json';
|
||||
import kokrMessages from './messages/ko_kr.json';
|
||||
import plMessages from './messages/pl.json';
|
||||
import ptbrMessages from './messages/pt_br.json';
|
||||
import ruMessages from './messages/ru.json';
|
||||
import thMessages from './messages/th.json';
|
||||
import ptMessages from './messages/pt.json';
|
||||
import itMessages from './messages/it.json';
|
||||
import ukMessages from './messages/uk.json';
|
||||
import deMessages from './messages/de.json';
|
||||
import ruMessages from './messages/ru.json';
|
||||
import hiMessages from './messages/hi.json';
|
||||
import frCAMessages from './messages/fr_CA.json';
|
||||
// no need to import en messages-- they are in the defaultMessage field
|
||||
|
||||
const messages = {
|
||||
ar: arMessages,
|
||||
'es-419': es419Messages,
|
||||
fr: frMessages,
|
||||
'zh-cn': zhcnMessages,
|
||||
ca: caMessages,
|
||||
he: heMessages,
|
||||
id: idMessages,
|
||||
'ko-kr': kokrMessages,
|
||||
pl: plMessages,
|
||||
'pt-br': ptbrMessages,
|
||||
pt: ptMessages,
|
||||
it: itMessages,
|
||||
de: deMessages,
|
||||
hi: hiMessages,
|
||||
'fr-ca': frCAMessages,
|
||||
ru: ruMessages,
|
||||
th: thMessages,
|
||||
uk: ukMessages,
|
||||
};
|
||||
|
||||
|
||||
@@ -1,32 +1 @@
|
||||
{
|
||||
"footer.socialLinks.srText.facebook": "Like edX on Facebook",
|
||||
"footer.socialLinks.srText.twitter": "Follow edX on Twitter",
|
||||
"footer.socialLinks.srText.youtube": "Subscribe to the edX YouTube channel",
|
||||
"footer.socialLinks.srText.linkedin": "Follow edX on LinkedIn",
|
||||
"footer.socialLinks.srText.reddit": "Subscribe to the edX subreddit",
|
||||
"footer.languageForm.select.label": "Choose Language",
|
||||
"footer.languageForm.submit.label": "Apply",
|
||||
"footer.edxLinks.about": "About",
|
||||
"footer.edxLinks.business": "edX for Business",
|
||||
"footer.edxLinks.affiliates": "Affiliates",
|
||||
"footer.edxLinks.openEdx": "Open edX",
|
||||
"footer.edxLinks.careers": "Careers",
|
||||
"footer.edxLinks.news": "News",
|
||||
"footer.legalLinks.heading": "Legal",
|
||||
"footer.legalLinks.termsOfService": "Terms of Service & Honor Code",
|
||||
"footer.legalLinks.privacyPolicy": "Privacy Policy",
|
||||
"footer.legalLinks.a11yPolicy": "Accessibility Policy",
|
||||
"footer.legalLinks.trademarkPolicy": "Trademark Policy",
|
||||
"footer.legalLinks.sitemap": "Sitemap",
|
||||
"footer.connectLinks.heading": "Connect",
|
||||
"footer.connectLinks.blog": "Blog",
|
||||
"footer.connectLinks.contact": "Contact Us",
|
||||
"footer.connectLinks.help": "Help Center",
|
||||
"footer.connectLinks.mediaKit": "Media Kit",
|
||||
"footer.connectLinks.donate": "Donate",
|
||||
"footer.mobileApp.apple": "Download the edX mobile app from the Apple App Store",
|
||||
"footer.mobileApp.google": "Download the edX mobile app from Google Play",
|
||||
"footer.logo.altText": "Powered by Open edX",
|
||||
"footer.logo.ariaLabel": "edX Home",
|
||||
"footer.ariaLabel": "Page Footer"
|
||||
}
|
||||
{}
|
||||
@@ -1,32 +1 @@
|
||||
{
|
||||
"footer.socialLinks.srText.facebook": "Like edX on Facebook",
|
||||
"footer.socialLinks.srText.twitter": "Follow edX on Twitter",
|
||||
"footer.socialLinks.srText.youtube": "Subscribe to the edX YouTube channel",
|
||||
"footer.socialLinks.srText.linkedin": "Follow edX on LinkedIn",
|
||||
"footer.socialLinks.srText.reddit": "Subscribe to the edX subreddit",
|
||||
"footer.languageForm.select.label": "Choose Language",
|
||||
"footer.languageForm.submit.label": "Apply",
|
||||
"footer.edxLinks.about": "About",
|
||||
"footer.edxLinks.business": "edX for Business",
|
||||
"footer.edxLinks.affiliates": "Affiliates",
|
||||
"footer.edxLinks.openEdx": "Open edX",
|
||||
"footer.edxLinks.careers": "Careers",
|
||||
"footer.edxLinks.news": "News",
|
||||
"footer.legalLinks.heading": "Legal",
|
||||
"footer.legalLinks.termsOfService": "Terms of Service & Honor Code",
|
||||
"footer.legalLinks.privacyPolicy": "Privacy Policy",
|
||||
"footer.legalLinks.a11yPolicy": "Accessibility Policy",
|
||||
"footer.legalLinks.trademarkPolicy": "Trademark Policy",
|
||||
"footer.legalLinks.sitemap": "Sitemap",
|
||||
"footer.connectLinks.heading": "Connect",
|
||||
"footer.connectLinks.blog": "Blog",
|
||||
"footer.connectLinks.contact": "Contact Us",
|
||||
"footer.connectLinks.help": "Help Center",
|
||||
"footer.connectLinks.mediaKit": "Media Kit",
|
||||
"footer.connectLinks.donate": "Donate",
|
||||
"footer.mobileApp.apple": "Download the edX mobile app from the Apple App Store",
|
||||
"footer.mobileApp.google": "Download the edX mobile app from Google Play",
|
||||
"footer.logo.altText": "Powered by Open edX",
|
||||
"footer.logo.ariaLabel": "edX Home",
|
||||
"footer.ariaLabel": "Page Footer"
|
||||
}
|
||||
{}
|
||||
@@ -1,32 +1 @@
|
||||
{
|
||||
"footer.socialLinks.srText.facebook": "Like edX on Facebook",
|
||||
"footer.socialLinks.srText.twitter": "Follow edX on Twitter",
|
||||
"footer.socialLinks.srText.youtube": "Subscribe to the edX YouTube channel",
|
||||
"footer.socialLinks.srText.linkedin": "Follow edX on LinkedIn",
|
||||
"footer.socialLinks.srText.reddit": "Subscribe to the edX subreddit",
|
||||
"footer.languageForm.select.label": "Choose Language",
|
||||
"footer.languageForm.submit.label": "Apply",
|
||||
"footer.edxLinks.about": "About",
|
||||
"footer.edxLinks.business": "edX for Business",
|
||||
"footer.edxLinks.affiliates": "Affiliates",
|
||||
"footer.edxLinks.openEdx": "Open edX",
|
||||
"footer.edxLinks.careers": "Careers",
|
||||
"footer.edxLinks.news": "News",
|
||||
"footer.legalLinks.heading": "Legal",
|
||||
"footer.legalLinks.termsOfService": "Terms of Service & Honor Code",
|
||||
"footer.legalLinks.privacyPolicy": "Privacy Policy",
|
||||
"footer.legalLinks.a11yPolicy": "Accessibility Policy",
|
||||
"footer.legalLinks.trademarkPolicy": "Trademark Policy",
|
||||
"footer.legalLinks.sitemap": "Sitemap",
|
||||
"footer.connectLinks.heading": "Connect",
|
||||
"footer.connectLinks.blog": "Blog",
|
||||
"footer.connectLinks.contact": "Contact Us",
|
||||
"footer.connectLinks.help": "Help Center",
|
||||
"footer.connectLinks.mediaKit": "Media Kit",
|
||||
"footer.connectLinks.donate": "Donate",
|
||||
"footer.mobileApp.apple": "Download the edX mobile app from the Apple App Store",
|
||||
"footer.mobileApp.google": "Download the edX mobile app from Google Play",
|
||||
"footer.logo.altText": "Powered by Open edX",
|
||||
"footer.logo.ariaLabel": "edX Home",
|
||||
"footer.ariaLabel": "Page Footer"
|
||||
}
|
||||
{}
|
||||
@@ -1 +0,0 @@
|
||||
{}
|
||||
@@ -1 +0,0 @@
|
||||
{}
|
||||
@@ -1,32 +1 @@
|
||||
{
|
||||
"footer.socialLinks.srText.facebook": "Like edX on Facebook",
|
||||
"footer.socialLinks.srText.twitter": "Follow edX on Twitter",
|
||||
"footer.socialLinks.srText.youtube": "Subscribe to the edX YouTube channel",
|
||||
"footer.socialLinks.srText.linkedin": "Follow edX on LinkedIn",
|
||||
"footer.socialLinks.srText.reddit": "Subscribe to the edX subreddit",
|
||||
"footer.languageForm.select.label": "Choose Language",
|
||||
"footer.languageForm.submit.label": "Apply",
|
||||
"footer.edxLinks.about": "About",
|
||||
"footer.edxLinks.business": "edX for Business",
|
||||
"footer.edxLinks.affiliates": "Affiliates",
|
||||
"footer.edxLinks.openEdx": "Open edX",
|
||||
"footer.edxLinks.careers": "Careers",
|
||||
"footer.edxLinks.news": "News",
|
||||
"footer.legalLinks.heading": "Legal",
|
||||
"footer.legalLinks.termsOfService": "Terms of Service & Honor Code",
|
||||
"footer.legalLinks.privacyPolicy": "Privacy Policy",
|
||||
"footer.legalLinks.a11yPolicy": "Accessibility Policy",
|
||||
"footer.legalLinks.trademarkPolicy": "Trademark Policy",
|
||||
"footer.legalLinks.sitemap": "Sitemap",
|
||||
"footer.connectLinks.heading": "Connect",
|
||||
"footer.connectLinks.blog": "Blog",
|
||||
"footer.connectLinks.contact": "Contact Us",
|
||||
"footer.connectLinks.help": "Help Center",
|
||||
"footer.connectLinks.mediaKit": "Media Kit",
|
||||
"footer.connectLinks.donate": "Donate",
|
||||
"footer.mobileApp.apple": "Download the edX mobile app from the Apple App Store",
|
||||
"footer.mobileApp.google": "Download the edX mobile app from Google Play",
|
||||
"footer.logo.altText": "Powered by Open edX",
|
||||
"footer.logo.ariaLabel": "edX Home",
|
||||
"footer.ariaLabel": "Page Footer"
|
||||
}
|
||||
{}
|
||||
Reference in New Issue
Block a user