Commit04653e2

committed

setup tutorial initialization

1 parent6993147 commit04653e2Copy full SHA for 04653e2

File tree

+23

-15

lines changed

+23

-15

lines changed

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@ let initialProgress: CR.Progress = {`
`13`	`13`
`14`	`14`	`exportdefault{`
`15`	`15`	`start:async()=>{`
	`16`	`+// verify that the user has a tutorial & progress`
	`17`	`+// verify git is setup with a coderoad remote`
`16`	`18`	`const[tutorial,progress,hasGit,hasGitRemote]=awaitPromise.all([`
`17`	`19`	`storage.getTutorial(),`
`18`	`20`	`storage.getProgress(),`
`@@ -22,9 +24,11 @@ export default {`
`22`	`24`	`initialTutorial=tutorial`
`23`	`25`	`initialProgress=progress`
`24`	`26`	`constcanContinue=!!(tutorial&&progress&&hasGit&&hasGitRemote)`
	`27`	`+// if a tutorial exists, "CONTINUE"`
	`28`	`+// otherwise start from "NEW"`
`25`	`29`	`send(canContinue ?'CONTINUE' :'NEW')`
`26`	`30`	`},`
`27`		`-loadTutorial:assign({`
	`31`	`+tutorialLoad:assign({`
`28`	`32`	`// load initial data, progress & position`
`29`	`33`	`data():CR.TutorialData{`
`30`	`34`	`if(!initialTutorial){`
`@@ -33,7 +37,9 @@ export default {`
`33`	`37`	`returninitialTutorial.data`
`34`	`38`
`35`	`39`	`},`
`36`		`-progress():CR.Progress{returninitialProgress},`
	`40`	`+progress():CR.Progress{`
	`41`	`+returninitialProgress`
	`42`	`+},`
`37`	`43`	`position(){`
`38`	`44`	`if(!initialTutorial){`
`39`	`45`	`thrownewError('No Tutorial loaded')`
`@@ -53,4 +59,5 @@ export default {`
`53`	`59`	`returnposition`
`54`	`60`	`}`
`55`	`61`	`}),`
	`62`	`+`
`56`	`63`	`}`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,8 @@`
	`1`	`+import*asCRfrom'typings'`
`1`	`2`
`2`	`3`	`exportdefault{`
`3`		`-`
	`4`	`+// skip to the stage if the level has already been started`
	`5`	`+hasNoNextLevelProgress:(context:CR.MachineContext):boolean=>{`
	`6`	`+returnfalse`
	`7`	`+},`
`4`	`8`	`}`

Lines changed: 8 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import{Machine}from'xstate'`
	`1`	`+import{Machine,send}from'xstate'`
`2`	`2`	`import*asCRfrom'typings'`
`3`	`3`
`4`	`4`	`importactionsfrom'./actions'`
`@@ -43,28 +43,25 @@ export const tutorialMachine = Machine<`
`43`	`43`
`44`	`44`	`},`
`45`	`45`	`ContinueTutorial:{`
`46`		`-onEntry:'loadTutorial',`
	`46`	`+onEntry:'tutorialLoad',`
`47`	`47`	`on:{`
`48`	`48`	`TUTORIAL_START:{`
`49`		`-target:'Tutorial',`
	`49`	`+target:'Tutorial.LoadNext',`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`	`},`
`53`	`53`	`}`
`54`	`54`	`},`
`55`	`55`	`Tutorial:{`
`56`		`-initial:'Initialize',`
	`56`	`+initial:'Summary',`
`57`	`57`	`states:{`
`58`		`-Initialize:{`
	`58`	`+LoadNext:{`
	`59`	`+onEntry:()=>send('LOAD_NEXT'),`
`59`	`60`	`on:{`
`60`		`-TUTORIAL_LOADED:[`
`61`		`-{`
`62`		`-target:'Summary',`
`63`		`-cond:'hasNoProgress',`
`64`		`-},`
	`61`	`+LOAD_NEXT:[`
`65`	`62`	`{`
`66`	`63`	`target:'Level',`
`67`		`-cond:'hasNoLevelProgress',`
	`64`	`+cond:'hasNoNextLevelProgress',`
`68`	`65`	`},`
`69`	`66`	`{`
`70`	`67`	`target:'Stage',`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ export interface MachineStateSchema {`
`143`	`143`	`}`
`144`	`144`	`Tutorial:{`
`145`	`145`	`states:{`
`146`		`-Initialize:{}`
	`146`	`+LoadNext:{}`
`147`	`147`	`Summary:{}`
`148`	`148`	`Level:{}`
`149`	`149`	`Stage:{`

Comments

(0)