Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
2
2022-073
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
2022-073
2022-073
Commits
82fa207c
Commit
82fa207c
authored
Oct 10, 2022
by
Nilan Meegoda
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'video_player' into 'master'
video player bug fix See merge request
!23
parents
21b24d51
8b3a781c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
6 deletions
+13
-6
web-app/frontend/src/components/activities/ActivityContainer.jsx
.../frontend/src/components/activities/ActivityContainer.jsx
+10
-2
web-app/frontend/src/components/activities/reasoningIqEval/pictureConcept/PictureConcept.jsx
...ivities/reasoningIqEval/pictureConcept/PictureConcept.jsx
+2
-2
web-app/frontend/src/utility/videos.jsx
web-app/frontend/src/utility/videos.jsx
+1
-2
No files found.
web-app/frontend/src/components/activities/ActivityContainer.jsx
View file @
82fa207c
...
...
@@ -11,11 +11,12 @@ const ActivityContainer = () => {
const
nextActivityHandler
=
()
=>
{
setCurrentActivityNo
(
currentActivityNo
+
1
);
setIsGuideVideoClicked
(
true
);
};
const
changeActivityScreen
=
()
=>
{
const
changeActivityScreen
=
(
state
)
=>
{
setTimeout
(()
=>
{
setIsGuideVideoClicked
(
fals
e
);
setIsGuideVideoClicked
(
stat
e
);
},
2000
);
}
...
...
@@ -33,6 +34,7 @@ const ActivityContainer = () => {
className=
"activity-container-navigator-item"
onClick=
{
()
=>
{
setCurrentActivityNo
(
1
);
setIsGuideVideoClicked
(
true
);
changeColor
();
}
}
>
...
...
@@ -43,6 +45,7 @@ const ActivityContainer = () => {
className=
"activity-container-navigator-item"
onClick=
{
()
=>
{
setCurrentActivityNo
(
2
);
setIsGuideVideoClicked
(
true
);
changeColor
();
}
}
>
...
...
@@ -53,6 +56,7 @@ const ActivityContainer = () => {
className=
"activity-container-navigator-item"
onClick=
{
()
=>
{
setCurrentActivityNo
(
3
);
setIsGuideVideoClicked
(
true
);
changeColor
();
}
}
>
...
...
@@ -63,6 +67,7 @@ const ActivityContainer = () => {
className=
"activity-container-navigator-item"
onClick=
{
()
=>
{
setCurrentActivityNo
(
4
);
setIsGuideVideoClicked
(
true
);
changeColor
();
}
}
>
...
...
@@ -73,6 +78,7 @@ const ActivityContainer = () => {
className=
"activity-container-navigator-item"
onClick=
{
()
=>
{
setCurrentActivityNo
(
5
);
setIsGuideVideoClicked
(
true
);
changeColor
();
}
}
>
...
...
@@ -83,6 +89,7 @@ const ActivityContainer = () => {
className=
"activity-container-navigator-item"
onClick=
{
()
=>
{
setCurrentActivityNo
(
6
);
setIsGuideVideoClicked
(
true
);
changeColor
();
}
}
>
...
...
@@ -93,6 +100,7 @@ const ActivityContainer = () => {
className=
"activity-container-navigator-item"
onClick=
{
()
=>
{
setCurrentActivityNo
(
7
);
setIsGuideVideoClicked
(
true
);
changeColor
();
}
}
>
...
...
web-app/frontend/src/components/activities/reasoningIqEval/pictureConcept/PictureConcept.jsx
View file @
82fa207c
...
...
@@ -141,7 +141,7 @@ const PictureConcept = ({ nextActivity }) => {
</
div
>
)
}
{
/* {
allCompleted && (
{
allCompleted
&&
(
<
button
className=
"float-right bg-transparent hover:bg-red-500 text-red-700 font-semibold hover:text-white py-2 px-4 border border-red-500 hover:border-transparent rounded"
onClick=
{
()
=>
{
...
...
@@ -150,7 +150,7 @@ const PictureConcept = ({ nextActivity }) => {
>
Next Activity
</
button
>
)}
*/
}
)
}
{
!
allCompleted
&&
<
Timer
switchActivity=
{
switchActivityHandler
}
/>
}
{
!
allCompleted
&&
<
div
></
div
>
}
</
div
>
...
...
web-app/frontend/src/utility/videos.jsx
View file @
82fa207c
...
...
@@ -42,8 +42,7 @@ const Video = ({ currentActivtyIndex, changeScreen }) => {
},
[]);
const
myCallback
=
()
=>
{
console
.
log
(
"
Test 123
"
);
changeScreen
();
changeScreen
(
false
);
}
return
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment