Compare commits

...

4 Commits

Author SHA1 Message Date
victorAnumudu b3d33f87cf added app download route 2023-12-20 14:39:17 +01:00
ameye 5922064c42 Merge branch 'expire-session-clear' of WrenchBoard/Users-Wrench into master 2023-12-18 12:57:03 +00:00
victorAnumudu eae8dc43ec clears expire session value after 5secs 2023-12-18 13:40:36 +01:00
ameye 34e6322126 Merge branch 'signup-country' of WrenchBoard/Users-Wrench into master 2023-12-18 08:59:28 +00:00
5 changed files with 55 additions and 9 deletions
+14 -8
View File
@@ -1,16 +1,22 @@
import Toaster from "./components/Helpers/Toaster";
import Routers from "./Routers";
import Default from "./components/Partials/Default";
import { Navigate, useLocation } from "react-router-dom";
function App() {
return (
<Default>
<>
<Routers />
<Toaster />
</>
</Default>
);
const {pathname} = useLocation()
return (
<Default>
<>
{pathname.startsWith('/@') ?
<Navigate to="/app" replace={true} />
:
<Routers />
}
<Toaster />
</>
</Default>
);
}
export default App;
+2
View File
@@ -51,6 +51,7 @@ import FacebookRedirect from "./views/FacebookRedirect";
import AppleRedirectPage from "./views/AppleRedirectPage";
import LndPage from "./views/LndPage";
import FamilySettingsPage from "./views/FamilySettingsPage";
import AppDownloadPage from "./views/AppDownloadPage";
export default function Routers() {
return (
@@ -79,6 +80,7 @@ export default function Routers() {
<Route path="/complereset" element={<VerifyPasswordPages />} />
<Route exact path="/outmessage" element={<VerifyYouPages />} />
<Route exact path="/lnd/*" element={<LndPage />} />
<Route exact path="/app" element={<AppDownloadPage />} />
{/* private route */}
<Route element={<AuthRoute />}>
@@ -0,0 +1,9 @@
import React from 'react'
export default function AppDownload() {
return (
<div>
<div className='h-screen flex justify-center items-center'>App Download Content Comes here</div>
</div>
)
}
+17 -1
View File
@@ -19,11 +19,13 @@ import ReCAPTCHA from "react-google-recaptcha";
export default function Login() {
// eslint-disable-next-line no-restricted-globals
const queryParams = new URLSearchParams(location?.search);
const sessionExpired = queryParams.get("sessionExpired");
// const sessionExpired = queryParams.get("sessionExpired");
const dispatch = useDispatch();
const { state } = useLocation();
const [sessionExpired, setSessionExpired] = useState(queryParams.get("sessionExpired"))
const [validCaptcha, setValidCaptcha] = useState({ show: false, valid: "" }); // FOR CAPTCHA
let [loginType, setLoginType] = useState("");
@@ -235,6 +237,20 @@ export default function Login() {
setPassword("");
}, [loginType]);
// EFFECT TO CLEAR SESSION EXPIRY IF IT EXISTS AFTER SOME SECONDS
useEffect(()=>{
let timer;
if(sessionExpired == "true"){
timer = setTimeout(()=>{
setSessionExpired(false)
},5000)
}
return () => {
clearTimeout(timer)
}
}, [])
return (
<>
<AuthLayout slogan="Welcome to WrenchBoard">
+13
View File
@@ -0,0 +1,13 @@
import React from "react";
import AppDownload from "../components/AppDownload/AppDownload";
import { useLocation } from "react-router-dom";
function AppDownloadPage() {
return (
<>
<AppDownload />
</>
);
}
export default AppDownloadPage;