From ca88a4bfbf0bd2e44bf5b9b657bca402cf52f4b6 Mon Sep 17 00:00:00 2001
From: Wayne <wayne.lee@2fi-solutions.com.hk>
Date: Sun, 17 Mar 2024 15:49:59 +0900
Subject: [PATCH] Add logo to login page

---
 src/app/api/projects/actions.ts                |  2 +-
 src/app/manifest.ts                            |  2 +-
 .../CreateProject/ProjectClientDetails.tsx     | 18 +++++++++---------
 .../EnterTimesheet/EnterTimesheetModal.tsx     |  4 ++--
 src/components/LoginPage/LoginPage.tsx         |  8 ++++++--
 5 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/app/api/projects/actions.ts b/src/app/api/projects/actions.ts
index f05ef40..ef39406 100644
--- a/src/app/api/projects/actions.ts
+++ b/src/app/api/projects/actions.ts
@@ -7,7 +7,6 @@ import { Task, TaskGroup } from "../tasks";
 export interface CreateProjectInputs {
   // Project details
   projectCode: string;
-  projectSubcode: string;
   projectName: string;
   projectCategory: string;
   projectDescription: string;
@@ -15,6 +14,7 @@ export interface CreateProjectInputs {
   // Client details
   clientCode: string;
   clientName: string;
+  clientContactName: string;
   clientPhone: string;
   clientEmail: string;
   clientSubsidiary: string;
diff --git a/src/app/manifest.ts b/src/app/manifest.ts
index c36a62c..a0f6048 100644
--- a/src/app/manifest.ts
+++ b/src/app/manifest.ts
@@ -9,7 +9,7 @@ export default function manifest(): MetadataRoute.Manifest {
     scope: "/",
     display: "standalone",
     background_color: "#fff",
-    theme_color: "#fff",
+    theme_color: "#111927",
     icons: [
       {
         src: "windows11/SmallTile.scale-100.png",
diff --git a/src/components/CreateProject/ProjectClientDetails.tsx b/src/components/CreateProject/ProjectClientDetails.tsx
index cb9d2f7..610c15f 100644
--- a/src/components/CreateProject/ProjectClientDetails.tsx
+++ b/src/components/CreateProject/ProjectClientDetails.tsx
@@ -42,13 +42,6 @@ const ProjectClientDetails: React.FC<{ isActive: boolean }> = ({
                 {...register("projectCode")}
               />
             </Grid>
-            <Grid item xs={6}>
-              <TextField
-                label={t("Project Subcode")}
-                fullWidth
-                {...register("projectSubcode")}
-              />
-            </Grid>
             <Grid item xs={6}>
               <TextField
                 label={t("Project Name")}
@@ -99,18 +92,25 @@ const ProjectClientDetails: React.FC<{ isActive: boolean }> = ({
           <Grid container spacing={2} columns={{ xs: 6, sm: 12 }}>
             <Grid item xs={6}>
               <TextField
-                label={t("Client Code and Name")}
+                label={t("Client Code")}
                 fullWidth
                 {...register("clientCode")}
               />
             </Grid>
             <Grid item xs={6}>
               <TextField
-                label={t("Client Lead Name")}
+                label={t("ClientName")}
                 fullWidth
                 {...register("clientName")}
               />
             </Grid>
+            <Grid item xs={6}>
+              <TextField
+                label={t("Client Lead Name")}
+                fullWidth
+                {...register("clientContactName")}
+              />
+            </Grid>
             <Grid item xs={6}>
               <TextField
                 label={t("Client Lead Phone Number")}
diff --git a/src/components/EnterTimesheet/EnterTimesheetModal.tsx b/src/components/EnterTimesheet/EnterTimesheetModal.tsx
index b76ae98..c63a905 100644
--- a/src/components/EnterTimesheet/EnterTimesheetModal.tsx
+++ b/src/components/EnterTimesheet/EnterTimesheetModal.tsx
@@ -21,7 +21,7 @@ import { DataGrid } from "@mui/x-data-grid";
 import TimesheetInputGrid from "./TimesheetInputGrid";
 import { BASE_API_URL } from "@/config/api";
 
-import { fetchTimesheets } from "@/app/api/timesheets";
+// import { fetchTimesheets } from "@/app/api/timesheets";
 
 interface EnterTimesheetModalProps {
   isOpen: boolean;
@@ -62,7 +62,7 @@ const EnterTimesheetModal: React.FC<EnterTimesheetModalProps> = ({
   ];
 
   const fetchTimesheet = async () => {
-    fetchTimesheets();
+    // fetchTimesheets();
     // const res = await fetch(`http://localhost:8090/api/timesheets`, {
     // // const res = await fetch(`${BASE_API_URL}/timesheets`, {
     //   method: "GET",
diff --git a/src/components/LoginPage/LoginPage.tsx b/src/components/LoginPage/LoginPage.tsx
index 497d188..eb65647 100644
--- a/src/components/LoginPage/LoginPage.tsx
+++ b/src/components/LoginPage/LoginPage.tsx
@@ -1,14 +1,18 @@
 import Grid from "@mui/material/Grid";
 import Paper from "@mui/material/Paper";
 import LoginForm from "./LoginForm";
+import Logo from "../Logo";
+import { Box } from "@mui/material";
 
 const LoginPage = () => {
   return (
     <Grid container height="100vh">
-      <Grid item sm>
-        test
+      <Grid item sm sx={{ backgroundColor: 'neutral.900'}}>
       </Grid>
       <Grid item xs={12} sm={8} lg={5}>
+        <Box sx={{ width: '100%', padding: 5, paddingBlockStart: 10, display: 'flex', alignItems: 'flex-end', justifyContent: 'center', svg: { maxHeight: 120 } }}>
+          <Logo />
+        </Box>
         <Paper square sx={{ height: "100%" }}>
           <LoginForm />
         </Paper>