Commit640f413

committed

Reset to Level 1 step 1

Signed-off-by: Shubham Shah <shubhamshahrising@gmail.com>

1 parent9f45628 commit640f413Copy full SHA for 640f413

File tree

+18

-17

lines changed

+18

-17

lines changed

Lines changed: 3 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`importButtonfrom'components/Button'`
`2`		`-importReact,{useState}from'react'`
	`2`	`+importReact,{useState,useEffect}from'react'`
`3`	`3`	`import{Theme}from'../../../styles/theme'`
`4`	`4`	`importResetfrom'../components/Reset'`
`5`	`5`
`@@ -46,21 +46,10 @@ const styles = {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`interfaceProps{`
`49`		`-levels:T.LevelUI[]`
`50`		`-onResetToPosition(position:T.Position):void`
	`49`	`+onReset():void`
`51`	`50`	`}`
`52`	`51`
`53`	`52`	`constSettingsPage=(props:Props)=>{`
`54`		`-constonReset=()=>{`
`55`		`-constlevel:T.LevelUI\|null=props.levels.length ?props.levels[0] :null`
`56`		`-if(level){`
`57`		`-props.onResetToPosition({`
`58`		`-levelId:level.id,`
`59`		`-stepId:null,`
`60`		`-complete:false,`
`61`		`-})`
`62`		`-}`
`63`		`-}`
`64`	`53`	`return(`
`65`	`54`	`<divcss={styles.container}>`
`66`	`55`	`<divcss={styles.header}>`
`@@ -78,7 +67,7 @@ const SettingsPage = (props: Props) => {`
`78`	`67`	`level and first task checkpoint.`
`79`	`68`	`</div>`
`80`	`69`	`</div>`
`81`		`-<Resetstyle={styles.menuItemButton}warningonReset={onReset}/>`
	`70`	`+<Resetstyle={styles.menuItemButton}warningonReset={props.onReset}/>`
`82`	`71`	`</div>`
`83`	`72`	`</div>`
`84`	`73`	`</div>`

Lines changed: 14 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -128,13 +128,25 @@ const TutorialPage = (props: PageProps) => {`
`128`	`128`
`129`	`129`	`const[page,setPage]=React.useState<'about'\|'level'\|'review'\|'settings'>('level')`
`130`	`130`
	`131`	`+constonSettingsReset=()=>{`
	`132`	`+//Reset to first level first step`
	`133`	`+constlevel:T.LevelUI\|null=levels.length ?levels[1] :null`
	`134`	`+if(level){`
	`135`	`+onResetToPosition({`
	`136`	`+levelId:level.id,`
	`137`	`+stepId:level.steps.length ?level.steps[0].id :null,`
	`138`	`+complete:false,`
	`139`	`+})`
	`140`	`+setPage('level')`
	`141`	`+}`
	`142`	`+}`
`131`	`143`	`// format level code with status for easy rendering`
`132`	`144`	`const{ level, levels, levelIndex, stepIndex}=formatLevels({`
`133`	`145`	`position,`
`134`	`146`	`levels:tutorial.levels,`
`135`	`147`	`testStatus,`
`136`	`148`	`})`
`137`		`-console.log({ position})`
	`149`	`+`
`138`	`150`	`constdisableOptions=processes.length>0\|\|props.state==='Level.TestRunning'`
`139`	`151`
`140`	`152`	`return(`
`@@ -156,7 +168,7 @@ const TutorialPage = (props: PageProps) => {`
`156`	`168`	`)}`
`157`	`169`	`{page==='review'&&<ReviewPagelevels={levels}onResetToPosition={onResetToPosition}/>}`
`158`	`170`
`159`		`-{page==='settings'&&<SettingsPagelevels={levels}onResetToPosition={onResetToPosition}/>}`
	`171`	`+{page==='settings'&&<SettingsPageonReset={onSettingsReset}/>}`
`160`	`172`	`</div>`
`161`	`173`
`162`	`174`	`{props.state==='Completed' ?(`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ import Settings from '../src/containers/Tutorial/containers/Settings'`
`6`	`6`	`storiesOf('Settings',module)`
`7`	`7`	`.addDecorator(SideBarDecorator)`
`8`	`8`	`.add('Settings Page',()=>{`
`9`		`-return<Settings/>`
	`9`	`+return<SettingsonReset={()=>console.log('Reset...')}/>`
`10`	`10`	`})`

Comments

(0)