Skip to content

Commit d00309d

Browse files
committed
better state on progress
1 parent 6b9afad commit d00309d

4 files changed

Lines changed: 82 additions & 71 deletions

File tree

‎frontend/main/package.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
"next-seo": "^4.28.1",
3131
"next-themes": "^0.2.0",
3232
"prism-react-renderer": "^1.3.3",
33-
"prismjs": "^1.28.0",
3433
"react": "^17.0.2",
3534
"react-dom": "^17.0.2",
3635
"react-firebaseui": "^6.0.0",
@@ -45,7 +44,6 @@
4544
"@next/bundle-analyzer": "^12.0.3",
4645
"@next/eslint-plugin-next": "^12.0.3",
4746
"@types/node": "^16.11.40",
48-
"@types/prismjs": "^1.26.0",
4947
"@types/react-beautiful-dnd": "^13.0.0",
5048
"@types/react-dom": "^17.0.11",
5149
"@types/react-gtm-module": "^2.0.0",

‎frontend/main/src/components/PostMedia.tsx‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,23 @@ import { config } from '@/config/cloudinary';
55
import { Video } from 'cloudinary-react';
66
import ReactPlayer from 'react-player/lazy';
77
import Image from 'next/image';
8-
import { RefObject, useState } from 'react';
8+
import { SetStateAction } from 'react';
99

