Merge pull request #222 from nepalcodes/words-sentence

sentencify-mvp
nepalcodes · Aug 23, 2024 · f3ccc79 · f3ccc79
2 parents 1e8f4d1 + 07092b5
commit f3ccc79
Show file tree

Hide file tree

Showing 2 changed files with 90 additions and 25 deletions.
diff --git a/nepalingo-web/src/lib/getNextWord.ts b/nepalingo-web/src/lib/getNextWord.ts
@@ -1,6 +1,6 @@
 export const newariWords = [
-  "hello",
   "call",
+  "can",
   "do",
   "how",
   "I",
@@ -30,6 +30,33 @@ export const newariWords = [
   "salt",
 ];
 
+export const WordSentences = [
+  "my",
+  "name",
+  "is",
+  "my name is Ram",
+  "I",
+  "years",
+  "old",
+  "I am five years old",
+  "from",
+  " I am from kathmandu",
+  "don't",
+  "speak",
+  "your",
+  "language",
+  "well",
+  "I don’t speak your language well",
+  "how",
+  "are",
+  "you",
+  "how are you",
+  "where",
+  "from",
+  "I am",
+  "where are you from?",
+];
+
 export async function getTajpuriyaWords(): Promise<string[]> {
   const wordText = await fetch("./dictionaries/TajpuriyaDictionary.csv")
     .then((r) => r.text())
@@ -58,13 +85,14 @@ export function* wordGenerator(words: string[]) {
 
 export async function getNextWord(language: string) {
   let words: string[] = [];
-  if (
-    language === "Newari" ||
+  if (language === "Newari") {
+    words = newariWords;
+  } else if (
     language === "Maithili" ||
     language === "Sanskrit" ||
     language === "Nepali"
   ) {
-    words = newariWords;
+    words = WordSentences;
   } else if (language === "Tajpuriya") {
     words = await getTajpuriyaWords();
   }

diff --git a/nepalingo-web/src/pages/TestYourself.tsx b/nepalingo-web/src/pages/TestYourself.tsx
@@ -10,13 +10,13 @@ import { getNextWord } from "@/lib/getNextWord";
 const TestYourself: React.FC = () => {
   const { updateStreak } = useStreak();
   const { selectedLanguage } = useLanguage();
-  const [word, setWord] = useState("today");
-
+  const [word, setWord] = useState("hello");
+  const [wordIndex, setWordIndex] = useState(1);
   const [options, setOptions] = useState<string[]>([
+    "hello",
+    "bye",
+    "no",
     "today",
-    "rice",
-    "hot",
-    "salt",
   ]);
   const [selectedOption, setSelectedOption] = useState<string | null>(null);
   const [isCorrect, setIsCorrect] = useState<boolean | null>(null);
@@ -25,34 +25,62 @@ const TestYourself: React.FC = () => {
     word,
   });
   const wordGeneratorRef = useRef<ReturnType<typeof getNextWord> | null>(null);
+  const sentences = [
+    "My name is John.",
+    "I am learning a new language.",
+    "Where is the nearest restaurant?",
+    "What time is it?",
+    "How are you doing today?",
+    "Please help me with this task.",
+    "I am from Kathmandu.",
+    "The weather is nice today.",
+    "I like to read books.",
+    "Can you please give me directions?",
+  ];
 
   useEffect(() => {
     updateStreak(); // Trigger streak update on flashcard page load
     wordGeneratorRef.current = getNextWord(selectedLanguage || "newari");
   }, [selectedLanguage]);
 
   const getOptions = (word: string) => {
-    const randomWords = generate({ exactly: 3 }) as string[];
+    let randomWords;
+
+    if (word.includes(" ")) {
+      // If the word is a sentence, generate options from sentences
+      randomWords = sentences
+        .filter((sentence) => sentence !== word)
+        .sort(() => 0.5 - Math.random())
+        .slice(0, 3);
+    } else {
+      // Otherwise, generate options from random words
+      randomWords = generate({ exactly: 3 }) as string[];
+    }
+
     randomWords.push(word);
     const shuffledOptions = randomWords.sort(() => Math.random() - 0.5);
     setOptions(shuffledOptions);
   };
 
   const handleNextQuestion = async () => {
-    const generator = await wordGeneratorRef.current;
-    if (generator) {
-      const nextWord = generator?.next()?.value;
-
-      if (typeof nextWord === "string") {
-        setWord(nextWord);
-        setSelectedOption(null);
-        setIsCorrect(null);
-        getOptions(nextWord);
-      } else {
-        console.error("Generated word is not a string.");
+    let nextWord;
+    if (!isCorrect) {
+      nextWord = word;
+    } else {
+      const generator = await wordGeneratorRef.current;
+      if (generator) {
+        nextWord = generator?.next()?.value;
+        setWordIndex(wordIndex + 1);
       }
+    }
+
+    if (typeof nextWord === "string") {
+      setWord(nextWord);
+      setSelectedOption(null);
+      setIsCorrect(null);
+      getOptions(nextWord);
     } else {
-      console.error("Word generator not initialized.");
+      console.error("Generated word is not a string.");
     }
   };
 
@@ -75,8 +103,17 @@ const TestYourself: React.FC = () => {
   return (
     <div>
       <Header />
-      <div className="flex items-center justify-center min-h-screen bg-black text-white font-primary">
-        <div className="p-2 max-w-xl w-full text-center mb-8">
+      <div className="flex flex-col items-center justify-center w-full mt-4">
+        <h2 className="text-3xl font-semibold text-primary">
+          Section - <span className="text-white">Introductions</span>
+        </h2>
+        <p className="text-2xl text-green-500 mt-3">
+          Progress: <span className="text-white">{wordIndex}</span> out of{" "}
+          <span className="text-white">{24}</span>
+        </p>
+      </div>
+      <div className="flex justify-center bg-black text-white font-primary">
+        <div className="p-2 max-w-xl w-full text-center mt-20">
           <h2 className="text-4xl font-primary font-bold mb-6">
             What is this word in English?
           </h2>
@@ -109,7 +146,7 @@ const TestYourself: React.FC = () => {
                 </p>
               ) : (
                 <p className="text-2xl text-red-600">
-                  Incorrect. The correct answer is {word}.
+                  Incorrect. Please try again!
                 </p>
               )}
               <Button className="mt-6 text-2xl" onClick={handleNextQuestion}>