diff --git a/locales/es-ar/creator.json b/locales/es-ar/creator.json index 62966b6d..76299ba6 100644 --- a/locales/es-ar/creator.json +++ b/locales/es-ar/creator.json @@ -34,7 +34,7 @@ "definition": "la puma", "interests": "La comida.", "personality": "Hambrienta (¡siempre es buen momento para comer!).", - "origin": "Cordillera patagónica", + "origin": "Cordillera patagónica.", "curiousFact": "Su plato favorito es el churrasco y le encanta hacer asados.", "goals": { "steak": "Comer los churrascos." diff --git a/package-lock.json b/package-lock.json index 8f384070..8a260547 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pilasbloques", - "version": "2.6.1", + "version": "2.6.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "pilasbloques", - "version": "2.6.1", + "version": "2.6.2", "hasInstallScript": true, "dependencies": { "@babel/core": "^7.16.0", @@ -32,7 +32,7 @@ "babel-preset-react-app": "^10.0.1", "bfj": "^7.0.2", "blockly": "^10.4.3", - "blockly-proceds": "^1.0.15", + "blockly-proceds": "^1.0.16", "browserslist": "^4.18.1", "camelcase": "^6.2.1", "case-sensitive-paths-webpack-plugin": "^2.4.0", @@ -7637,9 +7637,9 @@ "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==" }, "node_modules/blockly-proceds": { - "version": "1.0.15", - "resolved": "https://registry.npmjs.org/blockly-proceds/-/blockly-proceds-1.0.15.tgz", - "integrity": "sha512-rrS2iuujX/0gUnbN3NZj5LBoPJct6POgh0S3ljcSXSMoUQ/cB6OP/h3X87VNlsFzaZyH2kv3Ige1kuS2GP6evw==", + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/blockly-proceds/-/blockly-proceds-1.0.16.tgz", + "integrity": "sha512-5yTBNKC62nophp1g7sSp5vw3GoWgguCz2aHwxfd3y2Bw3PCyDQSAN6ncAk8zr/A4nL3mj7V7KG1Aq/5f115rgA==", "peerDependencies": { "blockly": "^10.4.3" } @@ -34234,9 +34234,9 @@ } }, "blockly-proceds": { - "version": "1.0.15", - "resolved": "https://registry.npmjs.org/blockly-proceds/-/blockly-proceds-1.0.15.tgz", - "integrity": "sha512-rrS2iuujX/0gUnbN3NZj5LBoPJct6POgh0S3ljcSXSMoUQ/cB6OP/h3X87VNlsFzaZyH2kv3Ige1kuS2GP6evw==", + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/blockly-proceds/-/blockly-proceds-1.0.16.tgz", + "integrity": "sha512-5yTBNKC62nophp1g7sSp5vw3GoWgguCz2aHwxfd3y2Bw3PCyDQSAN6ncAk8zr/A4nL3mj7V7KG1Aq/5f115rgA==", "requires": {} }, "bluebird": { diff --git a/package.json b/package.json index 94e37fb1..22850e92 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pilasbloques", - "version": "2.6.1", + "version": "2.6.2", "productName": "Pilas Bloques", "genericName": "Programacion con bloques", "description": "Una herramienta para aprender a programar utilizando bloques", @@ -56,7 +56,7 @@ "babel-preset-react-app": "^10.0.1", "bfj": "^7.0.2", "blockly": "^10.4.3", - "blockly-proceds": "^1.0.15", + "blockly-proceds": "^1.0.16", "browserslist": "^4.18.1", "camelcase": "^6.2.1", "case-sensitive-paths-webpack-plugin": "^2.4.0", diff --git a/src/components/blockly/blocks.ts b/src/components/blockly/blocks.ts index 7b1880b0..3904b332 100644 --- a/src/components/blockly/blocks.ts +++ b/src/components/blockly/blocks.ts @@ -147,11 +147,6 @@ export const commonBlocks: BlockType[] = [ intlId: 'while', categoryId: 'repetitions' }, - { - id: 'OpComparacion', - intlId: 'logic_compare', - categoryId: 'operators' - }, { id: 'OpAritmetica', intlId: 'math_arithmetic', @@ -175,6 +170,11 @@ export const commonBlocks: BlockType[] = [ ] const notUsedBlocks: BlockType[] = [ + { + id: 'OpComparacion', + intlId: 'logic_compare', + categoryId: 'operators' + }, { id: 'SiguienteColumna', intlId: 'nextColumn', diff --git a/src/components/creator/ActorSelection/ActorSelection.tsx b/src/components/creator/ActorSelection/ActorSelection.tsx index 1785885f..90437d40 100644 --- a/src/components/creator/ActorSelection/ActorSelection.tsx +++ b/src/components/creator/ActorSelection/ActorSelection.tsx @@ -15,7 +15,7 @@ export const ActorSelection = () => { return (
}/> + }/> diff --git a/src/components/creator/Editor/ChallengeDetailsEdition/ToolBoxEditor/ToolBoxEditor.tsx b/src/components/creator/Editor/ChallengeDetailsEdition/ToolBoxEditor/ToolBoxEditor.tsx index a4629cfa..094b59bc 100644 --- a/src/components/creator/Editor/ChallengeDetailsEdition/ToolBoxEditor/ToolBoxEditor.tsx +++ b/src/components/creator/Editor/ChallengeDetailsEdition/ToolBoxEditor/ToolBoxEditor.tsx @@ -14,9 +14,7 @@ import { useThemeContext } from "../../../../../theme/ThemeContext"; export const ToolBoxEditor = () => { - const shouldShow = process.env.NODE_ENV !== 'production' - - const [contentHeight,] = useState(window.innerHeight*0.7) + const [contentHeight,] = useState(window.innerHeight * 0.7) const { t } = useTranslation('creator'); const { isSmallScreen } = useThemeContext() @@ -63,17 +61,15 @@ export const ToolBoxEditor = () => { onCancel={handleOnCancel} title={`${t('toolbox.title')}${t(`selection.cards.${challenge.scene.type}.name`)}`} noScrollable={true} - dialogProps={{ maxWidth: "md"}}> + dialogProps={{ maxWidth: "md" }}> - - - + + + - {shouldShow ? - :<> - } + categorized={isCategorized || toolboxState.categorizationShouldBeForced()} /> @@ -108,7 +104,7 @@ export class ToolboxState { return this.categories.find(category => category.id === categoryId)!.isSelected() } - categorizationShouldBeForced() { + categorizationShouldBeForced() { return this.isCategorySelected(PROCEDURE_CATEGORY) //If this category is selected, the categorization should always be enabled } } diff --git a/src/components/creator/Editor/ChallengeDetailsEdition/ToolBoxEditor/ToolboxPreview.tsx b/src/components/creator/Editor/ChallengeDetailsEdition/ToolBoxEditor/ToolboxPreview.tsx index 01977dff..15674fbf 100644 --- a/src/components/creator/Editor/ChallengeDetailsEdition/ToolBoxEditor/ToolboxPreview.tsx +++ b/src/components/creator/Editor/ChallengeDetailsEdition/ToolBoxEditor/ToolboxPreview.tsx @@ -18,7 +18,7 @@ export const ToolboxPreview = ({ categorized, blockIds }: ToolboxPreviewProps) = } : {} // used only in toolboxpreview to show blocks under the categories return { {challengeExists ? ( <>
} SubHeader={} />} /> - - + + ) : <>} ) @@ -39,11 +39,8 @@ export const CreatorViewMode = () => { export const CreatorViewHeader = ({ title }: { title: string }) => { const { t } = useTranslation('creator') - return - - - {title} - - - + return + + {title} + } \ No newline at end of file diff --git a/src/components/creator/Editor/Editor.tsx b/src/components/creator/Editor/Editor.tsx index 2b2f1be9..42f21ba7 100644 --- a/src/components/creator/Editor/Editor.tsx +++ b/src/components/creator/Editor/Editor.tsx @@ -30,20 +30,18 @@ export const CreatorEditor = () => { }, [challengeExists, navigate]) return ( - <> - { challengeExists ? - ( - -
- - } - SubHeader={ : undefined} reactViewButton={ } />} /> - - + <> + {challengeExists ? + ( + +
} + SubHeader={ : undefined} reactViewButton={} />} /> + + + - - - ) : <>} + + ) : <>} ) @@ -59,5 +57,5 @@ export const EditorSubHeader = (props: EditorSubHeaderProps) => {props.viewButton} {props.reactViewButton} - + diff --git a/src/components/creator/Editor/EmberCreatorViewMode.tsx b/src/components/creator/Editor/EmberCreatorViewMode.tsx index 7db88c87..2cb43bdf 100644 --- a/src/components/creator/Editor/EmberCreatorViewMode.tsx +++ b/src/components/creator/Editor/EmberCreatorViewMode.tsx @@ -33,7 +33,7 @@ export const EmberCreatorViewMode = () => { <>
} SubHeader={} />} /> - + ) : <>} ) @@ -42,11 +42,8 @@ export const EmberCreatorViewMode = () => { export const EmberCreatorViewHeader = ({ title }: { title: string }) => { const { t } = useTranslation('creator') - return - - - {title} - - - + return + + {title} + } \ No newline at end of file diff --git a/src/components/creator/Selection.tsx b/src/components/creator/Selection.tsx index b0d9fe31..e7e6dce6 100644 --- a/src/components/creator/Selection.tsx +++ b/src/components/creator/Selection.tsx @@ -138,9 +138,7 @@ export const CreatorSelection = () => {
- {t("selection.title")} - {t("selection.subtitle")} diff --git a/src/components/home/CreateChallengeCard.tsx b/src/components/home/CreateChallengeCard.tsx index 4c3a3b2a..f5c25562 100644 --- a/src/components/home/CreateChallengeCard.tsx +++ b/src/components/home/CreateChallengeCard.tsx @@ -17,11 +17,9 @@ export const CreatorCard = (props: CreatorCardProps) => {
-
{props.text}
- ) } \ No newline at end of file