diff --git a/src/discussions/discussions-home/DiscussionsHome.jsx b/src/discussions/discussions-home/DiscussionsHome.jsx index 2ae61262..341c0be6 100644 --- a/src/discussions/discussions-home/DiscussionsHome.jsx +++ b/src/discussions/discussions-home/DiscussionsHome.jsx @@ -3,11 +3,14 @@ import React, { useContext, useEffect } from 'react'; import classNames from 'classnames'; import { useDispatch, useSelector } from 'react-redux'; import { - Redirect, Route, Switch, useHistory, useLocation, useRouteMatch, + Redirect, + Route, + Switch, + useHistory, + useLocation, + useRouteMatch, } from 'react-router'; -import Footer from '@edx/frontend-component-footer'; -import Header from '@edx/frontend-component-header'; import { AppContext } from '@edx/frontend-platform/react'; import { breakpoints, useWindowSize } from '@edx/paragon'; @@ -29,14 +32,14 @@ export default function DiscussionsHome() { const history = useHistory(); const { authenticatedUser } = useContext(AppContext); const location = useLocation(); - const postEditorVisible = useSelector(state => state.threads.postEditorVisible); - const { params: { page } } = useRouteMatch(`${Routes.COMMENTS.PAGE}?`); - const { params } = useRouteMatch(ALL_ROUTES); + const postEditorVisible = useSelector( + (state) => state.threads.postEditorVisible, + ); const { - courseId, - postId, - topicId, - } = params; + params: { page }, + } = useRouteMatch(`${Routes.COMMENTS.PAGE}?`); + const { params } = useRouteMatch(ALL_ROUTES); + const { courseId, postId, topicId } = params; const inContext = new URLSearchParams(location.search).get('inContext') !== null; // Display the content area if we are currently viewing/editing a post or creating one. @@ -44,7 +47,9 @@ export default function DiscussionsHome() { // If the window is larger than a particular size, always show the sidebar for navigating between posts/topics. // However, for smaller screens or embeds, only show the sidebar if the content area isn't displayed. const displaySidebar = useWindowSize().width >= breakpoints.large.minWidth || !displayContentArea; - const redirectToThread = useSelector(state => state.threads.redirectToThread); + const redirectToThread = useSelector( + (state) => state.threads.redirectToThread, + ); useEffect(() => { dispatch(fetchCourseConfig(courseId)); dispatch(fetchCourseTopics(courseId)); @@ -64,25 +69,24 @@ export default function DiscussionsHome() { }, [redirectToThread]); return ( - - {!inContext &&
}
- {!inContext && } + {!inContext && ( + + )}
@@ -97,7 +101,10 @@ export default function DiscussionsHome() { - +
-
- { - postEditorVisible ? ( - - + {postEditorVisible ? ( + + + + ) : ( + + + - ) : ( - - - - - - - - - ) - } + + + + + )}
- {!inContext &&