merge

.github/workflows/build.yml

@@ -88,9 +88,32 @@ jobs:
           node-version-file: '.nvmrc'
       - run: npm install
       - run: npm run build
-      - run: npm run pack:win32
+      - run: npm run pack:win
       - uses: ncipollo/release-action@v1
         with:
           allowUpdates: true
           artifacts: "binaries/*.exe"
           token: ${{ secrets.GITHUB_TOKEN }}
+
+  publish-surge: # When there is a push in develop, publish on surge
+    runs-on: ubuntu-latest
+    env:
+      REACT_APP_API_URL: ${{ secrets.API_URL }}
+      REACT_APP_GOOGLE_ANALYTICS_KEY: ${{ secrets.GOOGLE_ANALYTICS_KEY }}
+      REACT_APP_VERSION: ${{github.ref_name}}
+    if: github.event_name == 'push' && github.ref == 'refs/heads/develop'
+    needs: test
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version-file: ".nvmrc"
+      - run: npm install
+      - run: npm run build:surge
+      - name: Deploy to pbdevelop.surge.sh
+        uses: dswistowski/surge-sh-action@v1
+        with:
+          domain: 'pbdevelop.surge.sh'
+          project: 'build/'
+          login: ${{ secrets.SURGE_LOGIN }}
+          token: ${{ secrets.SURGE_TOKEN }}

locales/en-us/blocks.json

@@ -12,9 +12,9 @@
         "categorized": "Categorize Blocks"
     },
     "blocks": {
-        "ballHereChuy":"Is there a football ball here?",
-        "ballHerePingPong":"Is there a ping pong ball here?",
-        "ballHerePulpito":"Is there a pulpito ball here?",
+        "footBallHere":"Is there a football ball here?",
+        "pingPongBallHere":"Is there a ping pong ball here?",
+        "pulpitoBallHere":"Is there a pulpito ball here?",
         "butterflyHere": "Is there a butterfly here?",
         "canHere": "Is there a can here?",
         "cellphoneHere": "Is there a cell phone here?",

locales/en-us/books.json

@@ -1,17 +1,17 @@
 {
 
     "1": {
-        "title": "First Cycle",
+        "title": "Beginner Level",
         "description": "Challenges of Teachers` Handbook  \"Computer Science in the classroom, 1st cycle of elementary school\""
     },
 
     "2" : {
-        "title": "Second Cycle",
+        "title": "Intermediate Level",
         "description": "Challenges of Teachers` Book \"Activities to learn how to Program.AR\", for the 2nd cycle of elementary school, and beyond."
     },
 
     "3" : {
-        "title": "Advanced",
+        "title": "Advanced Level",
         "description": "Advanced challenges"
     }
 

locales/en-us/chapters.json

@@ -1,12 +1,12 @@
 {
     "Capítulo 3": {
-      "title": "Chapter 3: Programming in your computer"
+      "title": "Programming in your computer"
     },
     "Capítulo 4": {
-      "title": "Chapter 4: Repetition"
+      "title": "Repetition"
     },
     "Capítulo 5": {
-      "title": "Chapter 5: Conditional alternative"
+      "title": "Conditional alternative"
     },
     "Autómatas, comandos, procedimientos y repetición": {
       "title": "Automatons, commands, procedures, and repetition"
@@ -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"
     }
   }

locales/en-us/creator.json

@@ -12,9 +12,84 @@
 		"interests": "Interests",
 		"personality": "Personality",
 		"origin": "Origin",
-		"curiousFact": "Curious fact",      
+		"curiousFact": "Fun fact",      
 		"goals": "Goals",
-		"creator": "create your own challenge"
+		"creator": "create your own challenge",
+		"cards": {
+			"Lita": { 	"name": "Lita",
+						"definition": "the mulita",
+						"interests": "Cultivation. Orchards.",
+						"personality": "Cheerful (you will always see her smiling!).",
+						"origin": "Argentine Mesopotamia.",
+						"curiousFact": "She has her own orchard and likes to encase herself in her shell, like a ball.",
+						"goals": {
+							"letucce": "Pick the lettuces.",
+						 	"tomato": "Pick the tomatoes.",
+							"salad": "Prepare the salads."
+						}
+			},
+			"Duba": { 	"name": "Duba",
+						"definition": "the puma",
+						"interests": "Food.",
+						"personality": "Hungry (it's always a great time to eat!).",
+						"origin": "Argentine Patagonian mountain range.",
+						"curiousFact": "Her favorite dish is beefsteak and she loves to make \"asados\".",
+						"goals": {
+							"steak": "Eat the beefsteaks."
+						}
+			},
+			"Yvoty": { 	"name": "Yvoty",
+						"definition": "the yaguareté",
+						"interests": "Technology. Computing. Social networks.",
+						"personality": "Creative. Unprejudiced (she doesn't mind what people think!).",
+						"origin": "Argentine Misiones's rainforest.",
+						"curiousFact": "Yvoty means \"flower\" in the Guaraní language and is pronounced \"ivotí\", with the stress on the last \"i\". But it is written with two \"y\"!",
+						"goals": {
+							"firefly": "Wake up the fireflies.",
+							"butterfly": "Photograph the butterflies.",
+							"unlockCellphone": "Unlock the cell phones.",
+							"charger": "Pick the cell phone chargers.",
+							"chargeCellphone": "Charge the cell phones."
+						}
+			},
+			"Manic": {  "name": "Mañic",
+						"definition": "the ñandú (South American ostrich)",
+						"interests": "Science. Astronomy.",
+						"personality": "Curious. Active. Agile (she never forgets her inline skates!).",
+						"origin": "Argentine Pampas plains.",
+						"curiousFact": "Her grandmother from Formosa (Argentina) gave her the name, which literally means \"ñandú\" in the Qom language.",
+						"goals": {
+							"telescope": "Repair the telescopes.",
+							"star": "Watch the stars. ",
+							"planet": "Watch the planets."
+						}
+			},
+			"Capy": {  "name": "Capy y Guyrá",
+						"definition": "the capybara and the cattle tyrant",
+						"interests": "The environment. Ecology.",
+						"personality": "Caregivers. Friends (they are always together!).",
+						"origin": "Argentine wetlands.",
+						"curiousFact": "Their names Capy (from \"capybara\" which means \"lord of the grass\") and Guyrá (means \"bird\"), are from the Tupi Guaraní language.",
+						"goals": {
+							"can":"Pick the cans.",
+							"paper":"Pick the papers."
+						}
+			},
+			"Chuy": {  "name": "Chuy",
+						"definition": "the magellanic penguin",
+						"interests": "Team work. Have fun.",
+						"personality": "Generose. Sportsperson (they love to climb sea cliffs!).",
+						"origin": "Argentine Patagonian beach.",
+						"curiousFact": "Their name comes from \"chuy chuy\" which means \"cold\" in the Mapuche language.",      
+						"goals": {
+							"paddle": "Pick the paddles.",					
+							"trophy": "Pick the trophies.",
+							"pingpong": "Bounce ping pong balls.",
+							"pulpito": "Bounce the rubber balls.",
+							"football":"Kick the football balls."
+						}
+			}
+		}
 	},
 	"editor": {
 		"buttons": {
@@ -36,33 +111,31 @@
 		"previewModeHeader": "Challenge preview"
 	},
 	"title": {
-		"title": "Write your challenge's title",
-		"button": "Write your title",
+		"title": "Write the challenge's title for ",
+		"button": "Write the title",
 		"input": "Title"	
 	},
 	"statement": {
-		"title": "Statement",
-		"button": "Write your statement",
-		"description": "Description",
+		"title": "Write the challenge's statement for ",
+		"button": "Write the statement",
+		"description": "Statement text",
 		"clue": "Clue",
-		"markdownTitle": "This is what your statement and clue will look like:",
-		"descriptionHint": "Write a sentence for the exercise. Make it concise and clearly express the goal. You can use **bold**, _italics_ and :wink: emojis with Markdown syntax.",
 		"includeClue": "Include a clue",
 		"defaultDescription": "Your **statement** will look like this...",
 		"defaultTitle": "Write your challenge's title..."
 	},
 	"tools": {
 		"putObstacle": "Add obstacle",
 		"putObject": "Add objects",
-		"putActor": "Move character",
+		"putActor": "Move ",
 		"delete": "Delete"
 	},
 	"scene": {
 		"numCols": "Modify columns",
 		"numRows": "Modify rows"
 	},
 	"toolbox": {
-		"title": "Select available commands",
+		"title": "Select the challenge's commands for ",
 		"button": "Select available commands",
 		"categoriesHint": "When you want to use procedures there should always be categories"
 	},
@@ -77,5 +150,6 @@
 		"next": "Next",
 		"prev": "Previous",
 		"multipleInitialScenarios": "Initial scenarios"
-	}
+	},
+	"importedChallengedHeader": "Challenge created by the community"
 }

