Skip to content

Commit efd3335

Browse files
LittleNa1000LittleNa1000
committed
refactor: migrate enums and interafaces in /web
1 parent 8bd90a6 commit efd3335

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+114
-500
lines changed

‎apps/api/src/entities/user.entity.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { AuthRole, AuthRoleEnum } from '@repo/shared';
1+
import { type AuthRole, AuthRoleEnum } from '@repo/shared';
22
import {
33
Column,
44
CreateDateColumn,

‎apps/web/src/app/(authenticated)/new-project/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Folders } from 'lucide-react';
2+
import { projectFormAction } from '@repo/shared';
23
import Title from '@/src/components/header/title';
34
import Header from '@/src/components/header/header';
45
import ProjectForm from '@/src/components/new-project/projectForm';
5-
import { projectFormAction } from '@/src/constant/formAction';
66

77
export default function Page() {
88
return (

‎apps/web/src/app/(authenticated)/project/[projectId]/info/page.tsx‎

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
'use client';
2+
import { projectFormAction } from '@repo/shared';
3+
import { Folders } from 'lucide-react';
4+
import { useParams } from 'next/navigation';
5+
import { useEffect, useState } from 'react';
26
import Header from '@/src/components/header/header';
37
import Title from '@/src/components/header/title';
48
import ProjectForm from '@/src/components/new-project/projectForm';
59
import { toast } from '@/src/components/ui/use-toast';
6-
import { projectFormAction } from '@/src/constant/formAction';
7-
import { Project } from '@/src/interface/project';
8-
import { User } from '@/src/interface/user';
10+
import type { Project } from '@/src/interface/project';
11+
import type { User } from '@/src/interface/user';
912
import findJoinedUsersByProjectId from '@/src/service/user-proj/findJoinedUsersByProjectId';
1013
import getProjectByProjectId from '@/src/service/project/getProjectByProjectId';
11-
import { Folders } from 'lucide-react';
12-
import { useParams } from 'next/navigation';
13-
import { useEffect, useState } from 'react';
1414

1515
export default function ProjectInfoPage() {
1616
const params = useParams();
@@ -46,25 +46,23 @@ export default function ProjectInfoPage() {
4646
}, [projectId]);
4747

4848
return (
49-
<>
50-
<main className="space-y-5 py-10 px-6">
51-
<Header>
52-
<Title icon={<Folders size={40} />} href="/projects">
53-
รายละเอียดโครงการ
54-
</Title>
55-
</Header>
49+
<main className="space-y-5 py-10 px-6">
50+
<Header>
51+
<Title icon={<Folders size={40} />} href="/projects">
52+
รายละเอียดโครงการ
53+
</Title>
54+
</Header>
5655

57-
<div className="">
58-
{!loading && members.length > 0 && project && (
59-
<ProjectForm
60-
project={project}
61-
formAction={projectFormAction.INFO}
62-
joinUsers={members}
63-
isAdmin={false}
64-
/>
65-
)}
66-
</div>
67-
</main>
68-
</>
56+
<div className="">
57+
{!loading && members.length > 0 && project ? (
58+
<ProjectForm
59+
project={project}
60+
formAction={projectFormAction.INFO}
61+
joinUsers={members}
62+
isAdmin={false}
63+
/>
64+
) : null}
65+
</div>
66+
</main>
6967
);
7068
}

‎apps/web/src/app/admin/home/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import { ArrowRight, Home, FileSearch, Folders } from 'lucide-react';
33
import Link from 'next/link';
44
import { useEffect, useState } from 'react';
55
import { useRouter } from 'next/navigation';
6+
import { FilingStatus } from '@repo/shared';
67
import Header from '@/src/components/header/header';
78
import Title from '@/src/components/header/title';
89
import { StatusTable } from '@/src/components/status/statusTable';
9-
import { FilingStatus } from '@/src/constant/enum';
1010
import type { Filing } from '@/src/interface/filing';
1111
import { Button } from '@/src/components/ui/button';
1212
import type { Project, ProjectWithLastOpen } from '@/src/interface/project';

‎apps/web/src/app/admin/new-project/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Folders } from 'lucide-react';
2+
import { projectFormAction } from '@repo/shared';
23
import Title from '@/src/components/header/title';
34
import Header from '@/src/components/header/header';
45
import ProjectForm from '@/src/components/new-project/projectForm';
5-
import { projectFormAction } from '@/src/constant/formAction';
66

