Commit2b968cf

authored

Merge pull request#365 from coderoad/feature/hints

Feature/hints

2 parents16dbc6c +4d532de commit2b968cfCopy full SHA for 2b968cf

File tree

+69

-1

lines changed

+69

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ export type Step = {`
`28`	`28`	`setup:StepActions`
`29`	`29`	`solution:Maybe<StepActions>`
`30`	`30`	`subtasks?:{[testName:string]:boolean}`
	`31`	`+hints?:string[]`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`/** A tutorial for use in VSCode CodeRoad */`
`@@ -61,7 +62,7 @@ export interface TestRunnerArgs {`
`61`	`62`
`62`	`63`	`exportinterfaceTestRunnerConfig{`
`63`	`64`	`command:string`
`64`		`-args?:TestRunnerArgs`
	`65`	`+args:TestRunnerArgs`
`65`	`66`	`path?:string// deprecated`
`66`	`67`	`directory?:string`
`67`	`68`	`actions?:StepActions// deprecated`

Lines changed: 50 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,50 @@`
	`1`	`+import*asReactfrom'react'`
	`2`	`+importMarkdownfrom'../../../components/Markdown'`
	`3`	`+importButtonfrom'../../../components/Button'`
	`4`	`+`
	`5`	`+conststyles={`
	`6`	`+hints:{`
	`7`	`+marginTop:'1rem',`
	`8`	`+},`
	`9`	`+hintList:{`
	`10`	`+marginBottom:'0.5rem',`
	`11`	`+},`
	`12`	`+hint:{`
	`13`	`+margin:'0.5rem 0',`
	`14`	`+backgroundColor:'rgba(255,229,100,0.3)',`
	`15`	`+borderLeft:'#ffe564',`
	`16`	`+padding:'0.5rem',`
	`17`	`+},`
	`18`	`+}`
	`19`	`+`
	`20`	`+interfaceProps{`
	`21`	`+hints:string[]`
	`22`	`+}`
	`23`	`+`
	`24`	`+constHints=(props:Props)=>{`
	`25`	`+const[hintIndex,setHintIndex]=React.useState(-1)`
	`26`	`+constisFinalHint=props.hints.length-1===hintIndex`
	`27`	`+constnextHint=()=>{`
	`28`	`+if(!isFinalHint){`
	`29`	`+setHintIndex((currentHintIndex)=>currentHintIndex+1)`
	`30`	`+}`
	`31`	`+}`
	`32`	`+return(`
	`33`	`+<divstyle={styles.hints}>`
	`34`	`+<divstyle={styles.hintList}>`
	`35`	`+{props.hints.map((h,i)=>{`
	`36`	`+returni<=hintIndex ?(`
	`37`	`+<divkey={i}style={styles.hint}>`
	`38`	`+<Markdown>{h}</Markdown>`
	`39`	`+</div>`
	`40`	`+) :null`
	`41`	`+})}`
	`42`	`+</div>`
	`43`	`+<ButtononClick={nextHint}disabled={isFinalHint}>`
	`44`	`+ Get A Hint`
	`45`	`+</Button>`
	`46`	`+</div>`
	`47`	`+)`
	`48`	`+}`
	`49`	`+`
	`50`	`+exportdefaultHints`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -173,6 +173,7 @@ const Level = ({`
`173`	`173`	`content={step.content}`
`174`	`174`	`onLoadSolution={onLoadSolution}`
`175`	`175`	`subtasks={subtasks}`
	`176`	`+hints={step.hints}`
`176`	`177`	`/>`
`177`	`178`	`)`
`178`	`179`	`})}`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,13 +2,15 @@ import * as React from 'react'`
`2`	`2`	`import*asTfrom'typings'`
`3`	`3`	`import{css,jsx}from'@emotion/core'`
`4`	`4`	`importTestStatusIconfrom'./TestStatusIcon'`
	`5`	`+importHintsfrom'./Hints'`
`5`	`6`	`importMarkdownfrom'../../../components/Markdown'`
`6`	`7`
`7`	`8`	`interfaceProps{`
`8`	`9`	`order:number`
`9`	`10`	`content:string`
`10`	`11`	`status:T.ProgressStatus`
`11`	`12`	`subtasks:{name:string;pass:boolean}[]\|null`
	`13`	`+hints?:string[]`
`12`	`14`	`onLoadSolution():void`
`13`	`15`	`}`
`14`	`16`
`@@ -54,9 +56,11 @@ const Step = (props: Props) => {`
`54`	`56`	`{props.status==='COMPLETE'&&<TestStatusIconsize="small"checked/>}`
`55`	`57`	`</div>`
`56`	`58`	`<div>`
	`59`	`+{/* content */}`
`57`	`60`	`<divcss={styles.content}>`
`58`	`61`	`<Markdown>{props.content\|\|''}</Markdown>`
`59`	`62`	`</div>`
	`63`	`+{/* subtasks */}`
`60`	`64`	`{props.subtasks ?(`
`61`	`65`	`<ulcss={styles.subtasks}>`
`62`	`66`	`{props.subtasks.map((subtask)=>(`
`@@ -68,6 +72,8 @@ const Step = (props: Props) => {`
`68`	`72`	`))}`
`69`	`73`	`</ul>`
`70`	`74`	`) :null}`
	`75`	`+{/* hints */}`
	`76`	`+{props.hints&&props.hints.length ?<Hintshints={props.hints}/> :null}`
`71`	`77`	`</div>`
`72`	`78`	`</div>`
`73`	`79`	`</div>`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -98,3 +98,13 @@ storiesOf('Step', module)`
`98`	`98`	`]}`
`99`	`99`	`/>`
`100`	`100`	`))`
	`101`	`+.add('Hints',()=>(`
	`102`	`+<Step`
	`103`	`+order={1}`
	`104`	`+content={text('text',stepText)}`
	`105`	`+status="ACTIVE"`
	`106`	`+onLoadSolution={action('onLoadSolution')}`
	`107`	`+subtasks={null}`
	`108`	`+hints={['First hint!','Second hint!']}`
	`109`	`+/>`
	`110`	`+))`

Comments

(0)