diff --git a/.gitignore b/.gitignore index 177ba411..a38427e4 100755 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ node_modules npm-debug.log coverage module.config.js +env.config.* dist/ src/i18n/transifex_input.json diff --git a/package-lock.json b/package-lock.json index 98062bdb..152f7a2a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,11 +10,10 @@ "license": "AGPL-3.0", "dependencies": { "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2", - "@edx/frontend-component-footer": "^14.3.0", + "@edx/frontend-component-footer": "^14.6.0", "@edx/frontend-component-header": "^6.2.0", "@edx/frontend-platform": "^8.3.3", "@edx/openedx-atlas": "^0.6.0", - "@openedx/frontend-slot-footer": "^1.1.0", "@openedx/paragon": "^22.16.0", "@reduxjs/toolkit": "1.9.7", "@tinymce/tinymce-react": "5.1.1", @@ -2030,9 +2029,9 @@ } }, "node_modules/@edx/frontend-component-footer": { - "version": "14.3.0", - "resolved": "https://registry.npmjs.org/@edx/frontend-component-footer/-/frontend-component-footer-14.3.0.tgz", - "integrity": "sha512-domQOIsAf+b1YiQvpt245Cfz6OgrKKw3TJrDIFS+J70Mn98MpCGGg55mBraOzTfopsouzp5bN03F1PLkXyjnEQ==", + "version": "14.6.0", + "resolved": "https://registry.npmjs.org/@edx/frontend-component-footer/-/frontend-component-footer-14.6.0.tgz", + "integrity": "sha512-cgRhom6W/WErQ9yvLmfgB6ANBs+rBDLOH73NcvJIhfwWgAg67q+MLUscIbcX9N/9Yykk+kb7Ytr3CDefiKS7HA==", "license": "AGPL-3.0", "dependencies": { "@fortawesome/fontawesome-svg-core": "6.7.2", @@ -2040,6 +2039,7 @@ "@fortawesome/free-regular-svg-icons": "6.7.2", "@fortawesome/free-solid-svg-icons": "6.7.2", "@fortawesome/react-fontawesome": "0.2.2", + "@openedx/frontend-plugin-framework": "^1.7.0", "classnames": "^2.5.1", "jest-environment-jsdom": "^29.7.0", "lodash": "^4.17.21", @@ -3665,20 +3665,6 @@ } } }, - "node_modules/@openedx/frontend-slot-footer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@openedx/frontend-slot-footer/-/frontend-slot-footer-1.1.0.tgz", - "integrity": "sha512-EpWWRctxjucF7/5RMTWzdwiYHJDNgQ+b6a4PJvZX04u4u9ydURTSDeOlbmsu6ps/DsLU3NnQhG5VyRRwXGEhcg==", - "license": "AGPL-3.0", - "dependencies": { - "@openedx/frontend-plugin-framework": "^1.5.0" - }, - "peerDependencies": { - "@edx/frontend-component-footer": "*", - "react": "^17.0.0 || ^18.0.0", - "react-dom": "^17.0.0 || ^18.0.0" - } - }, "node_modules/@openedx/paragon": { "version": "22.16.1", "resolved": "https://registry.npmjs.org/@openedx/paragon/-/paragon-22.16.1.tgz", diff --git a/package.json b/package.json index f7b43670..cf633b66 100644 --- a/package.json +++ b/package.json @@ -30,11 +30,10 @@ }, "dependencies": { "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2", - "@edx/frontend-component-footer": "^14.3.0", + "@edx/frontend-component-footer": "^14.6.0", "@edx/frontend-component-header": "^6.2.0", "@edx/frontend-platform": "^8.3.3", "@edx/openedx-atlas": "^0.6.0", - "@openedx/frontend-slot-footer": "^1.1.0", "@openedx/paragon": "^22.16.0", "@reduxjs/toolkit": "1.9.7", "@tinymce/tinymce-react": "5.1.1", diff --git a/src/discussions/discussions-home/DiscussionsHome.jsx b/src/discussions/discussions-home/DiscussionsHome.jsx index c46247dd..1f57935f 100644 --- a/src/discussions/discussions-home/DiscussionsHome.jsx +++ b/src/discussions/discussions-home/DiscussionsHome.jsx @@ -27,7 +27,7 @@ import { selectPostEditorVisible } from '../posts/data/selectors'; import { isCourseStatusValid } from '../utils'; import useFeedbackWrapper from './FeedbackWrapper'; -const FooterSlot = lazy(() => import('@openedx/frontend-slot-footer')); +const FooterSlot = lazy(() => import('@edx/frontend-component-footer').then(module => ({ default: module.FooterSlot }))); const PostActionsBar = lazy(() => import('../posts/post-actions-bar/PostActionsBar')); const CourseTabsNavigation = lazy(() => import('../../components/NavigationBar/CourseTabsNavigation')); const LegacyBreadcrumbMenu = lazy(() => import('../navigation/breadcrumb-menu/LegacyBreadcrumbMenu')); diff --git a/src/plugin-slots/FooterSlot/README.md b/src/plugin-slots/FooterSlot/README.md index d7f718c1..481659fe 100644 --- a/src/plugin-slots/FooterSlot/README.md +++ b/src/plugin-slots/FooterSlot/README.md @@ -1,12 +1,13 @@ # Footer Slot -### Slot ID: `footer_slot` +### Slot ID: `org.openedx.frontend.layout.footer.v1` -## Description +### Slot ID Aliases +* `footer_slot` This slot is used to replace/modify/hide the footer. -The implementation of the `FooterSlot` component lives in [the `frontend-slot-footer` repository](https://github.com/openedx/frontend-slot-footer/). +The implementation of the `FooterSlot` component lives in [the `frontend-component-footer` repository](https://github.com/openedx/frontend-component-footer/). ## Example @@ -23,7 +24,7 @@ import { DIRECT_PLUGIN, PLUGIN_OPERATIONS } from '@openedx/frontend-plugin-frame const config = { pluginSlots: { - footer_slot: { + 'org.openedx.frontend.layout.footer.v1': { plugins: [ { // Hide the default footer diff --git a/src/plugin-slots/README.md b/src/plugin-slots/README.md index 9922f5a7..c2fac7b5 100644 --- a/src/plugin-slots/README.md +++ b/src/plugin-slots/README.md @@ -1,3 +1,3 @@ # `frontend-app-discussions` Plugin Slots -* [`footer_slot`](./FooterSlot/) +* [`org.openedx.frontend.layout.footer.v1`](./FooterSlot/)