diff --git a/.env.development b/.env.development index 91d7bd0..ce33bcd 100644 --- a/.env.development +++ b/.env.development @@ -8,7 +8,6 @@ LOGOUT_URL='http://localhost:18000/logout' 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 -LOGO_POWERED_BY_OPEN_EDX_URL_SVG=https://edx-cdn.org/v3/stage/open-edx-tag.svg FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico CSRF_TOKEN_API_PATH='/csrf/api/v1/token' REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh' diff --git a/.env.test b/.env.test index dcf23da..9501a12 100644 --- a/.env.test +++ b/.env.test @@ -8,7 +8,6 @@ LOGOUT_URL='http://localhost:18000/logout' 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 -LOGO_POWERED_BY_OPEN_EDX_URL_SVG=https://edx-cdn.org/v3/stage/open-edx-tag.svg FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico CSRF_TOKEN_API_PATH='/csrf/api/v1/token' REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh' diff --git a/README.rst b/README.rst index acbea22..832f3cc 100644 --- a/README.rst +++ b/README.rst @@ -30,6 +30,12 @@ To start the MFE and enable the feature in LMS: From there, simply load the configured address/port. You should be prompted to log into your LMS if you are not already, and then redirected to your home page. +Plugins +------- +This MFE can be customized using `Frontend Plugin Framework `_. + +The parts of this MFE that can be customized in that manner are documented `here `_. + Contributing ------------ diff --git a/example.env.config.js b/example.env.config.js index 67d2313..78f1751 100644 --- a/example.env.config.js +++ b/example.env.config.js @@ -29,7 +29,6 @@ module.exports = { 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', - LOGO_POWERED_BY_OPEN_EDX_URL_SVG: 'https://edx-cdn.org/v3/stage/open-edx-tag.svg', FAVICON_URL: 'https://edx-cdn.org/v3/default/favicon.ico', CSRF_TOKEN_API_PATH: '/csrf/api/v1/token', REFRESH_ACCESS_TOKEN_ENDPOINT: 'http://localhost:18000/login_refresh', diff --git a/package-lock.json b/package-lock.json index 1216bec..b203481 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2123,9 +2123,10 @@ } }, "node_modules/@edx/frontend-component-footer": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/@edx/frontend-component-footer/-/frontend-component-footer-13.1.0.tgz", - "integrity": "sha512-Rtv8dfQmL75El8kF8dG9nYF1Cqj2AbWPLVLE4b0XTvipfx2RMeDKpgAO5XLAzTt0h+5fmiMCGhVEv3Y70Xu5pQ==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/@edx/frontend-component-footer/-/frontend-component-footer-14.0.0.tgz", + "integrity": "sha512-3Riz6ippBnPz1oq6gZgFBx27bJkNL+rwwKrv0uCuHV/5MscS1aYeKx1ZAMuUsxkKcGX6uhyU6PwM6agvnhKfNQ==", + "peer": true, "dependencies": { "@fortawesome/fontawesome-svg-core": "6.5.2", "@fortawesome/free-brands-svg-icons": "6.5.2", @@ -2149,6 +2150,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.5.2.tgz", "integrity": "sha512-gBxPg3aVO6J0kpfHNILc+NMhXnqHumFxOmjYCFfOiLZfwhnnfhtsdA2hfJlDnj+8PjAs6kKQPenOTKj3Rf7zHw==", "hasInstallScript": true, + "peer": true, "engines": { "node": ">=6" } @@ -2158,6 +2160,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.5.2.tgz", "integrity": "sha512-5CdaCBGl8Rh9ohNdxeeTMxIj8oc3KNBgIeLMvJosBMdslK/UnEB8rzyDRrbKdL1kDweqBPo4GT9wvnakHWucZw==", "hasInstallScript": true, + "peer": true, "dependencies": { "@fortawesome/fontawesome-common-types": "6.5.2" }, @@ -2170,6 +2173,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.5.2.tgz", "integrity": "sha512-zi5FNYdmKLnEc0jc0uuHH17kz/hfYTg4Uei0wMGzcoCL/4d3WM3u1VMc0iGGa31HuhV5i7ZK8ZlTCQrHqRHSGQ==", "hasInstallScript": true, + "peer": true, "dependencies": { "@fortawesome/fontawesome-common-types": "6.5.2" }, @@ -2182,6 +2186,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.5.2.tgz", "integrity": "sha512-QWFZYXFE7O1Gr1dTIp+D6UcFUF0qElOnZptpi7PBUMylJh+vFmIedVe1Ir6RM1t2tEQLLSV1k7bR4o92M+uqlw==", "hasInstallScript": true, + "peer": true, "dependencies": { "@fortawesome/fontawesome-common-types": "6.5.2" }, @@ -5795,6 +5800,7 @@ "version": "20.0.1", "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-20.0.1.tgz", "integrity": "sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==", + "peer": true, "dependencies": { "@types/node": "*", "@types/tough-cookie": "*", @@ -5982,7 +5988,8 @@ "node_modules/@types/tough-cookie": { "version": "4.0.5", "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz", - "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==" + "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==", + "peer": true }, "node_modules/@types/warning": { "version": "3.0.3", @@ -7611,6 +7618,7 @@ "version": "0.2.6", "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz", "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==", + "peer": true, "dependencies": { "fast-json-stable-stringify": "2.x" }, @@ -15563,7 +15571,8 @@ "node_modules/make-error": { "version": "1.3.6", "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", - "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==" + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "peer": true }, "node_modules/make-event-props": { "version": "1.6.2", diff --git a/package.json b/package.json index a57e857..fc67c67 100755 --- a/package.json +++ b/package.json @@ -28,8 +28,7 @@ "dependencies": { "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2", "@edx/browserslist-config": "^1.1.0", - "@edx/frontend-component-footer": "13.1.0", - "@edx/frontend-enterprise-hotjar": "7.1.0", + "@edx/frontend-enterprise-hotjar": "3.0.0", "@edx/frontend-platform": "8.0.0", "@edx/openedx-atlas": "^0.6.0", "@edx/react-unit-test-utils": "3.0.0", @@ -38,6 +37,7 @@ "@fortawesome/free-solid-svg-icons": "^5.15.4", "@fortawesome/react-fontawesome": "^0.2.0", "@openedx/frontend-plugin-framework": "^1.2.0", + "@openedx/frontend-slot-footer": "^1.0.2", "@openedx/paragon": "^22.2.2", "@optimizely/react-sdk": "^2.9.2", "@redux-beacon/segment": "^1.1.0", diff --git a/src/App.jsx b/src/App.jsx index da5bc25..5f3db99 100755 --- a/src/App.jsx +++ b/src/App.jsx @@ -6,7 +6,7 @@ import { logError } from '@edx/frontend-platform/logging'; import { initializeHotjar } from '@edx/frontend-enterprise-hotjar'; import { ErrorPage, AppContext } from '@edx/frontend-platform/react'; -import Footer from '@edx/frontend-component-footer'; +import FooterSlot from '@openedx/frontend-slot-footer'; import { Alert } from '@openedx/paragon'; import { RequestKeys } from 'data/constants/requests'; @@ -109,7 +109,7 @@ export const App = () => { )} -