cleanup routes

ShMcK · ShMcK · commit bebd11411ea2 · 2020-04-12T21:20:48.000-07:00
Signed-off-by: shmck &lt;shawn.j.mckay@gmail.com&gt;
diff --git a/typings/index.d.ts b/typings/index.d.ts
@@ -65,11 +65,11 @@ export interface MachineStateSchema {
     Setup: {
       states: {
         Startup: {}
-        Start: {}
         ValidateSetup: {}
+        Start: {}
         SelectTutorial: {}
         SetupNewTutorial: {}
-        StartNewTutorial: {}
+        StartTutorial: {}
       }
     }
     Tutorial: {
diff --git a/web-app/src/Routes.tsx b/web-app/src/Routes.tsx
@@ -30,13 +30,10 @@ const Routes = () => {
         <Route path="Setup.Start">
           <StartPage send={send} context={context} />
         </Route>
-        <Route path={['Setup.LoadTutorialSummary', 'Setup.LoadTutorialData', 'Setup.SetupNewTutorial']}>
-          <LoadingPage text="Loading Tutorial..." />
-        </Route>
         <Route path="Setup.SelectTutorial">
           <SelectTutorialPage send={send} context={context} />
         </Route>
-        <Route path={['Setup.SetupNewTutorial', 'Setup.StartNewTutorial']}>
+        <Route path={['Setup.SetupNewTutorial', 'Setup.StartTutorial']}>
           <LoadingPage text="Configuring tutorial..." />
         </Route>
         {/* Tutorial */}
diff --git a/web-app/src/containers/Tutorial/index.tsx b/web-app/src/containers/Tutorial/index.tsx
@@ -16,7 +16,6 @@ const TutorialPage = (props: PageProps) => {
   const levelData: TT.Level = selectors.currentLevel(props.context)
 
   const onContinue = (): void => {
-    console.log('onContinue triggered')
     props.send({
       type: 'LEVEL_NEXT',
       payload: {
diff --git a/web-app/src/services/state/machine.ts b/web-app/src/services/state/machine.ts
@@ -81,7 +81,7 @@ export const createMachine = (options: any) => {
               on: {
                 NEW_TUTORIAL: 'ValidateSetup',
                 CONTINUE_TUTORIAL: {
-                  target: '#tutorial-level',
+                  target: 'StartTutorial',
                   actions: ['continueConfig'],
                 },
                 CONTINUE_FAILED: {
@@ -107,11 +107,11 @@ export const createMachine = (options: any) => {
                   actions: ['setError'],
                 },
                 TRY_AGAIN: 'SetupNewTutorial',
-                TUTORIAL_CONFIGURED: 'StartNewTutorial',
+                TUTORIAL_CONFIGURED: 'StartTutorial',
               },
             },
-            StartNewTutorial: {
-              onEntry: ['startNewTutorial'],
+            StartTutorial: {
+              onEntry: ['StartTutorial'],
               after: {
                 0: '#tutorial',
               },

Original file line number	Diff line number	Diff line change
`@@ -65,11 +65,11 @@ export interface MachineStateSchema {`
`65`	`65`	`Setup: {`
`66`	`66`	`states: {`
`67`	`67`	`Startup: {}`
`68`		`- Start: {}`
`69`	`68`	`ValidateSetup: {}`
	`69`	`+ Start: {}`
`70`	`70`	`SelectTutorial: {}`
`71`	`71`	`SetupNewTutorial: {}`
`72`		`- StartNewTutorial: {}`
	`72`	`+ StartTutorial: {}`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`	`Tutorial: {`