diff --git a/src/App.jsx b/src/App.jsx index 7433210..101f34e 100755 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,24 +1,41 @@ import React from 'react'; import { BrowserRouter as Router } from 'react-router-dom'; +import { useDispatch } from 'react-redux'; import Footer from '@edx/frontend-component-footer'; -import 'data/services/lms/fakeData/courses'; +import { actions } from 'data/redux'; +import fakeData from 'data/services/lms/fakeData/courses'; import LearnerDashboardHeader from 'containers/LearnerDashboardHeader'; import Dashboard from 'containers/Dashboard'; import './App.scss'; -export const App = () => ( - -
- -
- -
-
-
-); +export const App = () => { + const dispatch = useDispatch(); + // TODO: made development-only + React.useEffect(() => { + window.loadMockData = () => { + dispatch(actions.app.loadGlobalData(fakeData.globalData)); + dispatch(actions.app.loadCourses({ + courses: [ + ...fakeData.courseRunData, + ...fakeData.entitlementData, + ], + })); + }; + }); + return ( + +
+ +
+ +
+
+
+ ); +}; export default App; diff --git a/src/containers/CourseCard/components/RelatedProgramsBadge/index.jsx b/src/containers/CourseCard/components/RelatedProgramsBadge/index.jsx index 00284de..c50dd40 100644 --- a/src/containers/CourseCard/components/RelatedProgramsBadge/index.jsx +++ b/src/containers/CourseCard/components/RelatedProgramsBadge/index.jsx @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { Button } from '@edx/paragon'; +import { Button, Icon } from '@edx/paragon'; import { Program } from '@edx/paragon/icons'; import RelatedProgramsBadgeModal from 'containers/RelatedProgramsModal'; @@ -20,13 +20,12 @@ export const RelatedProgramsBadge = ({ cardId }) => { <> diff --git a/src/containers/CourseList/index.jsx b/src/containers/CourseList/index.jsx index d42f3b5..d57aae9 100644 --- a/src/containers/CourseList/index.jsx +++ b/src/containers/CourseList/index.jsx @@ -24,7 +24,7 @@ export const CourseList = () => { return (
-

+

{formatMessage(messages.myCourses)}

); export const WidgetSidebar = () => { const { formatMessage } = useIntl(); return ( -
+
{

{formatMessage(messages.lookingForChallengePrompt)}

- - {formatMessage(messages.findCoursesButton)} + + {formatMessage(messages.findCoursesButton, { arrow: arrowIcon })}
diff --git a/src/containers/WidgetSidebar/index.scss b/src/containers/WidgetSidebar/index.scss deleted file mode 100644 index 57b1486..0000000 --- a/src/containers/WidgetSidebar/index.scss +++ /dev/null @@ -1,6 +0,0 @@ -@import "@edx/paragon/scss/core/core"; -@include media-breakpoint-down(md) { - .widget-sidebar { - display: none; - } -} diff --git a/src/containers/WidgetSidebar/messages.js b/src/containers/WidgetSidebar/messages.js index 0195552..2f9bd16 100644 --- a/src/containers/WidgetSidebar/messages.js +++ b/src/containers/WidgetSidebar/messages.js @@ -8,7 +8,7 @@ const messages = defineMessages({ }, findCoursesButton: { id: 'WidgetSidebar.findCoursesButton', - defaultMessage: 'Explore courses', + defaultMessage: 'Find a course {arrow}', description: 'Button to explore more courses', }, });