fix: QRcode scan for search page , benefit details --- upon proceed -…

…-- ask for login, come back to same screen again (#55) * fix: QRcode scan for search page , benefit details --- upon proceed --- ask for login, come back to same screen again * fix: add routes --------- Co-authored-by: sagar <[email protected]>
tekdi · Dec 3, 2024 · d335202 · d335202
1 parent 6fcb6e0
commit d335202
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 35 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -21,6 +21,11 @@ function App() {
   useEffect(() => {
     if (token) {
       setRoutes(authRoutes);
+      const redirectUrl = localStorage.getItem("redirectUrl");
+      if (redirectUrl) {
+        window.location.href = redirectUrl;
+        localStorage.removeItem("redirectUrl");
+      }
     } else {
       setRoutes(guestRoutes);
     }

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -55,6 +55,7 @@
   "BENEFIT_DETAILS_MANDATORY_DOCUMENTS": "Mandatory Documents",
   "BENEFIT_DETAILS_APPLICATION_SUBMITTED": "Application Already Submitted",
   "BENEFIT_DETAILS_PROCEED_TO_APPLY": "Proceed To Apply",
+  "BENEFIT_DETAILS_LOGIN_TO_APPLY": "Login To Apply",
   "SUBMIT_DIALOGUE_HEADING_TEXT": "Application Submitted",
   "SUBMIT_DIALOGUE_SUBHEADING_TEXT": "Confirmation",
   "SUBMIT_DIALOGUE_CONTENT_TEXT": "Your application to the ",

diff --git a/src/locales/hi.json b/src/locales/hi.json
@@ -4,5 +4,6 @@
   "ENGLISH": "अंग्रेजी",
   "HINDI": "हिन्दी",
   "SELECT_LANGUAGE": "भाषा चुनें",
-  "SIGN_IN/SIGN_UI_WITH_YOUR_E-WALLET": "अपने ई-वॉलेट से साइन इन/साइन अप करें"
+  "SIGN_IN/SIGN_UI_WITH_YOUR_E-WALLET": "अपने ई-वॉलेट से साइन इन/साइन अप करें",
+  "BENEFIT_DETAILS_LOGIN_TO_APPLY": "आवेदन करने के लिए लॉगिन करें।"
 }
diff --git a/src/routes/GuestRoutes.tsx b/src/routes/GuestRoutes.tsx
@@ -2,13 +2,23 @@ import { lazy } from "react";
 import SignIn from "../screens/auth/SignIn";
 
 const Splash = lazy(() => import("../screens/auth/Splash"));
+const ExploreBenefits = lazy(() => import("../screens/benefit/Benefits"));
+const BenefitsDetails = lazy(() => import("../screens/benefit/Details"));
 const Signup = lazy(() => import("../screens/auth/SignUpWithPassword"));
 
 const routes = [
   {
     path: "/signup",
     component: Signup,
   },
+  {
+    path: "/explorebenefits",
+    component: ExploreBenefits,
+  },
+  {
+    path: "/benefits/:id",
+    component: BenefitsDetails,
+  },
   {
     path: "/signin",
     component: SignIn,

diff --git a/src/screens/benefit/Benefits.tsx b/src/screens/benefit/Benefits.tsx
@@ -53,21 +53,24 @@ const ExploreBenefits: React.FC = () => {
   useEffect(() => {
     const init = async () => {
       try {
-        const user = await getUser();
+        const token = localStorage.getItem("authToken");
+        if (token) {
+          const user = await getUser();
 
-        const filters: Filter = {
-          "caste-eligibility": user?.data?.caste,
-          annualIncome: user?.data?.annualIncome,
-        };
+          const filters: Filter = {
+            "caste-eligibility": user?.data?.caste,
+            annualIncome: user?.data?.annualIncome,
+          };
 
-        const newFilter: Filter = {};
-        Object.keys(filters).forEach((key) => {
-          if (filters[key] && filters[key] !== "") {
-            newFilter[key] = filters[key]?.toLowerCase() || filters[key];
-          }
-        });
+          const newFilter: Filter = {};
+          Object.keys(filters).forEach((key) => {
+            if (filters[key] && filters[key] !== "") {
+              newFilter[key] = filters[key]?.toLowerCase() || filters[key];
+            }
+          });
 
-        setFilter(newFilter);
+          setFilter(newFilter);
+        }
         setInitState("no");
       } catch (e) {
         setError(`Failed to initialize user data: ${(e as Error).message}`);
@@ -128,6 +131,7 @@ const ExploreBenefits: React.FC = () => {
         ],
       }}
       isSearchbar={true}
+      isMenu={Boolean(localStorage.getItem("authToken"))}
     >
       {error && (
         <Modal isOpen={!!error} onClose={() => setError(null)}>

diff --git a/src/screens/benefit/Details.tsx b/src/screens/benefit/Details.tsx
@@ -8,7 +8,6 @@ import {
   useDisclosure,
   HStack,
   Icon,
-  Spinner,
   Modal,
   ModalOverlay,
   ModalContent,
@@ -134,8 +133,6 @@ const BenefitsDetails: React.FC = () => {
     let mounted = true;
     const init = async () => {
       try {
-        const user = await getUser();
-
         const result = await getOne({ id });
         const resultItem =
           (result as { data: { responses: Array<any> } }).data?.responses?.[0]
@@ -153,19 +150,23 @@ const BenefitsDetails: React.FC = () => {
             )
             ?.list?.filter((e: { value: unknown }) => e.value)
             .map((e: { value: unknown }) => e.value) || [];
-
         if (mounted) {
           setItem({ ...resultItem, document: docs });
 
-          setAuthUser(user?.data || {});
+          const token = localStorage.getItem("authToken");
+          if (token) {
+            const user = await getUser();
+
+            setAuthUser(user?.data || {});
 
-          const appResult = await getApplication({
-            user_id: user?.data?.user_id,
-            benefit_id: id,
-          });
+            const appResult = await getApplication({
+              user_id: user?.data?.user_id,
+              benefit_id: id,
+            });
 
-          if (appResult?.data?.applications?.length > 0) {
-            setIsApplied(true);
+            if (appResult?.data?.applications?.length > 0) {
+              setIsApplied(true);
+            }
           }
           setLoading(false);
         }
@@ -260,7 +261,10 @@ const BenefitsDetails: React.FC = () => {
   }
 
   return (
-    <Layout _heading={{ heading: item?.descriptor?.name || "", handleBack }}>
+    <Layout
+      _heading={{ heading: item?.descriptor?.name || "", handleBack }}
+      isMenu={Boolean(localStorage.getItem("authToken"))}
+    >
       <Box className="card-scroll invisible_scroll">
         <Box maxW="2xl" m={4}>
           <Heading size="md" color="#484848" fontWeight={500}>
@@ -306,16 +310,27 @@ const BenefitsDetails: React.FC = () => {
               <ListItem key={document}>{document}</ListItem>
             ))}
           </UnorderedList>
-          <CommonButton
-            mt={6}
-            onClick={handleConfirmation}
-            label={
-              isApplied
-                ? t("BENEFIT_DETAILS_APPLICATION_SUBMITTED")
-                : t("BENEFIT_DETAILS_PROCEED_TO_APPLY")
-            }
-            isDisabled={isApplied}
-          />
+          {localStorage.getItem("authToken") ? (
+            <CommonButton
+              mt={6}
+              onClick={handleConfirmation}
+              label={
+                isApplied
+                  ? t("BENEFIT_DETAILS_APPLICATION_SUBMITTED")
+                  : t("BENEFIT_DETAILS_PROCEED_TO_APPLY")
+              }
+              isDisabled={isApplied}
+            />
+          ) : (
+            <CommonButton
+              mt={6}
+              onClick={() => {
+                localStorage.setItem("redirectUrl", window.location.href);
+                navigate("/signin");
+              }}
+              label={t("BENEFIT_DETAILS_LOGIN_TO_APPLY")}
+            />
+          )}
         </Box>
       </Box>