extract strings

microsoft · Feb 12, 2024 · 2f98d27 · 2f98d27
1 parent a27188a
commit 2f98d27
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 13 deletions.
diff --git a/teachertool/src/components/HomeScreen.tsx b/teachertool/src/components/HomeScreen.tsx
@@ -5,7 +5,7 @@ import { Button } from "react-common/components/controls/Button";
 import { classList } from "react-common/components/util";
 import { showModal } from "../transforms/showModal";
 import { resetRubricAsync } from "../transforms/resetRubricAsync";
-import Constants, { Ticks } from "../constants";
+import { Constants, Strings, Ticks } from "../constants";
 import { Swiper, SwiperSlide } from "swiper/react";
 import { Mousewheel, Navigation } from "swiper";
 
@@ -60,7 +60,7 @@ const Carousel: React.FC<CarouselProps> = ({ children }) => {
 
     return (
         <Swiper
-            spaceBetween={10}
+            spaceBetween={0}
             slidesPerView={"auto"}
             allowTouchMove={true}
             slidesOffsetBefore={32}
@@ -96,13 +96,13 @@ const GetStarted: React.FC = () => {
             </div>
             <Carousel>
                 <Card
-                    title={lf("New Rubric")}
+                    title={Strings.NewRubric}
                     icon={"fas fa-plus-circle"}
                     className={css.newRubric}
                     onClick={onNewRubricClickedAsync}
                 />
                 <Card
-                    title={lf("Import Rubric")}
+                    title={Strings.ImportRubric}
                     icon={"fas fa-file-upload"}
                     className={css.importRubric}
                     onClick={onImportRubricClicked}

diff --git a/teachertool/src/components/RubricWorkspace.tsx b/teachertool/src/components/RubricWorkspace.tsx
@@ -15,7 +15,8 @@ import { writeRubricToFile } from "../services/fileSystemService";
 import { showModal } from "../transforms/showModal";
 import { isProjectLoaded } from "../state/helpers";
 import { setAutorun } from "../transforms/setAutorun";
-import { Ticks } from "../constants";
+import { Strings, Ticks } from "../constants";
+import { resetRubricAsync } from "../transforms/resetRubricAsync";
 
 function handleImportRubricClicked() {
     pxt.tickEvent(Ticks.ImportRubric);
@@ -28,6 +29,11 @@ function handleExportRubricClicked() {
     writeRubricToFile(teacherTool.rubric);
 }
 
+async function handleNewRubricClickedAsync() {
+    pxt.tickEvent(Ticks.NewRubric);
+    await resetRubricAsync(true);
+}
+
 async function handleEvaluateClickedAsync() {
     pxt.tickEvent(Ticks.Evaluate);
     await runEvaluateAsync(true);
@@ -70,15 +76,21 @@ function getActionMenuItems(tab: TabName): MenuItem[] {
         case "rubric":
             items.push(
                 {
-                    title: lf("Import Rubric"),
-                    label: lf("Import Rubric"),
-                    ariaLabel: lf("Import Rubric"),
+                    title: Strings.NewRubric,
+                    label: Strings.NewRubric,
+                    ariaLabel: Strings.NewRubric,
+                    onClick: handleNewRubricClickedAsync,
+                },
+                {
+                    title: Strings.ImportRubric,
+                    label: Strings.ImportRubric,
+                    ariaLabel: Strings.ImportRubric,
                     onClick: handleImportRubricClicked,
                 },
                 {
-                    title: lf("Export Rubric"),
-                    label: lf("Export Rubric"),
-                    ariaLabel: lf("Export Rubric"),
+                    title: Strings.ExportRubric,
+                    label: Strings.ExportRubric,
+                    ariaLabel: Strings.ExportRubric,
                     onClick: handleExportRubricClicked,
                 }
             );

diff --git a/teachertool/src/constants.ts b/teachertool/src/constants.ts
@@ -2,6 +2,9 @@ export namespace Strings {
     export const ConfirmReplaceRubric = lf("This will replace your current rubric. Continue?");
     export const UntitledProject = lf("Untitled Project");
     export const UntitledRubric = lf("Untitled Rubric");
+    export const NewRubric = lf("New Rubric");
+    export const ImportRubric = lf("Import Rubric");
+    export const ExportRubric = lf("Export Rubric");
 }
 
 export namespace Ticks {
@@ -19,8 +22,8 @@ export namespace Ticks {
     export const RemoveCriteria = "teachertool.removecriteria";
 }
 
-namespace Constants {
+namespace Misc {
     export const LearnMoreLink = "https://makecode.com/teachertool"; // TODO: Replace with gwlink or aka.ms link
 }
 
-export default Constants;
+export const Constants = Object.assign(Misc, { Strings, Ticks });