Commit0544c56

committed

workspace validation progress

1 parent5858c93 commit0544c56Copy full SHA for 0544c56

File tree

+62

-0

lines changed

+62

-0

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ export interface MachineStateSchema {`
`74`	`74`	`LoadStoredTutorial:{}`
`75`	`75`	`Start:{}`
`76`	`76`	`CheckEmptyWorkspace:{}`
	`77`	`+NonEmptyWorkspace:{}`
`77`	`78`	`RequestEmptyWorkspace:{}`
`78`	`79`	`SelectTutorial:{}`
`79`	`80`	`LoadTutorialSummary:{}`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import SelectTutorialPage from './containers/SelectTutorial'`
`7`	`7`	`importOverviewPagefrom'./containers/Overview'`
`8`	`8`	`importCompletedPagefrom'./containers/Tutorial/CompletedPage'`
`9`	`9`	`importLevelSummaryPagefrom'./containers/Tutorial/LevelPage'`
	`10`	`+importSelectEmptyWorkspacefrom'./containers/Check/SelectWorkspace'`
`10`	`11`
`11`	`12`	`constRoutes=()=>{`
`12`	`13`	`const{ context, send, Router, Route}=useRouter()`
`@@ -31,6 +32,9 @@ const Routes = () => {`
`31`	`32`	`<Routepath={['Setup.LoadTutorialSummary','Setup.LoadTutorialData','Setup.SetupNewTutorial']}>`
`32`	`33`	`<LoadingPagetext="Loading Tutorial..."context={context}/>`
`33`	`34`	`</Route>`
	`35`	`+<Routepath={['Setup.NonEmptyWorkspace','Setup.RequestEmptyWorkspace']}>`
	`36`	`+<SelectEmptyWorkspacesend={send}/>`
	`37`	`+</Route>`
`34`	`38`	`<Routepath="Setup.Error">`
`35`	`39`	`<LoadingPagetext="Error"context={context}/>`
`36`	`40`	`</Route>`

Lines changed: 30 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,30 @@`
	`1`	`+import*asReactfrom'react'`
	`2`	`+import*asTfrom'typings'`
	`3`	`+import{css,jsx}from'@emotion/core'`
	`4`	`+importButtonfrom'../../components/Button'`
	`5`	`+`
	`6`	`+conststyles={`
	`7`	`+container:{`
	`8`	`+padding:'1rem',`
	`9`	`+},`
	`10`	`+}`
	`11`	`+`
	`12`	`+typeProps={`
	`13`	`+send:(action:T.Action)=>void`
	`14`	`+}`
	`15`	`+`
	`16`	`+constSelectWorkspace=(props:Props)=>{`
	`17`	`+constonOpenWorkspace=()=>props.send({type:'REQUEST_WORKSPACE'})`
	`18`	`+return(`
	`19`	`+<divcss={styles.container}>`
	`20`	`+<h3>Select or Create An Empty Workspace</h3>`
	`21`	`+<p>CodeRoad runs Git commands in the background and will change your workspace files.</p>`
	`22`	`+<br/>`
	`23`	`+<Buttontype="secondary"onClick={onOpenWorkspace}>`
	`24`	`+ Open a Workspace`
	`25`	`+</Button>`
	`26`	`+</div>`
	`27`	`+)`
	`28`	`+}`
	`29`	`+`
	`30`	`+exportdefaultSelectWorkspace`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -82,10 +82,16 @@ export const createMachine = (options: any) => {`
`82`	`82`	`IS_EMPTY_WORKSPACE:'SelectTutorial',`
`83`	`83`	`},`
`84`	`84`	`},`
	`85`	`+NonEmptyWorkspace:{`
	`86`	`+on:{`
	`87`	`+REQUEST_WORKSPACE:'RequestEmptyWorkspace',`
	`88`	`+},`
	`89`	`+},`
`85`	`90`	`RequestEmptyWorkspace:{`
`86`	`91`	`onEntry:['requestWorkspaceSelection'],`
`87`	`92`	`on:{`
`88`	`93`	`WORKSPACE_LOADED:'CheckEmptyWorkspace',`
	`94`	`+CANCEL:'NonEmptyWorkspace',`
`89`	`95`	`},`
`90`	`96`	`},`
`91`	`97`	`SelectTutorial:{`

Lines changed: 21 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,21 @@`
	`1`	`+import{storiesOf}from'@storybook/react'`
	`2`	`+import{action}from'@storybook/addon-actions'`
	`3`	`+importReactfrom'react'`
	`4`	`+import{css,jsx}from'@emotion/core'`
	`5`	`+importSelectWorkspacefrom'../src/containers/Check/SelectWorkspace'`
	`6`	`+importSideBarDecoratorfrom'./utils/SideBarDecorator'`
	`7`	`+`
	`8`	`+conststyles={`
	`9`	`+container:{`
	`10`	`+display:'flex'as'flex',`
	`11`	`+flexDirection:'column'as'column',`
	`12`	`+},`
	`13`	`+}`
	`14`	`+`
	`15`	`+storiesOf('Check',module)`
	`16`	`+.addDecorator(SideBarDecorator)`
	`17`	`+.add('Select Workspace',()=>(`
	`18`	`+<divcss={styles.container}>`
	`19`	`+<SelectWorkspacesend={action('send')}/>`
	`20`	`+</div>`
	`21`	`+))`

Comments

(0)