Jun 13, 2019 · Jun 13, 2019 · Jun 13, 2019 · Jun 13, 2019
diff --git a/src/editor/commands/index.ts b/src/editor/commands/index.ts
 const{ steps}=tutorial.data
 const{ setup}=steps[pos.stepId].actions
 awaitgit.gitLoadCommits(setup)
 machine.send('TUTORIAL_LOADED')
 },
 [COMMANDS.TUTORIAL_SETUP]:async(tutorial:CR.Tutorial)=>{
 console.log('tutorial setup',tutorial)
diff --git a/src/state/actions/index.ts b/src/state/actions/index.ts
 constcanContinue=!!(tutorial&&progress&&hasGit&&hasGitRemote)

 if(canContinue){
 // continue
 currentTutorial=tutorial
 currentProgress=progress
 }
 asynctutorialLaunch(){
 // TODO: add selection of tutorial id
 consttutorial:CR.Tutorial=awaitapi({resource:'getTutorial',params:{id:'1'}})
 currentTutorial=tutorial
 console.log('api')
 console.log(tutorial)
 vscode.commands.executeCommand('coderoad.tutorial_launch',tutorial)
 vscode.commands.executeCommand('coderoad.tutorial_setup',currentTutorial)
 vscode.commands.executeCommand('coderoad.open_webview',vscode.ViewColumn.Two)
 },
 initializeNewTutorial:assign({
 position:(context:any):CR.Position=>{
 const{ data}=context
 constlevelId=data.summary.levelList[0]
 conststageId=data.levels[levelId].stageList[0]
 conststepId=data.stages[stageId].stepList[0]
 return{
                levelId,
                stageId,
                stepId
 }
 }
 }),
 tutorialContinue:assign({
 // load initial data, progress & position
 data():CR.TutorialData{
 returnnextProgress
 }
 }),
 stepLoadNext(){
 console.log("LOAD NEXT STEP")
 stepLoadNext:assign({
 position:(context:any)=>{
 const{ data, position}=context
 const{ stepList}=data.stages[position.stageId]
 constcurrentStepIndex=stepList.indexOf(position.stepId)
 constnextStepId=stepList[currentStepIndex+1]
 return{
                ...context.position,
 stepId:nextStepId,
 }
 }
 }),
 loadLevel(){
 console.log('loadLevel')
 },
 loadStage(){
 console.log('loadStage')
 }
 }
diff --git a/src/state/machine.ts b/src/state/machine.ts
 },
 Tutorial:{
 id:'tutorial',
 initial:'Summary',
 initial:'Initialize',
 onEntry:['tutorialSetup'],
 states:{
 Initialize:{
 onEntry:['initializeNewTutorial'],
 after:{
 0:'Summary'
 }
 },
 LoadNext:{
 id:'tutorial-load-next',
 onEntry:['tutorialLoadNext'],
diff --git a/typings/index.d.ts b/typings/index.d.ts
 }
 Tutorial:{
 states:{
 Initialize:{}
 Summary:{}
 LoadNext:{}
 Level:{}
diff --git a/web-app/src/containers/Tutorial/SummaryPage.tsx b/web-app/src/containers/Tutorial/SummaryPage.tsx

 constSummaryPage=(props:PageProps)=>{
 const{ data}=React.useContext(DataContext)
 return<Summarydata={data}onNext={()=>props.send('LOAD_NEXT')}/>
 return<Summarydata={data}onNext={()=>props.send('NEXT')}/>
 }

 exportdefaultSummaryPage
Original file line number	Diff line number	Diff line change
Expand Up		@@ -63,6 +63,7 @@ export const createCommands = ({ context, machine, storage, git, position }: Cre
		const{ steps}=tutorial.data
		const{ setup}=steps[pos.stepId].actions
		awaitgit.gitLoadCommits(setup)
		machine.send('TUTORIAL_LOADED')
		},
		[COMMANDS.TUTORIAL_SETUP]:async(tutorial:CR.Tutorial)=>{
		console.log('tutorial setup',tutorial)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,6 +32,7 @@ export default {
		constcanContinue=!!(tutorial&&progress&&hasGit&&hasGitRemote)

		if(canContinue){
		// continue
		currentTutorial=tutorial
		currentProgress=progress
		}
Expand All		@@ -41,6 +42,7 @@ export default {
		asynctutorialLaunch(){
		// TODO: add selection of tutorial id
		consttutorial:CR.Tutorial=awaitapi({resource:'getTutorial',params:{id:'1'}})
		currentTutorial=tutorial
		console.log('api')
		console.log(tutorial)
		vscode.commands.executeCommand('coderoad.tutorial_launch',tutorial)
Expand All		@@ -49,6 +51,19 @@ export default {
		vscode.commands.executeCommand('coderoad.tutorial_setup',currentTutorial)
		vscode.commands.executeCommand('coderoad.open_webview',vscode.ViewColumn.Two)
		},
		initializeNewTutorial:assign({
		position:(context:any):CR.Position=>{
		const{ data}=context
		constlevelId=data.summary.levelList[0]
		conststageId=data.levels[levelId].stageList[0]
		conststepId=data.stages[stageId].stepList[0]
		return{
		levelId,
		stageId,
		stepId
		}
		}
		}),
		tutorialContinue:assign({
		// load initial data, progress & position
		data():CR.TutorialData{
Expand DownExpand Up		@@ -149,7 +164,22 @@ export default {
		returnnextProgress
		}
		}),
		stepLoadNext(){
		console.log("LOAD NEXT STEP")
		stepLoadNext:assign({
		position:(context:any)=>{
		const{ data, position}=context
		const{ stepList}=data.stages[position.stageId]
		constcurrentStepIndex=stepList.indexOf(position.stepId)
		constnextStepId=stepList[currentStepIndex+1]
		return{
		...context.position,
		stepId:nextStepId,
		}
		}
		}),
		loadLevel(){
		console.log('loadLevel')
		},
		loadStage(){
		console.log('loadStage')
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -57,9 +57,15 @@ export const machine = Machine<
		},
		Tutorial:{
		id:'tutorial',
		initial:'Summary',
		initial:'Initialize',
		onEntry:['tutorialSetup'],
		states:{
		Initialize:{
		onEntry:['initializeNewTutorial'],
		after:{
		0:'Summary'
		}
		},
		LoadNext:{
		id:'tutorial-load-next',
		onEntry:['tutorialLoadNext'],
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -146,6 +146,7 @@ export interface MachineStateSchema {
		}
		Tutorial:{
		states:{
		Initialize:{}
		Summary:{}
		LoadNext:{}
		Level:{}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,7 +9,7 @@ interface PageProps {

		constSummaryPage=(props:PageProps)=>{
		const{ data}=React.useContext(DataContext)
		return<Summarydata={data}onNext={()=>props.send('LOAD_NEXT')}/>
		return<Summarydata={data}onNext={()=>props.send('NEXT')}/>
		}

		exportdefaultSummaryPage