prepping for first release

Author: c4lyp5o

Dockerfile

@@ -0,0 +1,7 @@
+FROM node:alpine
+WORKDIR /app
+COPY package.json ./
+COPY package-lock.json ./
+COPY ./ ./
+RUN npm i
+CMD ["npm", "run", "start"]

src/pages/Hadith.js

@@ -2,6 +2,13 @@ import { useState, useEffect } from 'react';
 import { getTheKeetab, giveTheKeetab } from './getTimes';
 
 function Hadith() {
+
+    useEffect(() => {
+        async function Awwalun() {
+          setKeetab(await getTheKeetab());
+        }    
+        Awwalun();
+      }, []);
 
   const [intro, setIntro] = useState(true);
   const [hadith, setHadith] = useState([]);
@@ -29,15 +36,7 @@ function Hadith() {
   }
 
   async function handleClick(event) {
-    if (keetab.length > 5) {
-      setSearch(event.target.value);
-      return;
-    } else if (keetab.length === 0) {
-      await getTheKeetab().then(data => {
-        setKeetab(data);
-      setSearch(event.target.value);
-      });
-    }
+    setSearch(event.target.value);
   }
 
   function HadithPage() {

src/pages/Quran.js

@@ -2,13 +2,21 @@ import { useState, useEffect } from 'react';
 import { getTheQuran, giveTheQuran, giveQuranAudio } from './getTimes';
 
 function Quran() {
-  
+
+  useEffect(() => {
+    async function Awwalun() {
+      setSurah(await getTheQuran());
+    }    
+    Awwalun();
+  }, []);
+
   const [intro, setIntro] = useState(true);
   const [surah, setSurah] = useState([]);
   const [search, setSearch] = useState("");
   const [quran, setQuran] = useState([]);
   const [display, setDisplay] = useState(false);
   const [audio, setAudio] = useState([]);
+  const [clicked, setClicked] = useState(0);
 
   useEffect(() => { document.title = "Al-Quran" }, []);
 
@@ -22,24 +30,23 @@ function Quran() {
 
   async function handleSubmit(event) {
     event.preventDefault();
-    await giveQuranAudio(search).then(data => { setAudio(data) });
+    await giveQuranAudio(search).then(data => { setAudio(data); console.log(data); });
     await giveTheQuran(search).then(data => {
       setDisplay(true);
       setIntro(false);
       setQuran(data);
+      console.log(audio);
     });
   }
 
   async function handleClick(event) {
-    if (surah.length > 113) {
-      setSearch(event.target.value);
+    setClicked(clicked + 1);
+    if (clicked === 0) {
       return;
-    } else if (surah.length === 0) {
-      await getTheQuran().then(data => {
-        setSurah(data);
-      setSearch(event.target.value);
-      });
+    } else if (clicked === 2) {
+      window.location.reload();
     }
+    setSearch(event.target.value);
   }
 
   function Surah() {

src/pages/getTimes.js

@@ -116,29 +116,37 @@ export async function giveTheQuran(surah) {
 }
 
 export async function giveQuranAudio(surah) {
-  try {
-    surah++;
-    const audio = await fetch(`https://api.quran.sutanlab.id/surah/${surah}`, {
-      crossDomain:true,
-      method: 'GET',
-    });
-    myCache.set('quranAudio', audio.json(), ttl);
-  } catch (error) {
-    console.log(error);
-  }
-  const audio = await myCache.get('quranAudio');
+  surah++;
+  if (myCache.has(`quranAudio-${surah}`)) {
+    console.log("audio is in cache");
+  } else {
+    try{
+      const audio = await fetch(`https://api.quran.sutanlab.id/surah/${surah}`, {
+        crossDomain:true,
+        method: 'GET',
+      });
+      myCache.set(`quranAudio-${surah}`, audio.json(), ttl);
+    } catch (error) {
+      console.log(error);
+    }
+  }  
+  const audio = await myCache.get(`quranAudio-${surah}`);
   return audio.data.verses;
 }
 
 export async function getTheKeetab() {
-  try {
-    const keetab = await fetch('https://api.hadith.sutanlab.id/books', {
-      crossDomain:true,
-      method: 'GET',
-    });
-    myCache.set('keetab', keetab.json(), ttl);
-  } catch (error) {
-    console.log(error);
+  if (myCache.has('keetab')) {
+    console.log("keetab is in cache");
+  } else {
+    try {
+      const keetab = await fetch('https://api.hadith.sutanlab.id/books', {
+        crossDomain:true,
+        method: 'GET',
+      });
+      myCache.set('keetab', keetab.json(), ttl);
+    } catch (error) {
+      console.log(error);
+    }
   }
   const keetab = await myCache.get('keetab');
   return keetab.data;