From 691dfd559f2a7473ff878537135cdd56cf8b9665 Mon Sep 17 00:00:00 2001 From: Ankush1oo8 <154556772+Ankush1oo8@users.noreply.github.com> Date: Fri, 22 Nov 2024 00:49:51 +0530 Subject: [PATCH 1/2] Fixed issue #510 --- src/App.jsx | 80 ++++++++++++++++++++++++++++------------------------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/src/App.jsx b/src/App.jsx index a3f8b663..5a6f52f0 100755 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,33 +1,30 @@ -import React from 'react'; -import { Helmet } from 'react-helmet'; +import React from "react"; +import { Helmet } from "react-helmet"; -import { useIntl } from '@edx/frontend-platform/i18n'; -import { logError } from '@edx/frontend-platform/logging'; -import { initializeHotjar } from '@edx/frontend-enterprise-hotjar'; +import { useIntl } from "@edx/frontend-platform/i18n"; +import { logError } from "@edx/frontend-platform/logging"; +import { initializeHotjar } from "@edx/frontend-enterprise-hotjar"; -import { ErrorPage, AppContext } from '@edx/frontend-platform/react'; -import FooterSlot from '@openedx/frontend-slot-footer'; -import { Alert } from '@openedx/paragon'; +import { ErrorPage, AppContext } from "@edx/frontend-platform/react"; +import FooterSlot from "@openedx/frontend-slot-footer"; +import { Alert } from "@openedx/paragon"; -import { RequestKeys } from 'data/constants/requests'; -import store from 'data/store'; -import { - selectors, - actions, -} from 'data/redux'; -import { reduxHooks } from 'hooks'; -import Dashboard from 'containers/Dashboard'; +import { RequestKeys } from "data/constants/requests"; +import store from "data/store"; +import { selectors, actions } from "data/redux"; +import { reduxHooks } from "hooks"; +import Dashboard from "containers/Dashboard"; -import track from 'tracking'; +import track from "tracking"; -import fakeData from 'data/services/lms/fakeData/courses'; +import fakeData from "data/services/lms/fakeData/courses"; -import AppWrapper from 'containers/WidgetContainers/AppWrapper'; -import LearnerDashboardHeader from 'containers/LearnerDashboardHeader'; +import AppWrapper from "containers/WidgetContainers/AppWrapper"; +import LearnerDashboardHeader from "containers/LearnerDashboardHeader"; -import { getConfig } from '@edx/frontend-platform'; -import messages from './messages'; -import './App.scss'; +import { getConfig } from "@edx/frontend-platform"; +import messages from "./messages"; +import "./App.scss"; export const App = () => { const { authenticatedUser } = React.useContext(AppContext); @@ -41,17 +38,17 @@ export const App = () => { const loadData = reduxHooks.useLoadData(); React.useEffect(() => { - if (authenticatedUser?.administrator || getConfig().NODE_ENV === 'development') { + if ( + authenticatedUser?.administrator || + getConfig().NODE_ENV === "development" + ) { window.loadEmptyData = () => { loadData({ ...fakeData.globalData, courses: [] }); }; window.loadMockData = () => { loadData({ ...fakeData.globalData, - courses: [ - ...fakeData.courseRunData, - ...fakeData.entitlementData, - ], + courses: [...fakeData.courseRunData, ...fakeData.entitlementData], }); }; window.store = store; @@ -75,20 +72,27 @@ export const App = () => { <> {formatMessage(messages.pageTitle)} - +
-
- {hasNetworkFailure - ? ( - - - - ) : ( - - )} +
+ {hasNetworkFailure ? ( + + + + ) : ( + + )}
From 9172507b8ef91835f2952cd440c27b3aba6e858d Mon Sep 17 00:00:00 2001 From: Ankush1oo8 <154556772+Ankush1oo8@users.noreply.github.com> Date: Fri, 22 Nov 2024 11:48:24 +0530 Subject: [PATCH 2/2] made format changes and fixed issue #510 --- src/App.jsx | 82 +++++++++++++++++++++++++---------------------------- 1 file changed, 39 insertions(+), 43 deletions(-) diff --git a/src/App.jsx b/src/App.jsx index 5a6f52f0..a2ac0d60 100755 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,30 +1,33 @@ -import React from "react"; -import { Helmet } from "react-helmet"; +import React from 'react'; +import { Helmet } from 'react-helmet'; -import { useIntl } from "@edx/frontend-platform/i18n"; -import { logError } from "@edx/frontend-platform/logging"; -import { initializeHotjar } from "@edx/frontend-enterprise-hotjar"; +import { useIntl } from '@edx/frontend-platform/i18n'; +import { logError } from '@edx/frontend-platform/logging'; +import { initializeHotjar } from '@edx/frontend-enterprise-hotjar'; -import { ErrorPage, AppContext } from "@edx/frontend-platform/react"; -import FooterSlot from "@openedx/frontend-slot-footer"; -import { Alert } from "@openedx/paragon"; +import { ErrorPage, AppContext } from '@edx/frontend-platform/react'; +import FooterSlot from '@openedx/frontend-slot-footer'; +import { Alert } from '@openedx/paragon'; -import { RequestKeys } from "data/constants/requests"; -import store from "data/store"; -import { selectors, actions } from "data/redux"; -import { reduxHooks } from "hooks"; -import Dashboard from "containers/Dashboard"; +import { RequestKeys } from 'data/constants/requests'; +import store from 'data/store'; +import { + selectors, + actions, +} from 'data/redux'; +import { reduxHooks } from 'hooks'; +import Dashboard from 'containers/Dashboard'; -import track from "tracking"; +import track from 'tracking'; -import fakeData from "data/services/lms/fakeData/courses"; +import fakeData from 'data/services/lms/fakeData/courses'; -import AppWrapper from "containers/WidgetContainers/AppWrapper"; -import LearnerDashboardHeader from "containers/LearnerDashboardHeader"; +import AppWrapper from 'containers/WidgetContainers/AppWrapper'; +import LearnerDashboardHeader from 'containers/LearnerDashboardHeader'; -import { getConfig } from "@edx/frontend-platform"; -import messages from "./messages"; -import "./App.scss"; +import { getConfig } from '@edx/frontend-platform'; +import messages from './messages'; +import './App.scss'; export const App = () => { const { authenticatedUser } = React.useContext(AppContext); @@ -38,17 +41,17 @@ export const App = () => { const loadData = reduxHooks.useLoadData(); React.useEffect(() => { - if ( - authenticatedUser?.administrator || - getConfig().NODE_ENV === "development" - ) { + if (authenticatedUser?.administrator || getConfig().NODE_ENV === 'development') { window.loadEmptyData = () => { loadData({ ...fakeData.globalData, courses: [] }); }; window.loadMockData = () => { loadData({ ...fakeData.globalData, - courses: [...fakeData.courseRunData, ...fakeData.entitlementData], + courses: [ + ...fakeData.courseRunData, + ...fakeData.entitlementData, + ], }); }; window.store = store; @@ -72,27 +75,20 @@ export const App = () => { <> {formatMessage(messages.pageTitle)} - +
-
- {hasNetworkFailure ? ( - - - - ) : ( - - )} +
+ {hasNetworkFailure + ? ( + + + + ) : ( + + )}
@@ -101,4 +97,4 @@ export const App = () => { ); }; -export default App; +export default App; \ No newline at end of file