| @@ -7,7 +7,6 @@ import { Task, TaskGroup } from "../tasks"; | |||||
| export interface CreateProjectInputs { | export interface CreateProjectInputs { | ||||
| // Project details | // Project details | ||||
| projectCode: string; | projectCode: string; | ||||
| projectSubcode: string; | |||||
| projectName: string; | projectName: string; | ||||
| projectCategory: string; | projectCategory: string; | ||||
| projectDescription: string; | projectDescription: string; | ||||
| @@ -15,6 +14,7 @@ export interface CreateProjectInputs { | |||||
| // Client details | // Client details | ||||
| clientCode: string; | clientCode: string; | ||||
| clientName: string; | clientName: string; | ||||
| clientContactName: string; | |||||
| clientPhone: string; | clientPhone: string; | ||||
| clientEmail: string; | clientEmail: string; | ||||
| clientSubsidiary: string; | clientSubsidiary: string; | ||||
| @@ -9,7 +9,7 @@ export default function manifest(): MetadataRoute.Manifest { | |||||
| scope: "/", | scope: "/", | ||||
| display: "standalone", | display: "standalone", | ||||
| background_color: "#fff", | background_color: "#fff", | ||||
| theme_color: "#fff", | |||||
| theme_color: "#111927", | |||||
| icons: [ | icons: [ | ||||
| { | { | ||||
| src: "windows11/SmallTile.scale-100.png", | src: "windows11/SmallTile.scale-100.png", | ||||
| @@ -42,13 +42,6 @@ const ProjectClientDetails: React.FC<{ isActive: boolean }> = ({ | |||||
| {...register("projectCode")} | {...register("projectCode")} | ||||
| /> | /> | ||||
| </Grid> | </Grid> | ||||
| <Grid item xs={6}> | |||||
| <TextField | |||||
| label={t("Project Subcode")} | |||||
| fullWidth | |||||
| {...register("projectSubcode")} | |||||
| /> | |||||
| </Grid> | |||||
| <Grid item xs={6}> | <Grid item xs={6}> | ||||
| <TextField | <TextField | ||||
| label={t("Project Name")} | label={t("Project Name")} | ||||
| @@ -99,18 +92,25 @@ const ProjectClientDetails: React.FC<{ isActive: boolean }> = ({ | |||||
| <Grid container spacing={2} columns={{ xs: 6, sm: 12 }}> | <Grid container spacing={2} columns={{ xs: 6, sm: 12 }}> | ||||
| <Grid item xs={6}> | <Grid item xs={6}> | ||||
| <TextField | <TextField | ||||
| label={t("Client Code and Name")} | |||||
| label={t("Client Code")} | |||||
| fullWidth | fullWidth | ||||
| {...register("clientCode")} | {...register("clientCode")} | ||||
| /> | /> | ||||
| </Grid> | </Grid> | ||||
| <Grid item xs={6}> | <Grid item xs={6}> | ||||
| <TextField | <TextField | ||||
| label={t("Client Lead Name")} | |||||
| label={t("ClientName")} | |||||
| fullWidth | fullWidth | ||||
| {...register("clientName")} | {...register("clientName")} | ||||
| /> | /> | ||||
| </Grid> | </Grid> | ||||
| <Grid item xs={6}> | |||||
| <TextField | |||||
| label={t("Client Lead Name")} | |||||
| fullWidth | |||||
| {...register("clientContactName")} | |||||
| /> | |||||
| </Grid> | |||||
| <Grid item xs={6}> | <Grid item xs={6}> | ||||
| <TextField | <TextField | ||||
| label={t("Client Lead Phone Number")} | label={t("Client Lead Phone Number")} | ||||
| @@ -21,7 +21,7 @@ import { DataGrid } from "@mui/x-data-grid"; | |||||
| import TimesheetInputGrid from "./TimesheetInputGrid"; | import TimesheetInputGrid from "./TimesheetInputGrid"; | ||||
| import { BASE_API_URL } from "@/config/api"; | import { BASE_API_URL } from "@/config/api"; | ||||
| import { fetchTimesheets } from "@/app/api/timesheets"; | |||||
| // import { fetchTimesheets } from "@/app/api/timesheets"; | |||||
| interface EnterTimesheetModalProps { | interface EnterTimesheetModalProps { | ||||
| isOpen: boolean; | isOpen: boolean; | ||||
| @@ -62,7 +62,7 @@ const EnterTimesheetModal: React.FC<EnterTimesheetModalProps> = ({ | |||||
| ]; | ]; | ||||
| const fetchTimesheet = async () => { | const fetchTimesheet = async () => { | ||||
| fetchTimesheets(); | |||||
| // fetchTimesheets(); | |||||
| // const res = await fetch(`http://localhost:8090/api/timesheets`, { | // const res = await fetch(`http://localhost:8090/api/timesheets`, { | ||||
| // // const res = await fetch(`${BASE_API_URL}/timesheets`, { | // // const res = await fetch(`${BASE_API_URL}/timesheets`, { | ||||
| // method: "GET", | // method: "GET", | ||||
| @@ -1,14 +1,18 @@ | |||||
| import Grid from "@mui/material/Grid"; | import Grid from "@mui/material/Grid"; | ||||
| import Paper from "@mui/material/Paper"; | import Paper from "@mui/material/Paper"; | ||||
| import LoginForm from "./LoginForm"; | import LoginForm from "./LoginForm"; | ||||
| import Logo from "../Logo"; | |||||
| import { Box } from "@mui/material"; | |||||
| const LoginPage = () => { | const LoginPage = () => { | ||||
| return ( | return ( | ||||
| <Grid container height="100vh"> | <Grid container height="100vh"> | ||||
| <Grid item sm> | |||||
| test | |||||
| <Grid item sm sx={{ backgroundColor: 'neutral.900'}}> | |||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} sm={8} lg={5}> | <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%" }}> | <Paper square sx={{ height: "100%" }}> | ||||
| <LoginForm /> | <LoginForm /> | ||||
| </Paper> | </Paper> | ||||