Merge pull request #135 from Program-AR/numericChallengeIds

Numeric challenge ids & develop react fix
Program-AR · Nov 7, 2023 · d05c00e · d05c00e
2 parents f4e341b + 6b0f8ac
commit d05c00e
Show file tree

Hide file tree

Showing 12 changed files with 799 additions and 1,519 deletions.
diff --git a/locales/en-us/challenges.json b/locales/en-us/challenges.json
diff --git a/locales/en-us/chapters.json b/locales/en-us/chapters.json
@@ -25,5 +25,20 @@
     },
     "Desafios complementarios": {
       "title": "Complementary challenges"
+    },
+    "1": {
+      "title": "Automatons, commands, procedures, and repetition"
+    },
+    "2": {
+      "title": "Conditional alternative"
+    },
+    "3": {
+      "title": "Conditional repetition"
+    },
+    "4": {
+      "title": "Numerical sensors"
+    },
+    "5": {
+      "title": "Solutions parameterizing"
     }
   }
diff --git a/locales/es-ar/challenges.json b/locales/es-ar/challenges.json
diff --git a/locales/es-ar/chapters.json b/locales/es-ar/chapters.json
@@ -25,5 +25,20 @@
     },
     "Desafios complementarios": {
       "title": "Desafíos complementarios"
+    },
+    "1": {
+      "title": "Autómatas, comandos, procedimientos y repetición"
+    },
+    "2": {
+      "title": "Alternativa condicional"
+    },
+    "3": {
+      "title": "Repetición condicional"
+    },
+    "4": {
+      "title": "Sensores Numéricos"
+    },
+    "5": {
+      "title": "Parametrización de soluciones"
     }
   }
diff --git a/locales/pt-br/challenges.json b/locales/pt-br/challenges.json
diff --git a/locales/pt-br/chapters.json b/locales/pt-br/chapters.json
@@ -25,5 +25,20 @@
     },
     "Desafios complementarios": {
       "title": "Desafios complementares"
+    },
+    "1": {
+      "title": "Autômatos, comandos, procedimentos e repetição"
+    },
+    "2": {
+      "title": "Alternativa condicional"
+    },
+    "3": {
+      "title": "Repetição condicional"
+    },
+    "4": {
+      "title": "Sensores Numéricos"
+    },
+    "5": {
+      "title": "Parametrização de Soluções"
     }
   }
diff --git a/scripts/copyEmberPB.sh b/scripts/copyEmberPB.sh
@@ -1,4 +1,4 @@
-PB_APP_VERSION="1.16.2"
+PB_APP_VERSION="1.16.3"
 
 echo "==> Downloading Pilas Bloques app online..."
 mkdir -p tmp

diff --git a/src/components/ChallengeView.tsx b/src/components/ChallengeView.tsx
@@ -45,7 +45,6 @@ const ChallengeBreadcrumb = (path: PathToChallenge) => {
 
 type ChallengeViewProps = {
     challengeId: number
-    textChallengeId?: string
 }
 
 const ChallengeView = (props: ChallengeViewProps) => {
@@ -58,19 +57,14 @@ const ChallengeView = (props: ChallengeViewProps) => {
 
     return <>
         <Header CenterComponent={ChallengeBreadcrumb(path)} />
-        <EmberView path={`desafio/${props.textChallengeId ? props.textChallengeId : props.challengeId}${solutionParam}`} />
+        <EmberView path={`desafio/${props.challengeId}${solutionParam}`} />
     </>
 }
 
 
 export const ChallengeById = () => {
     const { id } = useParams()
-    /* TEMPORAL hasta cambiar ids en PB Ember a numeros 100x ? */
-    let textId = id
-    let numId = Number(id)
-    if( id?.includes('nuevo'))
-       numId = Number(id.replace('nuevo','')) + 1000
-    return <ChallengeView challengeId={numId} textChallengeId={textId} />
+    return <ChallengeView challengeId={Number(id)}/>
 }
 
 export const ChallengeByName = () => {

diff --git a/src/staticData/books.ts b/src/staticData/books.ts
@@ -59,7 +59,7 @@ const rawBooksData: RawBookData[] = [
   },
   {
     id: 1000,
-    chapterIds: ['Nuevos Desafios'],
+    chapterIds: ['1','2','3','4','5'],
     simpleReadMode: true
   },  
 ];