Commitcb9f82e

committed

setup continue path

1 parent314e71b commitcb9f82eCopy full SHA for cb9f82e

File tree

+25

-22

lines changed

+25

-22

lines changed

Lines changed: 1 addition & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ import tutorial from '../../state/context/tutorials/basic'`
`9`	`9`
`10`	`10`	`constCOMMANDS={`
`11`	`11`	`START:'coderoad.start',`
`12`		`-NEW_OR_CONTINUE:'coderoad.new_or_continue',`
`13`	`12`	`TUTORIAL_LAUNCH:'coderoad.tutorial_launch',`
`14`	`13`	`OPEN_WEBVIEW:'coderoad.open_webview',`
`15`	`14`	`SEND_STATE:'coderoad.send_state',`
`@@ -45,23 +44,8 @@ export const createCommands = ({ context, machine, storage, git, position }: Cre`
`45`	`44`	`[COMMANDS.OPEN_WEBVIEW]:(column:number=vscode.ViewColumn.One)=>{`
`46`	`45`	`webview.createOrShow(column);`
`47`	`46`	`},`
`48`		`-// launch with continue or new`
`49`		`-[COMMANDS.NEW_OR_CONTINUE]:async()=>{`
`50`		`-// verify that the user has a tutorial & progress`
`51`		`-// verify git is setup with a coderoad remote`
`52`		`-const[tutorial,progress,hasGit,hasGitRemote]=awaitPromise.all([`
`53`		`-storage.getTutorial(),`
`54`		`-storage.getProgress(),`
`55`		`-git.gitVersion(),`
`56`		`-git.gitCheckRemoteExists(),`
`57`		`-])`
`58`		`-constcanContinue=!!(tutorial&&progress&&hasGit&&hasGitRemote)`
`59`		`-console.log('canContinue',canContinue)`
`60`		`-// if a tutorial exists, 'CONTINUE'`
`61`		`-// otherwise start from 'NEW'`
`62`		`-machine.send(canContinue ?'CONTINUE' :'NEW')`
`63`		`-},`
`64`	`47`	`// launch a new tutorial`
	`48`	`+// NOTE: may be better to move into action as logic is primarily non-vscode`
`65`	`49`	`[COMMANDS.TUTORIAL_LAUNCH]:async()=>{`
`66`	`50`	`console.log('launch tutorial')`
`67`	`51`

Lines changed: 21 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,10 @@`
`1`	`1`	`import{assign}from'xstate'`
	`2`	`+// NOTE: codesmell - importing machine`
	`3`	`+import{machine}from'../../extension'`
`2`	`4`	`import*asCRfrom'typings'`
`3`	`5`	`import*asvscodefrom'vscode'`
	`6`	`+import*asstoragefrom'../../services/storage'`
	`7`	`+import*asgitfrom'../../services/git'`
`4`	`8`
`5`	`9`	`letinitialTutorial:CR.Tutorial\|undefined`
`6`	`10`	`letinitialProgress:CR.Progress={`
`@@ -15,8 +19,23 @@ export default {`
`15`	`19`	`console.log('execute coderoad.open_webview')`
`16`	`20`	`vscode.commands.executeCommand('coderoad.open_webview')`
`17`	`21`	`},`
`18`		`-newOrContinue(){`
`19`		`-vscode.commands.executeCommand('coderoad.new_or_continue')`
	`22`	`+asyncnewOrContinue(){`
	`23`	`+// verify that the user has a tutorial & progress`
	`24`	`+// verify git is setup with a coderoad remote`
	`25`	`+const[tutorial,progress,hasGit,hasGitRemote]=awaitPromise.all([`
	`26`	`+storage.getTutorial(),`
	`27`	`+storage.getProgress(),`
	`28`	`+git.gitVersion(),`
	`29`	`+git.gitCheckRemoteExists(),`
	`30`	`+])`
	`31`	`+constcanContinue=!!(tutorial&&progress&&hasGit&&hasGitRemote)`
	`32`	`+`
	`33`	`+if(canContinue){`
	`34`	`+initialTutorial=tutorial`
	`35`	`+initialProgress=progress`
	`36`	`+}`
	`37`	`+`
	`38`	`+machine.send(canContinue ?'CONTINUE' :'NEW')`
`20`	`39`	`},`
`21`	`40`	`tutorialLaunch(){`
`22`	`41`	`vscode.commands.executeCommand('coderoad.tutorial_launch')`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ export const machine = Machine<`
`49`	`49`
`50`	`50`	`},`
`51`	`51`	`ContinueTutorial:{`
`52`		`-onEntry:'tutorialContinue',`
	`52`	`+onEntry:['tutorialContinue'],`
`53`	`53`	`on:{`
`54`	`54`	`TUTORIAL_START:{`
`55`	`55`	`target:'Tutorial.LoadNext',`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,15 +15,15 @@ const Routes = ({ state }: Props) => {`
`15`	`15`	`return(`
`16`	`16`	`<div>`
`17`	`17`	`<Condstate={state}path="SelectTutorial.Startup">`
`18`		`-<divstyle={{backgroundColor:'red'}}>`
	`18`	`+<div>`
`19`	`19`	`<h3>Starting...</h3>`
`20`	`20`	`</div>`
`21`	`21`	`</Cond>`
`22`	`22`	`<Condstate={state}path="SelectTutorial.NewTutorial">`
`23`	`23`	`<NewPage/>`
`24`	`24`	`</Cond>`
`25`	`25`	`<Condstate={state}path="SelectTutorial.ContinueTutorial">`
`26`		`-<ContinuePage/>`
	`26`	`+<ContinuePage/>`
`27`	`27`	`</Cond>`
`28`	`28`	`<Condstate={state}path="Tutorial">`
`29`	`29`	`<TutorialPage/>`

Comments

(0)