From 151bdc378fa227bede6fb18b0a8985a643573173 Mon Sep 17 00:00:00 2001 From: LittleNa1000 Date: Fri, 22 Nov 2024 20:01:55 +0700 Subject: [PATCH] refactor: change PascalCase file name to camelCase --- .../web/src/app/(authenticated)/home/page.tsx | 2 +- .../project/[projectId]/[filingId]/page.tsx | 2 +- .../src/app/(authenticated)/status/page.tsx | 2 +- apps/web/src/app/admin/home/page.tsx | 2 +- .../project/[projectId]/[filingId]/page.tsx | 2 +- apps/web/src/app/page.tsx | 2 +- apps/web/src/app/pdpa/page.tsx | 45 +++++++----- apps/web/src/app/welcome/page.tsx | 13 ++-- .../{AcceptPDPA.tsx => acceptPDPA.tsx} | 0 .../create-edit/activityPanel.tsx | 2 +- .../{DocumentCard.tsx => documentCard.tsx} | 0 .../filling-detail/filingTimeline.tsx | 2 +- ...ageHeader.tsx => onboardingPageHeader.tsx} | 0 .../components/new-project/projectForm.tsx | 2 +- .../components/project/allProjectPanel.tsx | 2 +- .../components/project/popoverAddFiling.tsx | 2 +- ...mnHeader.tsx => dataTableColumnHeader.tsx} | 0 .../status/{StatusPage.tsx => statusPage.tsx} | 4 +- .../{StatusStepper.tsx => statusStepper.tsx} | 71 +++++++++++-------- .../status/{StatusSvg.tsx => statusSvg.tsx} | 0 .../{StatusTable.tsx => statusTable.tsx} | 4 +- ...ableColumns.tsx => statusTableColumns.tsx} | 2 +- ...ilter.tsx => statusTableFacetedFilter.tsx} | 0 ...ableToolBar.tsx => statusTableToolBar.tsx} | 2 +- apps/web/src/constant/filterProject.ts | 2 +- apps/web/src/constant/{Map.ts => map.ts} | 0 apps/web/src/constant/schema.ts | 2 +- 27 files changed, 93 insertions(+), 74 deletions(-) rename apps/web/src/components/{AcceptPDPA.tsx => acceptPDPA.tsx} (100%) rename apps/web/src/components/filling-detail/{DocumentCard.tsx => documentCard.tsx} (100%) rename apps/web/src/components/header/{OnboardingPageHeader.tsx => onboardingPageHeader.tsx} (100%) rename apps/web/src/components/status/{DataTableColumnHeader.tsx => dataTableColumnHeader.tsx} (100%) rename apps/web/src/components/status/{StatusPage.tsx => statusPage.tsx} (91%) rename apps/web/src/components/status/{StatusStepper.tsx => statusStepper.tsx} (57%) rename apps/web/src/components/status/{StatusSvg.tsx => statusSvg.tsx} (100%) rename apps/web/src/components/status/{StatusTable.tsx => statusTable.tsx} (97%) rename apps/web/src/components/status/{StatusTableColumns.tsx => statusTableColumns.tsx} (97%) rename apps/web/src/components/status/{StatusTableFacetedFilter.tsx => statusTableFacetedFilter.tsx} (100%) rename apps/web/src/components/status/{StatusTableToolBar.tsx => statusTableToolBar.tsx} (97%) rename apps/web/src/constant/{Map.ts => map.ts} (100%) diff --git a/apps/web/src/app/(authenticated)/home/page.tsx b/apps/web/src/app/(authenticated)/home/page.tsx index 41956935..c9c6cb75 100644 --- a/apps/web/src/app/(authenticated)/home/page.tsx +++ b/apps/web/src/app/(authenticated)/home/page.tsx @@ -3,7 +3,7 @@ import { ArrowRight, Folders, Home, Radio } from 'lucide-react'; import Header from '../../../components/header/header'; import Title from '@/src/components/header/title'; import MyProjectData from '@/src/components/project/myProjectData'; -import { StatusTable } from '@/src/components/status/StatusTable'; +import { StatusTable } from '@/src/components/status/statusTable'; import { FilingType } from '@/src/interface/filing'; import Link from 'next/link'; import { Button } from '@/src/components/ui/button'; diff --git a/apps/web/src/app/(authenticated)/project/[projectId]/[filingId]/page.tsx b/apps/web/src/app/(authenticated)/project/[projectId]/[filingId]/page.tsx index 696c6ae0..0ffc05fc 100644 --- a/apps/web/src/app/(authenticated)/project/[projectId]/[filingId]/page.tsx +++ b/apps/web/src/app/(authenticated)/project/[projectId]/[filingId]/page.tsx @@ -1,7 +1,7 @@ 'use client'; import Header from '@/src/components/header/header'; -import DocumentStatusStepper from '@/src/components/status/StatusStepper'; +import DocumentStatusStepper from '@/src/components/status/statusStepper'; import { FilingStatus } from '@/src/constant/enum'; import { FilingType } from '@/src/interface/filing'; import FilingTimeline from '@/src/components/filling-detail/filingTimeline'; diff --git a/apps/web/src/app/(authenticated)/status/page.tsx b/apps/web/src/app/(authenticated)/status/page.tsx index 1395cad3..4972de06 100644 --- a/apps/web/src/app/(authenticated)/status/page.tsx +++ b/apps/web/src/app/(authenticated)/status/page.tsx @@ -2,7 +2,7 @@ import { Radio } from 'lucide-react'; import Header from '@/src/components/header/header'; import Title from '@/src/components/header/title'; import { getUserId } from '@/src/service/auth'; -import StatusPage from '@/src/components/status/StatusPage'; +import StatusPage from '@/src/components/status/statusPage'; export default async function Page() { const userId = await getUserId(); diff --git a/apps/web/src/app/admin/home/page.tsx b/apps/web/src/app/admin/home/page.tsx index c9fb91d8..6965fffd 100644 --- a/apps/web/src/app/admin/home/page.tsx +++ b/apps/web/src/app/admin/home/page.tsx @@ -4,7 +4,7 @@ import Link from 'next/link'; import { useEffect, useState } from 'react'; import Header from '@/src/components/header/header'; import Title from '@/src/components/header/title'; -import { StatusTable } from '@/src/components/status/StatusTable'; +import { StatusTable } from '@/src/components/status/statusTable'; import { FilingStatus } from '@/src/constant/enum'; import type { FilingType } from '@/src/interface/filing'; import { Button } from '@/src/components/ui/button'; diff --git a/apps/web/src/app/admin/project/[projectId]/[filingId]/page.tsx b/apps/web/src/app/admin/project/[projectId]/[filingId]/page.tsx index 44a6e735..da7171fa 100644 --- a/apps/web/src/app/admin/project/[projectId]/[filingId]/page.tsx +++ b/apps/web/src/app/admin/project/[projectId]/[filingId]/page.tsx @@ -1,7 +1,7 @@ 'use client'; import Header from '@/src/components/header/header'; -import DocumentStatusStepper from '@/src/components/status/StatusStepper'; +import DocumentStatusStepper from '@/src/components/status/statusStepper'; import { FilingStatus } from '@/src/constant/enum'; import { FilingType } from '@/src/interface/filing'; import FilingTimeline from '@/src/components/filling-detail/filingTimeline'; diff --git a/apps/web/src/app/page.tsx b/apps/web/src/app/page.tsx index 00b3568a..e61aaf52 100644 --- a/apps/web/src/app/page.tsx +++ b/apps/web/src/app/page.tsx @@ -1,4 +1,4 @@ -import OnboardingPageHeader from '@/src/components/header/OnboardingPageHeader'; +import OnboardingPageHeader from '@/src/components/header/onboardingPageHeader'; import { Button } from '@/src/components/ui/button'; import Image from 'next/image'; import Link from 'next/link'; diff --git a/apps/web/src/app/pdpa/page.tsx b/apps/web/src/app/pdpa/page.tsx index 30ff6776..9496d4ad 100644 --- a/apps/web/src/app/pdpa/page.tsx +++ b/apps/web/src/app/pdpa/page.tsx @@ -1,31 +1,38 @@ -import AcceptPDPA from "@/src/components/AcceptPDPA" -import OnboardingPageHeader from "@/src/components/header/OnboardingPageHeader" +import AcceptPDPA from '@/src/components/acceptPDPA'; +import OnboardingPageHeader from '@/src/components/header/onboardingPageHeader'; export default function Page() { return ( <>
-

นโยบายการจัดเก็บข้อมูลส่วนบุคคล

+

+ นโยบายการจัดเก็บข้อมูลส่วนบุคคล +

- Lorem ipsum dolor sit amet consectetur adipisicing elit. Eum error eligendi amet fuga - blanditiis sunt soluta ab id. Quod nisi similique omnis molestias excepturi, nesciunt unde - sequi natus dolorem inventore! Lorem ipsum dolor sit, amet consectetur adipisicing elit. - Voluptas, sapiente? Tenetur asperiores velit quae fugit iste, veritatis aperiam ullam nisi - voluptatum natus excepturi ea non illo ratione cupiditate, assumenda adipisci.Lorem ipsum - dolor sit amet consectetur adipisicing elit. Eum error eligendi amet fuga blanditiis sunt - soluta ab id. Quod nisi similique omnis molestias excepturi, nesciunt unde sequi natus - dolorem inventore! Lorem ipsum dolor sit, amet consectetur adipisicing elit. Voluptas, - sapiente? Tenetur asperiores velit quae fugit iste, veritatis aperiam ullam nisi - voluptatum natus excepturi ea non illo ratione cupiditate, assumenda adipisci.Lorem ipsum - dolor sit amet consectetur adipisicing elit. Eum error eligendi amet fuga blanditiis sunt - soluta ab id. Quod nisi similique omnis molestias excepturi, nesciunt unde sequi natus - dolorem inventore! Lorem ipsum dolor sit, amet consectetur adipisicing elit. Voluptas, - sapiente? Tenetur asperiores velit quae fugit iste, veritatis aperiam ullam nisi - voluptatum natus excepturi ea non illo ratione cupiditate, assumenda adipisci. + Lorem ipsum dolor sit amet consectetur adipisicing elit. Eum error + eligendi amet fuga blanditiis sunt soluta ab id. Quod nisi similique + omnis molestias excepturi, nesciunt unde sequi natus dolorem + inventore! Lorem ipsum dolor sit, amet consectetur adipisicing elit. + Voluptas, sapiente? Tenetur asperiores velit quae fugit iste, + veritatis aperiam ullam nisi voluptatum natus excepturi ea non illo + ratione cupiditate, assumenda adipisci.Lorem ipsum dolor sit amet + consectetur adipisicing elit. Eum error eligendi amet fuga blanditiis + sunt soluta ab id. Quod nisi similique omnis molestias excepturi, + nesciunt unde sequi natus dolorem inventore! Lorem ipsum dolor sit, + amet consectetur adipisicing elit. Voluptas, sapiente? Tenetur + asperiores velit quae fugit iste, veritatis aperiam ullam nisi + voluptatum natus excepturi ea non illo ratione cupiditate, assumenda + adipisci.Lorem ipsum dolor sit amet consectetur adipisicing elit. Eum + error eligendi amet fuga blanditiis sunt soluta ab id. Quod nisi + similique omnis molestias excepturi, nesciunt unde sequi natus dolorem + inventore! Lorem ipsum dolor sit, amet consectetur adipisicing elit. + Voluptas, sapiente? Tenetur asperiores velit quae fugit iste, + veritatis aperiam ullam nisi voluptatum natus excepturi ea non illo + ratione cupiditate, assumenda adipisci.
- ) + ); } diff --git a/apps/web/src/app/welcome/page.tsx b/apps/web/src/app/welcome/page.tsx index 531c9b49..001e4162 100644 --- a/apps/web/src/app/welcome/page.tsx +++ b/apps/web/src/app/welcome/page.tsx @@ -1,7 +1,7 @@ -import OnboardingPageHeader from "@/src/components/header/OnboardingPageHeader" -import { Button } from "@/src/components/ui/button" -import Image from "next/image" -import Link from "next/link" +import OnboardingPageHeader from '@/src/components/header/onboardingPageHeader'; +import { Button } from '@/src/components/ui/button'; +import Image from 'next/image'; +import Link from 'next/link'; export default function Page() { return ( @@ -19,10 +19,11 @@ export default function Page() {

เริ่มต้นใช้งานระบบเอกสารกันเลย!

- ) + ); } diff --git a/apps/web/src/components/AcceptPDPA.tsx b/apps/web/src/components/acceptPDPA.tsx similarity index 100% rename from apps/web/src/components/AcceptPDPA.tsx rename to apps/web/src/components/acceptPDPA.tsx diff --git a/apps/web/src/components/filling-detail/create-edit/activityPanel.tsx b/apps/web/src/components/filling-detail/create-edit/activityPanel.tsx index 0a4bcc60..0036eb73 100644 --- a/apps/web/src/components/filling-detail/create-edit/activityPanel.tsx +++ b/apps/web/src/components/filling-detail/create-edit/activityPanel.tsx @@ -1,7 +1,7 @@ import { DocumentActivityMapForAdmin, DocumentActivityMapForUser, -} from '@/src/constant/Map'; +} from '@/src/constant/map'; import { FormControl } from '../../ui/form'; import { SelectContent, diff --git a/apps/web/src/components/filling-detail/DocumentCard.tsx b/apps/web/src/components/filling-detail/documentCard.tsx similarity index 100% rename from apps/web/src/components/filling-detail/DocumentCard.tsx rename to apps/web/src/components/filling-detail/documentCard.tsx diff --git a/apps/web/src/components/filling-detail/filingTimeline.tsx b/apps/web/src/components/filling-detail/filingTimeline.tsx index 1704666a..6a76d6a2 100644 --- a/apps/web/src/components/filling-detail/filingTimeline.tsx +++ b/apps/web/src/components/filling-detail/filingTimeline.tsx @@ -2,7 +2,7 @@ import { Clock } from 'lucide-react'; import type { DocumentType } from '@/src/interface/document'; import type { FilingStatus } from '@/src/constant/enum'; import type { User } from '@/src/interface/user'; -import DocumentCard from './DocumentCard'; +import DocumentCard from './documentCard'; export default function FilingTimeline({ documents, diff --git a/apps/web/src/components/header/OnboardingPageHeader.tsx b/apps/web/src/components/header/onboardingPageHeader.tsx similarity index 100% rename from apps/web/src/components/header/OnboardingPageHeader.tsx rename to apps/web/src/components/header/onboardingPageHeader.tsx diff --git a/apps/web/src/components/new-project/projectForm.tsx b/apps/web/src/components/new-project/projectForm.tsx index dbfefa95..fccf71d5 100644 --- a/apps/web/src/components/new-project/projectForm.tsx +++ b/apps/web/src/components/new-project/projectForm.tsx @@ -23,7 +23,7 @@ import { SelectTrigger, SelectValue, } from '@/src/components/ui/select'; -import { projectTypeMap } from '@/src/constant/Map'; +import { projectTypeMap } from '@/src/constant/map'; import createProject from '@/src/service/project/createProject'; import { getUserId } from '@/src/service/auth'; import { findUserByUserId } from '@/src/service/user/findUserByUserId'; diff --git a/apps/web/src/components/project/allProjectPanel.tsx b/apps/web/src/components/project/allProjectPanel.tsx index 3589f5e9..99c75562 100644 --- a/apps/web/src/components/project/allProjectPanel.tsx +++ b/apps/web/src/components/project/allProjectPanel.tsx @@ -3,7 +3,7 @@ import AllProjectCard from './allProjectCard'; import { Project } from '@/src/interface/project'; import { filterProjectStatus } from '@/src/styles/enumMap'; import { useState, useEffect, Dispatch, SetStateAction } from 'react'; -import { projectTypeMap } from '@/src/constant/Map'; +import { projectTypeMap } from '@/src/constant/map'; import SelectType from '../filter/selectType'; export default function AllProjectPanel({ diff --git a/apps/web/src/components/project/popoverAddFiling.tsx b/apps/web/src/components/project/popoverAddFiling.tsx index 7b6dd7df..343051da 100644 --- a/apps/web/src/components/project/popoverAddFiling.tsx +++ b/apps/web/src/components/project/popoverAddFiling.tsx @@ -7,7 +7,7 @@ import { DialogTrigger, } from '../ui/dialog'; import { HiDocumentAdd } from 'react-icons/hi'; -import { filingTypeMap } from '@/src/constant/Map'; +import { filingTypeMap } from '@/src/constant/map'; import { useEffect, useState } from 'react'; import createFiling from '@/src/service/filing/createFiling'; import { FilingType } from '@/src/interface/filing'; diff --git a/apps/web/src/components/status/DataTableColumnHeader.tsx b/apps/web/src/components/status/dataTableColumnHeader.tsx similarity index 100% rename from apps/web/src/components/status/DataTableColumnHeader.tsx rename to apps/web/src/components/status/dataTableColumnHeader.tsx diff --git a/apps/web/src/components/status/StatusPage.tsx b/apps/web/src/components/status/statusPage.tsx similarity index 91% rename from apps/web/src/components/status/StatusPage.tsx rename to apps/web/src/components/status/statusPage.tsx index 5ce46459..cbcb6bba 100644 --- a/apps/web/src/components/status/StatusPage.tsx +++ b/apps/web/src/components/status/statusPage.tsx @@ -2,8 +2,8 @@ import { useEffect, useState } from 'react'; import type { FilingType } from '@/src/interface/filing'; import getFilingsByUserId from '@/src/service/filing/getFilingsByUserId'; -import DocumentStatusStepper from './StatusStepper'; -import { StatusTable } from './StatusTable'; +import DocumentStatusStepper from './statusStepper'; +import { StatusTable } from './statusTable'; export default function StatusPage({ userId }: { userId: string }) { const [statuses, setStatuses] = useState([]); diff --git a/apps/web/src/components/status/StatusStepper.tsx b/apps/web/src/components/status/statusStepper.tsx similarity index 57% rename from apps/web/src/components/status/StatusStepper.tsx rename to apps/web/src/components/status/statusStepper.tsx index 64c92dbf..bf2785f0 100644 --- a/apps/web/src/components/status/StatusStepper.tsx +++ b/apps/web/src/components/status/statusStepper.tsx @@ -1,17 +1,23 @@ -"use client" +'use client'; -import { Step1, Step2, Step3, Step4, Step5 } from "@/src/components/status/StatusSvg" -import Stepper from "@mui/joy/Stepper" -import Step, { stepClasses } from "@mui/joy/Step" -import StepIndicator from "@mui/joy/StepIndicator" -import { FilingStatus } from "../../constant/enum" -import { FilingStatusToStepper } from "@/src/styles/enumMap" +import { + Step1, + Step2, + Step3, + Step4, + Step5, +} from '@/src/components/status/statusSvg'; +import Stepper from '@mui/joy/Stepper'; +import Step, { stepClasses } from '@mui/joy/Step'; +import StepIndicator from '@mui/joy/StepIndicator'; +import { FilingStatus } from '../../constant/enum'; +import { FilingStatusToStepper } from '@/src/styles/enumMap'; const steps = [ - { no: "1", children: <>ขอเลขรัน }, - { no: "2", children: <>ทำเอกสาร }, + { no: '1', children: <>ขอเลขรัน }, + { no: '2', children: <>ทำเอกสาร }, { - no: "3", + no: '3', children: ( <> ส่งให้ฝ่ายเลขานุการ @@ -21,7 +27,7 @@ const steps = [ ), }, { - no: "4", + no: '4', children: ( <> หัวหน้านิสิต & @@ -33,7 +39,7 @@ const steps = [ ), }, { - no: "5", + no: '5', children: ( <> ส่งเอกสาร @@ -42,14 +48,14 @@ const steps = [ ), }, -] +]; export default function DocumentStatusStepper({ status, }: { - status: FilingStatus | "DEFAULT" | "LOADING" + status: FilingStatus | 'DEFAULT' | 'LOADING'; }) { - const stepStatuses = FilingStatusToStepper[status] + const stepStatuses = FilingStatusToStepper[status]; return ( <> @@ -63,38 +69,43 @@ export default function DocumentStatusStepper({ + }} + > {stepStatuses.map((stepStatus, index) => { return ( + {steps[index].no} - }> + } + >
{steps[index].children}
 - ) + ); })} - ) + ); } diff --git a/apps/web/src/components/status/StatusSvg.tsx b/apps/web/src/components/status/statusSvg.tsx similarity index 100% rename from apps/web/src/components/status/StatusSvg.tsx rename to apps/web/src/components/status/statusSvg.tsx diff --git a/apps/web/src/components/status/StatusTable.tsx b/apps/web/src/components/status/statusTable.tsx similarity index 97% rename from apps/web/src/components/status/StatusTable.tsx rename to apps/web/src/components/status/statusTable.tsx index a586b601..2e3abe99 100644 --- a/apps/web/src/components/status/StatusTable.tsx +++ b/apps/web/src/components/status/statusTable.tsx @@ -21,8 +21,8 @@ import { TableHeader, TableRow, } from '@/src/components/ui/table'; -import { columns } from './StatusTableColumns'; -import StatusTableToolBar from './StatusTableToolBar'; +import { columns } from './statusTableColumns'; +import StatusTableToolBar from './statusTableToolBar'; import { FilingType } from '@/src/interface/filing'; export function StatusTable({ diff --git a/apps/web/src/components/status/StatusTableColumns.tsx b/apps/web/src/components/status/statusTableColumns.tsx similarity index 97% rename from apps/web/src/components/status/StatusTableColumns.tsx rename to apps/web/src/components/status/statusTableColumns.tsx index 7df16e7c..217941d1 100644 --- a/apps/web/src/components/status/StatusTableColumns.tsx +++ b/apps/web/src/components/status/statusTableColumns.tsx @@ -1,5 +1,5 @@ import { ColumnDef } from '@tanstack/react-table'; -import { DataTableColumnHeader } from './DataTableColumnHeader'; +import { DataTableColumnHeader } from './dataTableColumnHeader'; import { TextMyProject, buttonColors } from '@/src/styles/enumMap'; import Link from 'next/link'; import { Button } from '../ui/button'; diff --git a/apps/web/src/components/status/StatusTableFacetedFilter.tsx b/apps/web/src/components/status/statusTableFacetedFilter.tsx similarity index 100% rename from apps/web/src/components/status/StatusTableFacetedFilter.tsx rename to apps/web/src/components/status/statusTableFacetedFilter.tsx diff --git a/apps/web/src/components/status/StatusTableToolBar.tsx b/apps/web/src/components/status/statusTableToolBar.tsx similarity index 97% rename from apps/web/src/components/status/StatusTableToolBar.tsx rename to apps/web/src/components/status/statusTableToolBar.tsx index 4f38a2a7..7e542b10 100644 --- a/apps/web/src/components/status/StatusTableToolBar.tsx +++ b/apps/web/src/components/status/statusTableToolBar.tsx @@ -3,7 +3,7 @@ import { Search } from 'lucide-react'; import { Table } from '@tanstack/react-table'; import { FilingType } from '@/src/interface/filing'; import { filterStatus } from '@/src/styles/enumMap'; -import { DataTableFacetedFilter } from './StatusTableFacetedFilter'; +import { DataTableFacetedFilter } from './statusTableFacetedFilter'; export default function StatusTableToolBar({ table, diff --git a/apps/web/src/constant/filterProject.ts b/apps/web/src/constant/filterProject.ts index f9eca7cd..f8f0377e 100644 --- a/apps/web/src/constant/filterProject.ts +++ b/apps/web/src/constant/filterProject.ts @@ -1,5 +1,5 @@ import { ProjectStatus } from './enum'; -import { projectTypeMap } from './Map'; +import { projectTypeMap } from './map'; export const statusProjectItems = [ { diff --git a/apps/web/src/constant/Map.ts b/apps/web/src/constant/map.ts similarity index 100% rename from apps/web/src/constant/Map.ts rename to apps/web/src/constant/map.ts diff --git a/apps/web/src/constant/schema.ts b/apps/web/src/constant/schema.ts index e942bfed..beacc2f2 100644 --- a/apps/web/src/constant/schema.ts +++ b/apps/web/src/constant/schema.ts @@ -1,6 +1,6 @@ import { z } from 'zod'; import { getFileType } from '../lib/utils'; -import { projectTypeMap } from './Map'; +import { projectTypeMap } from './map'; import { DocumentActivity } from './enum'; const projectTypes = projectTypeMap.map((item) => item.value.toString());