diff --git a/package-lock.json b/package-lock.json index 2df6b36851..ea06117091 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,11 +17,6 @@ "@edx/frontend-enterprise-utils": "3.2.0", "@edx/frontend-platform": "4.0.1", "@edx/paragon": "20.39.2", - "@fortawesome/fontawesome-svg-core": "1.2.35", - "@fortawesome/free-brands-svg-icons": "5.15.3", - "@fortawesome/free-regular-svg-icons": "5.15.3", - "@fortawesome/free-solid-svg-icons": "5.15.3", - "@fortawesome/react-fontawesome": "0.1.14", "algoliasearch": "4.8.3", "axios-mock-adapter": "1.19.0", "classnames": "2.2.6", @@ -3994,6 +3989,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz", "integrity": "sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg==", "hasInstallScript": true, + "peer": true, "engines": { "node": ">=6" } @@ -4003,30 +3999,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.35.tgz", "integrity": "sha512-uLEXifXIL7hnh2sNZQrIJWNol7cTVIzwI+4qcBIq9QWaZqUblm0IDrtSqbNg+3SQf8SMGHkiSigD++rHmCHjBg==", "hasInstallScript": true, - "dependencies": { - "@fortawesome/fontawesome-common-types": "^0.2.35" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@fortawesome/free-brands-svg-icons": { - "version": "5.15.3", - "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.15.3.tgz", - "integrity": "sha512-1hirPcbjj72ZJtFvdnXGPbAbpn3Ox6mH3g5STbANFp3vGSiE5u5ingAKV06mK6ZVqNYxUPlh4DlTnaIvLtF2kw==", - "hasInstallScript": true, - "dependencies": { - "@fortawesome/fontawesome-common-types": "^0.2.35" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@fortawesome/free-regular-svg-icons": { - "version": "5.15.3", - "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.3.tgz", - "integrity": "sha512-q4/p8Xehy9qiVTdDWHL4Z+o5PCLRChePGZRTXkl+/Z7erDVL8VcZUuqzJjs6gUz6czss4VIPBRdCz6wP37/zMQ==", - "hasInstallScript": true, + "peer": true, "dependencies": { "@fortawesome/fontawesome-common-types": "^0.2.35" }, @@ -4039,6 +4012,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.3.tgz", "integrity": "sha512-XPeeu1IlGYqz4VWGRAT5ukNMd4VHUEEJ7ysZ7pSSgaEtNvSo+FLurybGJVmiqkQdK50OkSja2bfZXOeyMGRD8Q==", "hasInstallScript": true, + "peer": true, "dependencies": { "@fortawesome/fontawesome-common-types": "^0.2.35" }, @@ -4050,6 +4024,7 @@ "version": "0.1.14", "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.14.tgz", "integrity": "sha512-4wqNb0gRLVaBm/h+lGe8UfPPivcbuJ6ecI4hIgW0LjI7kzpYB9FkN0L9apbVzg+lsBdcTf0AlBtODjcSX5mmKA==", + "peer": true, "dependencies": { "prop-types": "^15.7.2" }, diff --git a/package.json b/package.json index 87ddae89d0..c358cbf26d 100644 --- a/package.json +++ b/package.json @@ -33,11 +33,6 @@ "@edx/frontend-enterprise-utils": "3.2.0", "@edx/frontend-platform": "4.0.1", "@edx/paragon": "20.39.2", - "@fortawesome/fontawesome-svg-core": "1.2.35", - "@fortawesome/free-brands-svg-icons": "5.15.3", - "@fortawesome/free-regular-svg-icons": "5.15.3", - "@fortawesome/free-solid-svg-icons": "5.15.3", - "@fortawesome/react-fontawesome": "0.1.14", "algoliasearch": "4.8.3", "axios-mock-adapter": "1.19.0", "classnames": "2.2.6", diff --git a/src/components/Admin/AdminCards.jsx b/src/components/Admin/AdminCards.jsx index d1afe4ac95..b367dff596 100644 --- a/src/components/Admin/AdminCards.jsx +++ b/src/components/Admin/AdminCards.jsx @@ -2,6 +2,9 @@ import React from 'react'; import PropTypes from 'prop-types'; import { injectIntl, intlShape } from '@edx/frontend-platform/i18n'; +import { + Award, Check, Groups, RemoveRedEye, +} from '@edx/paragon/icons'; import NumberCard from '../NumberCard'; @@ -17,7 +20,7 @@ class AdminCards extends React.Component { id: 'adminPortal.cards.registeredLearners', defaultMessage: 'total number of learners registered', }), - iconClassName: 'fa fa-users', + icon: Groups, actions: [{ label: intl.formatMessage({ id: 'adminPortal.cards.registeredUnenrolledLearners', @@ -32,7 +35,7 @@ class AdminCards extends React.Component { id: 'adminPortal.cards.enrolledOneCourse', defaultMessage: 'learners enrolled in at least one course', }), - iconClassName: 'fa fa-check', + icon: Check, actions: [{ label: intl.formatMessage({ id: 'adminPortal.cards.enrolledLearners', @@ -53,7 +56,7 @@ class AdminCards extends React.Component { id: 'adminPortal.cards.activeLearnersPastWeek', defaultMessage: 'active learners in the past week', }), - iconClassName: 'fa fa-eye', + icon: RemoveRedEye, actions: [{ label: intl.formatMessage({ id: 'adminPortal.cards.learnersActiveWeek', @@ -77,7 +80,7 @@ class AdminCards extends React.Component { courseCompletions: { ref: React.createRef(), description: 'course completions', - iconClassName: 'fa fa-trophy', + icon: Award, actions: [{ label: intl.formatMessage({ id: 'adminPortal.cards.completedLearners', @@ -107,7 +110,7 @@ class AdminCards extends React.Component { id={cardKey} title={title} description={card.description} - iconClassName={card.iconClassName} + icon={card.icon} detailActions={card.actions} /> diff --git a/src/components/Admin/AdminSearchForm.jsx b/src/components/Admin/AdminSearchForm.jsx index 953929321e..3fcec0a454 100644 --- a/src/components/Admin/AdminSearchForm.jsx +++ b/src/components/Admin/AdminSearchForm.jsx @@ -2,9 +2,9 @@ import React from 'react'; import dayjs from 'dayjs'; import PropTypes from 'prop-types'; -import { faInfoCircle } from '@fortawesome/free-solid-svg-icons'; import { Form } from '@edx/paragon'; +import { Info } from '@edx/paragon/icons'; import SearchBar from '../SearchBar'; import { updateUrl } from '../../utils'; @@ -80,7 +80,7 @@ class AdminSearchForm extends React.Component {