瀏覽代碼

tsms to fpsms

feature/axios_provider
MSI\derek 6 月之前
父節點
當前提交
47a31eda68
共有 17 個檔案被更改,包括 42 行新增42 行删除
  1. +1
    -1
      .env.production
  2. +2
    -2
      .gitignore
  3. +2
    -2
      package-lock.json
  4. +1
    -1
      package.json
  5. +0
    -18
      src/app/(main)/dashboard/page.tsx
  6. +0
    -0
      src/app/(main)/home/CompanyTeamCashFlow/page.tsx
  7. +0
    -0
      src/app/(main)/home/ProjectCashFlow/page.tsx
  8. +0
    -0
      src/app/(main)/home/ProjectFinancialSummary/page.tsx
  9. +0
    -0
      src/app/(main)/home/ProjectStatusByClient/page.tsx
  10. +0
    -0
      src/app/(main)/home/StaffUtilization/page.tsx
  11. +10
    -9
      src/app/(main)/home/page.tsx
  12. +17
    -0
      src/app/(main)/homeX/page.tsx
  13. +2
    -2
      src/app/layout.tsx
  14. +2
    -2
      src/app/manifest.ts
  15. +1
    -1
      src/components/NavigationContent/NavigationContent.tsx
  16. +2
    -2
      src/theme/colorConst.js
  17. +2
    -2
      zip_project.ps1

+ 1
- 1
.env.production 查看文件

@@ -1,3 +1,3 @@
API_URL=http://localhost:8090/api API_URL=http://localhost:8090/api
NEXTAUTH_SECRET=secret NEXTAUTH_SECRET=secret
NEXTAUTH_URL=https://tsms-uat.2fi-solutions.com
NEXTAUTH_URL=https://fpsms-uat.2fi-solutions.com

+ 2
- 2
.gitignore 查看文件

@@ -37,8 +37,8 @@ next-env.d.ts


.vscode .vscode


#tsms.zip
tsms.zip
#fpsms.zip
fpsms.zip


# PWA files # PWA files
**/public/sw.js **/public/sw.js


+ 2
- 2
package-lock.json 查看文件

