-
+
{bucketsLoaging && Loading...
}
@@ -450,8 +453,8 @@ const ManageDirectory = ({ submitContact, onCLosed }) => {
/>
-
-
+
+
+ {errors.description && (
+
{errors.description.message}
+ )}
+
+
+ {/* Buttons */}
+
+
+
+
+
+
+
+ );
+};
+
+export default ManageDocument;
diff --git a/src/components/Documents/VersionListSkeleton.jsx b/src/components/Documents/VersionListSkeleton.jsx
new file mode 100644
index 00000000..d239315c
--- /dev/null
+++ b/src/components/Documents/VersionListSkeleton.jsx
@@ -0,0 +1,47 @@
+import React from "react";
+
+const SkeletonLine = ({ height = 16, width = "100%", className = "" }) => (
+
+);
+
+const VersionListSkeleton = ({ items = 5 }) => {
+ return (
+
+ {[...Array(items)].map((_, idx) => (
+
+ {/* Top row: document name + version/status */}
+
+
+ {/* Upload by row */}
+
+
+
+
+
+ {/* Updated at row */}
+
+
+
+
+ ))}
+
+ );
+};
+
+export default VersionListSkeleton;
diff --git a/src/components/Documents/ViewDocument.jsx b/src/components/Documents/ViewDocument.jsx
new file mode 100644
index 00000000..6405a3ed
--- /dev/null
+++ b/src/components/Documents/ViewDocument.jsx
@@ -0,0 +1,175 @@
+import React, { useState } from "react";
+import {
+ useDocumentDetails,
+ useDocumentVersionList,
+ useVerifyDocument,
+} from "../../hooks/useDocument";
+import { getDocuementsStatus, useDocumentContext } from "./Documents";
+import { formatUTCToLocalTime } from "../../utils/dateUtils";
+import Avatar from "../common/Avatar";
+import {
+ DOWNLOAD_DOCUMENT,
+ ITEMS_PER_PAGE,
+ VERIFY_DOCUMENT,
+} from "../../utils/constants";
+import DocumentDetailsSkeleton from "./DocumentDetailsSkeleton ";
+import { useHasUserPermission } from "../../hooks/useHasUserPermission";
+import DocumentVersionList from "./DocumentVersionList";
+
+const ViewDocument = () => {
+ const { viewDoc, setOpenDocument } = useDocumentContext();
+ const [currentPage, setCurrentPage] = useState(1);
+ const [showVersions, setShowVersions] = useState(false);
+ const canVerifyDocument = useHasUserPermission(VERIFY_DOCUMENT);
+
+ // Document Details
+ const { data, isLoading, isError, error } = useDocumentDetails(
+ viewDoc?.document
+ );
+
+ // Document Versions (fetch only if toggle is ON)
+ const {
+ data: versionList,
+ isLoading: versionLoading,
+ } = useDocumentVersionList(
+ showVersions ? data?.parentAttachmentId : null,
+ ITEMS_PER_PAGE - 10,
+ currentPage
+ );
+
+ const paginate = (page) => {
+ if (page >= 1 && page <= (versionList?.totalPages ?? 1)) {
+ setCurrentPage(page);
+ }
+ };
+
+ // Verify / Reject
+ const { mutate: VerifyDoc, isPending } = useVerifyDocument();
+ const VerifyDocument = () => {
+ VerifyDoc({ documentId: viewDoc?.document, isVerify: true });
+ };
+ const RejectDocument = () => {
+ VerifyDoc({ documentId: viewDoc?.document, isVerify: false });
+ };
+
+ if (isLoading) return
;
+ if (isError)
+ return (
+
+
{error?.response?.data?.message || error?.message}
+
{error?.response?.status}
+
+ );
+
+ return (
+
+
Document Details
+
+ {/* Document Info Rows */}
+
+
+
+ Category:
+
+
+ {data.documentType?.documentCategory?.name || "-"}
+
+
+
+
+ Type:
+
+ {data.documentType?.name || "-"}
+
+
+
+
+
+
+ Document Name:
+
+ {data.name || "-"}
+
+
+
+ Document ID:
+
+ {data.documentId || "-"}
+
+
+
+
+
+
+ Uploaded At:
+
+
+ {formatUTCToLocalTime(data.uploadedAt)}
+
+
+
+
+
+
+
+
+ Tags:
+
+
+ {data.tags?.length > 0 ? (
+ data.tags.map((t, i) => (
+
+ {t.name}
+
+ ))
+ ) : (
+ -
+ )}
+
+
+
+
+
+
+
+ Description:
+
+ {data.description || "-"}
+
+
+
+ {/* Toggle for Versions */}
+
+
Documents:
+
+
+ setShowVersions(e.target.checked)}
+ />
+
+
+
+
+
+ );
+};
+
+export default ViewDocument;
\ No newline at end of file
diff --git a/src/components/Employee/EmpActivities.jsx b/src/components/Employee/EmpActivities.jsx
index f5d9e8c2..e79b181d 100644
--- a/src/components/Employee/EmpActivities.jsx
+++ b/src/components/Employee/EmpActivities.jsx
@@ -25,7 +25,7 @@ error,
diff --git a/src/components/Employee/EmpAttendance.jsx b/src/components/Employee/EmpAttendance.jsx
index 26ae9531..dfa12e98 100644
--- a/src/components/Employee/EmpAttendance.jsx
+++ b/src/components/Employee/EmpAttendance.jsx
@@ -128,7 +128,7 @@ const EmpAttendance = ({ employee }) => {
>
diff --git a/src/components/Employee/EmpBanner.jsx b/src/components/Employee/EmpBanner.jsx
index 6cb12073..bb019bc6 100644
--- a/src/components/Employee/EmpBanner.jsx
+++ b/src/components/Employee/EmpBanner.jsx
@@ -3,6 +3,7 @@ import React, { useState, useEffect } from "react";
import { useChangePassword } from "../../components/Context/ChangePasswordContext";
import GlobalModel from "../common/GlobalModel";
import ManageEmployee from "./ManageEmployee";
+import { formatUTCToLocalTime } from "../../utils/dateUtils";
const EmpBanner = ({ profile, loggedInUser }) => {
const { openChangePassword } = useChangePassword();
@@ -77,7 +78,7 @@ const EmpBanner = ({ profile, loggedInUser }) => {
{" "}
Joined on{" "}
{profile?.joiningDate ? (
- new Date(profile.joiningDate).toLocaleDateString()
+ formatUTCToLocalTime(profile.joiningDate)
) : (
NA
)}
diff --git a/src/components/Employee/EmpDashboard.jsx b/src/components/Employee/EmpDashboard.jsx
index b25f6803..85c97836 100644
--- a/src/components/Employee/EmpDashboard.jsx
+++ b/src/components/Employee/EmpDashboard.jsx
@@ -9,7 +9,6 @@ const EmpDashboard = ({ profile }) => {
refetch,
} = useProjectsAllocationByEmployee(profile?.id);
- console.log(projectList);
return (
<>
diff --git a/src/components/Employee/EmpDocuments.jsx b/src/components/Employee/EmpDocuments.jsx
index 46aa33d0..b4c8046b 100644
--- a/src/components/Employee/EmpDocuments.jsx
+++ b/src/components/Employee/EmpDocuments.jsx
@@ -1,10 +1,15 @@
import React, { useState, useEffect } from "react";
import { ComingSoonPage } from "../../pages/Misc/ComingSoonPage";
+import DocumentPage from "../../pages/Documents/DocumentPage";
+import Documents from "../Documents/Documents";
+import { useParams } from "react-router-dom";
+import { DOCUMENTS_ENTITIES } from "../../utils/constants";
const EmpDocuments = ({ profile, loggedInUser }) => {
+ const {employeeId} = useParams()
return (
<>
-
+
);
};
diff --git a/src/components/Employee/EmpOverview.jsx b/src/components/Employee/EmpOverview.jsx
index 6b396745..cf4ce4af 100644
--- a/src/components/Employee/EmpOverview.jsx
+++ b/src/components/Employee/EmpOverview.jsx
@@ -142,13 +142,14 @@ const EmpOverview = ({ profile }) => {
{/* Address */}
-
-
+
+
- Address
+ Address
+
:
-
+
{profile?.currentAddress || NA}
diff --git a/src/components/Employee/EmployeeList.jsx b/src/components/Employee/EmployeeList.jsx
index 2ae93d5e..5a79c6ce 100644
--- a/src/components/Employee/EmployeeList.jsx
+++ b/src/components/Employee/EmployeeList.jsx
@@ -4,4 +4,4 @@ const EmployeeList = () => {
return EmployeeList
;
};
-export default EmployeeList;
+export default EmployeeList;
\ No newline at end of file
diff --git a/src/components/Employee/EmployeeNav.jsx b/src/components/Employee/EmployeeNav.jsx
index d9a6b3e0..8c25aa22 100644
--- a/src/components/Employee/EmployeeNav.jsx
+++ b/src/components/Employee/EmployeeNav.jsx
@@ -1,12 +1,31 @@
-import React from "react";
+import React, { useEffect, useState } from "react";
+import { useHasUserPermission } from "../../hooks/useHasUserPermission";
+import { VIEW_DOCUMENT } from "../../utils/constants";
+import { useProfile } from "../../hooks/useProfile";
+import { useParams } from "react-router-dom";
const EmployeeNav = ({ onPillClick, activePill }) => {
+ const { employeeId } = useParams();
+ const [isAbleToViewDocuments, setIsAbleToViewDocuments] = useState(false);
+
+ const canViewDocuments = useHasUserPermission(VIEW_DOCUMENT);
+ const { profile } = useProfile();
+
+ useEffect(() => {
+ if (profile?.employeeInfo?.id) {
+ setIsAbleToViewDocuments(profile.employeeInfo.id === employeeId);
+ }
+ }, [profile?.employeeInfo?.id, employeeId]);
+
const tabs = [
{ key: "profile", icon: "bx bx-user", label: "Profile" },
{ key: "attendance", icon: "bx bx-group", label: "Attendances" },
- { key: "documents", icon: "bx bx-user", label: "Documents" },
+ (isAbleToViewDocuments || canViewDocuments) && {
+ key: "documents",
+ icon: "bx bx-file",
+ label: "Documents",
+ },
{ key: "activities", icon: "bx bx-grid-alt", label: "Activities" },
- ];
-
+ ].filter(Boolean);
return (
diff --git a/src/components/Employee/ManageEmployee.jsx b/src/components/Employee/ManageEmployee.jsx
index 1805220b..81a4c4d2 100644
--- a/src/components/Employee/ManageEmployee.jsx
+++ b/src/components/Employee/ManageEmployee.jsx
@@ -17,6 +17,8 @@ import {
} from "../../slices/apiDataManager";
import { clearApiCacheKey } from "../../slices/apiCacheSlice";
import { useMutation } from "@tanstack/react-query";
+import Label from "../common/Label";
+import DatePicker from "../common/DatePicker";
const mobileNumberRegex = /^[0-9]\d{9}$/;
@@ -220,10 +222,10 @@ const ManageEmployee = ({ employeeId, onClosed, IsAllEmployee }) => {
return (
<>
+ );
+};
+export default LandingPage;
diff --git a/src/pages/TermsAndConditions/LegalInfoCard.jsx b/src/pages/TermsAndConditions/LegalInfoCard.jsx
index baa5d3da..cd7c9e05 100644
--- a/src/pages/TermsAndConditions/LegalInfoCard.jsx
+++ b/src/pages/TermsAndConditions/LegalInfoCard.jsx
@@ -4,25 +4,10 @@ const LegalInfoPage = () => {
return (
<>
MARCO SECURE SOLUTIONS
@@ -41,7 +26,7 @@ const LegalInfoPage = () => {
overflowY: 'auto',
flexGrow: 1,
- marginBottom: '2rem', // Adds space below the card
+ marginBottom: '2rem',
}}
>
Terms & Conditions
diff --git a/src/pages/authentication/AuthWrapper.jsx b/src/pages/authentication/AuthWrapper.jsx
index c065bac2..5c8f0eb9 100644
--- a/src/pages/authentication/AuthWrapper.jsx
+++ b/src/pages/authentication/AuthWrapper.jsx
@@ -4,17 +4,17 @@ import "./page-auth.css";
export const AuthWrapper = ({ children }) => {
return (
-
+ {/*
-
+
*/}
-
+
-
+
{
/>
-
+ {/*
*/}
{children}
-
-
+ //
+ //
);
-};
+};
\ No newline at end of file
diff --git a/src/pages/authentication/ForgotPasswordPage.jsx b/src/pages/authentication/ForgotPasswordPage.jsx
index 508b7a56..8a6fc608 100644
--- a/src/pages/authentication/ForgotPasswordPage.jsx
+++ b/src/pages/authentication/ForgotPasswordPage.jsx
@@ -1,89 +1,88 @@
import { useState } from "react";
-import {Link} from "react-router-dom";
+import { Link } from "react-router-dom";
import { AuthWrapper } from "./AuthWrapper"
import "./page-auth.css";
import AuthRepository from "../../repositories/AuthRepository";
import showToast from "../../services/toastService";
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
-import {z} from "zod";
+import { z } from "zod";
-const forgotPassSceham = z.object( {
+const forgotPassSceham = z.object({
email: z.string().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
- {
+ const onSubmit = async (data) => {
+ try {
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" )
+ 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 )
- } catch ( err )
- {
+ setLoading(false)
+ } catch (err) {
reset()
- if(err.response.status === 404){
- showToast( "verification email has been sent to your registered email address", "success" )
- }else{
- showToast("Something wrong","error")
- }
-
+ if (err.response.status === 404) {
+ showToast("verification email has been sent to your registered email address", "success")
+ } else {
+ showToast("Something wrong", "error")
+ }
+
setLoading(false)
}
}
return (
-
- Forgot Password? 🔒
-
- Enter your email and we'll send you instructions to reset your password
-
-
-
+
+
+
Forgot Password? 🔒
+
+ Enter your email and we'll send you instructions to reset your password
+
+
+
+
{
Back to login
-
+
+ {/* Footer Text */}
+
+
+
);
};
-export default ForgotPasswordPage;
+export default ForgotPasswordPage;
\ No newline at end of file
diff --git a/src/pages/authentication/LoginPage.jsx b/src/pages/authentication/LoginPage.jsx
index 3f91e29a..9240e33d 100644
--- a/src/pages/authentication/LoginPage.jsx
+++ b/src/pages/authentication/LoginPage.jsx
@@ -1,70 +1,54 @@
import { useEffect, useState } from "react";
-import { Link } from "react-router-dom";
-import { AuthWrapper } from "./AuthWrapper";
-import { useNavigate } from "react-router-dom";
-import "./page-auth.css";
+import { Link, useNavigate } from "react-router-dom";
import AuthRepository from "../../repositories/AuthRepository";
import showToast from "../../services/toastService";
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { z } from "zod";
+import { AuthWrapper } from "./AuthWrapper";
const LoginPage = () => {
const navigate = useNavigate();
const [loading, setLoading] = useState(false);
const [hidepass, setHidepass] = useState(true);
const [IsLoginWithOTP, setLoginWithOtp] = useState(false);
- const [IsTriedOTPThrough, setIsTriedOTPThrough] = useState(false);
const now = Date.now();
const loginSchema = IsLoginWithOTP
? z.object({
- username: z.string()
- .trim()
- .email({ message: "Valid email required" }),
- })
+ username: z.string().email({ message: "Valid email required" }),
+ })
: z.object({
- username: z.string()
- .trim()
- .email({ message: "Valid email required" }),
- password: z.string()
- .trim()
- .min(1, { message: "Password required" }),
- rememberMe: z.boolean(),
- });
+ username: z.string().email({ message: "Valid email required" }),
+ password: z.string().min(1, { message: "Password required" }),
+ rememberMe: z.boolean(),
+ });
const {
register,
handleSubmit,
formState: { errors },
- reset,
- getValues,
} = useForm({
resolver: zodResolver(loginSchema),
});
const onSubmit = async (data) => {
setLoading(true);
-
try {
- const username = data.username.trim();
- const password = data.password?.trim();
-
if (!IsLoginWithOTP) {
const userCredential = {
- username,
- password,
+ username: data.username,
+ password: data.password,
};
-
const response = await AuthRepository.login(userCredential);
localStorage.setItem("jwtToken", response.data.token);
localStorage.setItem("refreshToken", response.data.refreshToken);
setLoading(false);
navigate("/dashboard");
} else {
- await AuthRepository.sendOTP({ email: username });
+ await AuthRepository.sendOTP({ email: data.username });
showToast("OTP has been sent to your email.", "success");
- localStorage.setItem("otpUsername", username);
+ localStorage.setItem("otpUsername", data.username);
localStorage.setItem("otpSentTime", now.toString());
navigate("/auth/login-otp");
}
@@ -74,7 +58,6 @@ const LoginPage = () => {
}
};
-
useEffect(() => {
const otpSentTime = localStorage.getItem("otpSentTime");
if (
@@ -85,138 +68,150 @@ const LoginPage = () => {
navigate("/auth/login-otp");
}
}, [IsLoginWithOTP]);
+
return (
-
- Welcome to PMS!
-
- {IsLoginWithOTP
- ? "Enter your email to receive a one-time password (OTP)."
- : "Please sign-in to your account and start the adventure."}
-
-