close #24

Author: previ

src/common/coderbot.js

@@ -203,6 +203,75 @@ class CoderBot {
       },
     });
   }
+
+  getActivities() {
+    return this.$axios.get(`${this.CB}/listActivities`);
+  }
+
+  deleteActivity(name) {
+    return this.$axios.post(`${this.CB}/deleteActivity`, {
+      name,
+    });
+  }
+
+  saveActivity(an_activity) {
+    return this.$axios.post(`${this.CB}/saveActivity`, {
+      activity: an_activity
+    });
+  }
+
+  saveProgram(overwrite, name, dom_code, code, is_default) {
+    return this.$axios.post(`${this.CB}/saveProgram`, {
+      overwrite,
+      name,
+      dom_code,
+      code,
+      default: is_default
+    });
+  }
+
+  listPrograms() {
+    return this.$axios.get(`${this.CB}/list`);
+  }
+
+  loadProgram(name) {
+    return this.$axios.get(`${this.CB}/load`, {
+      params: {
+        name
+      },
+    });
+  }
+
+  deleteProgram(name) {
+    return this.$axios.post(`${this.CB}/delete`, {
+      name,
+    });
+  }
+
+  status() {
+    return this.$axios.get(`${this.CB}/status`);
+  }
+
+  info() {
+    return this.$axios.get(`${this.CB}/info`);
+  }
+
+  execProgram(dom_code, code, options) {
+    return this.$axios.post(`${this.CB}/exec`, {
+      name: 'run program',
+      dom_code,
+      code,
+      options
+    });
+  }
+
+  stopProgram() {
+    return this.$axios.post(`${this.CBv1}/program/end`);
+  }
+
+  programStatus() {
+    return this.$axios.get(`${this.CBv1}/program/status`);
+  }
 }
 
 export default CoderBot;

src/components/Activity.vue

@@ -393,7 +393,6 @@ export default {
       } else {
         toolboxJSON = this.activity.toolbox;
       }
-      console.log(this.settings);
       this.toolbox = toolboxJSON;
     });
 
