diff --git a/src/components/blockly/blockly.ts b/src/components/blockly/blockly.ts index 08160a37..66b4cab7 100644 --- a/src/components/blockly/blockly.ts +++ b/src/components/blockly/blockly.ts @@ -6,7 +6,7 @@ import { enableUnwantedProcedureBlocks, disableUnwantedProcedureBlocks } from ". import 'blockly/blocks'; import { createPrimitiveBlocks } from "./blocksGallery/primitives"; import { createSensorBlocks } from "./blocksGallery/sensors"; -import { createValueBlocks } from "./values"; +import { createValueBlocks } from "./blocksGallery/values"; import { createControlStructureBlocks } from "./blocksGallery/controlStructures"; import { createFirstBlock, createOthersBlocks } from "./blocksGallery/others"; diff --git a/src/components/blockly/values.ts b/src/components/blockly/blocksGallery/values.ts similarity index 83% rename from src/components/blockly/values.ts rename to src/components/blockly/blocksGallery/values.ts index 76b22590..780c944d 100644 --- a/src/components/blockly/values.ts +++ b/src/components/blockly/blocksGallery/values.ts @@ -1,6 +1,6 @@ import { javascriptGenerator, Order } from "blockly/javascript"; -import { BlocklyBlockDefinition, messageBlock } from "./blockly"; -import { optionType, validateRequiredOptions } from "./utils"; +import { BlocklyBlockDefinition, messageBlock } from "../blockly"; +import { optionType, validateRequiredOptions } from "../utils"; import Blockly, { Block } from "blockly/core" const directionsColor = '#2ba4e2'; @@ -78,4 +78,13 @@ export const createValueBlocks = (t: (key: string) => string) => { javascriptGenerator.forBlock['Numero'] = function (block: Block) { return [`${block.getFieldValue('NUM')}`, Order.ATOMIC]; }; + + Blockly.Blocks['Texto'] = { + init: Blockly.Blocks['text'].init, + categoryId: Blockly.Blocks['text'].categoryId, + } + + javascriptGenerator.forBlock['Texto'] = function (block: Block) { + return [`${block.getFieldValue('TEXT')}`, Order.ATOMIC]; + }; } \ No newline at end of file diff --git a/src/components/challengeView/SceneButtons/Execute.tsx b/src/components/challengeView/SceneButtons/Execute.tsx index 9ff58adb..c6f520bf 100644 --- a/src/components/challengeView/SceneButtons/Execute.tsx +++ b/src/components/challengeView/SceneButtons/Execute.tsx @@ -1,6 +1,6 @@ import { Button, IconButton, Stack } from "@mui/material" import { scene } from "../scene" -import { interpreterFactory } from "./interpreter-factory" +import { interpreterFactory } from "./interpreterFactory" import Interpreter from "js-interpreter" import { useThemeContext } from "../../../theme/ThemeContext" import styles from './sceneButtons.module.css' @@ -55,9 +55,4 @@ export const ExecuteButton = ({ challenge }: ExecuteButtonProps) => { } -} - -/** - * Bloques que no escupen codigo que deberian: con parametros, repeat (ver cambio al repeat de prod), procedimientos - * Test - */ \ No newline at end of file +} \ No newline at end of file diff --git a/src/components/challengeView/SceneButtons/SceneButtons.tsx b/src/components/challengeView/SceneButtons/SceneButtons.tsx index 4110543a..0a8e5c13 100644 --- a/src/components/challengeView/SceneButtons/SceneButtons.tsx +++ b/src/components/challengeView/SceneButtons/SceneButtons.tsx @@ -1,6 +1,6 @@ import { IconButton, Stack } from "@mui/material" import { PBCard } from "../../PBCard" -import { Circle, Info, PlayArrow, SkipNext } from "@mui/icons-material" +import { Circle, Info, SkipNext } from "@mui/icons-material" import { PBSwitch, pbIconStyle } from "../../PBSwitch" import styles from './sceneButtons.module.css' import BoltIcon from '@mui/icons-material/Bolt'; diff --git a/src/components/challengeView/SceneButtons/interpreter-factory.ts b/src/components/challengeView/SceneButtons/interpreterFactory.ts similarity index 100% rename from src/components/challengeView/SceneButtons/interpreter-factory.ts rename to src/components/challengeView/SceneButtons/interpreterFactory.ts diff --git a/src/components/challengeView/scene.ts b/src/components/challengeView/scene.ts index 6f379923..1714a69c 100644 --- a/src/components/challengeView/scene.ts +++ b/src/components/challengeView/scene.ts @@ -1,6 +1,6 @@ import { adaptURL } from "../../scriptLoader"; import { Challenge } from "../../staticData/challenges"; -import { Actor, Behaviour } from "./SceneButtons/interpreter-factory"; +import { Actor, Behaviour } from "./SceneButtons/interpreterFactory"; class Scene { iframe(): HTMLIFrameElement {