Skip to content

Feature/progress #390

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 5 commits into from
Jul 17, 2020
Merged

Feature/progress #390

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
60365ef
add modal stories
ShMcK Jul 17, 2020
60c171d
create progress pie component
ShMcK Jul 17, 2020
e192e43
progress indicator continue
ShMcK Jul 17, 2020
78d9a71
no progress on single task level
ShMcK Jul 17, 2020
bd28a70
fix continue button positioning
ShMcK Jul 17, 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
Prev Previous commit
fix continue button positioning 
Signed-off-by: shmck <shawn.j.mckay@gmail.com>
  • Loading branch information
@ShMcK
ShMcK committed Jul 17, 2020
commit bd28a702194c1be96e4acab5c6023a1f3be264d6
5 changes: 3 additions & 2 deletions web-app/src/containers/Tutorial/components/Continue.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ import ProgressPie from './ProgressPie'
const styles = {
content: {
display: 'flex' as 'flex',
flexDirection: 'column',
justifyContent: 'center',
flexDirection: 'column' as 'column',
justifyContent: 'center' as 'center',
alignItems: 'center' as 'center',
},
message: {
textAlign: 'center' as 'center',
Expand Down
16 changes: 9 additions & 7 deletions web-app/src/containers/Tutorial/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,14 +155,16 @@ const TutorialPage = (props: PageProps) => {
{/* Right */}
<div css={{ flex: 1, display: 'flex', justifyContent: 'flex-end' }}>
{level.status === 'COMPLETE' || !level.steps.length ? (
<Continue
onContinue={onContinue}
current={levelIndex + 1}
max={level.steps.length}
title={tutorial.summary.title}
/>
<div css={{ marginRight: '0.5rem' }}>
<Continue
onContinue={onContinue}
current={levelIndex + 1}
max={levels.length}
title={tutorial.summary.title}
/>
</div>
) : level.steps.length > 1 ? (
<StepProgress current={stepIndex} max={level.steps.length} />
<StepProgress current={stepIndex + 1} max={level.steps.length} />
) : null}
</div>
</div>
Expand Down