add actions for levels/stages

Author: ShMcK

src/editor/commands/index.ts

@@ -89,13 +89,6 @@ export const createCommands = ({ context, machine, storage, git, position }: Cre
       // TODO: use actual tutorial repo
       await Promise.all([git.gitSetupRemote(tutorial.meta.repo), storage.setTutorial(tutorial), storage.resetProgress()])
 
-      // TODO: refactor to allow client to call initialization
-      const pos: CR.Position = await position.getInitial(tutorial)
-
-      // eslint-disable-next-line
-      const { steps } = tutorial.data
-      const { setup } = steps[pos.stepId].actions
-      await git.gitLoadCommits(setup, dispatch)
       machine.send('TUTORIAL_LOADED')
     },
     [COMMANDS.TUTORIAL_SETUP]: async (tutorial: CR.Tutorial) => {

src/state/actions/index.ts

@@ -158,18 +158,34 @@ export default (dispatch: CR.EditorDispatch) => ({
       return nextPosition
     },
   }),
-  loadLevel() {
+  loadLevel(context: CR.MachineContext): void {
+    const { data, position } = context
     console.log('loadLevel')
+    console.log(position)
+    const { levels } = data
+    const level = levels[position.levelId]
+
+    // run level setup if it exists
+    if (level && level.actions && level.actions.setup) {
+      git.gitLoadCommits(level.actions.setup, dispatch)
+    }
   },
   stageLoadNext(context: CR.MachineContext) {
     console.log('stageLoadNext')
     const { position } = context
     console.log(position)
   },
   loadStage(context: CR.MachineContext): void {
+    const { data, position } = context
     console.log('loadStage')
-    const { position } = context
     console.log(position)
+    const { stages } = data
+    const stage = stages[position.levelId]
+
+    // run level setup if it exists
+    if (stage && stage.actions && stage.actions.setup) {
+      git.gitLoadCommits(stage.actions.setup, dispatch)
+    }
   },
   // @ts-ignore
   updatePosition: assign({

src/tutorials/basic.ts

@@ -66,12 +66,12 @@ const basic: CR.Tutorial = {
         },
         actions: {
           setup: {
-            commits: ['430500f', '8383061'],
+            commits: ['aab5f3d', '8fa5ad5'],
             commands: ['npm install'],
             files: ['src/sum.js'],
           },
           solution: {
-            commits: ['abbe136'],
+            commits: ['abe3123'],
           },
         },
         hints: [],
@@ -83,11 +83,11 @@ const basic: CR.Tutorial = {
         },
         actions: {
           setup: {
-            commits: ['9cbb518'],
+            commits: ['0e01df8'],
             files: ['src/multiply.js'],
           },
           solution: {
-            commits: ['5ae011f'],
+            commits: ['1b9a520'],
           },
         },
         hints: [],
@@ -99,11 +99,11 @@ const basic: CR.Tutorial = {
         },
         actions: {
           setup: {
-            commits: ['70c774c'],
+            commits: ['40802cf'],
             files: ['src/divide.js'],
           },
           solution: {
-            commits: ['3180bed'],
+            commits: ['b321a3d'],
           },
         },
         hints: [],
@@ -115,11 +115,11 @@ const basic: CR.Tutorial = {
         },
         actions: {
           setup: {
-            commits: ['16d9699'],
+            commits: ['4db40b4'],
             files: ['src/modulo.js'],
           },
           solution: {
-            commits: ['bbf8aa5']
+            commits: ['3580c9d']
           }
         }
       },
@@ -130,11 +130,11 @@ const basic: CR.Tutorial = {
         },
         actions: {
           setup: {
-            commits: ['683c8db'],
+            commits: ['abc1e2d'],
             files: ['src/power.js'],
           },
           solution: {
-            commits: ['deaf3a8']
+            commits: ['5d28c25']
           }
         }
       },
@@ -145,11 +145,11 @@ const basic: CR.Tutorial = {
         },
         actions: {
           setup: {
-            commits: ['c539057'],
+            commits: ['d2c5827'],
             files: ['src/hello.js'],
           },
           solution: {
-            commits: ['ab7d57b']
+            commits: ['f668bf7']
           }
         }
       },
@@ -160,11 +160,11 @@ const basic: CR.Tutorial = {
         },
         actions: {
           setup: {
-            commits: ['abe8404'],
+            commits: ['3aa0ccd'],
             files: ['src/hello.js'],
           },
           solution: {
-            commits: ['6f40d18']
+            commits: ['9897785']
           }
         }
       },