@@ -1,11 +1,11 @@
{ {
"name": "tsms",
"name": "fpsms",
"version": "0.1.0", "version": "0.1.0",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "tsms",
"name": "fpsms",
"version": "0.1.0", "version": "0.1.0",
"dependencies": { "dependencies": {
"@emotion/cache": "^11.11.0", "@emotion/cache": "^11.11.0",


+ 1
- 1
package.json 查看文件

@@ -1,5 +1,5 @@
{ {
"name": "tsms",
"name": "fpsms",
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"scripts": { "scripts": {


+ 0
- 18
src/app/(main)/dashboard/page.tsx 查看文件

@@ -1,18 +0,0 @@
import { Metadata } from "next";
import { I18nProvider } from "@/i18n";
import DashboardPage from "@/components/DashboardPage/DashboardPage";
import DashboardPageButton from "@/components/DashboardPage/DashboardTabButton";
import ProgressByClientSearch from "@/components/ProgressByClientSearch";
import { Suspense } from "react";
import Tabs, { TabsProps } from "@mui/material/Tabs";
import Tab from "@mui/material/Tab";

export const metadata: Metadata = {
title: "Dashboard",
};

const Dashboard: React.FC = () => {
return <div>test</div>;
};

export default Dashboard;

src/app/(main)/dashboard/CompanyTeamCashFlow/page.tsx → src/app/(main)/home/CompanyTeamCashFlow/page.tsx 查看文件


src/app/(main)/dashboard/ProjectCashFlow/page.tsx → src/app/(main)/home/ProjectCashFlow/page.tsx 查看文件


src/app/(main)/dashboard/ProjectFinancialSummary/page.tsx → src/app/(main)/home/ProjectFinancialSummary/page.tsx 查看文件


src/app/(main)/dashboard/ProjectStatusByClient/page.tsx → src/app/(main)/home/ProjectStatusByClient/page.tsx 查看文件


src/app/(main)/dashboard/StaffUtilization/page.tsx → src/app/(main)/home/StaffUtilization/page.tsx 查看文件


+ 10
- 9
src/app/(main)/home/page.tsx 查看文件

@@ -1,17 +1,18 @@
import { Metadata } from "next"; import { Metadata } from "next";
import { I18nProvider } from "@/i18n"; import { I18nProvider } from "@/i18n";
import UserWorkspacePage from "@/components/UserWorkspacePage/UserWorkspacePage";
import DashboardPage from "@/components/DashboardPage/DashboardPage";
import DashboardPageButton from "@/components/DashboardPage/DashboardTabButton";
import ProgressByClientSearch from "@/components/ProgressByClientSearch";
import { Suspense } from "react";
import Tabs, { TabsProps } from "@mui/material/Tabs";
import Tab from "@mui/material/Tab";


export const metadata: Metadata = { export const metadata: Metadata = {
title: "User Workspace",
title: "Dashboard",
}; };


const Home: React.FC = async () => {
return (
<I18nProvider namespaces={["home"]}>
<UserWorkspacePage />
</I18nProvider>
);
const Dashboard: React.FC = () => {
return <div>test</div>;
}; };


export default Home;
export default Dashboard;

+ 17
- 0
src/app/(main)/homeX/page.tsx 查看文件

@@ -0,0 +1,17 @@
import { Metadata } from "next";
import { I18nProvider } from "@/i18n";
import UserWorkspacePage from "@/components/UserWorkspacePage/UserWorkspacePage";

export const metadata: Metadata = {
title: "User Workspace",
};

const Home: React.FC = async () => {
return (
<I18nProvider namespaces={["home"]}>
<UserWorkspacePage />
</I18nProvider>
);
};

export default Home;

+ 2
- 2
src/app/layout.tsx 查看文件

@@ -3,8 +3,8 @@ import { detectLanguage } from "@/i18n";
import ThemeRegistry from "@/theme/ThemeRegistry"; import ThemeRegistry from "@/theme/ThemeRegistry";


export const metadata: Metadata = { export const metadata: Metadata = {
title: "TSMS",
description: "TSMS - Timesheet Management System",
title: "FPSMS",
description: "FPSMS - Timesheet Management System",
}; };


export default async function RootLayout({ export default async function RootLayout({


+ 2
- 2
src/app/manifest.ts 查看文件

@@ -2,8 +2,8 @@ import { MetadataRoute } from "next";


export default function manifest(): MetadataRoute.Manifest { export default function manifest(): MetadataRoute.Manifest {
return { return {
name: "TSMS",
short_name: "TSMS",
name: "FPSMS",
short_name: "FPSMS",
description: "Timesheet Management System", description: "Timesheet Management System",
start_url: "/", start_url: "/",
scope: "/", scope: "/",


+ 1
- 1
src/components/NavigationContent/NavigationContent.tsx 查看文件

@@ -32,7 +32,7 @@ interface NavigationItem {
} }


const navigationItems: NavigationItem[] = [ const navigationItems: NavigationItem[] = [
{ icon: <WorkHistory />, label: "User Workspace", path: "/home" },
// { icon: <WorkHistory />, label: "User Workspace", path: "/home" },
{ {
icon: <Dashboard />, icon: <Dashboard />,
label: "Dashboard", label: "Dashboard",


+ 2
- 2
src/theme/colorConst.js 查看文件

@@ -151,7 +151,7 @@ export const TAB_THEME = {
}; };


// copy from MTMS // copy from MTMS
export const TSMS_BUTTON_THEME = createTheme({
export const FPSMS_BUTTON_THEME = createTheme({
palette: { palette: {
primary: { primary: {
main: "#92C1E9", main: "#92C1E9",
@@ -342,7 +342,7 @@ export const ARS_BUTTON_THEME = createTheme({
}); });


//from ARS //from ARS
export const TSMS_LONG_BUTTON_THEME = createTheme({
export const FPSMS_LONG_BUTTON_THEME = createTheme({
palette: { palette: {
create: { create: {
main: "#57B962", main: "#57B962",


+ 2
- 2
zip_project.ps1 查看文件

@@ -1,7 +1,7 @@
$sourcePath = Get-Location $sourcePath = Get-Location
$destination = Join-Path -Path $sourcePath -ChildPath "tsms.zip"
$destination = Join-Path -Path $sourcePath -ChildPath "fpsms.zip"


$exclude = @(".git", ".next", ".vscode", "node_modules", ".gitignore", "zip_project.ps1", "tsms.zip")
$exclude = @(".git", ".next", ".vscode", "node_modules", ".gitignore", "zip_project.ps1", "fpsms.zip")


$files = Get-ChildItem -Path $sourcePath -Exclude $exclude $files = Get-ChildItem -Path $sourcePath -Exclude $exclude




Loading…
取消
儲存