1010
export default function PostMedia({
1111
post,
1212
noImage,
13-
vidRef,
14-
onStart,
15-
onProgress,
13+
playing,
14+
setPlaying,
15+
videoProgress,
16+
setVideoProgress,
1617
}: {
1718
post: Post;
1819
noImage?: boolean;
19-
vidRef?: RefObject<ReactPlayer>;
20-
onStart?: (progress?: any) => void;
21-
onProgress?: (progress?: { played: number }) => void;
20+
playing?: boolean;
21+
setPlaying?: (value: SetStateAction<boolean>) => void;
22+
videoProgress?: number;
23+
setVideoProgress?: (value: SetStateAction<number>) => void;
2224
}): JSX.Element {
23-
const [playing, setPlaying] = useState(true);
2425
const isYouTube = (): boolean => {
2526
if (post && post.coverVideo && post.coverVideo.url) {
2627
return post.coverVideo?.url.includes('youtu.be') ||
@@ -32,6 +33,17 @@ export default function PostMedia({
3233
}
3334
};
3435

36+
const onReady = (player: ReactPlayer) => {
37+
if (videoProgress && setPlaying) {
38+
console.log('vid seek to', videoProgress);
39+
player.seekTo(videoProgress, 'fraction');
40+
setPlaying(true);
41+
}
42+
};
43+
const onProgress = (progress?: { played: number }) => {
44+
progress && setVideoProgress && setVideoProgress(progress.played);
45+
};
46+
3547
return (
3648
<>
3749
{post?.coverVideo && Object.keys(post.coverVideo).length ? (
@@ -55,7 +67,6 @@ export default function PostMedia({
5567
<>
5668
{isYouTube() ? (
5769
<ReactPlayer
58-
ref={vidRef}
5970
className="react-player"
6071
url={post.coverVideo?.url}
6172
controls={true}
@@ -68,8 +79,8 @@ export default function PostMedia({
6879
position: 'relative',
6980
}}
7081
playing={playing}
71-
onStart={onStart}
7282
onProgress={onProgress}
83+
onReady={onReady}
7384
/>
7485
) : (
7586
<ReactPlayer

‎frontend/main/src/components/firebase/CourseProgress.tsx‎

Lines changed: 34 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
import { config } from '@/config/firebase';
2-
import { UserInfoExtended } from '@/models/user.model';
31
import { User } from 'firebase/auth';
42
import { doc, DocumentReference, setDoc } from 'firebase/firestore';
5-
import { useEffect, useState } from 'react';
3+
import { SetStateAction, useEffect, useState } from 'react';
64
import { useFirestore, useFirestoreDocData } from 'reactfire';
75

86
export const CourseProgress = ({
97
user,
108
courseId,
119
sectionId,
1210
lessonId,
13-
videoProgress,
1411
currentLesson,
12+
videoProgress,
13+
setVideoProgress,
1514
}: {
1615
user: User;
1716
courseId: string;
1817
sectionId: string;
1918
lessonId: string;
20-
videoProgress: number;
2119
currentLesson: string;
20+
videoProgress: number;
21+
setVideoProgress: (value: SetStateAction<number>) => void;
2222
}) => {
2323
return (
2424
<>
@@ -30,6 +30,7 @@ export const CourseProgress = ({
3030
lessonId={lessonId}
3131
videoProgress={videoProgress}
3232
currentLesson={currentLesson}
33+
setVideoProgress={setVideoProgress}
3334
/>
3435
)}
3536
</>
@@ -43,13 +44,15 @@ const UserProgress = ({
4344
lessonId,
4445
videoProgress,
4546
currentLesson,
47+
setVideoProgress,
4648
}: {
4749
user: User;
4850
courseId: string;
4951
sectionId: string;
5052
lessonId: string;
51-
videoProgress: number;
5253
currentLesson: string;
54+
videoProgress: number;
55+
setVideoProgress: (value: SetStateAction<number>) => void;
5356
}) => {
5457
const firestore = useFirestore();
5558
const ref = doc(
@@ -76,41 +79,53 @@ const UserProgress = ({
7679
const [checked, setChecked] = useState(false);
7780

7881
const handleManualChecked = () => {
82+
setChecked(!checked);
83+
console.log('setting manual checked', checked);
84+
7985
setDoc(
8086
ref,
8187
{
82-
manualComplete: !checked,
88+
manualComplete: checked ? null : true,
8389
},
8490
{ merge: true }
8591
);
8692
};
8793

8894
useEffect(() => {
95+
if (
96+
userProgress?.videoProgress &&
97+
currentLesson.replaceAll('-', '') === lessonId
98+
) {
99+
setVideoProgress(videoProgress || userProgress?.videoProgress || 0);
100+
}
101+
89102
if (
90103
ref &&
91104
videoProgress &&
92105
currentLesson.replaceAll('-', '') === lessonId
93106
) {
107+
console.log('setting doc', videoProgress);
94108
setDoc(
95109
ref,
96110
{
97111
videoProgress,
98-
complete:
99-
userProgress?.manualComplete ||
100-
(userProgress && userProgress?.videoProgress
101-
? userProgress?.videoProgress > 0.98
102-
: false),
103112
},
104113
{ merge: true }
105114
);
115+
if (userProgress?.manualComplete || videoProgress > 0.92) {
116+
setChecked(true);
117+
console.log('setting checked', true);
118+
119+
setDoc(
120+
ref,
121+
{
122+
complete: true,
123+
},
124+
{ merge: true }
125+
);
126+
}
106127
}
107-
setChecked(
108-
userProgress?.manualComplete ||
109-
(userProgress && userProgress?.videoProgress
110-
? userProgress?.videoProgress > 0.98
111-
: false)
112-
);
113-
}, [ref, videoProgress, userProgress]);
128+
}, [videoProgress, currentLesson, lessonId]);
114129

115130
return (
116131
<>

‎frontend/main/src/layout/PostLayout.tsx‎

Lines changed: 27 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,6 @@ const MemberNotValidShow = dynamic<any>(
3838
}
3939
);
4040

41-
import Prism from 'prismjs';
42-
43-
import 'prismjs/components/prism-javascript';
44-
import 'prismjs/components/prism-css';
45-
import 'prismjs/components/prism-jsx';
46-
// import 'prismjs/plugins/toolbar/prism-toolbar';
47-
// import 'prismjs/plugins/copy-to-clipboard/prism-copy-to-clipboard';
48-
import 'prismjs/plugins/diff-highlight/prism-diff-highlight';
4941
import dynamic from 'next/dynamic';
5042
import { isActiveLesson } from '@/utils/basics/links';
5143
import ReactPlayer from 'react-player/lazy';
@@ -68,28 +60,18 @@ export default function PostLayout({
6860
const [href, setHref] = useState('');
6961
const { data: user } = useUser();
7062

63+
// Track Video Details and Pass to Progress
64+
const [videoProgress, setVideoProgress] = useState(0);
65+
const [playing, setPlaying] = useState(false);
66+
const [currentLesson, setCurrentLesson] = useState<string | null>(null);
7167
useEffect(() => {
72-
Prism.highlightAll();
7368
setHref(location.href);
69+
setPlaying(false);
70+
setVideoProgress(0);
71+
setCurrentLesson(post.id);
72+
console.log('Reset');
7473
}, [post]);
7574

76-
// Track Video Details and Pass to Progress
77-
const [videoProgress, setVideoProgress] = useState(0);
78-
const vidRef = useRef<ReactPlayer>(null);
79-
const onStart = (progress?: any) => {
80-
console.log('onStart', progress);
81-
// const vid = vidRef.current;
82-
// if (!vid) {
83-
// return;
84-
// }
85-
// //Seek to current user lesson position?
86-
// vid.seekTo(0.25, 'fraction');
87-
};
88-
const onProgress = (progress?: { played: number }) => {
89-
console.log('onProgress', progress);
90-
progress && setVideoProgress(progress.played);
91-
};
92-
9375
function isLockedLesson() {
9476
// Only lockdown lessons
9577
if (post._type != PostType.lesson) {
@@ -249,14 +231,17 @@ export default function PostLayout({
249231
</Link>
250232
{user && user.uid && (
251233
<div className="flex flex-wrap justify-between px-2 m-1">
252-
<CourseProgress
253-
user={user}
254-
courseId={course.id}
255-
sectionId={section._key}
256-
lessonId={lesson._id}
257-
videoProgress={videoProgress}
258-
currentLesson={post.id}
259-
/>
234+
{currentLesson && (
235+
<CourseProgress
236+
user={user}
237+
courseId={course.id}
238+
sectionId={section._key}
239+
lessonId={lesson._id}
240+
currentLesson={currentLesson}
241+
videoProgress={videoProgress}
242+
setVideoProgress={setVideoProgress}
243+
/>
244+
)}
260245
</div>
261246
)}
262247
</li>
@@ -336,18 +321,20 @@ export default function PostLayout({
336321
{!isLockedLesson() ? (
337322
<PostMedia
338323
post={post}
339-
vidRef={vidRef}
340-
onStart={onStart}
341-
onProgress={onProgress}
324+
playing={playing}
325+
setPlaying={setPlaying}
326+
videoProgress={videoProgress}
327+
setVideoProgress={setVideoProgress}
342328
/>
343329
) : user && user?.uid ? (
344330
<>
345331
<MemberValidShow user={user}>
346332
<PostMedia
347333
post={post}
348-
vidRef={vidRef}
349-
onStart={onStart}
350-
onProgress={onProgress}
334+
playing={playing}
335+
setPlaying={setPlaying}
336+
videoProgress={videoProgress}
337+
setVideoProgress={setVideoProgress}
351338
/>
352339
</MemberValidShow>
353340
<MemberNotValidShow user={user}>

0 commit comments

Comments
 (0)