An0nCrypto
diff --git a/‎typings/index.d.ts
Lines changed: 1 addition & 0 deletions b/‎typings/index.d.ts
Lines changed: 1 addition & 0 deletions
diff --git a/‎web-app/src/Routes.tsx
Lines changed: 4 additions & 0 deletions b/‎web-app/src/Routes.tsx
Lines changed: 4 additions & 0 deletions
diff --git a/‎web-app/src/containers/Check/SelectWorkspace.tsx
Lines changed: 30 additions & 0 deletions b/‎web-app/src/containers/Check/SelectWorkspace.tsx
Lines changed: 30 additions & 0 deletions
diff --git a/‎web-app/src/services/state/machine.ts
Lines changed: 6 additions & 0 deletions b/‎web-app/src/services/state/machine.ts
Lines changed: 6 additions & 0 deletions
diff --git a/‎web-app/stories/Check.stories.tsx
Lines changed: 21 additions & 0 deletions b/‎web-app/stories/Check.stories.tsx
Lines changed: 21 additions & 0 deletions
@@ -74,6 +74,7 @@ export interface MachineStateSchema {
         LoadStoredTutorial: {}
         Start: {}
         CheckEmptyWorkspace: {}
+        NonEmptyWorkspace: {}
         RequestEmptyWorkspace: {}
         SelectTutorial: {}
         LoadTutorialSummary: {}
 
@@ -7,6 +7,7 @@ import SelectTutorialPage from './containers/SelectTutorial'
 import OverviewPage from './containers/Overview'
 import CompletedPage from './containers/Tutorial/CompletedPage'
 import LevelSummaryPage from './containers/Tutorial/LevelPage'
+import SelectEmptyWorkspace from './containers/Check/SelectWorkspace'
 
 const Routes = () => {
   const { context, send, Router, Route } = useRouter()
@@ -31,6 +32,9 @@ const Routes = () => {
         <Route path={['Setup.LoadTutorialSummary', 'Setup.LoadTutorialData', 'Setup.SetupNewTutorial']}>
           <LoadingPage text="Loading Tutorial..." context={context} />
         </Route>
+        <Route path={['Setup.NonEmptyWorkspace', 'Setup.RequestEmptyWorkspace']}>
+          <SelectEmptyWorkspace send={send} />
+        </Route>
         <Route path="Setup.Error">
           <LoadingPage text="Error" context={context} />
         </Route>
 
@@ -0,0 +1,30 @@
+import * as React from 'react'
+import * as T from 'typings'
+import { css, jsx } from '@emotion/core'
+import Button from '../../components/Button'
+
+const styles = {
+  container: {
+    padding: '1rem',
+  },
+}
+
+type Props = {
+  send: (action: T.Action) => void
+}
+
+const SelectWorkspace = (props: Props) => {
+  const onOpenWorkspace = () => props.send({ type: 'REQUEST_WORKSPACE' })
+  return (
+    <div css={styles.container}>
+      <h3>Select or Create An Empty Workspace</h3>
+      <p>CodeRoad runs Git commands in the background and will change your workspace files.</p>
+      <br />
+      <Button type="secondary" onClick={onOpenWorkspace}>
+        Open a Workspace
+      </Button>
+    </div>
+  )
+}
+
+export default SelectWorkspace
@@ -82,10 +82,16 @@ export const createMachine = (options: any) => {
                 IS_EMPTY_WORKSPACE: 'SelectTutorial',
               },
             },
+            NonEmptyWorkspace: {
+              on: {
+                REQUEST_WORKSPACE: 'RequestEmptyWorkspace',
+              },
+            },
             RequestEmptyWorkspace: {
               onEntry: ['requestWorkspaceSelection'],
               on: {
                 WORKSPACE_LOADED: 'CheckEmptyWorkspace',
+                CANCEL: 'NonEmptyWorkspace',
               },
             },
             SelectTutorial: {
 
@@ -0,0 +1,21 @@
+import { storiesOf } from '@storybook/react'
+import { action } from '@storybook/addon-actions'
+import React from 'react'
+import { css, jsx } from '@emotion/core'
+import SelectWorkspace from '../src/containers/Check/SelectWorkspace'
+import SideBarDecorator from './utils/SideBarDecorator'
+
+const styles = {
+  container: {
+    display: 'flex' as 'flex',
+    flexDirection: 'column' as 'column',
+  },
+}
+
+storiesOf('Check', module)
+  .addDecorator(SideBarDecorator)
+  .add('Select Workspace', () => (
+    <div css={styles.container}>
+      <SelectWorkspace send={action('send')} />
+    </div>
+  ))