@nualang/nualang-ui-components 0.1.1208 → 0.1.1210

package/dist/Cards/Classroom/Classroom.js

@@ -12,15 +12,11 @@ var _Skeleton = _interopRequireDefault(require("@mui/material/Skeleton"));
 var _Rating = _interopRequireDefault(require("@mui/material/Rating"));
 var _Group = _interopRequireDefault(require("@mui/icons-material/Group"));
 var _ExitToApp = _interopRequireDefault(require("@mui/icons-material/ExitToApp"));
-var _Edit = _interopRequireDefault(require("@mui/icons-material/Edit"));
-var _RateReview = _interopRequireDefault(require("@mui/icons-material/RateReview"));
 var _Add = _interopRequireDefault(require("@mui/icons-material/Add"));
 var _Person = _interopRequireDefault(require("@mui/icons-material/Person"));
 var _MoreVert = _interopRequireDefault(require("@mui/icons-material/MoreVert"));
-var _Reviews = _interopRequireDefault(require("../../Dialogs/Reviews"));
 var _Members = _interopRequireDefault(require("../../Dialogs/Members"));
 var _Members2 = _interopRequireDefault(require("../../Lists/Members"));
-var _Reviews2 = _interopRequireDefault(require("../../Lists/Reviews"));
 var _index = require("../../utils/index");
 var _index2 = _interopRequireDefault(require("../../utils/placeholder-images/index"));
 var _ProgressiveCardMedia = _interopRequireDefault(require("../../Misc/ProgressiveCardMedia"));