typings/index.d.ts

@@ -6,6 +6,9 @@ export interface TutorialLevel {
     title: string
     text: string
   }
+  actions?: {
+    setup: TutorialAction
+  }
 }
 
 export interface TutorialStage {
@@ -14,6 +17,9 @@ export interface TutorialStage {
     title: string
     text: string
   }
+  actions?: {
+    setup: TutorialAction
+  }
 }
 
 export interface TutorialHint {

web-app/src/tutorials/basic.ts

@@ -1,7 +1,7 @@
 import * as CR from 'typings'
 
 const basic: CR.Tutorial = {
-  id: 'tutorialId',
+  id: '1',
   meta: {
     version: '0.1.0',
     repo: 'https://github.com/ShMcK/coderoad-tutorial-basic.git',
@@ -17,16 +17,23 @@ const basic: CR.Tutorial = {
     summary: {
       title: 'Basic Test',
       description: 'A basic coding skills example',
-      levelList: ['level1Id'],
+      levelList: ['level1Id', 'level2Id'],
     },
     levels: {
       level1Id: {
-        stageList: ['stage1Id'],
+        stageList: ['stage1Id', 'stage2Id'],
         content: {
-          title: 'Sum Level',
+          title: 'Operators',
           text: 'A description of this stage',
         },
       },
+      level2Id: {
+        stageList: ['a'],
+        content: {
+          title: 'Logic',
+          text: 'Some basic logic in level 2'
+        }
+      }
     },
     stages: {
       stage1Id: {
@@ -42,7 +49,14 @@ const basic: CR.Tutorial = {
           title: 'Second Stage',
           text: 'Going into round 2'
         }
-      }
+      },
+      a: {
+        stepList: ['a1', 'a2'],
+        content: {
+          title: 'Part 1',
+          text: 'Going into round 1'
+        }
+      },
     },
     steps: {
       step1Id: {
@@ -52,12 +66,12 @@ const basic: CR.Tutorial = {
         },
         actions: {
           setup: {
-            commits: ['430500f', '8383061'],
+            commits: ['aab5f3d', '8fa5ad5'],
             commands: ['npm install'],
             files: ['src/sum.js'],
           },
           solution: {
-            commits: ['abbe136'],
+            commits: ['abe3123'],
           },
         },
         hints: [],
@@ -69,11 +83,11 @@ const basic: CR.Tutorial = {
         },
         actions: {
           setup: {
-            commits: ['9cbb518'],
+            commits: ['0e01df8'],
             files: ['src/multiply.js'],
           },
           solution: {
-            commits: ['5ae011f'],
+            commits: ['1b9a520'],
           },
         },
         hints: [],
@@ -85,11 +99,11 @@ const basic: CR.Tutorial = {
         },
         actions: {
           setup: {
-            commits: ['70c774c'],
+            commits: ['40802cf'],
             files: ['src/divide.js'],
           },
           solution: {
-            commits: ['3180bed'],
+            commits: ['b321a3d'],
           },
         },
         hints: [],
@@ -101,11 +115,11 @@ const basic: CR.Tutorial = {
         },
         actions: {
           setup: {
-            commits: ['16d9699'],
-            files: [],
+            commits: ['4db40b4'],
+            files: ['src/modulo.js'],
           },
           solution: {
-            commits: ['bbf8aa5']
+            commits: ['3580c9d']
           }
         }
       },
@@ -116,11 +130,41 @@ const basic: CR.Tutorial = {
         },
         actions: {
           setup: {
-            commits: ['683c8db'],
-            files: [],
+            commits: ['abc1e2d'],
+            files: ['src/power.js'],
+          },
+          solution: {
+            commits: ['5d28c25']
+          }
+        }
+      },
+      a1: {
+        content: {
+          title: 'Hello',
+          text: 'Return the word "hello"'
+        },
+        actions: {
+          setup: {
+            commits: ['d2c5827'],
+            files: ['src/hello.js'],
+          },
+          solution: {
+            commits: ['f668bf7']
+          }
+        }
+      },
+      a2: {
+        content: {
+          title: 'Bye',
+          text: 'Return the word "bye"'
+        },
+        actions: {
+          setup: {
+            commits: ['3aa0ccd'],
+            files: ['src/hello.js'],
           },
           solution: {
-            commits: ['deaf3a8']
+            commits: ['9897785']
           }
         }
       },