Merge pull request #7 from harshvg247/main

Added loader and title
Parth-Sinha · Mar 7, 2024 · 3b2ccc5 · 3b2ccc5
2 parents 0b1a210 + 918bb51
commit 3b2ccc5
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/backend/controllers/urlControllers.js b/backend/controllers/urlControllers.js
@@ -62,8 +62,11 @@ const get_click_short_url =  async(req, res)=>{
     }})
     console.log(foundUrl)
     if(foundUrl){
-
-        const redirectTo = "https://" + foundUrl.redirectedUrl
+        let redirectTo = "https://" + foundUrl.redirectedUrl;
+        if(foundUrl.redirectedUrl.slice(0, 5)=="https"){
+            redirectTo = foundUrl.redirectedUrl
+        }
+
         return res.redirect(302, redirectTo)
     }
     // Error [ERR_HTTP_HEADERS_SENT]: Cannot set headers after they are sent to the client

diff --git a/client/public/favicon.ico b/client/public/favicon.ico
diff --git a/client/public/index.html b/client/public/index.html
@@ -24,7 +24,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>React App</title>
+    <title>Slinkly</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/client/src/components/Loader.js b/client/src/components/Loader.js
diff --git a/client/src/components/PrivateRoutes.js b/client/src/components/PrivateRoutes.js
@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { Outlet, useNavigate } from 'react-router-dom';
 import axios from 'axios';
+import Loader from './Loader';
 
 const PrivateRoute = () => {
   const [isAuthenticated, setIsAuthenticated] = useState(false);
@@ -41,7 +42,7 @@ const PrivateRoute = () => {
   }, [navigate, accessToken]);
 
   if (isLoading) {
-    return <div>Loading...</div>;
+    return <Loader/>;
   }
 
   return isAuthenticated ? <Outlet /> : null;