Merge pull request #320 from Program-AR/post-qa

Cositas varias de la nueva pantalla
Program-AR · Dec 2, 2024 · cd8c7ab · cd8c7ab
2 parents 4c8405b + 121f1bd
commit cd8c7ab
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 66 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -15,7 +15,7 @@ export const ActorSelection = () => {
 	return (
         <Stack alignItems="center" height="inherit" sx={{backgroundColor: theme.palette.background.paper}}>
             <Header CenterComponent={
-                <BetaBadge smaller={true}><HeaderText text={t("selection.title")}/></BetaBadge>}/>
+                <HeaderText text={t("selection.title")}/>}/>
             <ChallengeInProgressDialog />
             <Stack className={styles['selection']}
                    style={isSmallScreen ? {} : {height: "100%"}}>

diff --git 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" }}>
             <Stack direction="row">
-                <PBCard sx={{display:"flex", maxWidth: isSmallScreen ? '50%' : 'inherit', flexDirection:"column", padding:"5px", maxHeight:`${contentHeight}px`}}> 
-                    <CategorizedToggle toolboxState={toolboxState} isCategorized={isCategorized} setIsCategorized={setIsCategorized}/>
-                    <BlocksSelector toolboxState={toolboxState} setToolBoxItems={setToolBoxItems} toolBoxItems={toolBoxItems} availableBlocks={availableBlocksFor(challenge!.scene.type)}/>
+                <PBCard sx={{ display: "flex", maxWidth: isSmallScreen ? '50%' : 'inherit', flexDirection: "column", padding: "5px", maxHeight: `${contentHeight}px` }}>
+                    <CategorizedToggle toolboxState={toolboxState} isCategorized={isCategorized} setIsCategorized={setIsCategorized} />
+                    <BlocksSelector toolboxState={toolboxState} setToolBoxItems={setToolBoxItems} toolBoxItems={toolBoxItems} availableBlocks={availableBlocksFor(challenge!.scene.type)} />
                 </PBCard>
-                {shouldShow ? <ToolboxPreview 
+                <ToolboxPreview
                     blockIds={toolBoxItems}
-                    categorized={isCategorized || toolboxState.categorizationShouldBeForced()}/>
-                    :<></>
-                }
+                    categorized={isCategorized || toolboxState.categorizationShouldBeForced()} />
             </Stack>
         </GenericModalDialog>
     </>
@@ -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
@@ -18,7 +18,7 @@ export const ToolboxPreview = ({ categorized, blockIds }: ToolboxPreviewProps) =
   } : {} // used only in toolboxpreview to show blocks under the categories
 
   return <PBBlocklyWorkspace
-    sx={{ minWidth: isSmallScreen ? "auto" : "50%", padding: "5px", display: "flex", flexDirection: "column", ...sx }}
+    sx={{ minWidth: isSmallScreen ? "auto" : "58%", padding: "5px", display: "flex", flexDirection: "column", ...sx }}
     title
     blockIds={blockIds}
     categorized={categorized}

diff --git a/src/components/creator/Editor/CreatorViewMode.tsx b/src/components/creator/Editor/CreatorViewMode.tsx
@@ -29,8 +29,8 @@ export const CreatorViewMode = () => {
         {challengeExists ? (
             <>
                 <Header CenterComponent={<CreatorViewHeader title={challengeBeingEdited.title} />} SubHeader={<EditorSubHeader viewButton={<ReturnToEditionButton />} />} />
-                <ChallengeView height='calc(95% - var(--creator-subheader-height))' path={EMBER_IMPORTED_CHALLENGE_PATH}/>
-                
+                <ChallengeView height='calc(95% - var(--creator-subheader-height))' path={EMBER_IMPORTED_CHALLENGE_PATH} />
+
             </>
         ) : <></>}
     </>)