77
export default function Page() {
88
return (

‎apps/web/src/app/admin/project/[projectId]/info/page.tsx‎

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
'use client';
2+
import { projectFormAction } from '@repo/shared';
3+
import { Folders } from 'lucide-react';
4+
import { useParams } from 'next/navigation';
5+
import { useEffect, useState } from 'react';
26
import Header from '@/src/components/header/header';
37
import Title from '@/src/components/header/title';
48
import ProjectForm from '@/src/components/new-project/projectForm';
59
import { toast } from '@/src/components/ui/use-toast';
6-
import { projectFormAction } from '@/src/constant/formAction';
7-
import { Project } from '@/src/interface/project';
8-
import { User } from '@/src/interface/user';
10+
import type { Project } from '@/src/interface/project';
11+
import type { User } from '@/src/interface/user';
912
import findJoinedUsersByProjectId from '@/src/service/user-proj/findJoinedUsersByProjectId';
1013
import getProjectByProjectId from '@/src/service/project/getProjectByProjectId';
11-
import { Folders } from 'lucide-react';
12-
import { useParams } from 'next/navigation';
13-
import { useEffect, useState } from 'react';
1414

1515
export default function ProjectInfoPage() {
1616
const params = useParams();
@@ -46,25 +46,23 @@ export default function ProjectInfoPage() {
4646
}, [projectId]);
4747

4848
return (
49-
<>
50-
<main className="py-10 px-6 space-y-5">
51-
<Header>
52-
<Title icon={<Folders size={40} />} href="/admin/projects">
53-
รายละเอียดโครงการ
54-
</Title>
55-
</Header>
49+
<main className="py-10 px-6 space-y-5">
50+
<Header>
51+
<Title icon={<Folders size={40} />} href="/admin/projects">
52+
รายละเอียดโครงการ
53+
</Title>
54+
</Header>
5655

57-
<div className="">
58-
{!loading && members.length > 0 && project && (
59-
<ProjectForm
60-
project={project}
61-
formAction={projectFormAction.INFO}
62-
joinUsers={members}
63-
isAdmin
64-
/>
65-
)}
66-
</div>
67-
</main>
68-
</>
56+
<div className="">
57+
{!loading && members.length > 0 && project ? (
58+
<ProjectForm
59+
project={project}
60+
formAction={projectFormAction.INFO}
61+
joinUsers={members}
62+
isAdmin
63+
/>
64+
) : null}
65+
</div>
66+
</main>
6967
);
7068
}

‎apps/web/src/components/admin-status/reply/filing-reply-after-submit-editing.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import { DocumentStatus } from '@repo/shared';
12
import type { Document } from '@/src/interface/document';
2-
import { DocumentStatus } from '@/src/constant/enum';
33
import FileDisplay from '../../filling-detail/display/fileDisplay';
44
import TextareaForDisplay from '../../filling-detail/display/textareaForDisplay';
55
import StatusButton from '../../filling-detail/display/statusButton';

‎apps/web/src/components/admin-status/reply/filing-reply-after-submit.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import { DocumentStatus } from '@repo/shared';
12
import type { Document } from '@/src/interface/document';
2-
import { DocumentStatus } from '@/src/constant/enum';
33
import FileDisplay from '../../filling-detail/display/fileDisplay';
44
import TextareaForDisplay from '../../filling-detail/display/textareaForDisplay';
55
import StatusButton from '../../filling-detail/display/statusButton';

‎apps/web/src/components/admin-status/reply/filing-reply-area.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
'use client';
22
import { FaFolderOpen } from 'react-icons/fa6';
33
import { useEffect, useState } from 'react';
4+
import { FilingStatus } from '@repo/shared';
45
import type { User } from '@/src/interface/user';
56
import { findUserByUserId } from '@/src/service/user/findUserByUserId';
6-
import { FilingStatus } from '@/src/constant/enum';
77
import type { FilingWithDocument } from '@/src/types/filing';
88
import { toast } from '../../ui/use-toast';
99
import FilingReplyComment from './filing-reply-comment';

‎apps/web/src/components/admin-status/reply/filing-reply-comment.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use client';
22
import { IoReturnUpBack } from 'react-icons/io5';
33
import { useEffect, useState } from 'react';
4-
import { FilingStatus, DocumentStatus } from '@/src/constant/enum';
4+
import { FilingStatus, DocumentStatus } from '@repo/shared';
55
import findLatestReplyDocumentByFilingId from '@/src/service/document/findLatestReplyDocumentByFilingId';
66
import type { Document } from '@/src/interface/document';
77
import { getUserId } from '@/src/service/auth';

0 commit comments

Comments
 (0)