Merge pull request #315 from Program-AR/merge-main

Merge hotfixes to develop
Program-AR · Oct 16, 2024 · 5fb7e2f · 5fb7e2f
2 parents ccaf5b4 + c55adbc
commit 5fb7e2f
Show file tree

Hide file tree

Showing 9 changed files with 339 additions and 287 deletions.
diff --git a/locales/en-us/blocks.json b/locales/en-us/blocks.json
@@ -139,7 +139,11 @@
     "rotateGrades": "Rotate grades",
     "isAVowel": "Is a vowel ?",
     "repeatEmpty": "Repeat",
-    "JumpForward": "Jump forward"    
+    "JumpForward": "Jump forward", 
+    "leftBorder": "Am I on the left edge?",
+    "rightBorder": "Am I on the right edge?",
+    "bottomBorder": "Am I on the bottom edge?",
+    "topBorder": "Am I on the top edge?"
   },
   "procedures": {
     "definition": "Define",

diff --git a/locales/es-ar/blocks.json b/locales/es-ar/blocks.json
@@ -138,7 +138,11 @@
     "rotateGrades": "Girar grados",
     "isAVowel": "¿ Hay vocal ?",
     "repeatEmpty": "Repetir",
-    "JumpForward": "Saltar hacia adelante"    
+    "JumpForward": "Saltar hacia adelante",
+    "leftBorder": "¿Estoy en el borde de la izquierda?",
+    "rightBorder": "¿Estoy en el borde de la derecha?",
+    "bottomBorder": "¿Estoy en el borde de abajo?",
+    "topBorder": "¿Estoy en el borde de arriba?"
   },
   "procedures": {
     "definition": "Definir",

diff --git a/locales/pt-br/blocks.json b/locales/pt-br/blocks.json
@@ -120,7 +120,11 @@
     "jumpDown": "Saltar para baixo",
     "jumpUp": "Saltar para cima",
     "goInAlligator": "Vai em jacaré",
-    "backToLeftBorder": "Voltar para a margem esquerda"    
+    "backToLeftBorder": "Voltar para a margem esquerda",
+    "leftBorder": "Estou na borda esquerda?",
+    "rightBorder": "Estou na borda direita?",
+    "bottomBorder": "Estou na borda inferior?",
+    "topBorder": "Estou na borda superior?"
   },
   "procedures": {
     "definition": "Definir",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -81,7 +81,7 @@
     "js-interpreter": "^5.1.2",
     "makensis": "^2.0.8",
     "mini-css-extract-plugin": "^2.4.5",
-    "pilas-bloques-exercises": "^1.4.33",
+    "pilas-bloques-exercises": "^1.4.34",
     "postcss": "^8.4.4",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-loader": "^6.2.1",

diff --git a/public/pilas.html b/public/pilas.html
@@ -22,7 +22,7 @@
 
 <head>
   <script src="libs/pilasweb.js?v=0.5.0"></script>
-  <script src="libs/pilas-bloques-exercises.js?v=1.4.33"></script>
+  <script src="libs/pilas-bloques-exercises.js?v=1.4.34"></script>
 </head>
 
 </html>
diff --git a/scripts/copyEmberPB.sh b/scripts/copyEmberPB.sh
@@ -1,4 +1,4 @@
-PB_APP_VERSION="1.17.6"
+PB_APP_VERSION="1.17.9"
 
 echo "==> Downloading Pilas Bloques app online..."
 mkdir -p tmp

diff --git a/src/components/blockly/blocks.ts b/src/components/blockly/blocks.ts
@@ -68,6 +68,26 @@ export const commonBlocks: BlockType[] = [
     intlId: 'cameToTheEnd',
     categoryId: 'sensors'
   },
+  {
+    id: 'BordeArriba',
+    intlId: 'topBorder',
+    categoryId: 'sensors'
+  },
+  {
+    id: 'BordeAbajo',
+    intlId: 'bottomBorder',
+    categoryId: 'sensors'
+  },
+  {
+    id: 'BordeIzquierdo',
+    intlId: 'leftBorder',
+    categoryId: 'sensors'
+  },
+  {
+    id: 'BordeDerecho',
+    intlId: 'rightBorder',
+    categoryId: 'sensors'
+  },
   {
     id: 'Si',
     intlId: 'simpleAlternative',