@@ -537,21 +536,8 @@ export default {
 
     saveProgram() {
       if (this.programName != '') {
-        const axios = this.$axios;
-        const {
-          CB
-        } = this;
-        const {
-          overwrite
-        } = this.$data;
-        console.log('save');
         const data = this.getProgramData();
-        axios.post(`${CB}/saveProgram?overwrite=${overwrite}`, {
-          name: data.name,
-          dom_code: data.dom_code,
-          code: data.code,
-          default: '',
-        }).then((prog_data) => {
+        this.$coderbot.saveProgram(this.$data.overwrite, data.name, data.dom_code, data.code, '').then((prog_data) => {
           if (prog_data.data == 'defaultOverwrite' || prog_data.data == 'askOverwrite') {
             if (prog_data.data == 'askOverwrite') {
               this.$data.overwriteDialog = true;
@@ -574,29 +560,17 @@ export default {
 
     loadProgramList() {
       // Get the list of available programs and populate the popup
-      const axios = this.$axios;
-      const {
-        CB
-      } = this.$data;
-      axios.get(`${CB}/list`)
+      this.$coderbot.listPrograms()
         .then((response) => {
           this.$data.carica = true;
           this.$data.programList = response.data;
         });
     },
 
     loadProgram(program) {
-      const axios = this.$axios;
-      const {
-        CB
-      } = this.$data;
       this.$data.carica = false;
       this.$data.programName = program;
-      axios.get(`${CB}/load`, {
-        params: {
-          name: program,
-        },
-      }).then((data) => {
+      this.$coderbot.loadProgram(this.$data.programName).then((data) => {
         this.$refs.workspace.loadProgram(data.data.dom_code);
         this.$data.isDefault = data.data.default;
       });
@@ -625,24 +599,14 @@ export default {
         this.$data.code = '';
         this.$data.workspace.clear();
       }
-      const axios = this.$axios;
-      const {
-        CB
-      } = this.$data;
       console.log('delete');
-      axios.post(`${CB}/delete`, {
-        name: program,
-      }).then(() => {
+      this.$coderbot.deleteProgram(program).then(() => {
         console.log('deleted');
       });
     },
 
     pollStatus() {
-      const axios = this.$axios;
-      const {
-        CB
-      } = this;
-      axios.get(`${CB}/status`)
+      this.$coderbot.status()
         .then((response) => {
           // If the reconnection happened while in this component, send a notification
           if (this.status == 0 && response.status) {
@@ -652,7 +616,7 @@ export default {
           this.statusData = response.data;
           this.status = response.status;
         });
-      axios.get(`${this.CB}/info`)
+      this.$coderbot.info()
         .then((response) => {
           this.info = response.data;
         })
@@ -668,27 +632,16 @@ export default {
     },
 
     getProgramCode() {
-      this.code = this.workspace.getProgramCode();
+      this.code = this.$refs.workspace.getProgramCode();
       this.dialogCode = true;
     },
 
     runProgram() {
       if (this.status) {
-        const axios = this.$axios;
-        const {
-          CB
-        } = this;
         // POST /program/save
         const options = this.activity;
-
         const { dom_code, code } = this.$refs.workspace.getProgramData();
-
-        axios.post(`${CB}/exec`, {
-          name: 'run program',
-          dom_code,
-          code,
-          options,
-        }).then(() => {
+        this.$coderbot.execProgram(dom_code, code, options).then(() => {
           this.runtimeDialog = true;
           setTimeout(() => {
             this.updateExecStatus();
@@ -703,14 +656,12 @@ export default {
 
     stopProgram() {
       console.log('Stopping');
-      const axios = this.$axios;
-      axios.post(`${this.CBv1}/program/end`);
+      this.$coderbot.stopProgram();
     },
 
     updateExecStatus() {
-      const axios = this.$axios;
       console.log('Updating Execution status');
-      axios.get(`${this.CBv1}/program/status`)
+      this.$coderbot.programStatus()
         .then((response) => {
           this.program_status = response.data.running;
           if (this.program_status) {

src/components/ActivityEditor.vue

@@ -578,32 +578,23 @@ export default {
         viewSource: { },
         autoRecVideo: { },
         name: { required: true, alphaNum },
-        description: { alphaNum },
+        description: { },
         maxBlocks: { integer, minValue: 0 },
       },
     };
   },
   mounted() {
     if (this.$route.params.name) {
-      const axios = this.$axios;
-      const {
-        CB
-      } = this;
       console.log('Loading activity', this.$route.params.name);
       this.saved = true;
-      axios.get(`${CB}/loadActivity`, {
-        params: {
-          name: this.$route.params.name,
-        },
-      }).then((response) => {
-        this.activity = response.data;
+      this.$coderbot.loadActivity(this.$route.params.name, false).then((activity) => {
+        this.activity = activity;
         if (this.activity.toolbox == null) {
           this.activity.toolbox = {
             kind: 'flyoutToolbox',
             contents: []
           };
         }
-        console.log(this.activity);
       });
     } else {
       this.restoreDefaults();
@@ -617,15 +608,8 @@ export default {
   },
   methods: {
     save() {
-      console.log(this.activity);
       if (this.activity.name) {
-        const axios = this.$axios;
-        const {
-          CB
-        } = this;
-        axios.post(`${CB}/saveActivity`, {
-          activity: this.activity,
-        }).then(() => {
+        this.$coderbot.saveActivity(this.activity).then(() => {
           this.snackbarText = this.$i18n.t('message.activity_saved');
           this.snackbar = true;
           this.saved = true;
@@ -728,7 +712,6 @@ export default {
       ];
     },
     onToolboxSave() {
-      console.log(this.activity.toolbox);
     },
   },
 };

src/components/ActivityList.vue

@@ -34,6 +34,7 @@
                         <b>{{ activity.name }}</b>
                         <small> {{activity.description}} </small>
                       </v-list-item-title>
+                      <v-icon v-if="activity.default">mdi-star</v-icon>
                       <v-btn text icon color="grey darken-1" v-if="activity.stock!=true" ripple @click="confirmDeleteDlg = true">
                         <v-icon>delete</v-icon>
                           <template>
@@ -100,25 +101,14 @@ export default {
       this.$router.push({ name: 'activity_open', params: { name } });
     },
     getActivities() {
-      const axios = this.$axios;
-      const {
-        CB
-      } = this.$data;
       // let programList = this.$data.programList
-      axios.get(`${CB}/listActivities`)
+      this.$coderbot.getActivities()
         .then((response) => {
           this.$data.activityList = response.data;
         });
     },
     deleteActivity(name) {
-      const axios = this.$axios;
-      const {
-        CB
-      } = this.$data;
-      // let programList = this.$data.programList
-      axios.post(`${CB}/deleteActivity`, {
-        name,
-      }).then(() => {
+      this.$coderbot.deleteActivity(name).then(() => {
         this.getActivities();
       });
     },

src/components/BlocklyWorkspace.vue

@@ -57,7 +57,6 @@ export default {
     // whenever settings changes, this function will run
     settings(newSettings, oldSettings) {
       if (newSettings != oldSettings) {
-        console.log('initBlockly.1');
         this.initBlockly(this.settings);
       }
     },
@@ -67,7 +66,6 @@ export default {
         if (this.workspace) {
           if (newToolbox.kind != this.toolbox_kind) {
             this.workspace.dispose();
-            console.log('initBlockly.2');
             this.initBlockly(this.settings);
             this.toolbox_kind = this.toolbox.kind;
           } else {

src/i18n/locales/it/messages.json

@@ -57,6 +57,7 @@
     "activity_program_clear": "Pulisci",
     "activity_program_run": "Esegui",
     "activity_program_load": "Carica Programma",
+    "activity_program_save": "Salva",
     "activity_program_save_as": "Salva con nome",
     "activity_program_export": "Esporta",
     "activity_program_import": "Importa",
@@ -73,7 +74,6 @@
     "activity_saved": "Attività salvata",
     "activity_save_error": "Salvataggio non riuscito: inserisci un nome all'attività!",
     "activity_program_save_as_name": "Nome del programma",
-    "activity_program_save": "Salva",
     "activity_program_remaining_blocks": "Blocchi rimanenti",
     "activity_description": "Description",
     "activity_predefined_view": "Vista predefinita",
@@ -100,6 +100,7 @@
     "activity_tabs_toolbox": "Menù Blocchi",
     "activity_toolbox_category_add": "Aggiungi Nuova Categoria",
     "activity_toolbox_category_add_all": "Aggiungi Tutte",
+    "activity_default": "Attività predefinita",
     "control_speak": "Pronuncia",
     "control_speaking": "Sto pronunciando",
     "control_photo_take": "Scatta foto",