closes #44

Author: previ

.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-      - image: circleci/node:14.6
+      - image: circleci/node:16
 
     working_directory: ~/repo
 
@@ -38,7 +38,7 @@ jobs:
       - run:
           root: ~/repo
           command: |
-            tar czf frontend.tgz dist
+            tar czf frontend.tar.gz dist
       - persist_to_workspace:
           root: ~/repo
           paths:

package.json

@@ -7,11 +7,9 @@
     "build": "vue-cli-service build",
     "test:unit": "vue-cli-service test:unit",
     "lint": "vue-cli-service lint",
-    "build2": "node build/build.js",
-    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
-    "e2e": "node test/e2e/runner.js",
+    "e2e": "node tests/e2e/runner.js",
     "test": "npm run unit && npm run e2e",
-    "unit": "jest --config test/unit/jest.conf.js --coverage"
+    "unit": "jest --config tests/unit/jest.conf.js --coverage"
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.4",

src/components/ActivityEditor.vue

@@ -275,14 +275,13 @@
           <v-tab-item>
             <v-container grid-list-md text-xs-center>
               <v-layout row wrap>
-                <!-- Column A -->
                 <v-flex xs12 md6 offset-md3>
                   <h3 class="text-xs-left">{{ $t("message.activity_views_title") }}</h3>
                   <v-card>
                     <v-form class="cardContent">
                       <v-switch v-bind:label='$t("message.activity_views_runtime_camera")'
-                        v-model="activity.exec.camera"></v-switch>
-                      <v-switch v-bind:label='$t("message.activity_views_runtime_log")' v-model="activity.exec.log">
+                        v-model="activity.camera"></v-switch>
+                      <v-switch v-bind:label='$t("message.activity_views_runtime_log")' v-model="activity.log">
                       </v-switch>
                     </v-form>
                   </v-card>
@@ -588,7 +587,7 @@ export default {
       console.log('Loading activity', this.$route.params.name);
       this.saved = true;
       this.$coderbot.loadActivity(this.$route.params.name, false).then((activity) => {
-        this.activity = activity;
+        this.activity = activity.data;
         if (this.activity.toolbox == null) {
           this.activity.toolbox = {
             kind: 'flyoutToolbox',

src/components/Settings.vue

@@ -31,23 +31,6 @@
               <v-layout row wrap>
                 <!-- Column A -->
                 <v-flex xs12 md6 offset-md3>
-                  <h3 class="text-xs-left">{{ $t("message.settings_system") }} </h3>
-                  <v-card>
-                    <div class="cardContent">
-                      <v-select v-model="settings.progLevel" :items="blocklyToolboxItems"
-                        v-bind:label="$t('message.settings_toolbox_level')"
-                        @select="$v.settings.progLevel.$touch"
-                      >
-                      </v-select>
-                      <!--<v-text-field v-model="settings.cbName" v-bind:label="Nome CoderBot"></v-text-field>
-												<br>-->
-                      <div v-for="(value, key) in cb.info" :key="key">
-                        {{ key }}: <code>{{ value }}</code>
-                      </div>
-                      {{ $t('message.settings_frontend_build') }}: <code> {{ lastCommit }} </code>
-                    </div>
-                  </v-card>
-                  <br>
                   <h3 class="text-xs-left">Stato </h3>
                   <v-card>
                     <div class="cardContent">
@@ -981,24 +964,6 @@ export default {
         startupProgram: null,
         progLevel: null,
       },
-      blocklyToolboxItems: [
-        {
-          text: this.$i18n.t('message.settings_toolbax_movement'),
-          value: 'basic_move'
-        },
-        {
-          text: this.$i18n.t('message.settings_toolbax_base'),
-          value: 'basic'
-        },
-        {
-          text: this.$i18n.t('message.settings_toolbax_standard'),
-          value: 'std'
-        },
-        {
-          text: this.$i18n.t('message.settings_toolbax_advanced'),
-          value: 'adv'
-        },
-      ],
       cb: {
         logs: {
           log: []