Commita12f254

authored

Merge pull requestcoderoad#7 from ShMcK/fixes

Fixes

2 parents9509a15 +5d0abd6 commita12f254Copy full SHA for a12f254

File tree

5 files changed

+42

-4

lines changed

src
- editor/commands
  - index.ts
- state
  - actions
    - index.ts
  - machine.ts
typings
- index.d.ts
web-app/src/containers/Tutorial
- SummaryPage.tsx

5 files changed

+42

-4

lines changed

`‎src/editor/commands/index.ts`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ export const createCommands = ({ context, machine, storage, git, position }: Cre`
`63`	`63`	`const{ steps}=tutorial.data`
`64`	`64`	`const{ setup}=steps[pos.stepId].actions`
`65`	`65`	`awaitgit.gitLoadCommits(setup)`
	`66`	`+machine.send('TUTORIAL_LOADED')`
`66`	`67`	`},`
`67`	`68`	`[COMMANDS.TUTORIAL_SETUP]:async(tutorial:CR.Tutorial)=>{`
`68`	`69`	`console.log('tutorial setup',tutorial)`

`‎src/state/actions/index.ts`

Lines changed: 32 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ export default {`
`32`	`32`	`constcanContinue=!!(tutorial&&progress&&hasGit&&hasGitRemote)`
`33`	`33`
`34`	`34`	`if(canContinue){`
	`35`	`+// continue`
`35`	`36`	`currentTutorial=tutorial`
`36`	`37`	`currentProgress=progress`
`37`	`38`	`}`
`@@ -41,6 +42,7 @@ export default {`
`41`	`42`	`asynctutorialLaunch(){`
`42`	`43`	`// TODO: add selection of tutorial id`
`43`	`44`	`consttutorial:CR.Tutorial=awaitapi({resource:'getTutorial',params:{id:'1'}})`
	`45`	`+currentTutorial=tutorial`
`44`	`46`	`console.log('api')`
`45`	`47`	`console.log(tutorial)`
`46`	`48`	`vscode.commands.executeCommand('coderoad.tutorial_launch',tutorial)`
`@@ -49,6 +51,19 @@ export default {`
`49`	`51`	`vscode.commands.executeCommand('coderoad.tutorial_setup',currentTutorial)`
`50`	`52`	`vscode.commands.executeCommand('coderoad.open_webview',vscode.ViewColumn.Two)`
`51`	`53`	`},`
	`54`	`+initializeNewTutorial:assign({`
	`55`	`+position:(context:any):CR.Position=>{`
	`56`	`+const{ data}=context`
	`57`	`+constlevelId=data.summary.levelList[0]`
	`58`	`+conststageId=data.levels[levelId].stageList[0]`
	`59`	`+conststepId=data.stages[stageId].stepList[0]`
	`60`	`+return{`
	`61`	`+ levelId,`
	`62`	`+ stageId,`
	`63`	`+ stepId`
	`64`	`+}`
	`65`	`+}`
	`66`	`+}),`
`52`	`67`	`tutorialContinue:assign({`
`53`	`68`	`// load initial data, progress & position`
`54`	`69`	`data():CR.TutorialData{`
`@@ -149,7 +164,22 @@ export default {`
`149`	`164`	`returnnextProgress`
`150`	`165`	`}`
`151`	`166`	`}),`
`152`		`-stepLoadNext(){`
`153`		`-console.log("LOAD NEXT STEP")`
	`167`	`+stepLoadNext:assign({`
	`168`	`+position:(context:any)=>{`
	`169`	`+const{ data, position}=context`
	`170`	`+const{ stepList}=data.stages[position.stageId]`
	`171`	`+constcurrentStepIndex=stepList.indexOf(position.stepId)`
	`172`	`+constnextStepId=stepList[currentStepIndex+1]`
	`173`	`+return{`
	`174`	`+ ...context.position,`
	`175`	`+stepId:nextStepId,`
	`176`	`+}`
	`177`	`+}`
	`178`	`+}),`
	`179`	`+loadLevel(){`
	`180`	`+console.log('loadLevel')`
	`181`	`+},`
	`182`	`+loadStage(){`
	`183`	`+console.log('loadStage')`
`154`	`184`	`}`
`155`	`185`	`}`

`‎src/state/machine.ts`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -57,9 +57,15 @@ export const machine = Machine<`
`57`	`57`	`},`
`58`	`58`	`Tutorial:{`
`59`	`59`	`id:'tutorial',`
`60`		`-initial:'Summary',`
	`60`	`+initial:'Initialize',`
`61`	`61`	`onEntry:['tutorialSetup'],`
`62`	`62`	`states:{`
	`63`	`+Initialize:{`
	`64`	`+onEntry:['initializeNewTutorial'],`
	`65`	`+after:{`
	`66`	`+0:'Summary'`
	`67`	`+}`
	`68`	`+},`
`63`	`69`	`LoadNext:{`
`64`	`70`	`id:'tutorial-load-next',`
`65`	`71`	`onEntry:['tutorialLoadNext'],`

`‎typings/index.d.ts`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,7 @@ export interface MachineStateSchema {`
`146`	`146`	`}`
`147`	`147`	`Tutorial:{`
`148`	`148`	`states:{`
	`149`	`+Initialize:{}`
`149`	`150`	`Summary:{}`
`150`	`151`	`LoadNext:{}`
`151`	`152`	`Level:{}`

`‎web-app/src/containers/Tutorial/SummaryPage.tsx`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ interface PageProps {`
`9`	`9`
`10`	`10`	`constSummaryPage=(props:PageProps)=>{`
`11`	`11`	`const{ data}=React.useContext(DataContext)`
`12`		`-return<Summarydata={data}onNext={()=>props.send('LOAD_NEXT')}/>`
	`12`	`+return<Summarydata={data}onNext={()=>props.send('NEXT')}/>`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`exportdefaultSummaryPage`

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!

Commita12f254

File tree

5 files changed

5 files changed

`‎src/editor/commands/index.ts`

`‎src/state/actions/index.ts`

`‎src/state/machine.ts`

`‎typings/index.d.ts`

`‎web-app/src/containers/Tutorial/SummaryPage.tsx`

0 commit comments