mirror of
https://github.com/rzmk/learnhouse.git
synced 2025-12-19 04:19:25 +00:00
feat: introduce focus mode
This commit is contained in:
swve
parent
411845d480
commit
46bf3f9c82
1 changed files with 459 additions and 155 deletions
|
|
@ -3,7 +3,7 @@ import Link from 'next/link'
|
||||||
import { getAPIUrl, getUriWithOrg } from '@services/config/config'
|
import { getAPIUrl, getUriWithOrg } from '@services/config/config'
|
||||||
import Canva from '@components/Objects/Activities/DynamicCanva/DynamicCanva'
|
import Canva from '@components/Objects/Activities/DynamicCanva/DynamicCanva'
|
||||||
import VideoActivity from '@components/Objects/Activities/Video/Video'
|
import VideoActivity from '@components/Objects/Activities/Video/Video'
|
||||||
import { BookOpenCheck, Check, CheckCircle, ChevronDown, ChevronLeft, ChevronRight, FileText, Folder, List, Menu, MoreVertical, UserRoundPen, Video, Layers, ListFilter, ListTree, X, Edit2, EllipsisVertical } from 'lucide-react'
|
import { BookOpenCheck, Check, CheckCircle, ChevronDown, ChevronLeft, ChevronRight, FileText, Folder, List, Menu, MoreVertical, UserRoundPen, Video, Layers, ListFilter, ListTree, X, Edit2, EllipsisVertical, Maximize2, Minimize2 } from 'lucide-react'
|
||||||
import { markActivityAsComplete, unmarkActivityAsComplete } from '@services/courses/activity'
|
import { markActivityAsComplete, unmarkActivityAsComplete } from '@services/courses/activity'
|
||||||
import DocumentPdfActivity from '@components/Objects/Activities/DocumentPdf/DocumentPdf'
|
import DocumentPdfActivity from '@components/Objects/Activities/DocumentPdf/DocumentPdf'
|
||||||
import ActivityIndicators from '@components/Pages/Courses/ActivityIndicators'
|
import ActivityIndicators from '@components/Pages/Courses/ActivityIndicators'
|
||||||
|
|
@ -16,7 +16,7 @@ import { CourseProvider } from '@components/Contexts/CourseContext'
|
||||||
import AIActivityAsk from '@components/Objects/Activities/AI/AIActivityAsk'
|
import AIActivityAsk from '@components/Objects/Activities/AI/AIActivityAsk'
|
||||||
import AIChatBotProvider from '@components/Contexts/AI/AIChatBotContext'
|
import AIChatBotProvider from '@components/Contexts/AI/AIChatBotContext'
|
||||||
import { useLHSession } from '@components/Contexts/LHSessionContext'
|
import { useLHSession } from '@components/Contexts/LHSessionContext'
|
||||||
import React, { useEffect } from 'react'
|
import React, { useEffect, useRef } from 'react'
|
||||||
import { getAssignmentFromActivityUUID, getFinalGrade, submitAssignmentForGrading } from '@services/courses/assignments'
|
import { getAssignmentFromActivityUUID, getFinalGrade, submitAssignmentForGrading } from '@services/courses/assignments'
|
||||||
import AssignmentStudentActivity from '@components/Objects/Activities/Assignment/AssignmentStudentActivity'
|
import AssignmentStudentActivity from '@components/Objects/Activities/Assignment/AssignmentStudentActivity'
|
||||||
import { AssignmentProvider } from '@components/Contexts/Assignments/AssignmentContext'
|
import { AssignmentProvider } from '@components/Contexts/Assignments/AssignmentContext'
|
||||||
|
|
@ -33,6 +33,7 @@ import ActivityNavigation from '@components/Pages/Activity/ActivityNavigation'
|
||||||
import ActivityChapterDropdown from '@components/Pages/Activity/ActivityChapterDropdown'
|
import ActivityChapterDropdown from '@components/Pages/Activity/ActivityChapterDropdown'
|
||||||
import FixedActivitySecondaryBar from '@components/Pages/Activity/FixedActivitySecondaryBar'
|
import FixedActivitySecondaryBar from '@components/Pages/Activity/FixedActivitySecondaryBar'
|
||||||
import CourseEndView from '@components/Pages/Activity/CourseEndView'
|
import CourseEndView from '@components/Pages/Activity/CourseEndView'
|
||||||
|
import { motion, AnimatePresence } from 'framer-motion'
|
||||||
|
|
||||||
interface ActivityClientProps {
|
interface ActivityClientProps {
|
||||||
activityid: string
|
activityid: string
|
||||||
|
|
@ -42,7 +43,16 @@ interface ActivityClientProps {
|
||||||
course: any
|
course: any
|
||||||
}
|
}
|
||||||
|
|
||||||
function ActivityActions({ activity, activityid, course, orgslug, assignment }: { activity: any, activityid: string, course: any, orgslug: string, assignment: any }) {
|
interface ActivityActionsProps {
|
||||||
|
activity: any
|
||||||
|
activityid: string
|
||||||
|
course: any
|
||||||
|
orgslug: string
|
||||||
|
assignment: any
|
||||||
|
showNavigation?: boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
function ActivityActions({ activity, activityid, course, orgslug, assignment, showNavigation = true }: ActivityActionsProps) {
|
||||||
const session = useLHSession() as any;
|
const session = useLHSession() as any;
|
||||||
const { contributorStatus } = useContributorStatus(course.course_uuid);
|
const { contributorStatus } = useContributorStatus(course.course_uuid);
|
||||||
|
|
||||||
|
|
@ -73,6 +83,9 @@ function ActivityActions({ activity, activityid, course, orgslug, assignment }:
|
||||||
</AssignmentSubmissionProvider>
|
</AssignmentSubmissionProvider>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
{showNavigation && (
|
||||||
|
<NextActivityButton course={course} currentActivityId={activity.id} orgslug={orgslug} />
|
||||||
|
)}
|
||||||
</AuthenticatedClientElement>
|
</AuthenticatedClientElement>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -92,8 +105,65 @@ function ActivityClient(props: ActivityClientProps) {
|
||||||
const [bgColor, setBgColor] = React.useState('bg-white')
|
const [bgColor, setBgColor] = React.useState('bg-white')
|
||||||
const [assignment, setAssignment] = React.useState(null) as any;
|
const [assignment, setAssignment] = React.useState(null) as any;
|
||||||
const [markStatusButtonActive, setMarkStatusButtonActive] = React.useState(false);
|
const [markStatusButtonActive, setMarkStatusButtonActive] = React.useState(false);
|
||||||
|
const [isFocusMode, setIsFocusMode] = React.useState(false);
|
||||||
|
const isInitialRender = useRef(true);
|
||||||
const { contributorStatus } = useContributorStatus(courseuuid);
|
const { contributorStatus } = useContributorStatus(courseuuid);
|
||||||
|
const router = useRouter();
|
||||||
|
|
||||||
|
// Function to find the current activity's position in the course
|
||||||
|
const findActivityPosition = () => {
|
||||||
|
let allActivities: any[] = [];
|
||||||
|
let currentIndex = -1;
|
||||||
|
|
||||||
|
// Flatten all activities from all chapters
|
||||||
|
course.chapters.forEach((chapter: any) => {
|
||||||
|
chapter.activities.forEach((activity: any) => {
|
||||||
|
const cleanActivityUuid = activity.activity_uuid?.replace('activity_', '');
|
||||||
|
allActivities.push({
|
||||||
|
...activity,
|
||||||
|
cleanUuid: cleanActivityUuid,
|
||||||
|
chapterName: chapter.name
|
||||||
|
});
|
||||||
|
|
||||||
|
// Check if this is the current activity
|
||||||
|
if (cleanActivityUuid === activityid.replace('activity_', '')) {
|
||||||
|
currentIndex = allActivities.length - 1;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
return { allActivities, currentIndex };
|
||||||
|
};
|
||||||
|
|
||||||
|
const { allActivities, currentIndex } = findActivityPosition();
|
||||||
|
|
||||||
|
// Get previous and next activities
|
||||||
|
const prevActivity = currentIndex > 0 ? allActivities[currentIndex - 1] : null;
|
||||||
|
const nextActivity = currentIndex < allActivities.length - 1 ? allActivities[currentIndex + 1] : null;
|
||||||
|
|
||||||
|
// Navigate to an activity
|
||||||
|
const navigateToActivity = (activity: any) => {
|
||||||
|
if (!activity) return;
|
||||||
|
|
||||||
|
const cleanCourseUuid = course.course_uuid?.replace('course_', '');
|
||||||
|
router.push(getUriWithOrg(orgslug, '') + `/course/${cleanCourseUuid}/activity/${activity.cleanUuid}`);
|
||||||
|
};
|
||||||
|
|
||||||
|
// Initialize focus mode from localStorage
|
||||||
|
React.useEffect(() => {
|
||||||
|
if (typeof window !== 'undefined') {
|
||||||
|
const saved = localStorage.getItem('globalFocusMode');
|
||||||
|
setIsFocusMode(saved === 'true');
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
// Save focus mode to localStorage
|
||||||
|
React.useEffect(() => {
|
||||||
|
if (typeof window !== 'undefined') {
|
||||||
|
localStorage.setItem('globalFocusMode', isFocusMode.toString());
|
||||||
|
isInitialRender.current = false;
|
||||||
|
}
|
||||||
|
}, [isFocusMode]);
|
||||||
|
|
||||||
function getChapterNameByActivityId(course: any, activity_id: any) {
|
function getChapterNameByActivityId(course: any, activity_id: any) {
|
||||||
for (let i = 0; i < course.chapters.length; i++) {
|
for (let i = 0; i < course.chapters.length; i++) {
|
||||||
|
|
@ -115,43 +185,72 @@ function ActivityClient(props: ActivityClientProps) {
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (activity.activity_type == 'TYPE_DYNAMIC') {
|
if (activity.activity_type == 'TYPE_DYNAMIC') {
|
||||||
setBgColor('bg-white nice-shadow');
|
setBgColor(isFocusMode ? 'bg-white' : 'bg-white nice-shadow');
|
||||||
}
|
}
|
||||||
else if (activity.activity_type == 'TYPE_ASSIGNMENT') {
|
else if (activity.activity_type == 'TYPE_ASSIGNMENT') {
|
||||||
setMarkStatusButtonActive(false);
|
setMarkStatusButtonActive(false);
|
||||||
setBgColor('bg-white nice-shadow');
|
setBgColor(isFocusMode ? 'bg-white' : 'bg-white nice-shadow');
|
||||||
getAssignmentUI();
|
getAssignmentUI();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
setBgColor('bg-zinc-950');
|
setBgColor(isFocusMode ? 'bg-zinc-950' : 'bg-zinc-950 nice-shadow');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
, [activity, pathname])
|
, [activity, pathname, isFocusMode])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<CourseProvider courseuuid={course?.course_uuid}>
|
<CourseProvider courseuuid={course?.course_uuid}>
|
||||||
<AIChatBotProvider>
|
<AIChatBotProvider>
|
||||||
<GeneralWrapperStyled>
|
{isFocusMode ? (
|
||||||
{activityid === 'end' ? (
|
<AnimatePresence>
|
||||||
<CourseEndView
|
<motion.div
|
||||||
courseName={course.name}
|
initial={isInitialRender.current ? false : { opacity: 0 }}
|
||||||
orgslug={orgslug}
|
animate={{ opacity: 1 }}
|
||||||
courseUuid={course.course_uuid}
|
exit={{ opacity: 0 }}
|
||||||
thumbnailImage={course.thumbnail_image}
|
transition={{ duration: 0.3 }}
|
||||||
/>
|
className="fixed inset-0 bg-white z-50"
|
||||||
) : (
|
>
|
||||||
<div className="space-y-4 pt-0">
|
{/* Focus Mode Top Bar */}
|
||||||
<div className="pt-2">
|
<motion.div
|
||||||
<div className="space-y-4 pb-4 activity-info-section">
|
initial={isInitialRender.current ? false : { y: -100 }}
|
||||||
<div className="flex justify-between items-center">
|
animate={{ y: 0 }}
|
||||||
<div className="flex space-x-6">
|
exit={{ y: -100 }}
|
||||||
|
transition={{ duration: 0.3 }}
|
||||||
|
className="fixed top-0 left-0 right-0 z-50 bg-white/90 backdrop-blur-xl border-b border-gray-100"
|
||||||
|
>
|
||||||
|
<div className="container mx-auto px-4 py-2">
|
||||||
|
<div className="flex items-center justify-between h-14">
|
||||||
|
<div className="flex items-center space-x-2">
|
||||||
|
<motion.button
|
||||||
|
whileHover={{ scale: 1.05 }}
|
||||||
|
whileTap={{ scale: 0.95 }}
|
||||||
|
onClick={() => setIsFocusMode(false)}
|
||||||
|
className="bg-white nice-shadow p-2 rounded-full cursor-pointer hover:bg-gray-50"
|
||||||
|
title="Exit focus mode"
|
||||||
|
>
|
||||||
|
<Minimize2 size={16} className="text-gray-700" />
|
||||||
|
</motion.button>
|
||||||
|
<ActivityChapterDropdown
|
||||||
|
course={course}
|
||||||
|
currentActivityId={activity.activity_uuid ? activity.activity_uuid.replace('activity_', '') : activityid.replace('activity_', '')}
|
||||||
|
orgslug={orgslug}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Center Course Info */}
|
||||||
|
<motion.div
|
||||||
|
initial={isInitialRender.current ? false : { opacity: 0, y: -20 }}
|
||||||
|
animate={{ opacity: 1, y: 0 }}
|
||||||
|
transition={{ delay: 0.1 }}
|
||||||
|
className="flex items-center space-x-4"
|
||||||
|
>
|
||||||
<div className="flex">
|
<div className="flex">
|
||||||
<Link
|
<Link
|
||||||
href={getUriWithOrg(orgslug, '') + `/course/${courseuuid}`}
|
href={getUriWithOrg(orgslug, '') + `/course/${courseuuid}`}
|
||||||
>
|
>
|
||||||
<img
|
<img
|
||||||
className="w-[100px] h-[57px] rounded-md drop-shadow-md"
|
className="w-[60px] h-[34px] rounded-md drop-shadow-md"
|
||||||
src={`${getCourseThumbnailMediaDirectory(
|
src={`${getCourseThumbnailMediaDirectory(
|
||||||
org?.org_uuid,
|
org?.org_uuid,
|
||||||
course.course_uuid,
|
course.course_uuid,
|
||||||
|
|
@ -162,156 +261,363 @@ function ActivityClient(props: ActivityClientProps) {
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex flex-col -space-y-1">
|
<div className="flex flex-col -space-y-1">
|
||||||
<p className="font-bold text-gray-700 text-md">Course </p>
|
<p className="font-bold text-gray-700 text-sm">Course </p>
|
||||||
<h1 className="font-bold text-gray-950 text-2xl first-letter:uppercase">
|
<h1 className="font-bold text-gray-950 text-lg first-letter:uppercase">
|
||||||
{course.name}
|
{course.name}
|
||||||
</h1>
|
</h1>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</motion.div>
|
||||||
{activity && activity.published == true && activity.content.paid_access != false && (
|
|
||||||
<AuthenticatedClientElement checkMethod="authentication">
|
{/* Progress Indicator */}
|
||||||
{ (
|
<motion.div
|
||||||
<div className="flex space-x-2">
|
initial={isInitialRender.current ? false : { opacity: 0, x: 20 }}
|
||||||
<PreviousActivityButton
|
animate={{ opacity: 1, x: 0 }}
|
||||||
course={course}
|
transition={{ delay: 0.2 }}
|
||||||
currentActivityId={activity.id}
|
className="flex items-center space-x-2"
|
||||||
orgslug={orgslug}
|
>
|
||||||
/>
|
<div className="relative w-8 h-8">
|
||||||
<NextActivityButton
|
<svg className="w-full h-full transform -rotate-90">
|
||||||
course={course}
|
<circle
|
||||||
currentActivityId={activity.id}
|
cx="16"
|
||||||
orgslug={orgslug}
|
cy="16"
|
||||||
/>
|
r="14"
|
||||||
</div>
|
stroke="#e5e7eb"
|
||||||
)}
|
strokeWidth="3"
|
||||||
</AuthenticatedClientElement>
|
fill="none"
|
||||||
)}
|
/>
|
||||||
|
<circle
|
||||||
|
cx="16"
|
||||||
|
cy="16"
|
||||||
|
r="14"
|
||||||
|
stroke="#10b981"
|
||||||
|
strokeWidth="3"
|
||||||
|
fill="none"
|
||||||
|
strokeLinecap="round"
|
||||||
|
strokeDasharray={2 * Math.PI * 14}
|
||||||
|
strokeDashoffset={2 * Math.PI * 14 * (1 - (course.trail?.runs?.find((run: any) => run.course_id === course.id)?.steps?.filter((step: any) => step.complete)?.length || 0) / (course.chapters?.reduce((acc: number, chapter: any) => acc + chapter.activities.length, 0) || 1))}
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
<div className="absolute inset-0 flex items-center justify-center">
|
||||||
|
<span className="text-xs font-bold text-gray-800">
|
||||||
|
{Math.round(((course.trail?.runs?.find((run: any) => run.course_id === course.id)?.steps?.filter((step: any) => step.complete)?.length || 0) / (course.chapters?.reduce((acc: number, chapter: any) => acc + chapter.activities.length, 0) || 1)) * 100)}%
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="text-xs text-gray-600">
|
||||||
|
{course.trail?.runs?.find((run: any) => run.course_id === course.id)?.steps?.filter((step: any) => step.complete)?.length || 0} of {course.chapters?.reduce((acc: number, chapter: any) => acc + chapter.activities.length, 0) || 0}
|
||||||
|
</div>
|
||||||
|
</motion.div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
</motion.div>
|
||||||
|
|
||||||
<ActivityIndicators
|
{/* Focus Mode Content */}
|
||||||
course_uuid={courseuuid}
|
<div className="pt-16 pb-20 h-full overflow-auto">
|
||||||
current_activity={activityid}
|
<div className="container mx-auto px-4">
|
||||||
orgslug={orgslug}
|
{activity && activity.published == true && (
|
||||||
course={course}
|
<>
|
||||||
/>
|
{activity.content.paid_access == false ? (
|
||||||
|
<PaidCourseActivityDisclaimer course={course} />
|
||||||
|
) : (
|
||||||
|
<motion.div
|
||||||
|
initial={isInitialRender.current ? false : { scale: 0.95, opacity: 0 }}
|
||||||
|
animate={{ scale: 1, opacity: 1 }}
|
||||||
|
transition={{ delay: 0.3 }}
|
||||||
|
className={`p-7 rounded-lg ${bgColor} mt-4`}
|
||||||
|
>
|
||||||
|
{/* Activity Types */}
|
||||||
|
<div>
|
||||||
|
{activity.activity_type == 'TYPE_DYNAMIC' && (
|
||||||
|
<Canva content={activity.content} activity={activity} />
|
||||||
|
)}
|
||||||
|
{activity.activity_type == 'TYPE_VIDEO' && (
|
||||||
|
<VideoActivity course={course} activity={activity} />
|
||||||
|
)}
|
||||||
|
{activity.activity_type == 'TYPE_DOCUMENT' && (
|
||||||
|
<DocumentPdfActivity
|
||||||
|
course={course}
|
||||||
|
activity={activity}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
{activity.activity_type == 'TYPE_ASSIGNMENT' && (
|
||||||
|
<div>
|
||||||
|
{assignment ? (
|
||||||
|
<AssignmentProvider assignment_uuid={assignment?.assignment_uuid}>
|
||||||
|
<AssignmentsTaskProvider>
|
||||||
|
<AssignmentSubmissionProvider assignment_uuid={assignment?.assignment_uuid}>
|
||||||
|
<AssignmentStudentActivity />
|
||||||
|
</AssignmentSubmissionProvider>
|
||||||
|
</AssignmentsTaskProvider>
|
||||||
|
</AssignmentProvider>
|
||||||
|
) : (
|
||||||
|
<div></div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</motion.div>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div className="flex justify-between items-center w-full">
|
{/* Focus Mode Bottom Bar */}
|
||||||
<div className="flex flex-1/3 items-center space-x-3">
|
{activity && activity.published == true && activity.content.paid_access != false && (
|
||||||
<ActivityChapterDropdown
|
<motion.div
|
||||||
course={course}
|
initial={isInitialRender.current ? false : { y: 100 }}
|
||||||
currentActivityId={activity.activity_uuid ? activity.activity_uuid.replace('activity_', '') : activityid.replace('activity_', '')}
|
animate={{ y: 0 }}
|
||||||
orgslug={orgslug}
|
exit={{ y: 100 }}
|
||||||
/>
|
transition={{ duration: 0.3 }}
|
||||||
<div className="flex flex-col -space-y-1">
|
className="fixed bottom-0 left-0 right-0 z-50 bg-white/90 backdrop-blur-xl border-t border-gray-100"
|
||||||
<p className="font-bold text-gray-700 text-md">
|
>
|
||||||
Chapter : {getChapterNameByActivityId(course, activity.id)}
|
<div className="container mx-auto px-4">
|
||||||
</p>
|
<div className="flex items-center justify-between h-16">
|
||||||
<h1 className="font-bold text-gray-950 text-2xl first-letter:uppercase">
|
<div className="flex items-center space-x-2">
|
||||||
{activity.name}
|
<button
|
||||||
</h1>
|
onClick={() => navigateToActivity(prevActivity)}
|
||||||
|
className={`flex items-center space-x-1.5 p-2 rounded-md transition-all duration-200 cursor-pointer ${
|
||||||
|
prevActivity
|
||||||
|
? 'text-gray-700'
|
||||||
|
: 'opacity-50 text-gray-400 cursor-not-allowed'
|
||||||
|
}`}
|
||||||
|
disabled={!prevActivity}
|
||||||
|
title={prevActivity ? `Previous: ${prevActivity.name}` : 'No previous activity'}
|
||||||
|
>
|
||||||
|
<ChevronLeft size={20} className="text-gray-800 shrink-0" />
|
||||||
|
<div className="flex flex-col items-start">
|
||||||
|
<span className="text-xs text-gray-500">Previous</span>
|
||||||
|
<span className="text-sm capitalize font-semibold text-left">
|
||||||
|
{prevActivity ? prevActivity.name : 'No previous activity'}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center space-x-2">
|
||||||
|
<ActivityActions
|
||||||
|
activity={activity}
|
||||||
|
activityid={activityid}
|
||||||
|
course={course}
|
||||||
|
orgslug={orgslug}
|
||||||
|
assignment={assignment}
|
||||||
|
showNavigation={false}
|
||||||
|
/>
|
||||||
|
<button
|
||||||
|
onClick={() => navigateToActivity(nextActivity)}
|
||||||
|
className={`flex items-center space-x-1.5 p-2 rounded-md transition-all duration-200 cursor-pointer ${
|
||||||
|
nextActivity
|
||||||
|
? 'text-gray-700'
|
||||||
|
: 'opacity-50 text-gray-400 cursor-not-allowed'
|
||||||
|
}`}
|
||||||
|
disabled={!nextActivity}
|
||||||
|
title={nextActivity ? `Next: ${nextActivity.name}` : 'No next activity'}
|
||||||
|
>
|
||||||
|
<div className="flex flex-col items-end">
|
||||||
|
<span className="text-xs text-gray-500">Next</span>
|
||||||
|
<span className="text-sm capitalize font-semibold text-right">
|
||||||
|
{nextActivity ? nextActivity.name : 'No next activity'}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<ChevronRight size={20} className="text-gray-800 shrink-0" />
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex space-x-2 items-center">
|
</div>
|
||||||
|
</motion.div>
|
||||||
|
)}
|
||||||
|
</motion.div>
|
||||||
|
</AnimatePresence>
|
||||||
|
) : (
|
||||||
|
<GeneralWrapperStyled>
|
||||||
|
{/* Original non-focus mode UI */}
|
||||||
|
{activityid === 'end' ? (
|
||||||
|
<CourseEndView
|
||||||
|
courseName={course.name}
|
||||||
|
orgslug={orgslug}
|
||||||
|
courseUuid={course.course_uuid}
|
||||||
|
thumbnailImage={course.thumbnail_image}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<div className="space-y-4 pt-0">
|
||||||
|
<div className="pt-2">
|
||||||
|
<div className="space-y-4 pb-4 activity-info-section">
|
||||||
|
<div className="flex justify-between items-center">
|
||||||
|
<div className="flex space-x-6">
|
||||||
|
<div className="flex">
|
||||||
|
<Link
|
||||||
|
href={getUriWithOrg(orgslug, '') + `/course/${courseuuid}`}
|
||||||
|
>
|
||||||
|
<img
|
||||||
|
className="w-[100px] h-[57px] rounded-md drop-shadow-md"
|
||||||
|
src={`${getCourseThumbnailMediaDirectory(
|
||||||
|
org?.org_uuid,
|
||||||
|
course.course_uuid,
|
||||||
|
course.thumbnail_image
|
||||||
|
)}`}
|
||||||
|
alt=""
|
||||||
|
/>
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
|
<div className="flex flex-col -space-y-1">
|
||||||
|
<p className="font-bold text-gray-700 text-md">Course </p>
|
||||||
|
<h1 className="font-bold text-gray-950 text-2xl first-letter:uppercase">
|
||||||
|
{course.name}
|
||||||
|
</h1>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
{activity && activity.published == true && activity.content.paid_access != false && (
|
{activity && activity.published == true && activity.content.paid_access != false && (
|
||||||
<AuthenticatedClientElement checkMethod="authentication">
|
<AuthenticatedClientElement checkMethod="authentication">
|
||||||
{activity.activity_type != 'TYPE_ASSIGNMENT' && (
|
{ (
|
||||||
<>
|
<div className="flex space-x-2">
|
||||||
<AIActivityAsk activity={activity} />
|
<PreviousActivityButton
|
||||||
{contributorStatus === 'ACTIVE' && activity.activity_type == 'TYPE_DYNAMIC' && (
|
course={course}
|
||||||
<Link
|
currentActivityId={activity.id}
|
||||||
href={getUriWithOrg(orgslug, '') + `/course/${courseuuid}/activity/${activityid}/edit`}
|
orgslug={orgslug}
|
||||||
className="bg-emerald-600 rounded-full px-5 drop-shadow-md flex items-center space-x-2 p-2.5 text-white hover:cursor-pointer transition delay-150 duration-300 ease-in-out"
|
/>
|
||||||
>
|
<NextActivityButton
|
||||||
<Edit2 size={17} />
|
course={course}
|
||||||
<span className="text-xs font-bold">Contribute</span>
|
currentActivityId={activity.id}
|
||||||
</Link>
|
orgslug={orgslug}
|
||||||
)}
|
/>
|
||||||
</>
|
</div>
|
||||||
)}
|
)}
|
||||||
</AuthenticatedClientElement>
|
</AuthenticatedClientElement>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{activity && activity.published == false && (
|
|
||||||
<div className="p-7 drop-shadow-xs rounded-lg bg-gray-800">
|
|
||||||
<div className="text-white">
|
|
||||||
<h1 className="font-bold text-2xl">
|
|
||||||
This activity is not published yet
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{activity && activity.published == true && (
|
<ActivityIndicators
|
||||||
<>
|
course_uuid={courseuuid}
|
||||||
{activity.content.paid_access == false ? (
|
current_activity={activityid}
|
||||||
<PaidCourseActivityDisclaimer course={course} />
|
orgslug={orgslug}
|
||||||
) : (
|
course={course}
|
||||||
<div className={`p-7 drop-shadow-xs rounded-lg ${bgColor}`}>
|
/>
|
||||||
{/* Activity Types */}
|
|
||||||
<div>
|
<div className="flex justify-between items-center w-full">
|
||||||
{activity.activity_type == 'TYPE_DYNAMIC' && (
|
<div className="flex flex-1/3 items-center space-x-3">
|
||||||
<Canva content={activity.content} activity={activity} />
|
<button
|
||||||
)}
|
onClick={() => setIsFocusMode(true)}
|
||||||
{activity.activity_type == 'TYPE_VIDEO' && (
|
className="bg-white nice-shadow p-2 rounded-full cursor-pointer hover:bg-gray-50 transition-all duration-200"
|
||||||
<VideoActivity course={course} activity={activity} />
|
title="Enter focus mode"
|
||||||
)}
|
>
|
||||||
{activity.activity_type == 'TYPE_DOCUMENT' && (
|
<Maximize2 size={16} className="text-gray-700" />
|
||||||
<DocumentPdfActivity
|
</button>
|
||||||
course={course}
|
<ActivityChapterDropdown
|
||||||
activity={activity}
|
course={course}
|
||||||
/>
|
currentActivityId={activity.activity_uuid ? activity.activity_uuid.replace('activity_', '') : activityid.replace('activity_', '')}
|
||||||
)}
|
orgslug={orgslug}
|
||||||
{activity.activity_type == 'TYPE_ASSIGNMENT' && (
|
/>
|
||||||
<div>
|
<div className="flex flex-col -space-y-1">
|
||||||
{assignment ? (
|
<p className="font-bold text-gray-700 text-md">
|
||||||
<AssignmentProvider assignment_uuid={assignment?.assignment_uuid}>
|
Chapter : {getChapterNameByActivityId(course, activity.id)}
|
||||||
<AssignmentsTaskProvider>
|
</p>
|
||||||
<AssignmentSubmissionProvider assignment_uuid={assignment?.assignment_uuid}>
|
<h1 className="font-bold text-gray-950 text-2xl first-letter:uppercase">
|
||||||
<AssignmentStudentActivity />
|
{activity.name}
|
||||||
</AssignmentSubmissionProvider>
|
</h1>
|
||||||
</AssignmentsTaskProvider>
|
|
||||||
</AssignmentProvider>
|
|
||||||
) : (
|
|
||||||
<div></div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
<div className="flex space-x-2 items-center">
|
||||||
</>
|
{activity && activity.published == true && activity.content.paid_access != false && (
|
||||||
)}
|
<AuthenticatedClientElement checkMethod="authentication">
|
||||||
|
{activity.activity_type != 'TYPE_ASSIGNMENT' && (
|
||||||
{/* Activity Actions below the content box */}
|
<>
|
||||||
{activity && activity.published == true && activity.content.paid_access != false && (
|
<AIActivityAsk activity={activity} />
|
||||||
<div className="flex justify-end mt-4">
|
{contributorStatus === 'ACTIVE' && activity.activity_type == 'TYPE_DYNAMIC' && (
|
||||||
<ActivityActions
|
<Link
|
||||||
activity={activity}
|
href={getUriWithOrg(orgslug, '') + `/course/${courseuuid}/activity/${activityid}/edit`}
|
||||||
activityid={activityid}
|
className="bg-emerald-600 rounded-full px-5 drop-shadow-md flex items-center space-x-2 p-2.5 text-white hover:cursor-pointer transition delay-150 duration-300 ease-in-out"
|
||||||
course={course}
|
>
|
||||||
orgslug={orgslug}
|
<Edit2 size={17} />
|
||||||
assignment={assignment}
|
<span className="text-xs font-bold">Contribute</span>
|
||||||
/>
|
</Link>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</AuthenticatedClientElement>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Fixed Activity Secondary Bar */}
|
{activity && activity.published == false && (
|
||||||
{activity && activity.published == true && activity.content.paid_access != false && (
|
<div className="p-7 drop-shadow-xs rounded-lg bg-gray-800">
|
||||||
<FixedActivitySecondaryBar
|
<div className="text-white">
|
||||||
course={course}
|
<h1 className="font-bold text-2xl">
|
||||||
currentActivityId={activityid}
|
This activity is not published yet
|
||||||
orgslug={orgslug}
|
</h1>
|
||||||
activity={activity}
|
</div>
|
||||||
/>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<div style={{ height: '100px' }}></div>
|
{activity && activity.published == true && (
|
||||||
|
<>
|
||||||
|
{activity.content.paid_access == false ? (
|
||||||
|
<PaidCourseActivityDisclaimer course={course} />
|
||||||
|
) : (
|
||||||
|
<div className={`p-7 drop-shadow-xs rounded-lg ${bgColor}`}>
|
||||||
|
{/* Activity Types */}
|
||||||
|
<div>
|
||||||
|
{activity.activity_type == 'TYPE_DYNAMIC' && (
|
||||||
|
<Canva content={activity.content} activity={activity} />
|
||||||
|
)}
|
||||||
|
{activity.activity_type == 'TYPE_VIDEO' && (
|
||||||
|
<VideoActivity course={course} activity={activity} />
|
||||||
|
)}
|
||||||
|
{activity.activity_type == 'TYPE_DOCUMENT' && (
|
||||||
|
<DocumentPdfActivity
|
||||||
|
course={course}
|
||||||
|
activity={activity}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
{activity.activity_type == 'TYPE_ASSIGNMENT' && (
|
||||||
|
<div>
|
||||||
|
{assignment ? (
|
||||||
|
<AssignmentProvider assignment_uuid={assignment?.assignment_uuid}>
|
||||||
|
<AssignmentsTaskProvider>
|
||||||
|
<AssignmentSubmissionProvider assignment_uuid={assignment?.assignment_uuid}>
|
||||||
|
<AssignmentStudentActivity />
|
||||||
|
</AssignmentSubmissionProvider>
|
||||||
|
</AssignmentsTaskProvider>
|
||||||
|
</AssignmentProvider>
|
||||||
|
) : (
|
||||||
|
<div></div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Activity Actions below the content box */}
|
||||||
|
{activity && activity.published == true && activity.content.paid_access != false && (
|
||||||
|
<div className="flex justify-end mt-4">
|
||||||
|
<ActivityActions
|
||||||
|
activity={activity}
|
||||||
|
activityid={activityid}
|
||||||
|
course={course}
|
||||||
|
orgslug={orgslug}
|
||||||
|
assignment={assignment}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Fixed Activity Secondary Bar */}
|
||||||
|
{activity && activity.published == true && activity.content.paid_access != false && (
|
||||||
|
<FixedActivitySecondaryBar
|
||||||
|
course={course}
|
||||||
|
currentActivityId={activityid}
|
||||||
|
orgslug={orgslug}
|
||||||
|
activity={activity}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div style={{ height: '100px' }}></div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
)}
|
||||||
)}
|
</GeneralWrapperStyled>
|
||||||
</GeneralWrapperStyled>
|
)}
|
||||||
</AIChatBotProvider>
|
</AIChatBotProvider>
|
||||||
</CourseProvider>
|
</CourseProvider>
|
||||||
</>
|
</>
|
||||||
|
|
@ -461,7 +767,6 @@ export function MarkStatus(props: {
|
||||||
status="warning"
|
status="warning"
|
||||||
/>
|
/>
|
||||||
</ToolTip>
|
</ToolTip>
|
||||||
<NextActivityButton course={props.course} currentActivityId={props.activity.id} orgslug={props.orgslug} />
|
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<div className="flex items-center space-x-2">
|
<div className="flex items-center space-x-2">
|
||||||
|
|
@ -483,7 +788,6 @@ export function MarkStatus(props: {
|
||||||
)}{' '}
|
)}{' '}
|
||||||
{!isMobile && <i className="not-italic text-xs font-bold">{isLoading ? 'Marking...' : 'Mark as complete'}</i>}
|
{!isMobile && <i className="not-italic text-xs font-bold">{isLoading ? 'Marking...' : 'Mark as complete'}</i>}
|
||||||
</div>
|
</div>
|
||||||
<NextActivityButton course={props.course} currentActivityId={props.activity.id} orgslug={props.orgslug} />
|
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue