Merge pull request #1515 from arjuncvinod/dev

fix(wadhwani): fixed toast issue and loader added
gtech-mulearn · May 19, 2024 · 8687adb · 8687adb
2 parents 3107c9d + 7092765
commit 8687adb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/modules/Dashboard/modules/Wadhwani/index.tsx b/src/modules/Dashboard/modules/Wadhwani/index.tsx
@@ -6,10 +6,13 @@ import {
 } from "./services/api";
 import toast from "react-hot-toast";
 import styles from "./index.module.css";
+import MuLoader from "@/MuLearnComponents/MuLoader/MuLoader";
+
 
 const Wadhwani = () => {
     const [data, setData] = useState<wadhwaniCourseResponse[]>([]);
     const [clientToken, setClientToken] = useState("");
+    const [isLoading,setIsLoading]=useState(true)
 
     useEffect(() => {
         fetchData();
@@ -29,6 +32,7 @@ const Wadhwani = () => {
             } else if (courses) {
                 setData(courses);
             }
+            setIsLoading(false)
         }
     };
 
@@ -48,7 +52,8 @@ const Wadhwani = () => {
         <div className={styles.wrapper}>
             <h1>Wadhwani Foundation Courses</h1>
             <div className={styles.container}>
-                {data.map(course => (
+                {isLoading?<MuLoader/>:
+                data.map(course => (
                     <div
                         key={course.courseId}
                         className={styles.card}

diff --git a/src/modules/Dashboard/modules/Wadhwani/services/api.ts b/src/modules/Dashboard/modules/Wadhwani/services/api.ts
@@ -1,7 +1,7 @@
 import { privateGateway } from "@/MuLearnServices/apiGateways";
 import { dashboardRoutes } from "@/MuLearnServices/urls";
 import { AxiosError } from "axios";
-
+import toast from "react-hot-toast";
 export const getWadhwaniClientToken = async () => {
     try {
         const response = await privateGateway.post(
@@ -47,6 +47,7 @@ export const getWadhwaniCourseLink = async (
     clientToken: string,
     courseId: string
 ) => {
+    const toastId=toast.loading("Fetching course link...")
     try {
         const response = await privateGateway.post(
             dashboardRoutes.getWadhwaniCourseLink,
@@ -61,12 +62,16 @@ export const getWadhwaniCourseLink = async (
         const message: wadhwaniCourseRedirectResponse = response?.data?.response;
         if (message.data?.error?.code) {
             return { response: null, error: message.data.error.description };
+        }else{
+            toast.success("Course link opened successfully!",{id:toastId})
         }
         return { response: message, error: null };
-    } catch (err: unknown) {
+    } catch (err: unknown) { 
+        toast.error("Please try again later.",{id:toastId})
         const error = err as AxiosError;
         if (error?.response) {
             throw error;
+
         } else {
             return { response: null, error: error.message };
         }