locales/en-us/home.json

@@ -1,6 +1,6 @@
 {
 	"cards": {
-		"initial": "Initial",
+		"initial": "Beginner",
 		"intermediate": "Intermediate",
 		"advanced": "Advanced",
 		"import": "Import your challenge",

locales/en-us/pageNotFound.json

@@ -0,0 +1,5 @@
+{
+	"title": "Page not found",
+	"text": "The page you are trying to access does not exist.",
+	"home": "Go to home page"
+}

locales/es-ar/blocks.json

@@ -12,9 +12,9 @@
         "categorized": "Categorizar Bloques"
     },
     "blocks": {
-        "ballHereChuy":"¿Hay una pelota de fútbol acá?",
-        "ballHerePingPong":"¿Hay una pelota de ping pong acá?",
-        "ballHerePulpito":"¿Hay una pelota pulpito acá?",
+        "footBallHere":"¿Hay una pelota de fútbol acá?",
+        "pingPongBallHere":"¿Hay una pelota de ping pong acá?",
+        "pulpitoBallHere":"¿Hay una pelota pulpito acá?",
         "butterflyHere": "¿Hay una mariposa acá?",
         "canHere": "¿Hay una lata acá?",
         "cellphoneHere": "¿Hay un celular acá?",

locales/es-ar/books.json

@@ -1,18 +1,22 @@
 {
 
     "1": {
-        "title": "Primer Ciclo",
+        "title": "Nivel Principiante",
         "description": "Desafíos del manual para docentes \"Ciencias de la Computación para el aula, 1° ciclo de primaria\""
     },
 
     "2" : {
-        "title": "Segundo Ciclo",
+        "title": "Nivel Intermedio",
         "description": "Desafíos del cuaderno para docentes \"Actividades para aprender a Program.AR\", para 2° ciclo de primaria en adelante."
     },
 
     "3" : {
-        "title": "Avanzado",
+        "title": "Nivel Avanzado",
         "description": "Desafios avanzados"
+    },
+    "1000" : {
+        "title": "Nuevos Desafíos",
+        "description": "Desafíos para los nuevos personajes - TEMPORAL - SE BORRARÁ"
     }
 
 }