diff --git a/package-lock.json b/package-lock.json index 334b3101..7745842a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,11 +9,11 @@ "version": "0.0.1", "license": "AGPL-3.0", "dependencies": { - "@edx/brand": "npm:@edx/brand-edx.org@^2.0.3", + "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2", "@edx/browserslist-config": "^1.1.0", "@edx/frontend-component-footer": "^12.2.1", "@edx/frontend-enterprise-hotjar": "^2.0.0", - "@edx/frontend-platform": "^5.1.0", + "@edx/frontend-platform": "^5.5.4", "@edx/paragon": "^20.44.0", "@edx/react-unit-test-utils": "^1.7.0", "@fortawesome/fontawesome-svg-core": "^1.2.36", @@ -2038,10 +2038,10 @@ } }, "node_modules/@edx/brand": { - "name": "@edx/brand-edx.org", - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@edx/brand-edx.org/-/brand-edx.org-2.1.2.tgz", - "integrity": "sha512-pBhUuegRg+2k63LWe3vyQDCdAiWTduaJ3hpHWqLZC3wYYyAyour6VGUbS1m9kg3+BmLz6AZR9P10BXT0iso6XQ==" + "name": "@openedx/brand-openedx", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@openedx/brand-openedx/-/brand-openedx-1.2.2.tgz", + "integrity": "sha512-mBvxR7aB9290j9+h3d/9G8VkG1b8ecLSmlxc0vskfm7DL/fKUzFmHAj3PI7Z4kkwCQOL4QT5mJHJKC0ZFf7qvQ==" }, "node_modules/@edx/browserslist-config": { "version": "1.2.0", @@ -2522,9 +2522,9 @@ } }, "node_modules/@edx/frontend-platform": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@edx/frontend-platform/-/frontend-platform-5.1.0.tgz", - "integrity": "sha512-/8Njj9015/1zf1Gn896JKhlcc2FIU/sbh0qkcckl74PtXS/p9GB29gTQJbhY7fCA/1grGNJurZvEaqkSU4ze8Q==", + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/@edx/frontend-platform/-/frontend-platform-5.5.4.tgz", + "integrity": "sha512-Yum+oST7XfDwDnDhBnzeR/mjp6O+G0g+5AZtIJ1BdTKQH1z9FObfim/pfoiI9STiYlguVpeWMkzWuca/QMLO/Q==", "dependencies": { "@cospired/i18n-iso-languages": "4.1.0", "@formatjs/intl-pluralrules": "4.3.3", diff --git a/package.json b/package.json index 1b8b1190..1ddf0618 100755 --- a/package.json +++ b/package.json @@ -26,11 +26,11 @@ "access": "public" }, "dependencies": { - "@edx/brand": "npm:@edx/brand-edx.org@^2.0.3", + "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2", "@edx/browserslist-config": "^1.1.0", "@edx/frontend-component-footer": "^12.2.1", "@edx/frontend-enterprise-hotjar": "^2.0.0", - "@edx/frontend-platform": "^5.1.0", + "@edx/frontend-platform": "^5.5.4", "@edx/paragon": "^20.44.0", "@edx/react-unit-test-utils": "^1.7.0", "@fortawesome/fontawesome-svg-core": "^1.2.36", diff --git a/src/config/index.js b/src/config/index.js index 648c7bde..447b1979 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -16,6 +16,7 @@ const configuration = { SUPPORT_URL: process.env.SUPPORT_URL || null, ENABLE_NOTICES: process.env.ENABLE_NOTICES || null, CAREER_LINK_URL: process.env.CAREER_LINK_URL || null, + LOGO_URL: process.env.LOGO_URL, }; const features = {}; diff --git a/src/containers/LearnerDashboardHeader/BrandLogo.jsx b/src/containers/LearnerDashboardHeader/BrandLogo.jsx index 2ea2a45c..fcedb008 100644 --- a/src/containers/LearnerDashboardHeader/BrandLogo.jsx +++ b/src/containers/LearnerDashboardHeader/BrandLogo.jsx @@ -3,6 +3,7 @@ import React from 'react'; import { useIntl } from '@edx/frontend-platform/i18n'; import { reduxHooks } from 'hooks'; +import { configuration } from '../../config'; import messages from './messages'; @@ -14,7 +15,7 @@ export const BrandLogo = () => { {formatMessage(messages.logoAltText)} diff --git a/src/containers/LearnerDashboardHeader/__snapshots__/BrandLogo.test.jsx.snap b/src/containers/LearnerDashboardHeader/__snapshots__/BrandLogo.test.jsx.snap index 96ecd4ea..f069b0a0 100644 --- a/src/containers/LearnerDashboardHeader/__snapshots__/BrandLogo.test.jsx.snap +++ b/src/containers/LearnerDashboardHeader/__snapshots__/BrandLogo.test.jsx.snap @@ -8,7 +8,7 @@ exports[`BrandLogo dashboard defined 1`] = ` edX, Inc. Dashboard `; @@ -21,7 +21,7 @@ exports[`BrandLogo dashboard undefined 1`] = ` edX, Inc. Dashboard `; diff --git a/src/i18n/messages/ar.json b/src/i18n/messages/ar.json index 725c72f2..2f5ffcc6 100644 --- a/src/i18n/messages/ar.json +++ b/src/i18n/messages/ar.json @@ -19,7 +19,7 @@ "learnerVariantDashboard.menu.profile.label": "الملف الشخصي", "learnerVariantDashboard.menu.viewPrograms.label": "عرض البرامج", "learnerVariantDashboard.menu.account.label": "الحساب", - "learnerVariantDashboard.menu.ordersAndSubscriptions.label": "Orders & Subscriptions", + "learnerVariantDashboard.menu.orderHistory.label": "Order History", "learnerVariantDashboard.menu.signOut.label": "تسجيل الخروج", "learnerVariantDashboard.course": "المساقات", "learnerVariantDashboard.program": "البرامج", diff --git a/src/i18n/messages/es_419.json b/src/i18n/messages/es_419.json index dadbe946..45016525 100644 --- a/src/i18n/messages/es_419.json +++ b/src/i18n/messages/es_419.json @@ -19,7 +19,7 @@ "learnerVariantDashboard.menu.profile.label": "Perfil", "learnerVariantDashboard.menu.viewPrograms.label": "Ver programas", "learnerVariantDashboard.menu.account.label": "Cuenta", - "learnerVariantDashboard.menu.ordersAndSubscriptions.label": "Pedidos y Subscripciones", + "learnerVariantDashboard.menu.orderHistory.label": "Historial de órdenes", "learnerVariantDashboard.menu.signOut.label": "Cerrar sesión", "learnerVariantDashboard.course": "cursos", "learnerVariantDashboard.program": "Programas", diff --git a/src/i18n/messages/fr.json b/src/i18n/messages/fr.json index 959b0040..4924f2e5 100644 --- a/src/i18n/messages/fr.json +++ b/src/i18n/messages/fr.json @@ -19,7 +19,7 @@ "learnerVariantDashboard.menu.profile.label": "Profil", "learnerVariantDashboard.menu.viewPrograms.label": "Voir les programmes", "learnerVariantDashboard.menu.account.label": "Compte", - "learnerVariantDashboard.menu.ordersAndSubscriptions.label": "Orders & Subscriptions", + "learnerVariantDashboard.menu.orderHistory.label": "Order History", "learnerVariantDashboard.menu.signOut.label": "Se déconnecter", "learnerVariantDashboard.course": "Cours", "learnerVariantDashboard.program": "Programmes", diff --git a/src/i18n/messages/fr_CA.json b/src/i18n/messages/fr_CA.json index 240c4489..6e0455d7 100644 --- a/src/i18n/messages/fr_CA.json +++ b/src/i18n/messages/fr_CA.json @@ -19,7 +19,7 @@ "learnerVariantDashboard.menu.profile.label": "Profil", "learnerVariantDashboard.menu.viewPrograms.label": "Voir les programmes", "learnerVariantDashboard.menu.account.label": "Compte", - "learnerVariantDashboard.menu.ordersAndSubscriptions.label": "Commandes et abonnements", + "learnerVariantDashboard.menu.orderHistory.label": "Historique des commandes", "learnerVariantDashboard.menu.signOut.label": "Se déconnecter", "learnerVariantDashboard.course": "Cours", "learnerVariantDashboard.program": "Programmes", diff --git a/src/i18n/messages/pt_BR.json b/src/i18n/messages/pt_BR.json index 34c01f4a..774b6715 100644 --- a/src/i18n/messages/pt_BR.json +++ b/src/i18n/messages/pt_BR.json @@ -19,7 +19,7 @@ "learnerVariantDashboard.menu.profile.label": "Perfil", "learnerVariantDashboard.menu.viewPrograms.label": "View Programs", "learnerVariantDashboard.menu.account.label": "Conta", - "learnerVariantDashboard.menu.ordersAndSubscriptions.label": "Orders & Subscriptions", + "learnerVariantDashboard.menu.orderHistory.label": "Order History", "learnerVariantDashboard.menu.signOut.label": "Sair", "learnerVariantDashboard.course": "Cursos", "learnerVariantDashboard.program": "Programas", diff --git a/src/i18n/messages/zh_CN.json b/src/i18n/messages/zh_CN.json index 652cb02f..d552a212 100644 --- a/src/i18n/messages/zh_CN.json +++ b/src/i18n/messages/zh_CN.json @@ -19,7 +19,7 @@ "learnerVariantDashboard.menu.profile.label": "Profile", "learnerVariantDashboard.menu.viewPrograms.label": "View Programs", "learnerVariantDashboard.menu.account.label": "Account", - "learnerVariantDashboard.menu.ordersAndSubscriptions.label": "Orders & Subscriptions", + "learnerVariantDashboard.menu.orderHistory.label": "Order History", "learnerVariantDashboard.menu.signOut.label": "Sign Out", "learnerVariantDashboard.course": "Courses", "learnerVariantDashboard.program": "Programs",