@@ -35,16 +31,13 @@ function OverflowMenu({
   classroomId,
   anchorEl,
   handleClose,
-  handleClickOpenReviews,
   handleClickOpenMembers,
   isCreator,
   isMember,
   viewClassroom,
   joinClassroom,
   leaveClassroom,
-  isInviteFeatureDisabled,
-  reviewsEnabled,
-  reviewCount
+  isInviteFeatureDisabled
 }) {
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Menu, {
     id: `card-menu-${classroomId}`,
@@ -52,16 +45,7 @@ function OverflowMenu({
     keepMounted: true,
     open: Boolean(anchorEl),
     onClose: handleClose,
-    children: [reviewsEnabled === "enabled" && reviewCount > 0 && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.MenuItem, {
-      onClick: handleClickOpenReviews,
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_CardElements.CardMenuIcon, {
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_RateReview.default, {
-          fontSize: "small"
-        })
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
-        children: t("reviews")
-      })]
-    }), isCreator && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.MenuItem, {
+    children: [isCreator && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.MenuItem, {
       onClick: handleClickOpenMembers,
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_CardElements.CardMenuIcon, {
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Group.default, {
@@ -123,14 +107,6 @@ function ClassroomLoading() {
           width: "20%"
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
           flexGrow: 1
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
-          mr: 0.5,
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Rating.default, {
-            value: 0,
-            precision: 0.5,
-            readOnly: true,
-            size: "small"
-          })
         })]
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
         variant: "body1",
@@ -153,11 +129,8 @@ function ClassroomCard({
   handleLeaveClassroom,
   membersProps,
   getMemberDetails,
-  getUserReviews,
   getMemberInfo,
-  reviewPlaceholderImageUrl,
   memberPlaceholderImageUrl,
-  getClassroomReviews,
   getClassroomMember,
   getClassroomMembers,
   username,
@@ -171,52 +144,15 @@ function ClassroomCard({
   });
   const {
     isMember,
-    membersQuery,
-    reviewsQuery
+    membersQuery
   } = (0, _useClassroomState.default)({
     classroomId: classroom && classroom.classroomId ? classroom.classroomId : null,
     username,
     memberId: username,
-    getClassroomReviews,
     getClassroomMember,
     getClassroomMembers,
     visible
   });
-  const [isReviewsOpen, setIsReviewsOpen] = (0, _react.useState)(false);
-  const handleClickOpenReviews = () => {
-    setIsReviewsOpen(true);
-  };
-  const formatReviews = async reviews => {
-    try {
-      if (Array.isArray(reviews)) {
-        const newReviews = await Promise.all(reviews.map(async review => {
-          const noReviews = await getUserReviews(review.createdBy);
-          const memberInfo = await getMemberInfo({
-            memberId: review.createdBy
-          });
-          return {
-            ...review,
-            username: memberInfo.username,
-            userImage: memberInfo.userImage,
-            noReviews: noReviews.Items.length
-          };
-        }));
-        setNewReviews(newReviews);
-      }
-    } catch (error) {
-      console.error("error", error);
-      throw error;
-    }
-  };
-  const [newReviewsList, setNewReviews] = (0, _react.useState)(null);
-  (0, _react.useEffect)(() => {
-    if (getMemberInfo && reviewsQuery.isSuccess && reviewsQuery.data.Items && reviewsQuery.data.Items.length) {
-      formatReviews(reviewsQuery.data.Items);
-    }
-  }, [getMemberInfo, reviewsQuery.isSuccess]);
-  const handleCloseReviews = () => {
-    setIsReviewsOpen(false);
-  };
   const [isMembersOpen, setIsMembersOpen] = (0, _react.useState)(false);
   const handleClickOpenMembers = () => {
     setIsMembersOpen(true);
@@ -246,8 +182,7 @@ function ClassroomCard({
     verificationStatus,
     gameAward,
     createdByName,
-    visibility,
-    reviewsEnabled
+    visibility
   } = classroom;
   const viewClassroom = () => {
     handleViewClassroom(classroom.classroomId);
@@ -265,8 +200,6 @@ function ClassroomCard({
       joinClassroom();
     }
   };
-  const starRating = reviewsQuery.isSuccess && reviewsQuery.data.Items.length > 0 ? (reviewsQuery.data.Items.reduce((total, next) => total + parseFloat(next.starRating), 0) / reviewsQuery.data.Items.length).toPrecision(3) : 0;
-  const reviewCount = reviewsQuery.isSuccess ? reviewsQuery.data.Items.length : 0;
   const memberCount = membersQuery.isSuccess ? membersQuery.data.Items.length : 0;
   const isInviteFeatureDisabled = classroomId && classroomId.toLowerCase().includes("wayside");
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_CardElements.CardContainer, {
@@ -366,44 +299,6 @@ function ClassroomCard({
           children: [memberCount, " ", memberCount === 1 ? t("member") : t("members")]
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
           flexGrow: 1
-        }), reviewsEnabled === "enabled" && reviewCount > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-          children: reviewsQuery.isLoading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Rating.default, {
-            value: 0,
-            precision: 0.5,
-            readOnly: true,
-            size: "small",
-            role: "button",
-            tabIndex: 0
-          }) : /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
-              mr: 0.5,
-              sx: _CardElements.classes.cursorPointer,
-              onClick: handleClickOpenReviews,
-              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Rating.default, {
-                value: starRating,
-                precision: 0.5,
-                readOnly: true,
-                size: "small",
-                onKeyDown: event => {
-                  if (event.key === "Enter") {
-                    handleClickOpenReviews();
-                  }
-                },
-                role: "button",
-                tabIndex: 0
-              })
-            }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
-              mr: 1,
-              sx: _CardElements.classes.cursorPointer,
-              onClick: handleClickOpenReviews,
-              children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Typography, {
-                variant: "body2",
-                color: "textSecondary",
-                component: "p",
-                children: [starRating ? starRating : 0, " (", reviewCount, ")"]
-              })
-            })]
-          })
         })]
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_CardElements.CardDescription, {
         variant: "body1",
@@ -439,24 +334,13 @@ function ClassroomCard({
       classroomId: classroomId,
       anchorEl: anchorEl,
       handleClose: handleCloseMenu,
-      handleClickOpenReviews: handleClickOpenReviews,
       handleClickOpenMembers: handleClickOpenMembers,
       isCreator: isCreator,
       isMember: isMember,
       viewClassroom: viewClassroom,
       joinClassroom: joinClassroom,
       leaveClassroom: leaveClassroom,
-      isInviteFeatureDisabled: isInviteFeatureDisabled,
-      reviewsEnabled: reviewsEnabled,
-      reviewCount: reviewCount
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Reviews.default, {
-      t: t,
-      dialogTitle: classroomName,
-      open: isReviewsOpen,
-      handleClose: handleCloseReviews,
-      isLoading: reviewsQuery.isLoading,
-      reviews: Array.isArray(newReviewsList) && newReviewsList.length ? newReviewsList : [],
-      placeholderImageUrl: reviewPlaceholderImageUrl
+      isInviteFeatureDisabled: isInviteFeatureDisabled
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Members.default, {
       t: t,
       placeholderImageUrl: memberPlaceholderImageUrl,
@@ -487,7 +371,6 @@ Classroom.propTypes = {
     forLang: _propTypes.default.string.isRequired,
     isMember: _propTypes.default.bool,
     isCreator: _propTypes.default.bool,
-    reviews: _Reviews2.default.propTypes,
     members: _Members2.default.propTypes,
     createdAt: _propTypes.default.number.isRequired,
     createdBy: _propTypes.default.string.isRequired,

package/dist/Cards/Course/Course.js

@@ -11,8 +11,6 @@ var _material = require("@mui/material");
 var _Skeleton = _interopRequireDefault(require("@mui/material/Skeleton"));
 var _Group = _interopRequireDefault(require("@mui/icons-material/Group"));
 var _ExitToApp = _interopRequireDefault(require("@mui/icons-material/ExitToApp"));
-var _Edit = _interopRequireDefault(require("@mui/icons-material/Edit"));
-var _RateReview = _interopRequireDefault(require("@mui/icons-material/RateReview"));
 var _Close = _interopRequireDefault(require("@mui/icons-material/Close"));
 var _Settings = _interopRequireDefault(require("@mui/icons-material/Settings"));
 var _Person = _interopRequireDefault(require("@mui/icons-material/Person"));
@@ -21,11 +19,9 @@ var _FileCopy = _interopRequireDefault(require("@mui/icons-material/FileCopy"));
 var _OndemandVideo = _interopRequireDefault(require("@mui/icons-material/OndemandVideo"));
 var _PictureAsPdf = _interopRequireDefault(require("@mui/icons-material/PictureAsPdf"));
 var _School = _interopRequireDefault(require("@mui/icons-material/School"));
-var _Reviews = _interopRequireDefault(require("../../Dialogs/Reviews"));
 var _Members = _interopRequireDefault(require("../../Dialogs/Members"));
 var _CourseOutline = _interopRequireDefault(require("../../Dialogs/CourseOutline"));
 var _Members2 = _interopRequireDefault(require("../../Lists/Members"));
-var _Reviews2 = _interopRequireDefault(require("../../Lists/Reviews"));
 var _index = _interopRequireDefault(require("../../utils/placeholder-images/index"));
 var _index2 = require("../../utils/index");
 var _PlayArrow = _interopRequireDefault(require("@mui/icons-material/PlayArrow"));
@@ -44,7 +40,6 @@ function OverflowMenu({
   courseId,
   anchorEl,
   handleClose,
-  handleClickOpenReviews,
   handleClickOpenMembers,
   isCreator,
   isMember,
@@ -55,8 +50,6 @@ function OverflowMenu({
   isAdmin,
   handleDuplicateCourse,
   course,
-  reviewsEnabled,
-  reviewCount,
   classroomId,
   isClassroomArchived = false
 }) {
@@ -66,16 +59,7 @@ function OverflowMenu({
     keepMounted: true,
     open: Boolean(anchorEl),
     onClose: handleClose,
-    children: [reviewsEnabled === "enabled" && reviewCount > 0 && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.MenuItem, {
-      onClick: handleClickOpenReviews,
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_CardElements.CardMenuIcon, {
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_RateReview.default, {
-          fontSize: "small"
-        })
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
-        children: t("reviews")
-      })]
-    }), isCreator && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.MenuItem, {
+    children: [isCreator && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.MenuItem, {
       onClick: handleClickOpenMembers,
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_CardElements.CardMenuIcon, {
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Group.default, {
@@ -212,11 +196,8 @@ function CourseCard({
   selected,
   getMemberDetails,
   getMemberInfo,
-  getUserReviews,
-  reviewPlaceholderImageUrl,
   memberPlaceholderImageUrl,
   getCourseSections,
-  getCourseReviews,
   getCourseMember,
   getCourseMembers,
   username,
@@ -250,51 +231,16 @@ function CourseCard({
   const {
     membersQuery,
     memberQuery,
-    reviewsQuery,
     isMember
   } = (0, _useCourseState.default)({
     courseId: course && course.courseId ? course.courseId : null,
     username,
     getCourseSections,
-    getCourseReviews,
     getCourseMember,
     getCourseMembers,
     memberId,
     visible
   });
-  const [newReviewsList, setNewReviews] = (0, _react.useState)(null);
-  const formatReviews = async reviews => {
-    try {
-      const newReviews = await Promise.all(reviews.map(async review => {
-        const noReviews = await getUserReviews(review.createdBy);
-        const memberInfo = await getMemberInfo({
-          memberId: review.createdBy
-        });
-        return {
-          ...review,
-          username: memberInfo.username,
-          userImage: memberInfo.userImage,
-          noReviews: noReviews.Items.length
-        };
-      }));
-      setNewReviews(newReviews);
-    } catch (error) {
-      console.error("error", error);
-      throw error;
-    }
-  };
-  (0, _react.useEffect)(() => {
-    if (getMemberInfo && reviewsQuery.isSuccess && reviewsQuery.data.Items && reviewsQuery.data.Items.length) {
-      formatReviews(reviewsQuery.data.Items);
-    }
-  }, [getMemberInfo, reviewsQuery.isSuccess]);
-  const [isReviewsOpen, setIsReviewsOpen] = (0, _react.useState)(false);
-  const handleClickOpenReviews = () => {
-    setIsReviewsOpen(true);
-  };
-  const handleCloseReviews = () => {
-    setIsReviewsOpen(false);
-  };
   const [isMembersOpen, setIsMembersOpen] = (0, _react.useState)(false);
   const handleClickOpenMembers = () => {
     setIsMembersOpen(true);
@@ -336,8 +282,7 @@ function CourseCard({
     gameAward,
     createdByName,
     exerciseStartTotal,
-    visibility,
-    reviewsEnabled
+    visibility
   } = course;
   const viewCourse = () => {
     if (selectable) {
@@ -365,7 +310,7 @@ function CourseCard({
       startCourse();
     }
   };
-  const reviewCount = reviewsQuery.isSuccess ? reviewsQuery.data.Items.length : 0;
+
   // const memberCount = membersQuery.isSuccess ? membersQuery.data.Items.length : 0;
 
   const isPlaysVisible = !disablePlays && exerciseStartTotal > -1;
@@ -571,7 +516,6 @@ function CourseCard({
       classroomId: classroomId,
       anchorEl: anchorEl,
       handleClose: handleCloseMenu,
-      handleClickOpenReviews: handleClickOpenReviews,
       handleClickOpenMembers: handleClickOpenMembers,
       isCreator: isCreator,
       isMember: isMember,
@@ -582,17 +526,7 @@ function CourseCard({
       handleRemoveCourse: handleRemoveCourse,
       handleDuplicateCourse: handleDuplicateCourse,
       course: course,
-      reviewsEnabled: reviewsEnabled,
-      reviewCount: reviewCount,
       isClassroomArchived: isClassroomArchived
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Reviews.default, {
-      t: t,
-      dialogTitle: courseName,
-      open: isReviewsOpen,
-      handleClose: handleCloseReviews,
-      isLoading: reviewsQuery.isLoading,
-      reviews: Array.isArray(newReviewsList) && newReviewsList.length ? newReviewsList : [],
-      placeholderImageUrl: reviewPlaceholderImageUrl
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Members.default, {
       getMemberDetails: getMemberDetails,
       t: t,
@@ -642,7 +576,6 @@ MemoizedCourse.propTypes = {
   createdAt: _propTypes.default.number.isRequired,
   createdBy: _propTypes.default.string.isRequired,
   userImage: _propTypes.default.string,
-  reviews: _propTypes.default.arrayOf(_Reviews2.default.propTypes),
   members: _propTypes.default.arrayOf(_Members2.default.propTypes),
   sections: _propTypes.default.arrayOf({
     sectionId: _propTypes.default.string.isRequired,

package/dist/Containers/App/App.js

@@ -10,7 +10,6 @@ var _DefaultColourButton = _interopRequireDefault(require("../../Misc/DefaultCol
 var _styles = require("@mui/material/styles");
 var _mui = require("tss-react/mui");
 var _useMediaQuery = _interopRequireDefault(require("@mui/material/useMediaQuery"));
-var _Star = _interopRequireDefault(require("@mui/icons-material/Star"));
 var _Search = _interopRequireDefault(require("@mui/icons-material/Search"));
 var _InputBase = _interopRequireDefault(require("@mui/material/InputBase"));
 var _InputAdornment = _interopRequireDefault(require("@mui/material/InputAdornment"));
@@ -91,7 +90,8 @@ const SearchIconWrapper = (0, _styles.styled)("div")(({
   justifyContent: "center"
 }));
 const StyledInputBase = (0, _styles.styled)(_InputBase.default)(({
-  theme
+  theme,
+  isUpgradePossible
 }) => ({
   color: "inherit",
   width: "100%",
@@ -100,9 +100,9 @@ const StyledInputBase = (0, _styles.styled)(_InputBase.default)(({
     paddingLeft: `calc(1em + ${theme.spacing(4)})`,
     transition: theme.transitions.create("width"),
     [theme.breakpoints.up("lg")]: {
-      width: "30ch",
+      width: isUpgradePossible ? "20ch" : "30ch",
       "&:focus": {
-        width: "35ch"
+        width: isUpgradePossible ? "25ch" : "35ch"
       }
     }
   }
@@ -111,7 +111,8 @@ function AppSearch({
   t,
   navigate,
   searchText,
-  setSearchText
+  setSearchText,
+  isUpgradePossible
 }) {
   const [debouncedSearchText, setDebouncedSearchText] = (0, _react.useState)("");
   const [prevDebouncedSearchText, setPrevDebouncedSearchText] = (0, _react.useState)("");
@@ -146,6 +147,7 @@ function AppSearch({
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Search.default, {})
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(StyledInputBase, {
       autoFocus: true,
+      isUpgradePossible: isUpgradePossible,
       placeholder: t("app_search_placeholder"),
       value: searchText,
       onChange: ev => {
@@ -283,6 +285,7 @@ function App({
   };
   const isSearchActive = searchText || isMobileSearchExpanded;
   const isTeacher = user && user["custom:role"] === "teach";
+  const isUpgradePossible = subscription && !subscription.isPaidUser && subscription.isUpgradePossible;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: classes.root,
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Header.default, {
@@ -307,7 +310,8 @@ function App({
           t: t,
           navigate: navigate,
           searchText: searchText,
-          setSearchText: setSearchText
+          setSearchText: setSearchText,
+          isUpgradePossible: isUpgradePossible
         })]
       }) : /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
         children: [isLgScreen ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
@@ -316,7 +320,8 @@ function App({
               t: t,
               navigate: navigate,
               searchText: searchText,
-              setSearchText: setSearchText
+              setSearchText: setSearchText,
+              isUpgradePossible: isUpgradePossible
             }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
               flexGrow: 1
             })]
@@ -353,16 +358,6 @@ function App({
           }),
           size: isLgScreen ? "medium" : "small",
           children: t("skip_navigation")
-        }), subscription && !subscription.isPaidUser && subscription.isUpgradePossible && authenticated && /*#__PURE__*/(0, _jsxRuntime.jsx)(_DefaultColourButton.default, {
-          variant: "contained",
-          startIcon: isLgScreen ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Star.default, {}) : null,
-          href: upgradePlanURL,
-          size: isLgScreen ? "medium" : "small",
-          sx: {
-            fontSize: isLgScreen ? null : 12,
-            mr: 1
-          },
-          children: t("upgrade_plan")
         }), isTeacher && (isLgScreen ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
           variant: "contained",
           onClick: handleClickCreate,
@@ -381,7 +376,16 @@ function App({
             onClick: handleClickCreate,
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Add.default, {})
           })
-        })), isLgScreen && /*#__PURE__*/(0, _jsxRuntime.jsx)(_WhatsNew.default, {
+        })), isUpgradePossible && authenticated && /*#__PURE__*/(0, _jsxRuntime.jsx)(_DefaultColourButton.default, {
+          variant: "contained",
+          href: upgradePlanURL,
+          size: isLgScreen ? "medium" : "small",
+          sx: {
+            fontSize: isLgScreen ? null : 12,
+            ml: 1
+          },
+          children: t("upgrade_plan")
+        }), isLgScreen && /*#__PURE__*/(0, _jsxRuntime.jsx)(_WhatsNew.default, {
           t: t,
           whatsNewMarkdown: whatsNewMarkdown,
           whatsNewDate: whatsNewDate

package/dist/Dialogs/CreatePhrase/CreatePhrase.js

@@ -223,10 +223,14 @@ function CreatePhrase({
 
   const autoFillTranslation = async () => {
     try {
-      const activePrompt = `Translate the following phrase "${phrase}" from ${learnLang} to ${forLang}. Provide all the acceptable translations if the phrase has multiple interpretations. Format the response as a valid JSON array with each translation as a string inside the array.`;
       let chatGptResponse = await makeChatGptApiRequest({
         model: "gpt-3.5-turbo",
-        prompt: activePrompt
+        promptKey: "autoFillTranslation",
+        promptVariables: {
+          learnLang,
+          forLang,
+          phrase
+        }
       });
       chatGptResponse = chatGptResponse.replaceAll("```", '').replaceAll("json", '');
       const translations = JSON.parse(chatGptResponse);

package/dist/Dialogs/GenerateBot/GenerateBot.js

@@ -138,16 +138,21 @@ function GenerateBotDialog({
       setIsBotGenerating(true);
       setErrorMessage("");
       let response;
-      let promptWithTopic;
-      let promptWithTopicPhrases;
-      const topicPrompt = `The questions should be about the topic: '${values.botTopic}'. Focus primarily on the topic to ensure the questions are aligned with it. If there is no relevance or similarity between the topic and the provided phrases, only use the topic for generating questions.`;
-      const topicGoalPrompt = `These questions must specifically target the goal: '${topicGoal}’. The questions should only focus on the goal '${topicGoal}’. Avoid generating questions that ask about unrelated details.`;
-      bot.selectedTemplate === "nualang.quiz.0.0.1" ? promptWithTopic = `Create ${values.botLengthNumber} questions in ${learnLang} about the topic ${values.botTopic}. Have atleast one correct answer for each question. The questions should be appropriate for ${["en-US"].includes(siteLanguage) ? "ACTFL" : "CEFR"} ${bot & bot.difficulty} level learners. Questions and answers must be unique from one another. Return an array with ${values.botLengthNumber} objects inside it. Each object should have the keys questions and answer. The key question should equal to the question that is generated about the topic. The key answer should equal to the corresponding answer to the question, make sure that the answer text is inside brackets like this answer: "(questionAnswer)" if there is more than one correct answer the value of the answer key should be formatted like this  answer: "(answer1|answer2)". Use this array as template: ${sampleQuestionArray} Your response should be in JSON.` : promptWithTopic = `Create ${values.botLengthNumber} open ended questions in ${learnLang} about the topic ${values.botTopic}. The questions should be appropriate for ${["en-US"].includes(siteLanguage) ? "ACTFL" : "CEFR"} ${bot & bot.difficulty} level learners. Each question must be unique. Return an array with ${values.botLengthNumber} objects inside it. Each object should have the key text. The key text should equal to the question that is generated about the topic. Your response should be in JSON.`;
-      bot.selectedTemplate === "nualang.quiz.0.0.1" ? promptWithTopicPhrases = `Create ${values.botLengthNumber} questions in ${learnLang}${values.botTopic.trim() === "" ? " using the following phrases as context to assist in the generations of questions." : "."} ${topicGoal.trim() !== "" ? topicGoalPrompt : ""} ${values.botTopic.trim() !== "" ? topicPrompt : ""} The questions should be appropriate for ${["en-US"].includes(siteLanguage) ? "ACTFL" : "CEFR"} ${bot & bot.difficulty} level learners. Include at least one correct answer for each question. Phrases for context: ${phrases}. Questions  must be unique from one another. Return an array with ${values.botLengthNumber} objects inside it. Each object should have the keys questions and answer. The key question should equal to the question that is generated about the topic. The key answer should equal to the corresponding answer to the question, make sure that the answer text is inside brackets like this answer: "(questionAnswer)" if there is more than one correct answer the value of the answer key should be formatted like this  answer: "(answer1|answer2)". Use this array as template: ${sampleQuestionArray} Your response should be in JSON.` : promptWithTopicPhrases = `Create ${values.botLengthNumber} questions in ${learnLang}${values.botTopic.trim() === "" ? " using the following phrases as context to assist in the generations of questions." : "."} ${topicGoal.trim() !== "" ? topicGoalPrompt : ""} ${values.botTopic.trim() !== "" ? topicPrompt : ""} The questions should be appropriate for ${["en-US"].includes(siteLanguage) ? "ACTFL" : "CEFR"} ${bot & bot.difficulty} level learners. Phrases for context: ${phrases}. Questions  must be unique from one another.  Return an array with ${values.botLengthNumber} objects inside it. Each object should have the key text. The key text should equal to the question that is generated about the topic. Your response should be in JSON.`;
-      const activePrompt = usePhrasesContext && phrases.length > 0 ? promptWithTopicPhrases : promptWithTopic;
       let chatGptResponse = await makeChatGptApiRequest({
         model: "gpt-3.5-turbo",
-        prompt: activePrompt
+        promptKey: "generateBot",
+        promptVariables: {
+          botTopic: values.botTopic,
+          topicGoal: topicGoal,
+          selectedTemplate: bot.selectedTemplate,
+          botLengthNumber: values.botLengthNumber,
+          learnLang: learnLang,
+          siteLanguage: siteLanguage,
+          difficulty: bot.difficulty,
+          sampleQuestionArray: sampleQuestionArray,
+          phrases: phrases,
+          usePhrasesContext: usePhrasesContext
+        }
       });
       response = chatGptResponse;
       const jsonResponse = removeExtraTextFromChatGptResponse(response);

package/dist/Dialogs/GeneratePhrases/GeneratePhrases.js

@@ -111,12 +111,21 @@ function GeneratePhrases({
     try {
       setIsGenerating(true);
       setErrorMessage(null);
-      const goalPrompt = `The generated phrases must specifically target the following linguistic goal: '${values.topicGoal}'. Avoid generating phrases that do not align with this goal. `;
-      const prompt = phraseType === "sentences" ? isPhrases ? `The context is a language learning application. Here is a list of phrases or sentences in ${learnLang} and their translations in ${forLang}:\n\n${JSON.stringify(phrases)}\n\nNow, generate ${values.phraseAmount} more unique sentences in ${learnLang} and their translations in ${forLang} on the topic of '${values.phrasesTopic}' in the same JSON format as the ones that I have passed to you. The 'idx' field should contain an index integer which follows on incrementally from the existing phrases. The 'image' field should contain an empty string. Do not include a 'voices' field. ${values.topicGoal.trim() ? goalPrompt : ""}The sentences should be unique and not already in the list. The sentences should be appropriate for ${["en-US"].includes(siteLanguage) ? "ACTFL" : "CEFR"} ${difficulty} level. Ensure the formatting of the JSON response is correct and follows this structure.` : `The context is a language learning application. Generate ${values.phraseAmount} unique phrases or sentences in ${learnLang} and their translations in ${forLang} on the topic of '${values.phrasesTopic}'. Return the sentences inside a JSON array of ${values.phraseAmount} objects, each with the following fields: 'phrase', 'translations', 'idx', and 'image'. Each field is required and cannot be omitted. The 'idx' field represents the index of the phrases, starting from 0 and going up by 1 up until the last phrase. The 'image' field should contain an empty string. The 'translations' field should be an array of at least one translation of the sentence in ${forLang}, but it can contain more translations as long as they are grammatically correct. ${values.topicGoal.trim() ? goalPrompt : ""}The sentences should be appropriate for the ${["en-US"].includes(siteLanguage) ? "ACTFL" : "CEFR"} ${difficulty} level. The sentences should be unique. Ensure the formatting of the JSON response is correct and follows this structure.` : isPhrases ? `The context is a language learning application. Here is a list of words or very short lexical phrases in ${learnLang} and their translations in ${forLang}:\n\n${JSON.stringify(phrases)}\n\nNow, generate ${values.phraseAmount} more unique words or very short lexical phrases and their translations in ${learnLang} on the topic of '${values.phrasesTopic}'. The input may resemble a script or contain dialogue, but do not generate words or very short lexical phrases formatted as scripts or sentences. Focus only on single words or very short lexical phrases. The 'idx' field should contain an index integer which follows on incrementally from the existing phrases. The 'image' field should contain an empty string. Do not include a 'voices' field. ${values.topicGoal.trim() ? goalPrompt : ""}The words or lexical phrases should be unique and not already in the list. The words or lexical phrases should be ${["en-US"].includes(siteLanguage) ? "ACTFL" : "CEFR"} ${difficulty} level. Ensure the formatting of the JSON response is correct and follows this structure.` : `The context is a language learning application. Generate ${values.phraseAmount} unique words or very short lexical phrases in ${learnLang} and their translations in ${forLang} on the topic of '${values.phrasesTopic}'. Return the unique words or very short lexical phrases inside a JSON array of ${values.phraseAmount} objects, each with the following fields: 'phrase', 'translations', 'idx', and 'image'. Each field is required and cannot be omitted. The 'idx' field represents the index of the phrases, starting from 0 and going up by 1 up until the last phrase. The 'image' field should contain an empty string. The 'translations' field should be an array of at least one translation of the phrase in ${forLang}, but it can contain more translations as long as they are grammatically correct. ${values.topicGoal.trim() ? goalPrompt : ""}The input may resemble a script or contain dialogue, but do not interpret or format the input as a script or sentences. Focus only on generating single words or very short lexical phrases. The words or very short lexical phrases should be appropriate for the ${["en-US"].includes(siteLanguage) ? "ACTFL" : "CEFR"} ${difficulty} level. The words or very short lexical phrases should be unique. Ensure the formatting of the JSON response is correct and follows this structure.`;
-      // console.log("prompt: ", prompt);
       const chatGptResponse = await makeChatGptApiRequest({
         model: "gpt-3.5-turbo",
-        prompt
+        promptKey: "generatePhrases",
+        promptVariables: {
+          topicGoal: values.topicGoal,
+          learnLang,
+          forLang,
+          phraseAmount: values.phraseAmount,
+          phrasesTopic: values.phrasesTopic,
+          siteLanguage,
+          difficulty,
+          phraseType,
+          isPhrases,
+          phrases
+        }
       });
       const phrasesArray = extractPhrasesArray(chatGptResponse);
       const parsedPhrases = JSON.parse(phrasesArray);

package/dist/Dialogs/GenerateQuestion/GenerateQuestion.js

@@ -87,10 +87,18 @@ function GenerateQuestion({
     try {
       setIsMessageGenerating(true);
       setErrorMessage(null);
-      const prompt = `Here is a script: ${JSON.stringify(script)}. Refer to Actor 1 as ${values.actor1.name} and Actor 2 as ${values.actor2.name} in the question and the answers. The purpose of this script is to test the reader's ability to read in ${finalLearnLang}. The reader's native language is ${finalForLang}. Please generate a new comprehension question based on the script that is completely unique to any existing questions, preferably referring to a unique part of the script if possible, and provide it in JSON format with the keys 'question' and 'answers'. The 'question' key has the value of the string contraining the question text. The 'answers' key is an array of objects, where each answer object contains 'text', 'correct', and 'type' keys. The type should always be 'multichoice'. There are four possible question types, 'factual', 'inference', 'truefalse' and 'vocabulary'. For factual questions, ensure the new question is explicitly answered by the script, to test the reader's understanding of the script. For inference questions, ensure the new question requires the reader to make an assumption based on the script. For true/false questions, ensure the new question can be answered with a true or false response. For vocabulary questions, ensure the new question tests the reader's understanding of a specific ${finalLearnLang} word or phrase used in the script, to test whether the reader can understand it. Vocabulary questions do not necessarily have to take the context of the conversation into account, they are merely to test the reader's ${finalLearnLang} vocabulary. The question type for this particular question to generate is ${questionType}. The question and answers should be generated in ${questionLanguage}.`;
       const chatGptResponse = await makeChatGptApiRequest({
         model: "gpt-3.5-turbo",
-        prompt
+        promptKey: "generateAnswer",
+        promptVariables: {
+          script,
+          actor1: values.actor1,
+          actor2: values.actor2,
+          finalLearnLang: finalLearnLang,
+          finalForLang: finalForLang,
+          questionType,
+          questionLanguage
+        }
       });
       const jsonResponse = extractJsonObject(chatGptResponse);
       const newQuestion = JSON.parse(jsonResponse);