Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Intro task updates #202

Merged
merged 4 commits into from
Oct 16, 2024
Merged

Intro task updates #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
794bf67
resize elements to fit inside most screens
zwatson2001 Oct 9, 2024
6b0e78d
parameterize taskFinished trial to display different message for intro
zwatson2001 Oct 10, 2024
3564bbb
Merge branch 'main' into update-intro-task
zwatson2001 Oct 10, 2024
9f1aa50
add instructions-small class and allow any end message in taskFinished
zwatson2001 Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions task-launcher/src/styles/abstracts/_fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ $font-size-l: 64px;
$font-size-m: 48px;
$font-size-s: 40px;
$font-size-xs: 32px;
$font-size-xs-em: 1.5em;
$font-size-xxs: 24px;
$font-size-xxxs: 16px;

Expand Down
49 changes: 49 additions & 0 deletions task-launcher/src/styles/layout/_containers.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,55 @@
}
}
}

&.instruction-small {
display: flex;
padding: $lev-spacing-s;
justify-content: center;
align-items: center;
text-align: center;
border: 3px solid $bg-accent_secondary;
border-radius: 32px;
background-color: $bg-bubble-base;
max-width: 90vw;

p {
font-size: $font-size-xs-em;
font-weight: $font-weight-light;
line-height: 1.0;
margin: 0;
}

@include respond-to('medium') {
display: flex;
padding: $lev-spacing-xs;
justify-content: center;
align-items: center;
border-radius: 24px;

p {
font-size: $font-size-xxs;
font-weight: $font-weight-light;
line-height: 1.0;
margin: 0;
}
}

@include respond-to('small') {
display: flex;
padding: $lev-spacing-xxs;
justify-content: center;
align-items: center;
border-radius: 16px;

p {
font-size: $font-size-xxxs;
font-weight: $font-weight-light;
line-height: 1.0;
margin: 0;
}
}
}
}

.lev-stimulus-container {
Expand Down
2 changes: 1 addition & 1 deletion task-launcher/src/tasks/intro/timeline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default function buildIntroTimeline(config: Record<string, any>, mediaAss

const timeline = [preloadTrials, initialTimeline, ...instructions];

timeline.push(taskFinished);
timeline.push(taskFinished('introFinished'));
timeline.push(exitFullscreen);

return { jsPsych, timeline };
Expand Down
3 changes: 2 additions & 1 deletion task-launcher/src/tasks/intro/trials/instructions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,14 @@ export const instructions = instructionData.map(data => {
<button id="replay-btn-revisited" class="replay">
${replayButtonSvg}
</button>
<div class="lev-row-container instruction">
<div class="lev-row-container instruction-small">
<p>${t[data.prompt]}</p>
</div>
<div class="lev-stim-content-x-3">
<img
src=${mediaAssets.images[data.image]}
alt='Instruction graphic'
style="height:330px;width:330px"
/>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion task-launcher/src/tasks/math/timeline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export default function buildMathTimeline(config: Record<string, any>, mediaAsse

initializeCat();

timeline.push(taskFinished);
timeline.push(taskFinished());
timeline.push(exitFullscreen);

return { jsPsych, timeline };
Expand Down
2 changes: 1 addition & 1 deletion task-launcher/src/tasks/matrix-reasoning/timeline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export default function buildMatrixTimeline(config: Record<string, any>, mediaAs

initializeCat();

timeline.push(taskFinished);
timeline.push(taskFinished());
timeline.push(exitFullscreen);

return { jsPsych, timeline };
Expand Down
2 changes: 1 addition & 1 deletion task-launcher/src/tasks/mental-rotation/timeline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export default function buildMentalRotationTimeline(config: Record<string, any>,

initializeCat();

timeline.push(taskFinished);
timeline.push(taskFinished());
timeline.push(exitFullscreen);

return { jsPsych, timeline };
Expand Down
2 changes: 1 addition & 1 deletion task-launcher/src/tasks/same-different-selection/timeline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export default function buildSameDifferentTimeline(config: Record<string, any>,

initializeCat();

timeline.push(taskFinished);
timeline.push(taskFinished());
timeline.push(exitFullscreen);

return { jsPsych, timeline };
Expand Down
53 changes: 28 additions & 25 deletions task-launcher/src/tasks/shared/trials/taskFinished.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,36 @@ import jsPsychHTMLMultiResponse from '@jspsych-contrib/plugin-html-multi-respons
import { taskStore, PageAudioHandler } from '../helpers';
import { mediaAssets } from '../../..';

export const taskFinished = {
type: jsPsychHTMLMultiResponse,
data: () => {
return {
// save_trial: true,
assessment_stage: 'instructions',
};
},
stimulus: () => {
const t = taskStore().translations;
return `
<div class='lev-stimulus-container'>
<div class='lev-row-container instruction'>
<h1>${t.taskFinished}</h1>
</div>
<footer>${t.generalFooter}</footer>
</div>`;
},
button_choices: [`Continue`],
keyboard_choices: 'ALL_KEYS',
button_html: '<button class="primary" style=margin-top:10%>Exit</button>',
on_load: () => {
if (mediaAssets.audio.taskFinished) {
PageAudioHandler.playAudio(mediaAssets.audio.taskFinished)
export const taskFinished = (endMessage = 'taskFinished') => {
return {
type: jsPsychHTMLMultiResponse,
data: () => {
return {
// save_trial: true,
assessment_stage: 'instructions',
};
},
stimulus: () => {
const t = taskStore().translations;

return `
<div class='lev-stimulus-container'>
<div class='lev-row-container instruction'>
<h1>${t[endMessage]}</h1>
</div>
<footer>${t.generalFooter}</footer>
</div>`;
},
button_choices: [`Continue`],
keyboard_choices: 'ALL_KEYS',
button_html: '<button class="primary" style=margin-top:10%>Exit</button>',
on_load: () => {
if (mediaAssets.audio[endMessage]) {
PageAudioHandler.playAudio(mediaAssets.audio[endMessage])
}
}
// trial_duration: 1000,
}
// trial_duration: 1000,
};


2 changes: 1 addition & 1 deletion task-launcher/src/tasks/theory-of-mind/timeline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export default function buildTOMTimeline(config: Record<string, any>, mediaAsset

initializeCat();

timeline.push(taskFinished);
timeline.push(taskFinished());
timeline.push(exitFullscreen);

return { jsPsych, timeline };
Expand Down
2 changes: 1 addition & 1 deletion task-launcher/src/tasks/trog/timeline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export default function buildTROGTimeline(config: Record<string, any>, mediaAsse
initializeCat();

// final screens
timeline.push(taskFinished);
timeline.push(taskFinished());
timeline.push(exitFullscreen);

return { jsPsych, timeline };
Expand Down
2 changes: 1 addition & 1 deletion task-launcher/src/tasks/vocab/timeline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export default function buildVocabTimeline(config: Record<string, any>, mediaAss
initializeCat();

// final screens
timeline.push(taskFinished);
timeline.push(taskFinished());
timeline.push(exitFullscreen);

return { jsPsych, timeline };
Expand Down
Loading