Skip to content

Commit

Permalink
Merge branch 'master' into ea/ent-7512
Browse files Browse the repository at this point in the history
  • Loading branch information
emrosarioa committed Aug 30, 2023
2 parents f911988 + 9af4648 commit c28551e
Show file tree
Hide file tree
Showing 49 changed files with 2,806 additions and 1,153 deletions.
33 changes: 4 additions & 29 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
13 changes: 8 additions & 5 deletions src/components/Admin/AdminCards.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand Down Expand Up @@ -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}
/>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Admin/AdminSearchForm.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -80,7 +80,7 @@ class AdminSearchForm extends React.Component {
<Form.Label className="search-label mb-2">
Filter by start date
<IconWithTooltip
icon={faInfoCircle}
icon={Info}
altText="More information"
tooltipText="A start date can be selected after the course name is selected."
/>
Expand Down
Loading

0 comments on commit c28551e

Please sign in to comment.