Compare commits
3 Commits
v10.1.4
...
abutterwor
| Author | SHA1 | Date | |
|---|---|---|---|
|
4a820357ee | ||
|
|
c99c06ba87 | ||
|
|
637282d20b |
@@ -1,19 +0,0 @@
|
||||
ACCESS_TOKEN_COOKIE_NAME=edx-jwt-cookie-header-payload
|
||||
BASE_URL=localhost:8080
|
||||
CREDENTIALS_BASE_URL=http://localhost:18150
|
||||
CSRF_TOKEN_API_PATH=/csrf/api/v1/token
|
||||
ECOMMERCE_BASE_URL=http://localhost:18130
|
||||
LANGUAGE_PREFERENCE_COOKIE_NAME=openedx-language-preference
|
||||
LMS_BASE_URL=http://localhost:18000
|
||||
LOGIN_URL=http://localhost:18000/login
|
||||
LOGOUT_URL=http://localhost:18000/login
|
||||
MARKETING_SITE_BASE_URL=http://localhost:18000
|
||||
ORDER_HISTORY_URL=localhost:1996/orders
|
||||
REFRESH_ACCESS_TOKEN_ENDPOINT=http://localhost:18000/login_refresh
|
||||
SEGMENT_KEY=null
|
||||
SITE_NAME=Open edX
|
||||
USER_INFO_COOKIE_NAME=edx-user-info
|
||||
LOGO_URL=https://edx-cdn.org/v3/default/logo.svg
|
||||
LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg
|
||||
LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg
|
||||
FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
|
||||
@@ -1,4 +1,3 @@
|
||||
coverage
|
||||
dist
|
||||
example
|
||||
node_modules
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
const { createConfig } = require('@edx/frontend-build');
|
||||
|
||||
module.exports = createConfig('eslint');
|
||||
26
.github/workflows/ci.yml
vendored
26
.github/workflows/ci.yml
vendored
@@ -1,26 +0,0 @@
|
||||
name: Default CI
|
||||
on: [push, pull_request]
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Setup Nodejs
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: 12
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
- name: Validate package-lock.json changes
|
||||
run: make validate-no-uncommitted-package-lock-changes
|
||||
- name: Lint
|
||||
run: npm run lint
|
||||
- name: Test
|
||||
run: npm run test
|
||||
- name: i18n_extract
|
||||
run: npm run i18n_extract
|
||||
- name: Coverage
|
||||
uses: codecov/codecov-action@v1
|
||||
37
.github/workflows/release.yml
vendored
37
.github/workflows/release.yml
vendored
@@ -1,37 +0,0 @@
|
||||
name: Release CI
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
jobs:
|
||||
release:
|
||||
name: Release
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Setup Node.js
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: 12
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
- name: Validate package-lock.json changes
|
||||
run: make validate-no-uncommitted-package-lock-changes
|
||||
- name: Lint
|
||||
run: npm run lint
|
||||
- name: Test
|
||||
run: npm run test
|
||||
- name: i18n_extract
|
||||
run: npm run i18n_extract
|
||||
- name: Coverage
|
||||
uses: codecov/codecov-action@v1
|
||||
- name: Build
|
||||
run: npm run build
|
||||
- name: Release
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_GITHUB_TOKEN }}
|
||||
NPM_TOKEN: ${{ secrets.SEMANTIC_RELEASE_NPM_TOKEN }}
|
||||
run: npx semantic-release
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@@ -8,5 +8,3 @@ temp
|
||||
|
||||
src/i18n/transifex_input.json
|
||||
temp/babel-plugin-react-intl
|
||||
/.vscode
|
||||
module.config.js
|
||||
|
||||
16
.travis.yml
Normal file
16
.travis.yml
Normal file
@@ -0,0 +1,16 @@
|
||||
language: node_js
|
||||
node_js: 12
|
||||
install:
|
||||
- npm install
|
||||
script:
|
||||
- npm run lint
|
||||
- npm run i18n_extract
|
||||
- npm run test
|
||||
- npm run build
|
||||
after_success:
|
||||
- npx semantic-release
|
||||
- npm run coveralls
|
||||
env:
|
||||
global:
|
||||
- secure: dxQadqP6tsoJzHcqs/Hs5AjE42z45q8ZeWKP5HcjbXoJURB4gc1uIxLky0FA6ZpulaTgRVTLcWQbx9yOODc9PQuFnFEDWlCg5EP8tONzeu7BVlJvV5eakgGUhl9w2pekBKsTGhK5dDg2y2D8bGfIL55UX81uiWeytp8s/y8QNs/FNXx9ScJnfhnC+2RfW52fB7iW12F1VYdQfVe43o5PsHze+YhB3FU/ztGe3iMaQiq9QplZWpvqQMpI7pTjyUAX8ITiiPS6UvLFObgpXpfjZdgd+yveFoi3z8o8F0NkmzBphFeSYFjFZE0qJ8bnGNIZldanMeuUgHmDeTwVmKQFhH2LqqnfcdGgW6UsKcHkSN1G51zzad2dEwAHrgxj1NkMp3JfEed2C7Kvntl6KRjVDmYZqHJvt+e+AHNbpjzblOW8tYMIrdz0TeJdk4D9pP3B3tRCtP6fvQ3GLzAMnaCrSsN6hZ9YVxWku8sg8WNEDHl14sZsdgk312MlHIdiUw97FHGrqx/NCix4IkUlCBDbKYbKzbZp20FfzZcwNRNH74+k6xpOnMGSfq8gByEhm9y02MBL76HiAI2VGct2La1ExaUfoikYGoNaZpFcZyOZKo6PYTYHpiUJmqrEnDyVQEOOXUaVsxWXwnYq/mU4nOEPKCRbNpPoksZdNxf6jlmMi8s=
|
||||
- secure: lrlV0WQaXTRJ2lqDkFZ+1RkRb7YM/STOViOHUNboXb5+1ReVwY0wklFDVk/Qigp3jkbqWfzkBmEjSDVGDLD61QjpGY4BsxZ/Jn3+KUdo0n82Ym6cI/je1fH2gqDLi4U8bylmnkI5oEjV/1txDxkj4hF5w/Leo/oGue3xQohpi//ihhm/PxzExj+QiDqyZPZ5RQZeqLfPEU3Wff04vLE5bRmy1nDTZrgm5Wb1n5ItGsyrUyrCGuAM9kIEun65Snb8hxCuU9pSm1w/xF73iOGLiiC8KZhLu6SxSKoC872ai1GpUXNIqA8kpVeH0Erf5opMtqJT3jTTan/VOFQEoOeAKhR0ga+5rfK2jkhhN77B98dGVndNCfBpDlgQxVv42H6riFk3payZT262QiUqDejiBDtSPTokTGxf7xFtQkQQahhxVXzC2HRKEkDTXNSP8cvk2JJ4zCcUgxJpycudLMuC/Xv0upK+Q0caItBrHxfVNnRKkjKqlDxRhA8nXTY8d2n19FNi7wahCECbyweJJ76EaJaa/Ib6remUBrbGLoQ2PkaSMBHAcn3+7+H/6x11b2s1RHj5qyfIyrvZcDDyNuxdXwpOkhtrkwZsjgtOfXL6IuxW5FExgPPr8B9nNwJJKdTxyxgfqtwBR5+m9nrMixzT6AMe95torZ6eX40gKZ/O9EU=
|
||||
@@ -16,11 +16,13 @@ To install frontend-component-footer into your project::
|
||||
|
||||
Component Usage::
|
||||
|
||||
import Footer, { messages } from '@edx/frontend-component-footer';
|
||||
import Footer from '@edx/frontend-component-footer';
|
||||
import footerMessages from '@edx/frontend-component-footer/src/i18n/index';
|
||||
|
||||
...
|
||||
|
||||
<Footer
|
||||
handleAllTrackEvents={(eventName, properties) => {/* track click event */}}
|
||||
onLanguageSelected={(languageCode) => {/* set language */}}
|
||||
supportedLanguages={[
|
||||
{ label: 'English', value: 'en'},
|
||||
@@ -28,6 +30,7 @@ Component Usage::
|
||||
]}
|
||||
/>
|
||||
|
||||
- handleAllTrackEvents (required)
|
||||
- onLanguageSelected (optional)
|
||||
- supportedLanguages (optional)
|
||||
|
||||
@@ -52,8 +55,8 @@ Build the component::
|
||||
|
||||
npm run build
|
||||
|
||||
.. |Build Status| image:: https://api.travis-ci.com/edx/frontend-component-footer.svg?branch=master
|
||||
:target: https://travis-ci.com/edx/frontend-component-footer
|
||||
.. |Build Status| image:: https://api.travis-ci.org/edx/frontend-component-footer.svg?branch=master
|
||||
:target: https://travis-ci.org/edx/frontend-component-footer
|
||||
.. |Coveralls| image:: https://img.shields.io/coveralls/edx/frontend-component-footer.svg?branch=master
|
||||
:target: https://coveralls.io/github/edx/frontend-component-footer
|
||||
.. |npm_version| image:: https://img.shields.io/npm/v/@edx/frontend-component-footer.svg
|
||||
|
||||
@@ -1,3 +1,35 @@
|
||||
const { createConfig } = require('@edx/frontend-build');
|
||||
|
||||
module.exports = createConfig('babel-preserve-modules');
|
||||
// These preset packages are included by frontend-build.
|
||||
// TODO: Add to frontend-build and leverage that config.
|
||||
module.exports = {
|
||||
presets: [
|
||||
[
|
||||
'@babel/preset-env',
|
||||
{
|
||||
modules: false,
|
||||
},
|
||||
],
|
||||
'@babel/preset-react',
|
||||
],
|
||||
plugins: [
|
||||
'@babel/plugin-proposal-object-rest-spread',
|
||||
'@babel/plugin-proposal-class-properties',
|
||||
],
|
||||
env: {
|
||||
i18n: {
|
||||
plugins: [
|
||||
[
|
||||
'react-intl',
|
||||
{
|
||||
messagesDir: './temp/babel-plugin-react-intl',
|
||||
moduleSourceName: '@edx/frontend-i18n',
|
||||
},
|
||||
],
|
||||
],
|
||||
},
|
||||
test: {
|
||||
presets: [
|
||||
'@babel/preset-env',
|
||||
],
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
@@ -1,33 +1,25 @@
|
||||
import 'babel-polyfill';
|
||||
|
||||
import React from 'react';
|
||||
import ReactDOM from 'react-dom';
|
||||
import { initialize, getConfig, subscribe, APP_READY } from '@edx/frontend-platform';
|
||||
import { AppContext, AppProvider } from '@edx/frontend-platform/react';
|
||||
import Footer from '@edx/frontend-component-footer';
|
||||
import { render } from 'react-dom';
|
||||
import { IntlProvider } from '@edx/frontend-i18n';
|
||||
|
||||
import './index.scss';
|
||||
import Footer from '../src';
|
||||
|
||||
subscribe(APP_READY, () => {
|
||||
ReactDOM.render(
|
||||
<AppProvider>
|
||||
<AppContext.Provider value={{
|
||||
authenticatedUser: null,
|
||||
config: getConfig(),
|
||||
}}>
|
||||
<Footer
|
||||
onLanguageSelected={() => {}}
|
||||
supportedLanguages={[
|
||||
{ label: 'English', value: 'en' },
|
||||
{ label: 'Español', value: 'es' },
|
||||
]}
|
||||
/>
|
||||
</AppContext.Provider>
|
||||
</AppProvider>,
|
||||
document.getElementById('root'),
|
||||
);
|
||||
});
|
||||
const App = () => (
|
||||
<div>
|
||||
<IntlProvider locale="en">
|
||||
<Footer
|
||||
/* eslint-disable-next-line no-unused-vars */
|
||||
handleAllTrackEvents={(eventName, properties) => {}}
|
||||
/* eslint-disable-next-line no-unused-vars */
|
||||
onLanguageSelected={(languageCode) => {}}
|
||||
supportedLanguages={[
|
||||
{ label: 'English', value: 'en' },
|
||||
{ label: 'Español', value: 'es' },
|
||||
]}
|
||||
/>
|
||||
</IntlProvider>
|
||||
</div>
|
||||
);
|
||||
|
||||
initialize({
|
||||
messages: []
|
||||
});
|
||||
render(<App />, document.getElementById('root'));
|
||||
|
||||
@@ -1,6 +1,2 @@
|
||||
@import "@edx/brand/paragon/fonts";
|
||||
@import "@edx/brand/paragon/variables";
|
||||
@import "@edx/paragon/scss/core/core";
|
||||
@import "@edx/brand/paragon/overrides";
|
||||
|
||||
@import "@edx/frontend-component-footer/footer";
|
||||
@import "~@edx/paragon/scss/core/core.scss";
|
||||
@import "../src/footer";
|
||||
|
||||
16604
package-lock.json
generated
16604
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
75
package.json
75
package.json
@@ -1,27 +1,23 @@
|
||||
{
|
||||
"name": "@edx/frontend-component-footer",
|
||||
"version": "1.0.0-semantically-released",
|
||||
"description": "Footer component for use when building Open edX frontend applications",
|
||||
"description": "Site footer component for use when building edX frontend applications",
|
||||
"main": "dist/index.js",
|
||||
"publishConfig": {
|
||||
"access": "public"
|
||||
},
|
||||
"scripts": {
|
||||
"build": "make build",
|
||||
"gc": "commit",
|
||||
"commitmsg": "commitlint -e $GIT_PARAMS",
|
||||
"coveralls": "cat ./coverage/lcov.info | coveralls",
|
||||
"i18n_extract": "BABEL_ENV=i18n fedx-scripts babel src --quiet > /dev/null",
|
||||
"lint": "fedx-scripts eslint --ext .js --ext .jsx .",
|
||||
"snapshot": "fedx-scripts jest --updateSnapshot",
|
||||
"precommit": "npm run lint",
|
||||
"prepublishOnly": "npm run build",
|
||||
"start": "fedx-scripts webpack-dev-server --progress",
|
||||
"test": "fedx-scripts jest --coverage"
|
||||
},
|
||||
"files": [
|
||||
"/dist"
|
||||
],
|
||||
"husky": {
|
||||
"hooks": {
|
||||
"pre-commit": "npm run lint",
|
||||
"commit-msg": "commitlint -e $GIT_PARAMS"
|
||||
}
|
||||
"test": "fedx-scripts jest --coverage",
|
||||
"snapshot": "fedx-scripts jest --updateSnapshot"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
@@ -34,38 +30,37 @@
|
||||
},
|
||||
"homepage": "https://github.com/edx/frontend-component-footer#readme",
|
||||
"devDependencies": {
|
||||
"@commitlint/cli": "8.2.0",
|
||||
"@commitlint/config-angular": "8.2.0",
|
||||
"@commitlint/prompt": "8.2.0",
|
||||
"@commitlint/prompt-cli": "8.2.0",
|
||||
"@edx/brand": "npm:@edx/brand-openedx@1.1.0",
|
||||
"@edx/frontend-build": "5.4.0",
|
||||
"@edx/frontend-platform": "1.8.1",
|
||||
"@edx/paragon": "12.0.5",
|
||||
"codecov": "3.7.2",
|
||||
"enzyme": "3.10.0",
|
||||
"enzyme-adapter-react-16": "1.14.0",
|
||||
"husky": "3.0.9",
|
||||
"prop-types": "15.7.2",
|
||||
"react": "16.10.2",
|
||||
"react-dom": "16.10.2",
|
||||
"react-redux": "^7.1.1",
|
||||
"react-router-dom": "^5.1.2",
|
||||
"react-test-renderer": "16.10.2",
|
||||
"reactifex": "1.1.1",
|
||||
"redux": "^4.0.4"
|
||||
"@commitlint/cli": "^7.1.2",
|
||||
"@commitlint/config-angular": "^6.0.2",
|
||||
"@commitlint/prompt": "^6.0.2",
|
||||
"@commitlint/prompt-cli": "^6.0.2",
|
||||
"@edx/frontend-build": "^1.0.1",
|
||||
"@edx/frontend-i18n": "^2.1.0",
|
||||
"@edx/frontend-logging": "^2.0.2",
|
||||
"@edx/paragon": "^7.1.3",
|
||||
"coveralls": "^3.0.0",
|
||||
"enzyme": "^3.3.0",
|
||||
"enzyme-adapter-react-16": "^1.1.1",
|
||||
"husky": "^0.14.3",
|
||||
"prop-types": "^15.5.10",
|
||||
"react": "^16.4.2",
|
||||
"react-dom": "^16.2.0",
|
||||
"react-test-renderer": "^16.6.0",
|
||||
"reactifex": "^1.1.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@fortawesome/fontawesome-svg-core": "1.2.34",
|
||||
"@fortawesome/free-brands-svg-icons": "5.8.2",
|
||||
"@fortawesome/free-regular-svg-icons": "5.8.2",
|
||||
"@fortawesome/free-solid-svg-icons": "5.8.2",
|
||||
"@fortawesome/react-fontawesome": "0.1.14"
|
||||
"@fortawesome/fontawesome-svg-core": "^1.2.17",
|
||||
"@fortawesome/free-brands-svg-icons": "^5.8.1",
|
||||
"@fortawesome/free-regular-svg-icons": "^5.8.1",
|
||||
"@fortawesome/free-solid-svg-icons": "^5.8.1",
|
||||
"@fortawesome/react-fontawesome": "^0.1.4"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@edx/frontend-platform": "^1.8.0",
|
||||
"@edx/frontend-i18n": "^2.1.0",
|
||||
"@edx/frontend-logging": "^2.0.2",
|
||||
"@edx/paragon": "^7.1.3",
|
||||
"prop-types": "^15.5.10",
|
||||
"react": "^16.9.0",
|
||||
"react-dom": "^16.9.0"
|
||||
"react": "^16.4.2",
|
||||
"react-dom": "^16.2.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
{
|
||||
"extends": [
|
||||
"config:base"
|
||||
],
|
||||
"patch": {
|
||||
"automerge": true
|
||||
},
|
||||
"rebaseStalePrs": true
|
||||
}
|
||||
@@ -1,17 +1,11 @@
|
||||
import React from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
|
||||
import { sendTrackEvent } from '@edx/frontend-platform/analytics';
|
||||
import { ensureConfig } from '@edx/frontend-platform/config';
|
||||
import { AppContext } from '@edx/frontend-platform/react';
|
||||
import { injectIntl, intlShape } from '@edx/frontend-i18n';
|
||||
|
||||
import messages from './Footer.messages';
|
||||
import FooterLogo from '../edx-openedx-logo-tag.png';
|
||||
import LanguageSelector from './LanguageSelector';
|
||||
|
||||
ensureConfig([
|
||||
'LOGO_TRADEMARK_URL',
|
||||
], 'Footer component');
|
||||
|
||||
const EVENT_NAMES = {
|
||||
FOOTER_LINK: 'edx.bi.footer.link',
|
||||
};
|
||||
@@ -37,7 +31,7 @@ class SiteFooter extends React.Component {
|
||||
category: 'outbound_link',
|
||||
label,
|
||||
};
|
||||
sendTrackEvent(eventName, properties);
|
||||
this.props.handleAllTrackEvents(eventName, properties);
|
||||
}
|
||||
|
||||
render() {
|
||||
@@ -48,40 +42,38 @@ class SiteFooter extends React.Component {
|
||||
intl,
|
||||
} = this.props;
|
||||
const showLanguageSelector = supportedLanguages.length > 0 && onLanguageSelected;
|
||||
const { config } = this.context;
|
||||
|
||||
return (
|
||||
<footer
|
||||
role="contentinfo"
|
||||
aria-label={intl.formatMessage(messages['footer.logo.ariaLabel'])}
|
||||
className="footer d-flex border-top py-3 px-4"
|
||||
>
|
||||
<div className="container-fluid d-flex">
|
||||
<div className="container d-flex">
|
||||
<a
|
||||
className="d-block"
|
||||
className="d-block mb-3"
|
||||
href="https://open.edx.org"
|
||||
aria-label={intl.formatMessage(messages['footer.logo.ariaLabel'])}
|
||||
>
|
||||
<img
|
||||
style={{ maxHeight: 45 }}
|
||||
src={logo || config.LOGO_TRADEMARK_URL}
|
||||
style={{ maxWidth: 150 }}
|
||||
src={logo || FooterLogo}
|
||||
alt={intl.formatMessage(messages['footer.logo.altText'])}
|
||||
/>
|
||||
</a>
|
||||
<div className="flex-grow-1" />
|
||||
{showLanguageSelector && (
|
||||
{showLanguageSelector &&
|
||||
<LanguageSelector
|
||||
options={supportedLanguages}
|
||||
onSubmit={onLanguageSelected}
|
||||
/>
|
||||
)}
|
||||
}
|
||||
</div>
|
||||
</footer>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
SiteFooter.contextType = AppContext;
|
||||
|
||||
SiteFooter.propTypes = {
|
||||
intl: intlShape.isRequired,
|
||||
logo: PropTypes.string,
|
||||
@@ -90,6 +82,7 @@ SiteFooter.propTypes = {
|
||||
label: PropTypes.string.isRequired,
|
||||
value: PropTypes.string.isRequired,
|
||||
})),
|
||||
handleAllTrackEvents: PropTypes.func.isRequired,
|
||||
};
|
||||
|
||||
SiteFooter.defaultProps = {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { defineMessages } from '@edx/frontend-platform/i18n';
|
||||
import { defineMessages } from '@edx/frontend-i18n';
|
||||
|
||||
const messages = defineMessages({
|
||||
'footer.socialLinks.srText.facebook': {
|
||||
|
||||
@@ -1,71 +1,47 @@
|
||||
import React from 'react';
|
||||
import renderer from 'react-test-renderer';
|
||||
import { mount } from 'enzyme';
|
||||
import { IntlProvider } from '@edx/frontend-platform/i18n';
|
||||
import { AppContext } from '@edx/frontend-platform/react';
|
||||
import { IntlProvider } from '@edx/frontend-i18n';
|
||||
|
||||
import Footer from './Footer';
|
||||
|
||||
describe('<Footer />', () => {
|
||||
describe('renders correctly', () => {
|
||||
it('renders without a language selector', () => {
|
||||
const mockHandleAllTrackEvents = jest.fn();
|
||||
const tree = renderer
|
||||
.create((
|
||||
<IntlProvider locale="en">
|
||||
<AppContext.Provider
|
||||
value={{
|
||||
authenticatedUser: null,
|
||||
config: {
|
||||
LOGO_TRADEMARK_URL: process.env.LOGO_TRADEMARK_URL,
|
||||
},
|
||||
}}
|
||||
>
|
||||
<Footer />
|
||||
</AppContext.Provider>
|
||||
<Footer handleAllTrackEvents={mockHandleAllTrackEvents} />
|
||||
</IntlProvider>
|
||||
))
|
||||
.toJSON();
|
||||
expect(tree).toMatchSnapshot();
|
||||
});
|
||||
it('renders without a language selector in es', () => {
|
||||
const mockHandleAllTrackEvents = jest.fn();
|
||||
const tree = renderer
|
||||
.create((
|
||||
<IntlProvider locale="es">
|
||||
<AppContext.Provider
|
||||
value={{
|
||||
authenticatedUser: null,
|
||||
config: {
|
||||
LOGO_TRADEMARK_URL: process.env.LOGO_TRADEMARK_URL,
|
||||
},
|
||||
}}
|
||||
>
|
||||
<Footer />
|
||||
</AppContext.Provider>
|
||||
<Footer handleAllTrackEvents={mockHandleAllTrackEvents} />
|
||||
</IntlProvider>
|
||||
))
|
||||
.toJSON();
|
||||
expect(tree).toMatchSnapshot();
|
||||
});
|
||||
it('renders with a language selector', () => {
|
||||
const mockHandleAllTrackEvents = jest.fn();
|
||||
const tree = renderer
|
||||
.create((
|
||||
<IntlProvider locale="en">
|
||||
<AppContext.Provider
|
||||
value={{
|
||||
authenticatedUser: null,
|
||||
config: {
|
||||
LOGO_TRADEMARK_URL: process.env.LOGO_TRADEMARK_URL,
|
||||
},
|
||||
}}
|
||||
>
|
||||
<Footer
|
||||
onLanguageSelected={() => {}}
|
||||
supportedLanguages={[
|
||||
{ label: 'English', value: 'en' },
|
||||
{ label: 'Español', value: 'es' },
|
||||
]}
|
||||
/>
|
||||
</AppContext.Provider>
|
||||
<Footer
|
||||
handleAllTrackEvents={mockHandleAllTrackEvents}
|
||||
onLanguageSelected={() => {}}
|
||||
supportedLanguages={[
|
||||
{ label: 'English', value: 'en' },
|
||||
{ label: 'Español', value: 'es' },
|
||||
]}
|
||||
/>
|
||||
</IntlProvider>
|
||||
))
|
||||
.toJSON();
|
||||
@@ -75,25 +51,18 @@ describe('<Footer />', () => {
|
||||
|
||||
describe('handles language switching', () => {
|
||||
it('calls onLanguageSelected prop when a language is changed', () => {
|
||||
const mockHandleAllTrackEvents = jest.fn();
|
||||
const mockHandleLanguageSelected = jest.fn();
|
||||
const wrapper = mount((
|
||||
<IntlProvider locale="en">
|
||||
<AppContext.Provider
|
||||
value={{
|
||||
authenticatedUser: null,
|
||||
config: {
|
||||
LOGO_TRADEMARK_URL: process.env.LOGO_TRADEMARK_URL,
|
||||
},
|
||||
}}
|
||||
>
|
||||
<Footer
|
||||
onLanguageSelected={mockHandleLanguageSelected}
|
||||
supportedLanguages={[
|
||||
{ label: 'English', value: 'en' },
|
||||
{ label: 'Español', value: 'es' },
|
||||
]}
|
||||
/>
|
||||
</AppContext.Provider>
|
||||
<Footer
|
||||
handleAllTrackEvents={mockHandleAllTrackEvents}
|
||||
onLanguageSelected={mockHandleLanguageSelected}
|
||||
supportedLanguages={[
|
||||
{ label: 'English', value: 'en' },
|
||||
{ label: 'Español', value: 'es' },
|
||||
]}
|
||||
/>
|
||||
</IntlProvider>
|
||||
));
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import React from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/i18n';
|
||||
import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-i18n';
|
||||
|
||||
const LanguageSelector = ({
|
||||
intl, options, onSubmit, ...props
|
||||
@@ -17,8 +17,8 @@ const LanguageSelector = ({
|
||||
onSubmit={handleSubmit}
|
||||
{...props}
|
||||
>
|
||||
{/* eslint-disable-next-line jsx-a11y/label-has-for */}
|
||||
<div className="form-group">
|
||||
{/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
|
||||
<label htmlFor="site-footer-language-select" className="d-inline-block m-0">
|
||||
<FormattedMessage
|
||||
id="footer.languageForm.select.label"
|
||||
@@ -32,7 +32,8 @@ const LanguageSelector = ({
|
||||
name="site-footer-language-select"
|
||||
defaultValue={intl.locale}
|
||||
>
|
||||
{options.map(({ value, label }) => <option key={value} value={value}>{label}</option>)}
|
||||
{options.map(({ value, label }) =>
|
||||
<option key={value} value={value}>{label}</option>)}
|
||||
</select>
|
||||
<button className="btn btn-outline-primary btn-sm" type="submit">
|
||||
<FormattedMessage
|
||||
|
||||
@@ -2,23 +2,24 @@
|
||||
|
||||
exports[`<Footer /> renders correctly renders with a language selector 1`] = `
|
||||
<footer
|
||||
aria-label="edX Home"
|
||||
className="footer d-flex border-top py-3 px-4"
|
||||
role="contentinfo"
|
||||
>
|
||||
<div
|
||||
className="container-fluid d-flex"
|
||||
className="container d-flex"
|
||||
>
|
||||
<a
|
||||
aria-label="edX Home"
|
||||
className="d-block"
|
||||
className="d-block mb-3"
|
||||
href="https://open.edx.org"
|
||||
>
|
||||
<img
|
||||
alt="Powered by Open edX"
|
||||
src="https://edx-cdn.org/v3/default/logo-trademark.svg"
|
||||
src="test-file-stub"
|
||||
style={
|
||||
Object {
|
||||
"maxHeight": 45,
|
||||
"maxWidth": 150,
|
||||
}
|
||||
}
|
||||
/>
|
||||
@@ -74,23 +75,24 @@ exports[`<Footer /> renders correctly renders with a language selector 1`] = `
|
||||
|
||||
exports[`<Footer /> renders correctly renders without a language selector 1`] = `
|
||||
<footer
|
||||
aria-label="edX Home"
|
||||
className="footer d-flex border-top py-3 px-4"
|
||||
role="contentinfo"
|
||||
>
|
||||
<div
|
||||
className="container-fluid d-flex"
|
||||
className="container d-flex"
|
||||
>
|
||||
<a
|
||||
aria-label="edX Home"
|
||||
className="d-block"
|
||||
className="d-block mb-3"
|
||||
href="https://open.edx.org"
|
||||
>
|
||||
<img
|
||||
alt="Powered by Open edX"
|
||||
src="https://edx-cdn.org/v3/default/logo-trademark.svg"
|
||||
src="test-file-stub"
|
||||
style={
|
||||
Object {
|
||||
"maxHeight": 45,
|
||||
"maxWidth": 150,
|
||||
}
|
||||
}
|
||||
/>
|
||||
@@ -104,23 +106,24 @@ exports[`<Footer /> renders correctly renders without a language selector 1`] =
|
||||
|
||||
exports[`<Footer /> renders correctly renders without a language selector in es 1`] = `
|
||||
<footer
|
||||
aria-label="edX Home"
|
||||
className="footer d-flex border-top py-3 px-4"
|
||||
role="contentinfo"
|
||||
>
|
||||
<div
|
||||
className="container-fluid d-flex"
|
||||
className="container d-flex"
|
||||
>
|
||||
<a
|
||||
aria-label="edX Home"
|
||||
className="d-block"
|
||||
className="d-block mb-3"
|
||||
href="https://open.edx.org"
|
||||
>
|
||||
<img
|
||||
alt="Powered by Open edX"
|
||||
src="https://edx-cdn.org/v3/default/logo-trademark.svg"
|
||||
src="test-file-stub"
|
||||
style={
|
||||
Object {
|
||||
"maxHeight": 45,
|
||||
"maxWidth": 150,
|
||||
}
|
||||
}
|
||||
/>
|
||||
|
||||
BIN
src/edx-openedx-logo-tag.png
Normal file
BIN
src/edx-openedx-logo-tag.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
@@ -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,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"
|
||||
}
|
||||
{}
|
||||
@@ -2,25 +2,3 @@ import Enzyme from 'enzyme';
|
||||
import Adapter from 'enzyme-adapter-react-16';
|
||||
|
||||
Enzyme.configure({ adapter: new Adapter() });
|
||||
|
||||
// These configuration values are usually set in webpack's EnvironmentPlugin however
|
||||
// Jest does not use webpack so we need to set these so for testing
|
||||
process.env.ACCESS_TOKEN_COOKIE_NAME = 'edx-jwt-cookie-header-payload';
|
||||
process.env.BASE_URL = 'localhost:1995';
|
||||
process.env.CREDENTIALS_BASE_URL = 'http://localhost:18150';
|
||||
process.env.CSRF_TOKEN_API_PATH = '/csrf/api/v1/token';
|
||||
process.env.ECOMMERCE_BASE_URL = 'http://localhost:18130';
|
||||
process.env.LANGUAGE_PREFERENCE_COOKIE_NAME = 'openedx-language-preference';
|
||||
process.env.LMS_BASE_URL = 'http://localhost:18000';
|
||||
process.env.LOGIN_URL = 'http://localhost:18000/login';
|
||||
process.env.LOGOUT_URL = 'http://localhost:18000/login';
|
||||
process.env.MARKETING_SITE_BASE_URL = 'http://localhost:18000';
|
||||
process.env.ORDER_HISTORY_URL = 'localhost:1996/orders';
|
||||
process.env.REFRESH_ACCESS_TOKEN_ENDPOINT = 'http://localhost:18000/login_refresh';
|
||||
process.env.SEGMENT_KEY = 'segment_whoa';
|
||||
process.env.SITE_NAME = 'edX';
|
||||
process.env.USER_INFO_COOKIE_NAME = 'edx-user-info';
|
||||
process.env.LOGO_URL = 'https://edx-cdn.org/v3/default/logo.svg';
|
||||
process.env.LOGO_TRADEMARK_URL = 'https://edx-cdn.org/v3/default/logo-trademark.svg';
|
||||
process.env.LOGO_WHITE_URL = 'https://edx-cdn.org/v3/default/logo-white.svg';
|
||||
process.env.FAVICON_URL = 'https://edx-cdn.org/v3/default/favicon.ico';
|
||||
|
||||
1275
stats.json
Normal file
1275
stats.json
Normal file
File diff suppressed because one or more lines are too long
@@ -7,9 +7,4 @@ module.exports = createConfig('webpack-dev', {
|
||||
path: path.resolve(__dirname, 'example/dist'),
|
||||
publicPath: '/',
|
||||
},
|
||||
resolve: {
|
||||
alias: {
|
||||
'@edx/frontend-component-footer': path.resolve(__dirname, 'src'),
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user