Commit25eef01

authored

Merge pull request#104 from ShMcK/feature/progress-tasks

Feature/progress tasks

2 parentsaa830ea +6b0cbff commit25eef01Copy full SHA for 25eef01

File tree

2 files changed

+30

-4

lines changed

web-app
- src/containers/Tutorial/LevelPage
  - Level.tsx
- stories
  - Level.stories.tsx

2 files changed

+30

-4

lines changed

`‎web-app/src/containers/Tutorial/LevelPage/Level.tsx`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,9 @@ const Level = ({ level, onContinue, onLoadSolution, processes, testStatus }: Pro`
`78`	`78`	`thrownewError('No Stage steps found')`
`79`	`79`	`}`
`80`	`80`
	`81`	`+//@ts-ignore`
	`82`	`+constcurrentStep=level.steps.indexOf(s=>s.status==='ACTIVE')+1`
	`83`	`+`
`81`	`84`	`return(`
`82`	`85`	`<divcss={styles.page}>`
`83`	`86`	`<divcss={styles.header}>`
`@@ -120,10 +123,14 @@ const Level = ({ level, onContinue, onLoadSolution, processes, testStatus }: Pro`
`120`	`123`	`{level.title}`
`121`	`124`	`</span>`
`122`	`125`	`<span>`
`123`		`-{level.status==='COMPLETE'&&(`
	`126`	`+{level.status==='COMPLETE'?(`
`124`	`127`	`<Buttontype="primary"onClick={onContinue}>`
`125`	`128`	`Continue`
`126`	`129`	`</Button>`
	`130`	`+) :(`
	`131`	`+<span>`
	`132`	`+{currentStep} of{level.steps.length} tasks`
	`133`	`+</span>`
`127`	`134`	`)}`
`128`	`135`	`</span>`
`129`	`136`	`</div>`

`‎web-app/stories/Level.stories.tsx`

Lines changed: 22 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,13 @@ storiesOf('Level', module)`
`71`	`71`	`],`
`72`	`72`	`}`
`73`	`73`	`return(`
`74`		`-<Levellevel={level}onContinue={action('onContinue')}onLoadSolution={action('onLoadSolution')}processes={[]}/>`
	`74`	`+<Level`
	`75`	`+level={level}`
	`76`	`+onContinue={action('onContinue')}`
	`77`	`+onLoadSolution={action('onLoadSolution')}`
	`78`	`+processes={[]}`
	`79`	`+testStatus={null}`
	`80`	`+/>`
`75`	`81`	`)`
`76`	`82`	`})`
`77`	`83`	`.add('Level 2',()=>{`
`@@ -129,6 +135,7 @@ storiesOf('Level', module)`
`129`	`135`	`description:'Installing dependencies',`
`130`	`136`	`},`
`131`	`137`	`]}`
	`138`	`+testStatus={null}`
`132`	`139`	`/>`
`133`	`140`	`)`
`134`	`141`	`})`
`@@ -201,7 +208,13 @@ storiesOf('Level', module)`
`201`	`208`	`],`
`202`	`209`	`}`
`203`	`210`	`return(`
`204`		`-<Levellevel={level}onContinue={action('onContinue')}onLoadSolution={action('onLoadSolution')}processes={[]}/>`
	`211`	`+<Level`
	`212`	`+level={level}`
	`213`	`+onContinue={action('onContinue')}`
	`214`	`+onLoadSolution={action('onLoadSolution')}`
	`215`	`+processes={[]}`
	`216`	`+testStatus={null}`
	`217`	`+/>`
`205`	`218`	`)`
`206`	`219`	`})`
`207`	`220`	`.add('FakeBook API L2',()=>{`
`@@ -267,6 +280,12 @@ storiesOf('Level', module)`
`267`	`280`	`],`
`268`	`281`	`}`
`269`	`282`	`return(`
`270`		`-<Levellevel={level}onContinue={action('onContinue')}onLoadSolution={action('onLoadSolution')}processes={[]}/>`
	`283`	`+<Level`
	`284`	`+level={level}`
	`285`	`+onContinue={action('onContinue')}`
	`286`	`+onLoadSolution={action('onLoadSolution')}`
	`287`	`+processes={[]}`
	`288`	`+testStatus={null}`
	`289`	`+/>`
`271`	`290`	`)`
`272`	`291`	`})`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit25eef01

File tree

2 files changed

2 files changed

`‎web-app/src/containers/Tutorial/LevelPage/Level.tsx`

`‎web-app/stories/Level.stories.tsx`

0 commit comments