wip #92

Author: previ

package-lock.json

@@ -33,7 +33,7 @@
     "vue-i18n": "^9.1.10",
     "vue-prism-component": "^2.0.0",
     "vue-router": "^4.1.3",
-    "vuetify": "^3.0.0-beta.8",
+    "vuetify": "^3.0.0-beta.10",
     "vuex": "^4.0.2"
   },
   "devDependencies": {

package.json

@@ -109,7 +109,7 @@ class CoderBot {
   async loadMusicPackages() {
     const result = await this.$axios.get(`${this.CB}/music/packages`);
     const packagesInstalled = [];
-    const music_packages = JSON.parse(result.data);
+    const music_packages = result.data;
     const musicInstruments = [];
     const musicAnimals = [];
     Object.entries(music_packages).forEach((key) => {
@@ -132,7 +132,7 @@ class CoderBot {
   async loadCNNModels() {
     const result = await this.$axios.get(`${this.CB}/cnnmodels`);
     const cnnModels = [];
-    const cnn_models = JSON.parse(result.data);
+    const cnn_models = result.data;
     Object.entries(cnn_models).forEach((entry) => {
       const model_key = entry[0];
       // const model_data = entry[1];
@@ -306,9 +306,7 @@ class CoderBot {
   }
 
   saveActivity(an_activity) {
-    return this.$axios.post(`${this.CB}/activities`, {
-      activity: an_activity
-    });
+    return this.$axios.post(`${this.CB}/activities`, an_activity);
   }
 
   saveProgram(overwrite, name, dom_code, code, is_default) {
@@ -322,7 +320,7 @@ class CoderBot {
   }
 
   listPrograms() {
-    return this.$axios.get(`${this.CB}/programs/list`);
+    return this.$axios.get(`${this.CB}/programs`);
   }
 
   loadProgram(name) {
@@ -335,17 +333,16 @@ class CoderBot {
     });
   }
 
-  runProgram(name, dom_code, code, options) {
+  runProgram(name, code, options) {
     return this.$axios.post(`${this.CB}/programs/${name}/run`, {
       name: 'run program',
-      dom_code,
-      code,
-      options
+      code: code,
+      options: options
     });
   }
 
   stopProgram(name) {
-    return this.$axios.post(`${this.CB}/programs/${name}/end`);
+    return this.$axios.patch(`${this.CB}/programs/${name}/stop`, {});
   }
 
   programStatus(name) {
@@ -362,16 +359,16 @@ class CoderBot {
 
   move(speed, elapse, distance) {
     return this.$axios.post(`${this.CB}/control/move`, {
-      speed,
-      elapse,
-      distance
+      speed: speed,
+      elapse: elapse,
+      distance: distance
     });
   }
 
   turn(speed, elapse) {
     return this.$axios.post(`${this.CB}/control/turn`, {
-      speed,
-      elapse
+      speed: speed,
+      elapse: elapse
     });
   }
 

src/common/coderbot.js

@@ -315,33 +315,33 @@ export default {
   setup() {
     return {
       theme: useTheme(),
+      settings: null,
+      cssProps: {
+        '--bodyFont': 'Roboto',
+        '--codeFont': 'Ubuntu Mono',
+      },
+      experimental: 0,
+      webcamStream: null,
+      isDefault: '',
     };
   },
   data: () => ({
-    cssProps: {
-      '--bodyFont': 'Roboto',
-      '--codeFont': 'Ubuntu Mono',
-    },
-    activityStyle: null,
     activity: {
       exec: {},
     },
+    toolbox: null,
+    dialog: false,
+    dialogCode: false,
     log: null,
-    settings: null,
     snackText: null,
     snackbar: false,
     drawer: false,
-    tabs: null,
-    dialog: false,
-    dialogCode: false,
     status: null,
     info: null,
     code: '',
-    toolbox: null,
     generalDialog: false,
     generalDialogText: null,
     generalDialogTitle: null,
-    experimental: 0,
     execMode: 'fullExec', // can be 'fullExec' or 'stepByStep',
     carica: false,
     programList: '',
@@ -351,9 +351,7 @@ export default {
     invalidName: false,
     del: false,
     clear: false,
-    webcamStream: null,
     runtimeDialog: false,
-    isDefault: '',
     cannotOverwrite: false,
     defaultProgramName: '',
     overwrite: true,
@@ -641,8 +639,8 @@ export default {
       if (this.status) {
         // POST /program/save
         const options = this.activity;
-        const { dom_code, code } = this.$refs.workspace.getProgramData();
-        this.$coderbot.execProgram(dom_code, code, options).then(() => {
+        const { code } = this.$refs.workspace.getProgramData();
+        this.$coderbot.runProgram(this.programName, code, options).then(() => {
           this.runtimeDialog = true;
           setTimeout(() => {
             this.updateExecStatus();

src/components/Activity.vue

@@ -232,37 +232,37 @@ export default {
       if (direction == 0) {
         // UP, move forward
         this.$coderbot.move(
-          speed = 100,
-          elapse = -1,
-          distance = 0
+          100, // speed
+          -1,  // elapse
+          null    // distance
         )
           .catch((error) => {
             console.log(`move error: ${error}`);
           });
       } else if (direction == 1) {
         // RIGHT, turn right
         this.$coderbot.turn(
-          speed = -80,
-          elapse = -1
+          -80, // speed
+          -1   // elapse
         )
           .catch((error) => {
             console.log(`turn error: ${error}`);
           });
       } else if (direction == 2) {
         // LEFT, turn left
         this.$coderbot.turn(
-          speed = 80,
-          elapse = -1
+          80, // speed
+          -1   // elapse
         )
           .catch((error) => {
             console.log(`turn error: ${error}`);
           });
       } else if (direction == 3) {
         // DOWN, move backwards
         this.$coderbot.move(
-          speed = -100,
-          elapse = -1,
-          distance = 0
+          -100, // speed
+          -1,  // elapse
+          null    // distance
         )
           .catch((error) => {
             console.log(`move error: ${error}`);