diff --git a/index.html b/index.html index 0ac2d657..6c752530 100644 --- a/index.html +++ b/index.html @@ -5,7 +5,7 @@ - Marco PMS + OnFieldWork.com diff --git a/public/img/app/dashboard-light-09.png b/public/img/app/dashboard-light-09.png new file mode 100644 index 00000000..316a52e8 Binary files /dev/null and b/public/img/app/dashboard-light-09.png differ diff --git a/src/components/Layout/Sidebar.jsx b/src/components/Layout/Sidebar.jsx index 07fa2c90..fb5349c4 100644 --- a/src/components/Layout/Sidebar.jsx +++ b/src/components/Layout/Sidebar.jsx @@ -15,7 +15,7 @@ const Sidebar = () => { >
- + {/* { aria-label="logo image" style={{ margin: "5px", paddingRight: "5px" }} /> - - PMS + */} + + + + OnField + Work + .com + diff --git a/src/layouts/AuthLayout.jsx b/src/layouts/AuthLayout.jsx index c1cf679f..fd123428 100644 --- a/src/layouts/AuthLayout.jsx +++ b/src/layouts/AuthLayout.jsx @@ -23,13 +23,13 @@ const AuthLayout = () => { to="/" className="app-brand-link gap-2 position-fixed top-2 start-0 mx-2 mx-sm-4" > - + {/* marco-logo - + */}
diff --git a/src/pages/Home/LandingPage.css b/src/pages/Home/LandingPage.css index 35b05e9e..b449465c 100644 --- a/src/pages/Home/LandingPage.css +++ b/src/pages/Home/LandingPage.css @@ -654,3 +654,15 @@ nav.layout-navbar.navbar-active::after { height: 100%; object-fit: cover; } + +.light-style .landing-hero { + background: linear-gradient(138.18deg, #eae8fd, #ede7e7 94.44%); +} + +.text-green { + color: #49bf3c !important; +} + +.text-blue { + color: var(--bs-blue); +} diff --git a/src/pages/Home/LandingPage.jsx b/src/pages/Home/LandingPage.jsx index d3288a9d..523a56a5 100644 --- a/src/pages/Home/LandingPage.jsx +++ b/src/pages/Home/LandingPage.jsx @@ -54,15 +54,27 @@ const LandingPage = () => { > - {/* Mobile menu toggle: End*/} - + + {/* - {/* */} PMS - {/* */} + PMS + + */} + + + + OnField + Work + .com {/* Menu logo wrapper: End */} @@ -226,7 +238,7 @@ const LandingPage = () => { diff --git a/src/pages/authentication/ForgotPasswordPage.jsx b/src/pages/authentication/ForgotPasswordPage.jsx index 0e234bd3..209ba714 100644 --- a/src/pages/authentication/ForgotPasswordPage.jsx +++ b/src/pages/authentication/ForgotPasswordPage.jsx @@ -1,6 +1,6 @@ import { useState } from "react"; import { Link } from "react-router-dom"; -import { AuthWrapper } from "./AuthWrapper" +import { AuthWrapper } from "./AuthWrapper"; import "./page-auth.css"; import AuthRepository from "../../repositories/AuthRepository"; import showToast from "../../services/toastService"; @@ -8,54 +8,76 @@ import { useForm } from "react-hook-form"; import { zodResolver } from "@hookform/resolvers/zod"; import { z } from "zod"; - const forgotPassSceham = z.object({ email: z.string().trim().email(), -}) +}); const ForgotPasswordPage = () => { + const [loding, setLoading] = useState(false); - const [loding, setLoading] = useState(false) - - const { register, + const { + register, handleSubmit, formState: { errors }, reset, - getValues } = useForm({ - resolver: zodResolver(forgotPassSceham), - defaultValues: { - email: "" - } - }) + getValues, + } = useForm({ + resolver: zodResolver(forgotPassSceham), + defaultValues: { + email: "", + }, + }); const onSubmit = async (data) => { try { - setLoading(true) - const response = await AuthRepository.forgotPassword(data) + setLoading(true); + const response = await AuthRepository.forgotPassword(data); if (response.data && response.success) - showToast("verification email has been sent to your registered email address", "success") - reset() - setLoading(false) + showToast( + "verification email has been sent to your registered email address", + "success" + ); + reset(); + setLoading(false); } catch (err) { - reset() + reset(); if (err.response.status === 404) { - showToast("verification email has been sent to your registered email address", "success") + showToast( + "verification email has been sent to your registered email address", + "success" + ); } else { - showToast("Something wrong", "error") + showToast("Something wrong", "error"); } - setLoading(false) + setLoading(false); } - } + }; return ( -
-
-

Forgot Password? 🔒

+
+
+
+ + + +
+ +
+
Forgot Password?

- Enter your email and we'll send you instructions to reset your password + Enter your email and we'll send you instructions to reset your + password

-
+
)}
- -
- - - Back to login - -
+
+ + + Back to login + +
{/* Footer Text */} -
); }; -export default ForgotPasswordPage; \ No newline at end of file +export default ForgotPasswordPage; diff --git a/src/pages/authentication/LoginPage.jsx b/src/pages/authentication/LoginPage.jsx index 0015a605..4431bf25 100644 --- a/src/pages/authentication/LoginPage.jsx +++ b/src/pages/authentication/LoginPage.jsx @@ -45,11 +45,11 @@ const LoginPage = () => { if (data.rememberMe) { localStorage.setItem("jwtToken", response.data.token); localStorage.setItem("refreshToken", response.data.refreshToken); - removeSession("session") + removeSession("session"); } else { sessionStorage.setItem("jwtToken", response.data.token); sessionStorage.setItem("refreshToken", response.data.refreshToken); - removeSession("local") + removeSession("local"); } setLoading(false); navigate("/auth/switch/org"); @@ -78,25 +78,35 @@ const LoginPage = () => { }, [IsLoginWithOTP]); useEffect(() => { - const token = - localStorage.getItem("jwtToken") || - sessionStorage.getItem("jwtToken"); + const token = + localStorage.getItem("jwtToken") || sessionStorage.getItem("jwtToken"); - if (token) { - navigate("/dashboard", { replace: true }); - } -}, []); + if (token) { + navigate("/dashboard", { replace: true }); + } + }, []); return (
-

Welcome to PMS!

+ + +
+ Welcome to
+

+ {" "} + OnField + Work + .com +

+

{IsLoginWithOTP ? "Enter your email to receive a one-time password (OTP)." : "Please sign in to your account and start the adventure"}

-
{/* Email */}
@@ -219,7 +229,6 @@ const LoginPage = () => { )} - {/* Footer Text */} {!IsLoginWithOTP ? (

diff --git a/src/pages/authentication/RegisterPage.jsx b/src/pages/authentication/RegisterPage.jsx index 65b7d619..6e05cfdb 100644 --- a/src/pages/authentication/RegisterPage.jsx +++ b/src/pages/authentication/RegisterPage.jsx @@ -37,33 +37,36 @@ const registerSchema = z.object({ const RegisterPage = () => { const [registered, setRegristered] = useState(false); const [industries, setIndustries] = useState([]); - const [Loading,setLoading] = useState(false) + const [Loading, setLoading] = useState(false); const { register, handleSubmit, - formState: { errors },reset + formState: { errors }, + reset, } = useForm({ resolver: zodResolver(registerSchema), }); const onSubmit = async (data) => { try { - setLoading(true) + setLoading(true); const response = await MarketRepository.requestDemo(data); - showToast("Your request has been sent successfully. Please stay in touch!"); + showToast( + "Your request has been sent successfully. Please stay in touch!" + ); setRegristered(true); - setLoading(false) - reset() + setLoading(false); + reset(); } catch (error) { showToast(error.message, "error"); - setLoading(false) + setLoading(false); } }; useEffect(() => { fetchIndustries(); }, []); - useEffect(() => { }, [industries]); + useEffect(() => {}, [industries]); const fetchIndustries = async () => { try { @@ -76,11 +79,20 @@ const RegisterPage = () => { }; return ( <> -

- -

Adventure starts here

+
+ + + +
+ +
+
Adventure starts here

Make your app management easy and fun!

{ className="mb-2" onSubmit={handleSubmit(onSubmit)} > -
-
- - - {errors.organizatioinName && ( -
- {errors.organizatioinName.message} -
- )} -
-
- - - {errors.email && ( -
- {errors.email.message} -
- )} -
+
+ + + {errors.organizatioinName && ( +
+ {errors.organizatioinName.message} +
+ )} +
+
+ + + {errors.email && ( +
+ {errors.email.message} +
+ )} +
- + {errors.contactPerson && (
{ - + {errors.contactNumber && (
{ - + {errors.about && (
{ - + {errors.oragnizationSize && (
{ - + {errors.industryId && (
{ privacy policy & terms -
{errors.terms && (
{ aria-label="Click me " className="btn btn-primary d-grid w-100" > - {Loading ? "Please Wait..." :" Request Demo"} + {Loading ? "Please Wait..." : " Request Demo"} @@ -313,4 +323,4 @@ const RegisterPage = () => { ); }; -export default RegisterPage; \ No newline at end of file +export default RegisterPage;