@@ -39,11 +39,8 @@ export const CreatorViewMode = () => {
 export const CreatorViewHeader = ({ title }: { title: string }) => {
     const { t } = useTranslation('creator')
 
-    return <BetaBadge smaller={true}>
-        <PBreadcrumbs>
-            <HeaderText text={t("editor.previewModeHeader")} />
-            <Typography>{title}</Typography>
-        </PBreadcrumbs>
-    </BetaBadge>
-
+    return <PBreadcrumbs>
+        <HeaderText text={t("editor.previewModeHeader")} />
+        <Typography>{title}</Typography>
+    </PBreadcrumbs>
 }
diff --git 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 ?
-      (<CreatorContextProvider>
-        <Stack alignItems="center" height="inherit" sx={{ backgroundColor: theme.palette.background.paper }}>
-          <Header CenterComponent={<BetaBadge smaller={true}>
-                                      <HeaderText text={t("editor.editorHeader")} />
-                                   </BetaBadge>} 
-                  SubHeader={<EditorSubHeader viewButton={shouldShow ? <EmberPreviewButton /> : undefined} reactViewButton={<PreviewButton /> } />} />
-          <Stack justifyContent="center" height="100%" width="100%" sx={{ maxWidth: 'var(--creator-max-width)', maxHeight: 'var(--creator-max-height)' }}>
-            <SceneEdition />
+    <>
+      {challengeExists ?
+        (<CreatorContextProvider>
+          <Stack alignItems="center" height="inherit" sx={{ backgroundColor: theme.palette.background.paper }}>
+            <Header CenterComponent={<HeaderText text={t("editor.editorHeader")} />}
+              SubHeader={<EditorSubHeader viewButton={shouldShow ? <EmberPreviewButton /> : undefined} reactViewButton={<PreviewButton />} />} />
+            <Stack justifyContent="center" height="100%" width="100%" sx={{ maxWidth: 'var(--creator-max-width)', maxHeight: 'var(--creator-max-height)' }}>
+              <SceneEdition />
+            </Stack>
           </Stack>
-        </Stack>
-      </CreatorContextProvider>
-      ) : <></>}
+        </CreatorContextProvider>
+        ) : <></>}
     </>
 
   )
@@ -59,5 +57,5 @@ export const EditorSubHeader = (props: EditorSubHeaderProps) =>
     <DiscardChallengeButton />
     {props.viewButton}
     {props.reactViewButton}
-    <ShareButton/>
+    <ShareButton />
   </CreatorSubHeader>
diff --git a/src/components/creator/Editor/EmberCreatorViewMode.tsx b/src/components/creator/Editor/EmberCreatorViewMode.tsx
@@ -33,7 +33,7 @@ export const EmberCreatorViewMode = () => {
             <>
                 <Header CenterComponent={<EmberCreatorViewHeader title={challengeBeingEdited.title} />} SubHeader={<EditorSubHeader viewButton={<ReturnToEditionButton />} />} />
                 <EmberView height='calc(100% - var(--creator-subheader-height))' path={EMBER_IMPORTED_CHALLENGE_PATH} />
-                
+
             </>
         ) : <></>}
     </>)
@@ -42,11 +42,8 @@ export const EmberCreatorViewMode = () => {
 export const EmberCreatorViewHeader = ({ title }: { title: string }) => {
     const { t } = useTranslation('creator')
 
-    return <BetaBadge smaller={true}>
-        <PBreadcrumbs>
-            <HeaderText text={t("editor.previewModeHeader")} />
-            <Typography>{title}</Typography>
-        </PBreadcrumbs>
-    </BetaBadge>
-
+    return <PBreadcrumbs>
+        <HeaderText text={t("editor.previewModeHeader")} />
+        <Typography>{title}</Typography>
+    </PBreadcrumbs>
 }
diff --git a/src/components/creator/Selection.tsx b/src/components/creator/Selection.tsx
@@ -138,9 +138,7 @@ export const CreatorSelection = () => {
 			<Header />
 			<ChallengeInProgressDialog />
 			<Container className={styles['selection']} maxWidth={false}>
-				<BetaBadge sx={{marginTop: 2}}>
 					<Typography className={styles['selection-text']} variant="h4">{t("selection.title")}</Typography>
-				</BetaBadge>
 				<Typography className={styles['selection-text']} variant="h5">{t("selection.subtitle")}</Typography>
 
 				<CharacterCards />

diff --git a/src/components/home/CreateChallengeCard.tsx b/src/components/home/CreateChallengeCard.tsx
@@ -17,11 +17,9 @@ export const CreatorCard = (props: CreatorCardProps) => {
             <div className={creatorCardsStyles['creator-card-icon']} >
                 <props.icon style={{fontSize: '2.5em'}} />
             </div>
-            <BetaBadge invisible={!props.visibleBadge}>
             <div className={creatorCardsStyles['creator-card-text']}>
                 <Typography color='black' align="center" fontWeight="400" >{props.text}</Typography>
             </div>
-        </BetaBadge>
         </Card>
     )
 }