chenyu-01 · chenyu-01 · Dec 25, 2023 · Dec 24, 2023 · Dec 24, 2023 · Dec 24, 2023
diff --git a/index.html b/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>LAPS React</title>
+    <title>Leave Application Processing System</title>
   </head>
 
   <body>

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/Authentification/Login.jsx b/src/components/Authentification/Login.jsx
@@ -12,28 +12,16 @@ export default function Login() {
   const [email, setEmail] = useState('');
   const [password, setPassword] = useState('');
   const [error, setError] = useState('');
-  const validateEmail = () => {
-    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-    return emailRegex.test(email);
-  };
 
   const validateForm = () => {
-    if (!validateEmail(email)) {
-      setError('Please enter a valid email address');
+    if (!email) {
+      setError('Please enter a email address');
       return false;
     }
-    // Password check (basic example: check for non-empty and minimum length)
     if (!password) {
       setError('Please enter a password');
       return false;
     }
-    if (password.length < 8) {
-      setError('Password must be at least 8 characters long.');
-    }
-    if (password.length > 20) {
-      setError('Password must be at most 20 characters long.');
-    }
-    setError('');
     return true;
   };
 

diff --git a/src/components/Authentification/SignUp.jsx b/src/components/Authentification/SignUp.jsx
@@ -12,24 +12,15 @@ export default function SignUp() {
   const [password2, setPassword2] = useState('');
   const [error, setError] = useState('');
   const navigate = useNavigate();
-  const validateEmail = () => {
-    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-    return emailRegex.test(email);
-  };
 
   const validateForm = () => {
-    if (!validateEmail(email)) {
-      setError('Please enter a valid email address');
+    if (!email) {
+      setError('Please enter a email address');
       return false;
     }
     // Password check (basic example: check for non-empty and minimum length)
     if (!password) {
-      if (password.length < 8) {
-        setError('Password must be at least 8 characters long.');
-      }
-      if (password.length > 20) {
-        setError('Password must be at most 20 characters long.');
-      }
+      setError('Please enter a password');
       return false;
     }
 

diff --git a/src/components/Dashboard/SideBar.jsx b/src/components/Dashboard/SideBar.jsx
@@ -3,7 +3,6 @@ import { Link } from 'react-router-dom';
 import { AuthContext } from '../../context/AuthContext';
 
 export default function SideBar({ isOpen }) {
-  // eslint-disable-next-line no-unused-vars
   const { userData } = useContext(AuthContext);
   const sideBarClass = isOpen ? 'block' : 'hidden';
   const role = userData.role;
@@ -49,7 +48,7 @@ function NavigationEmployee({ employeeId }) {
   );
 }
 
-function NavigationAdmin({ managerId }) {
+function NavigationAdmin() {
   return (
     <div className={'divide-y-2 w-full'}>
       <NavLink>
@@ -58,6 +57,15 @@ function NavigationAdmin({ managerId }) {
       <NavLink>
         <Link to={'/Dashboard'}>Dashboard</Link>
       </NavLink>
+      <NavLink>
+        <a href={`/leavetype/list`}>Edit Leave Types</a>
+      </NavLink>
+      <NavLink>
+        <a href={`/publicholidays/list`}>Public Holidays</a>
+      </NavLink>
+      <NavLink>
+        <a href={`/admin/role/list`}>Role List</a>
+      </NavLink>
     </div>
   );
 }
@@ -69,7 +77,7 @@ function NavigationManager({ managerId }) {
         <a href={`/leave/${managerId}`}>New Leave Application</a>
       </NavLink>
       <NavLink>
-        <Link to={'/Approval'}>Subordinate Applications</Link>
+        <Link to={'/Approval'}>View Leave Application for Approval</Link>
       </NavLink>
       <NavLink>
         <Link to={'/LeaveHistory'}>My Leave History</Link>

diff --git a/src/components/LeaveHistory/LeaveHistory.jsx b/src/components/LeaveHistory/LeaveHistory.jsx
@@ -2,10 +2,7 @@ import * as React from 'react';
 import LeaveTitle from './Leave-Title';
 import LeaveButtonCategories from './Leave-Button-Categories.jsx';
 import LeaveRow, { HeaderRow } from './LeaveRow.jsx';
-// eslint-disable-next-line no-unused-vars
-import LeavePerPage from './LeavePerPage.jsx';
-// eslint-disable-next-line no-unused-vars
-import LeaveTotalPage from './LeaveTotalPage.jsx';
+
 import Layout from '../Dashboard/Layout.jsx';
 import { AuthContext } from '../../context/AuthContext.jsx';
 import { useContext, useEffect, useState } from 'react';
@@ -90,11 +87,6 @@ export default function LeaveHistory() {
                 status={la.status}
               />
             ))}
-
-            {/*<div className="self-center flex w-[812px] max-w-full items-stretch justify-between gap-5 mt-80 px-0.5 max-md:flex-wrap max-md:mt-10">*/}
-            {/*  <LeavePerPage />*/}
-            {/*  <LeaveTotalPage />*/}
-            {/*</div>*/}
           </div>
         </div>
       </Layout>

diff --git a/src/components/LeaveHistory/LeavePerPage.jsx b/src/components/LeaveHistory/LeavePerPage.jsx
diff --git a/src/components/LeaveHistory/LeaveTotalPage.jsx b/src/components/LeaveHistory/LeaveTotalPage.jsx
diff --git a/src/components/Profile/Profile.jsx b/src/components/Profile/Profile.jsx
@@ -1,16 +1,45 @@
-import React, { useContext } from 'react';
+import React, { useContext, useEffect } from 'react';
 import { AuthContext } from '../../context/AuthContext.jsx';
 import { useNavigate } from 'react-router-dom';
+
 export default function Profile() {
   const navigate = useNavigate();
-  const { isAuthenticated, logout, userData } = useContext(AuthContext);
+  const { logout, userData } = useContext(AuthContext);
+  const [leaveEntitlement, setLeaveEntitlement] = React.useState({});
+  const fetchLeaveEntitlement = async () => {
+    try {
+      const response = await fetch(`/api/leave-entitlement/get/${userData.id}`);
+      if (response.ok) {
+        const data = await response.json();
+        return data;
+      } else {
+        console.log('Bad request', response.statusText);
+      }
+    } catch (error) {
+      console.error('Caught error:', error);
+    }
+  };
+  useEffect(() => {
+    if (userData && userData.id) {
+      fetchLeaveEntitlement().then((data) => {
+        setLeaveEntitlement(data);
+        console.log('Leave Entitlement:', data);
+      });
+    }
+  }, [userData]);
   return (
     <div className={'prose flex flex-col mx-auto container'}>
       <h1 className={'mt-5 mx-auto'}>Profile Page</h1>
       <h2>Id: {userData.id}</h2>
       <h2>Role: {userData.role}</h2>
       <h2>User: {userData.name}</h2>
       <h2>Email: {userData.email}</h2>
+      <h2>Leave Entitlement: </h2>
+      <ul>
+        <li>Annual Leave: {leaveEntitlement.annualLeaveDays}</li>
+        <li>Medical Leave: {leaveEntitlement.medicalLeaveDays}</li>
+        <li>Compensation Leave: {leaveEntitlement.compensationLeaveDays}</li>
+      </ul>
       <button
         className="btn btn-xs sm:btn-sm md:btn-md lg:btn-lg w-full my-2"
         onClick={logout}