feat: map service url with service name

metakgp · Jun 29, 2024 · 7bbed78 · 7bbed78
1 parent 061ce85
commit 7bbed78
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 24 deletions.
diff --git a/frontend/src/Services.tsx b/frontend/src/Services.tsx
@@ -1,4 +1,4 @@
-import { servicesList } from "./constants";
+import { ALLOWED_SERVICES } from "./constants";
 
 const Services = () => {
     return (
@@ -7,9 +7,9 @@ const Services = () => {
             <div className="subtitle">
                 Click on any of the links below to visit
             </div>
-            {servicesList.map((service) => (
-                <a className="service" key={service} href={service}>
-                    {service}
+            {Object.entries(ALLOWED_SERVICES).map(([url, serviceName]) => (
+                <a className="service" key={url} href={url}>
+                    {serviceName}
                 </a>
             ))}
         </div>

diff --git a/frontend/src/Success.tsx b/frontend/src/Success.tsx
@@ -5,20 +5,21 @@ import { useEffect } from "react";
 const Success = ({ email }: { email: string }) => {
     const [searchParams] = useSearchParams();
     const givenRedirectUrl = searchParams.get("redirect_url");
-    const redirectUrl = validRedirect(givenRedirectUrl);
+    const { serviceName, serviceLink } = validRedirect(givenRedirectUrl);
+    console.log(serviceName, serviceLink)
     const navigate = useNavigate();
 
     useEffect(() => {
         const timer = setTimeout(() => {
-            if (redirectUrl === "/services") {
-                navigate(redirectUrl);
+            if (serviceLink === "/services") {
+                navigate(serviceLink);
             } else {
-                window.open(redirectUrl, "_self");
+                window.open(serviceLink, "_self");
             }
         }, 3000);
 
-        return () => clearTimeout(timer)
-    }, [redirectUrl])
+        return () => clearTimeout(timer);
+    }, [serviceLink]);
 
     return (
         <div className="success-container">
@@ -28,8 +29,8 @@ const Success = ({ email }: { email: string }) => {
                 <br />
                 <span>{email}</span>
             </div>
-            <Link to={redirectUrl}>
-                Redirecting to <span>{redirectUrl}</span> in a few seconds
+            <Link to={serviceLink}>
+                Redirecting to <span>{serviceName}</span> in a few seconds
             </Link>
         </div>
     );

diff --git a/frontend/src/constants.ts b/frontend/src/constants.ts
@@ -2,8 +2,11 @@ export const BACKEND_URL = import.meta.env.PROD
     ? "https://heimdall-api.metakgp.org"
     : "http://localhost:3333";
 
-export const servicesList = [
-    "https://chill.metakgp.org",
-    "https://naarad.metakgp.org",
-    "https://naarad.metakgp.org/signup",
-];
+export type AllowedServices = {
+    [key: string]: string;
+};
+
+export const ALLOWED_SERVICES: AllowedServices = {
+    "https://chill.metakgp.org": "Chillzone",
+    "https://naarad.metakgp.org": "Naarad",
+};
diff --git a/frontend/src/utils.ts b/frontend/src/utils.ts
@@ -1,4 +1,4 @@
-import { servicesList } from "./constants";
+import { ALLOWED_SERVICES } from "./constants";
 
 export const validateEmail = (email: string): boolean => {
     return (
@@ -7,16 +7,16 @@ export const validateEmail = (email: string): boolean => {
     );
 };
 
-export const validRedirect = (link: string | null): string => {
+export const validRedirect = (link: string | null): { serviceName: string, serviceLink: string } => {
     if (!link) {
-        return "/services";
+        return { serviceName: "Services Page", serviceLink: "/services" };
     }
 
-    for (var service of servicesList) {
-        if (link.startsWith(service)) {
-            return link;
+    for (const serviceUrl in ALLOWED_SERVICES) {
+        if (link.startsWith(serviceUrl)) {
+            return { serviceName: ALLOWED_SERVICES[serviceUrl], serviceLink: link };
         }
     }
 
-    return "/services";
+    return { serviceName: "Services Page", serviceLink: "/services" };
 };