瀏覽代碼

Add logo to login page

tags/Baseline_30082024_FRONTEND_UAT
Wayne 1 年之前
父節點
當前提交
ca88a4bfbf
共有 5 個檔案被更改,包括 19 行新增15 行删除
  1. +1
    -1
      src/app/api/projects/actions.ts
  2. +1
    -1
      src/app/manifest.ts
  3. +9
    -9
      src/components/CreateProject/ProjectClientDetails.tsx
  4. +2
    -2
      src/components/EnterTimesheet/EnterTimesheetModal.tsx
  5. +6
    -2
      src/components/LoginPage/LoginPage.tsx

+ 1
- 1
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;


+ 1
- 1
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",


+ 9
- 9
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")}


+ 2
- 2
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",


+ 6
- 2
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>


Loading…
取消
儲存