Skip to content

Feature/progress tasks #104

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

Merged
merged 2 commits into from
Feb 3, 2020
Merged

Feature/progress tasks #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62ae4cb
cleanup Level stories
ShMcK Feb 2, 2020
6b0cbff
add basic progress tracker
ShMcK Feb 3, 2020
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
9 changes: 8 additions & 1 deletion web-app/src/containers/Tutorial/LevelPage/Level.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ const Level = ({ level, onContinue, onLoadSolution, processes, testStatus }: Pro
throw new Error('No Stage steps found')
}

// @ts-ignore
const currentStep = level.steps.indexOf(s => s.status === 'ACTIVE') + 1

return (
<div css={styles.page}>
<div css={styles.header}>
Expand Down Expand Up @@ -120,10 +123,14 @@ const Level = ({ level, onContinue, onLoadSolution, processes, testStatus }: Pro
{level.title}
</span>
<span>
{level.status === 'COMPLETE' && (
{level.status === 'COMPLETE' ? (
<Button type="primary" onClick={onContinue}>
Continue
</Button>
) : (
<span>
{currentStep} of {level.steps.length} tasks
</span>
)}
</span>
</div>
Expand Down
25 changes: 22 additions & 3 deletions web-app/stories/Level.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,13 @@ storiesOf('Level', module)
],
}
return (
<Level level={level} onContinue={action('onContinue')} onLoadSolution={action('onLoadSolution')} processes={[]} />
<Level
level={level}
onContinue={action('onContinue')}
onLoadSolution={action('onLoadSolution')}
processes={[]}
testStatus={null}
/>
)
})
.add('Level 2', () => {
Expand Down Expand Up @@ -129,6 +135,7 @@ storiesOf('Level', module)
description: 'Installing dependencies',
},
]}
testStatus={null}
/>
)
})
Expand Down Expand Up @@ -201,7 +208,13 @@ storiesOf('Level', module)
],
}
return (
<Level level={level} onContinue={action('onContinue')} onLoadSolution={action('onLoadSolution')} processes={[]} />
<Level
level={level}
onContinue={action('onContinue')}
onLoadSolution={action('onLoadSolution')}
processes={[]}
testStatus={null}
/>
)
})
.add('FakeBook API L2', () => {
Expand Down Expand Up @@ -267,6 +280,12 @@ storiesOf('Level', module)
],
}
return (
<Level level={level} onContinue={action('onContinue')} onLoadSolution={action('onLoadSolution')} processes={[]} />
<Level
level={level}
onContinue={action('onContinue')}
onLoadSolution={action('onLoadSolution')}
processes={[]}
testStatus={null}
/>
)
})