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
0a130e93
Commit
0a130e93
authored
Oct 11, 2022
by
Nilan Meegoda
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'minor_fixes' into 'master'
Minor fixes See merge request
!34
parents
d75d9081
a8197730
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
107 additions
and
32 deletions
+107
-32
web-app/frontend/public/Videos/30sec1.mp4
web-app/frontend/public/Videos/30sec1.mp4
+0
-0
web-app/frontend/public/Videos/40sec.mp4
web-app/frontend/public/Videos/40sec.mp4
+0
-0
web-app/frontend/src/components/activities/ActivityContainer.css
.../frontend/src/components/activities/ActivityContainer.css
+14
-0
web-app/frontend/src/components/activities/ActivityContainer.jsx
.../frontend/src/components/activities/ActivityContainer.jsx
+11
-0
web-app/frontend/src/pages/attention_demo/attentionspan.css
web-app/frontend/src/pages/attention_demo/attentionspan.css
+5
-0
web-app/frontend/src/pages/attention_demo/attentionspan.jsx
web-app/frontend/src/pages/attention_demo/attentionspan.jsx
+77
-32
No files found.
web-app/frontend/public/Videos/30sec1.mp4
0 → 100644
View file @
0a130e93
File added
web-app/frontend/public/Videos/40sec.mp4
0 → 100644
View file @
0a130e93
File added
web-app/frontend/src/components/activities/ActivityContainer.css
View file @
0a130e93
...
...
@@ -49,6 +49,20 @@
padding-bottom
:
5px
;
}
.activity-container-navigator-itemx
{
font-family
:
var
(
--font-family
);
font-weight
:
400
;
font-size
:
1em
;
color
:
white
;
background-color
:
rgb
(
237
,
188
,
8
);
border-radius
:
5px
;
margin
:
5px
0px
5px
0px
;
text-align
:
center
;
padding-top
:
5px
;
padding-bottom
:
5px
;
}
.activity-container-navigator-item
:hover
{
opacity
:
0.8
;
}
web-app/frontend/src/components/activities/ActivityContainer.jsx
View file @
0a130e93
...
...
@@ -11,8 +11,10 @@ import {
import
LetterPattern
from
"
./mentalChronometryEval/letterPattern/LetterPattern
"
;
import
Coding
from
"
./mentalChronometryEval/coding/Coding
"
;
import
PairCancerlation
from
"
./mentalChronometryEval/pairCancerlation/PairCancerlation
"
;
import
{
useNavigate
}
from
"
react-router-dom
"
;
const
ActivityContainer
=
()
=>
{
const
navigate
=
useNavigate
();
const
[
currentActivityNo
,
setCurrentActivityNo
]
=
useState
(
1
);
const
[
isGuideVideoClicked
,
setIsGuideVideoClicked
]
=
useState
(
true
);
...
...
@@ -113,6 +115,15 @@ const ActivityContainer = () => {
>
7
</
div
>
<
div
id=
"8"
className=
"activity-container-navigator-itemx"
onClick=
{
()
=>
{
navigate
(
"
/attentionDemo
"
)
}
}
>
8
</
div
>
</
div
>
<
div
id=
"activity-container-item-1"
>
{
isGuideVideoClicked
?
(
...
...
web-app/frontend/src/pages/attention_demo/attentionspan.css
View file @
0a130e93
...
...
@@ -47,4 +47,9 @@ video {
height
:
40%
;
}
.bt1
{
position
:
absolute
;
right
:
28px
;
}
web-app/frontend/src/pages/attention_demo/attentionspan.jsx
View file @
0a130e93
This diff is collapsed.
Click to expand it.
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