diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 58d7c99c0..3ae938a51 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: Release CI on: push: branches: - - master + - quince/indigo jobs: release: name: Release diff --git a/package-lock.json b/package-lock.json index 2c730c4f0..6db5bc0c3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { - "name": "@edx/frontend-component-footer", - "version": "1.0.0-semantically-released", + "name": "@edly-io/indigo-frontend-component-footer", + "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "@edx/frontend-component-footer", - "version": "1.0.0-semantically-released", + "name": "@edly-io/indigo-frontend-component-footer", + "version": "1.0.0", "license": "AGPL-3.0", "dependencies": { "@edx/paragon": "^21.3.1", diff --git a/package.json b/package.json index 30ee3e79b..a83bb3c5d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "@edx/frontend-component-footer", - "version": "1.0.0-semantically-released", + "name": "@edly-io/indigo-frontend-component-footer", + "version": "1.0.0", "description": "Footer component for use when building Open edX frontend applications", "main": "dist/index.js", "publishConfig": { @@ -24,14 +24,14 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/openedx/frontend-component-footer.git" + "url": "git+https://github.com/edly-io/frontend-component-footer.git" }, "author": "edX", "license": "AGPL-3.0", "bugs": { - "url": "https://github.com/openedx/frontend-component-footer/issues" + "url": "https://github.com/edly-io/frontend-component-footer/issues" }, - "homepage": "https://github.com/openedx/frontend-component-footer#readme", + "homepage": "https://github.com/edly-io/frontend-component-footer#readme", "devDependencies": { "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2", "@edx/browserslist-config": "^1.1.1", @@ -66,5 +66,11 @@ "prop-types": "^15.5.10", "react": "^16.9.0 || ^17.0.0", "react-dom": "^16.9.0 || ^17.0.0" + }, + "release": { + "branches": [ + "master", + "quince/indigo" + ] } } diff --git a/src/components/Footer.jsx b/src/components/Footer.jsx index d8d414c94..41cabc6aa 100644 --- a/src/components/Footer.jsx +++ b/src/components/Footer.jsx @@ -4,6 +4,8 @@ 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 { Image } from '@edx/paragon'; +import { getConfig } from '@edx/frontend-platform'; import messages from './Footer.messages'; import LanguageSelector from './LanguageSelector'; @@ -41,34 +43,45 @@ class SiteFooter extends React.Component { intl, } = this.props; const showLanguageSelector = supportedLanguages.length > 0 && onLanguageSelected; - const { config } = this.context; + const config = getConfig(); return ( - + + ); } } diff --git a/src/components/Footer.messages.js b/src/components/Footer.messages.js index 59d1bfc8b..49cb8930e 100644 --- a/src/components/Footer.messages.js +++ b/src/components/Footer.messages.js @@ -136,16 +136,31 @@ const messages = defineMessages({ defaultMessage: 'Download the edX mobile app from Google Play', description: 'The label for the link to download the google version of the edX app.', }, + 'footer.poweredby.text': { + id: 'footer.poweredby.text', + defaultMessage: 'Powered by', + description: 'text for the footer', + }, 'footer.logo.altText': { id: 'footer.logo.altText', defaultMessage: 'Powered by Open edX', description: 'alt text for the footer logo.', }, + 'footer.tutorlogo.altText': { + id: 'footer.tutorlogo.altText', + defaultMessage: 'Runs on Tutor', + description: 'alt text for the footer tutor logo', + }, 'footer.logo.ariaLabel': { id: 'footer.logo.ariaLabel', defaultMessage: 'edX Home', description: 'aria-label for the footer logo.', }, + 'footer.copyright.text': { + id: 'footer.copyright.text', + defaultMessage: 'Copyrights ©2023. All Rights Reserved.', + description: 'copyright text for the footer', + }, 'footer.ariaLabel': { id: 'footer.ariaLabel', defaultMessage: 'Page Footer', diff --git a/src/components/__snapshots__/Footer.test.jsx.snap b/src/components/__snapshots__/Footer.test.jsx.snap index aa388b21a..dc56cbfd8 100644 --- a/src/components/__snapshots__/Footer.test.jsx.snap +++ b/src/components/__snapshots__/Footer.test.jsx.snap @@ -1,31 +1,61 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[` + `; exports[` + `; exports[` + `;