From a6522f59831f02d35570b9b0bf3cd6b8284a349c Mon Sep 17 00:00:00 2001 From: Kyle McCormick Date: Wed, 8 Apr 2020 16:50:33 -0400 Subject: [PATCH] Prefix a bunch of routes with /learning --- src/course-home/SequenceLink.jsx | 2 +- src/courseware/CoursewareContainer.jsx | 12 ++++++------ .../course/sequence/content-lock/ContentLock.jsx | 2 +- src/index.jsx | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/course-home/SequenceLink.jsx b/src/course-home/SequenceLink.jsx index b8a5fdb8..410ba13b 100644 --- a/src/course-home/SequenceLink.jsx +++ b/src/course-home/SequenceLink.jsx @@ -7,7 +7,7 @@ export default function SequenceLink({ id, courseId }) { const sequence = useModel('sequences', id); return (
- {sequence.title} + {sequence.title}
); } diff --git a/src/courseware/CoursewareContainer.jsx b/src/courseware/CoursewareContainer.jsx index 19b86367..9c94eeb0 100644 --- a/src/courseware/CoursewareContainer.jsx +++ b/src/courseware/CoursewareContainer.jsx @@ -22,7 +22,7 @@ function useUnitNavigationHandler(courseId, sequenceId, unitId) { const dispatch = useDispatch(); return useCallback((nextUnitId) => { dispatch(checkBlockCompletion(courseId, sequenceId, unitId)); - history.push(`/course/${courseId}/${sequenceId}/${nextUnitId}`); + history.push(`/learning/course/${courseId}/${sequenceId}/${nextUnitId}`); }, [courseId, sequenceId]); } @@ -56,7 +56,7 @@ function useNextSequenceHandler(courseId, sequenceId) { return useCallback(() => { if (nextSequence !== null) { const nextUnitId = nextSequence.unitIds[0]; - history.push(`/course/${courseId}/${nextSequence.id}/${nextUnitId}`); + history.push(`/learning/course/${courseId}/${nextSequence.id}/${nextUnitId}`); } }, [courseStatus, sequenceStatus, sequenceId]); } @@ -68,7 +68,7 @@ function usePreviousSequenceHandler(courseId, sequenceId) { return useCallback(() => { if (previousSequence !== null) { const previousUnitId = previousSequence.unitIds[previousSequence.unitIds.length - 1]; - history.push(`/course/${courseId}/${previousSequence.id}/${previousUnitId}`); + history.push(`/learning/course/${courseId}/${previousSequence.id}/${previousUnitId}`); } }, [courseStatus, sequenceStatus, sequenceId]); } @@ -91,7 +91,7 @@ function useContentRedirect(courseStatus, sequenceStatus) { useEffect(() => { if (courseStatus === 'loaded' && !sequenceId) { // This is a replace because we don't want this change saved in the browser's history. - history.replace(`/course/${courseId}/${firstSequenceId}`); + history.replace(`/learning/course/${courseId}/${firstSequenceId}`); } }, [courseStatus, sequenceId]); @@ -102,7 +102,7 @@ function useContentRedirect(courseStatus, sequenceStatus) { const unitIndex = sequence.position || 0; const nextUnitId = sequence.unitIds[unitIndex]; // This is a replace because we don't want this change saved in the browser's history. - history.replace(`/course/${courseId}/${sequence.id}/${nextUnitId}`); + history.replace(`/learning/course/${courseId}/${sequence.id}/${nextUnitId}`); } } }, [sequenceStatus, sequenceId, unitId]); @@ -163,7 +163,7 @@ export default function CoursewareContainer() { useSavedSequencePosition(courseId, sequenceId, routeUnitId); if (courseStatus === 'denied') { - return ; + return ; } return ( diff --git a/src/courseware/course/sequence/content-lock/ContentLock.jsx b/src/courseware/course/sequence/content-lock/ContentLock.jsx index 5e1a09f6..67fcbab3 100644 --- a/src/courseware/course/sequence/content-lock/ContentLock.jsx +++ b/src/courseware/course/sequence/content-lock/ContentLock.jsx @@ -12,7 +12,7 @@ function ContentLock({ intl, courseId, prereqSectionName, prereqId, sequenceTitle, }) { const handleClick = useCallback(() => { - history.push(`/course/${courseId}/${prereqId}`); + history.push(`/learning/course/${courseId}/${prereqId}`); }); return ( diff --git a/src/index.jsx b/src/index.jsx index 4e2ceeac..312c503b 100755 --- a/src/index.jsx +++ b/src/index.jsx @@ -28,8 +28,8 @@ subscribe(APP_READY, () => { - - + +