From 59a64ad8b5c29b09b3e61a942c76b79a7b1c64a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=AA=85=EC=9E=AC?= Date: Thu, 14 Sep 2023 00:50:15 +0900 Subject: [PATCH 01/10] =?UTF-8?q?ADD=20::=20SearchInput=20=EB=94=94?= =?UTF-8?q?=EC=9E=90=EC=9D=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/maru-ui/src/Input/SearchInput.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/maru-ui/src/Input/SearchInput.tsx b/packages/maru-ui/src/Input/SearchInput.tsx index 71c88a683..aeffd7f43 100644 --- a/packages/maru-ui/src/Input/SearchInput.tsx +++ b/packages/maru-ui/src/Input/SearchInput.tsx @@ -14,7 +14,6 @@ const SearchInput = ({ }: InputProps) => { return ( - + ); }; @@ -31,9 +31,8 @@ export default SearchInput; const StyledSearchInput = styled.div` ${flex({ alignItems: 'center' })} - gap: 4px; height: 40px; - padding: 10px 8px; + padding: 0 12px 0 16px; background-color: ${color.white}; border: 1px solid ${color.gray400}; border-radius: 6px; From 84db157cdd20381042ea6bb4d160569be9f381b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=AA=85=EC=9E=AC?= Date: Thu, 14 Sep 2023 00:51:03 +0900 Subject: [PATCH 02/10] =?UTF-8?q?ADD=20::=20SideBar=20/review=20=EB=A7=81?= =?UTF-8?q?=ED=81=AC=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/admin/src/components/common/SideBar/SideBar.tsx | 6 +----- apps/admin/src/constants/common/constants.ts | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/apps/admin/src/components/common/SideBar/SideBar.tsx b/apps/admin/src/components/common/SideBar/SideBar.tsx index 9e1fd78f0..8d7aa4189 100644 --- a/apps/admin/src/components/common/SideBar/SideBar.tsx +++ b/apps/admin/src/components/common/SideBar/SideBar.tsx @@ -8,13 +8,9 @@ import { color, font } from '../../../../../../packages/maru-theme'; const NAVIGATION_DATA = [ { - name: '원서조회', + name: '원서 조회', route: ROUTES.MAIN, }, - { - name: '원서검토', - route: ROUTES.REVIEW, - }, { name: '공지사항', route: ROUTES.NOTICE, diff --git a/apps/admin/src/constants/common/constants.ts b/apps/admin/src/constants/common/constants.ts index d19b45f44..fb8995ec3 100644 --- a/apps/admin/src/constants/common/constants.ts +++ b/apps/admin/src/constants/common/constants.ts @@ -5,7 +5,6 @@ export const KEY = { export const ROUTES = { MAIN: '/', - REVIEW: '/review', NOTICE: '/notice', FAQ: '/faq', ANALYSIS: '/analysis', From 6e018fc4693f7d7722982cdf5defc2fc6c371e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=AA=85=EC=9E=AC?= Date: Thu, 14 Sep 2023 01:16:34 +0900 Subject: [PATCH 03/10] =?UTF-8?q?FIX=20::=20Text=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EB=84=8C=ED=8A=B8=20=EC=A4=84=EB=B0=94=EA=BF=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/maru-ui/src/Text/Text.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/maru-ui/src/Text/Text.tsx b/packages/maru-ui/src/Text/Text.tsx index da19b07b5..5c696ed23 100644 --- a/packages/maru-ui/src/Text/Text.tsx +++ b/packages/maru-ui/src/Text/Text.tsx @@ -25,6 +25,7 @@ export default Text; const StyledText = styled.p<{ fontType: Font; ellipsis: boolean }>` ${({ fontType }) => font[fontType]} + white-space: nowrap; ${(props) => props.ellipsis && css` From fd940b39a6828ecece577dece667e7b7875d9cf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=AA=85=EC=9E=AC?= Date: Thu, 14 Sep 2023 01:17:17 +0900 Subject: [PATCH 04/10] =?UTF-8?q?ADD=20::=20ButtonMenuItem=20=EC=A0=9C?= =?UTF-8?q?=EC=9E=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ButtonMenuItem/ButtonMenuItem.stories.tsx | 14 ++++++++++ .../ButtonMenuItem/ButtonMenuItem.tsx | 26 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 apps/admin/src/components/common/ButtonMenu/ButtonMenuItem/ButtonMenuItem.stories.tsx create mode 100644 apps/admin/src/components/common/ButtonMenu/ButtonMenuItem/ButtonMenuItem.tsx diff --git a/apps/admin/src/components/common/ButtonMenu/ButtonMenuItem/ButtonMenuItem.stories.tsx b/apps/admin/src/components/common/ButtonMenu/ButtonMenuItem/ButtonMenuItem.stories.tsx new file mode 100644 index 000000000..82ae6a017 --- /dev/null +++ b/apps/admin/src/components/common/ButtonMenu/ButtonMenuItem/ButtonMenuItem.stories.tsx @@ -0,0 +1,14 @@ +import type { Meta, StoryObj } from "@storybook/react"; +import ButtonMenuItem from "./ButtonMenuItem"; + +export default { + component: ButtonMenuItem, + title: "ButtonMenuItem", + tags: ["autodocs"], +} satisfies Meta; + +export const Default: StoryObj = { + args: { + children: '이것은 버튼 메뉴 아이템입니다~~' + }, +}; \ No newline at end of file diff --git a/apps/admin/src/components/common/ButtonMenu/ButtonMenuItem/ButtonMenuItem.tsx b/apps/admin/src/components/common/ButtonMenu/ButtonMenuItem/ButtonMenuItem.tsx new file mode 100644 index 000000000..3f64865a9 --- /dev/null +++ b/apps/admin/src/components/common/ButtonMenu/ButtonMenuItem/ButtonMenuItem.tsx @@ -0,0 +1,26 @@ +import { color } from '@maru/theme'; +import { flex } from '@maru/utils'; +import { ReactNode } from 'react'; +import styled from 'styled-components'; + +interface Props { + children: ReactNode; +} + +const ButtonMenuItem = ({ children }: Props) => { + return {children}; +}; + +export default ButtonMenuItem; + +const StyledButtonMenuItem = styled.div` + ${flex({ alignItems: 'center' })} + gap: 12px; + width: 100%; + height: 44px; + padding: 0 8px; + + &:hover { + background-color: ${color.gray100}; + } +`; From 08dc87983a4ec9cba7b2b554e8a1c78eed1b580a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=AA=85=EC=9E=AC?= Date: Thu, 14 Sep 2023 01:23:02 +0900 Subject: [PATCH 05/10] =?UTF-8?q?ADD=20::=20=EC=9B=90=EC=84=9C=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=EC=95=84=EC=9D=B4=EC=BD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/maru-icon/index.ts | 4 +++ packages/maru-icon/src/IconCheckDocument.tsx | 25 +++++++++++++++++++ packages/maru-icon/src/IconEditDocument.tsx | 26 ++++++++++++++++++++ packages/maru-icon/src/IconPrint.tsx | 25 +++++++++++++++++++ packages/maru-icon/src/IconUpload.tsx | 26 ++++++++++++++++++++ 5 files changed, 106 insertions(+) create mode 100644 packages/maru-icon/src/IconCheckDocument.tsx create mode 100644 packages/maru-icon/src/IconEditDocument.tsx create mode 100644 packages/maru-icon/src/IconPrint.tsx create mode 100644 packages/maru-icon/src/IconUpload.tsx diff --git a/packages/maru-icon/index.ts b/packages/maru-icon/index.ts index b7611368b..38c15da91 100644 --- a/packages/maru-icon/index.ts +++ b/packages/maru-icon/index.ts @@ -9,11 +9,15 @@ export { default as IconArrowTop } from './src/IconArrowTop'; export { default as IconCancelCircle } from './src/IconCancelCircle'; export { default as IconCheck } from './src/IconCheck'; export { default as IconCheckCircle } from './src/IconCheckCircle'; +export { default as IconCheckDocument } from './src/IconCheckDocument'; export { default as IconClose } from './src/IconClose'; +export { default as IconEditDocument } from './src/IconEditDocument'; export { default as IconError } from './src/IconError'; export { default as IconFaq } from './src/IconFaq'; export { default as IconFunction } from './src/IconFunction'; export { default as IconInvisibleEye } from './src/IconInvisibleEye'; +export { default as IconPrint } from './src/IconPrint'; export { default as IconSearch } from './src/IconSearch'; export { default as IconShortcuts } from './src/IconShortcuts'; +export { default as IconUpload } from './src/IconUpload'; export { default as IconVisibleEye } from './src/IconVisibleEye'; diff --git a/packages/maru-icon/src/IconCheckDocument.tsx b/packages/maru-icon/src/IconCheckDocument.tsx new file mode 100644 index 000000000..a4821a042 --- /dev/null +++ b/packages/maru-icon/src/IconCheckDocument.tsx @@ -0,0 +1,25 @@ +import type { SVGProps } from 'react'; + +const IconCheckDocument = (props: SVGProps) => { + return ( + + + + + + + + + ); +}; + +export default IconCheckDocument; diff --git a/packages/maru-icon/src/IconEditDocument.tsx b/packages/maru-icon/src/IconEditDocument.tsx new file mode 100644 index 000000000..d6b6a4995 --- /dev/null +++ b/packages/maru-icon/src/IconEditDocument.tsx @@ -0,0 +1,26 @@ +import type { SVGProps } from 'react'; +import React from 'react'; + +const IconEditDocument = (props: SVGProps) => { + return ( + + + + + + + + + ); +}; + +export default IconEditDocument; diff --git a/packages/maru-icon/src/IconPrint.tsx b/packages/maru-icon/src/IconPrint.tsx new file mode 100644 index 000000000..5df20cb1d --- /dev/null +++ b/packages/maru-icon/src/IconPrint.tsx @@ -0,0 +1,25 @@ +import type { SVGProps } from 'react'; + +const IconPrint = (props: SVGProps) => { + return ( + + + + + + + + + ); +}; + +export default IconPrint; diff --git a/packages/maru-icon/src/IconUpload.tsx b/packages/maru-icon/src/IconUpload.tsx new file mode 100644 index 000000000..71fc09fde --- /dev/null +++ b/packages/maru-icon/src/IconUpload.tsx @@ -0,0 +1,26 @@ +import type { SVGProps } from 'react'; +import React from 'react'; + +const IconUpload = (props: SVGProps) => { + return ( + + + + + + + + + ); +}; + +export default IconUpload; From 77b066cfbe0bb333ac3c9a03429d326ca40f3b64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=AA=85=EC=9E=AC?= Date: Thu, 14 Sep 2023 01:24:44 +0900 Subject: [PATCH 06/10] =?UTF-8?q?ADD=20::=20ButtonMenu=20=EC=A0=9C?= =?UTF-8?q?=EC=9E=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/ButtonMenu/ButtonMenu.stories.tsx | 59 ++++++++++++ .../common/ButtonMenu/ButtonMenu.tsx | 90 +++++++++++++++++++ 2 files changed, 149 insertions(+) create mode 100644 apps/admin/src/components/common/ButtonMenu/ButtonMenu.stories.tsx create mode 100644 apps/admin/src/components/common/ButtonMenu/ButtonMenu.tsx diff --git a/apps/admin/src/components/common/ButtonMenu/ButtonMenu.stories.tsx b/apps/admin/src/components/common/ButtonMenu/ButtonMenu.stories.tsx new file mode 100644 index 000000000..637aadab6 --- /dev/null +++ b/apps/admin/src/components/common/ButtonMenu/ButtonMenu.stories.tsx @@ -0,0 +1,59 @@ +import { IconCheckDocument, IconEditDocument, IconPrint, IconUpload } from "@maru/icon"; +import { color } from "@maru/theme"; +import { Text } from "@maru/ui"; +import type { Meta, StoryObj } from "@storybook/react"; +import ButtonMenu from "./ButtonMenu"; +import ButtonMenuItem from "./ButtonMenuItem/ButtonMenuItem"; + +export default { + component: ButtonMenu, + title: "ButtonMenu", + tags: ["autodocs"], +} satisfies Meta; + +export const Default: StoryObj = { + args: { + menuItemList: [ + + + + 검토해야 하는 원서 모아보기 + + , + + + + 2차 전형 점수 입력하기 + + , + + + + 명단 엑셀로 내보내기 + + , + + + + 원서 출력하기 + + , + ] + }, +}; \ No newline at end of file diff --git a/apps/admin/src/components/common/ButtonMenu/ButtonMenu.tsx b/apps/admin/src/components/common/ButtonMenu/ButtonMenu.tsx new file mode 100644 index 000000000..698c3ad76 --- /dev/null +++ b/apps/admin/src/components/common/ButtonMenu/ButtonMenu.tsx @@ -0,0 +1,90 @@ +import { useBooleanState, useOutsideClick } from '@maru/hooks'; +import { IconArrowBottom, IconArrowTop } from '@maru/icon'; +import { color } from '@maru/theme'; +import { Text } from '@maru/ui'; +import { flex } from '@maru/utils'; +import { CSSProperties, ReactNode } from 'react'; +import styled, { css } from 'styled-components'; + +interface Props { + width?: CSSProperties['width']; + menuItemList: ReactNode[]; +} + +const ButtonMenu = ({ width, menuItemList = [] }: Props) => { + const { + value: isOpen, + setFalse: closeMenu, + toggle: handleToggleButtonClick, + } = useBooleanState(); + + const menuRef = useOutsideClick(closeMenu); + + return ( +
+ + + 추가 기능 + + {isOpen ? ( + + ) : ( + + )} + + + + {menuItemList.map((menuItem) => ( + {menuItem} + ))} + + +
+ ); +}; + +export default ButtonMenu; + +const StyledButtonMenu = styled.div<{ $isOpen: boolean }>` + ${flex({ alignItems: 'center', justifyContent: 'space-between' })} + width: 100%; + height: 40px; + padding: 0 10px 0 16px; + background-color: ${color.white}; + border-radius: 6px; + cursor: pointer; + + ${(props) => + props.$isOpen + ? css` + border: 1px solid ${color.maruDefault}; + outline: 2px solid rgba(20, 112, 255, 0.25); + ` + : css` + border: 1px solid ${color.gray400}; + `} +`; + +const MenuListBox = styled.div<{ $isOpen: boolean }>` + position: relative; + display: ${(props) => (props.$isOpen ? 'block' : 'none')}; +`; + +const MenuList = styled.div` + z-index: 1; + position: absolute; + right: 0; + margin-top: 8px; + padding: 8px; + min-width: 120px; + background-color: ${color.white}; + border: 1px solid ${color.gray200}; + box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.08); + border-radius: 12px; +`; + +const MenuItem = styled.div` + width: 100%; + height: 44px; + cursor: pointer; +`; From acfc8b45c114e86497521f158110c9d8105b9e43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=AA=85=EC=9E=AC?= Date: Thu, 14 Sep 2023 01:24:56 +0900 Subject: [PATCH 07/10] =?UTF-8?q?FIX=20::=20Dropdown=20dropdownRef=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/maru-ui/src/Dropdown/Dropdown.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/maru-ui/src/Dropdown/Dropdown.tsx b/packages/maru-ui/src/Dropdown/Dropdown.tsx index b552cc869..f2b3cf6a1 100644 --- a/packages/maru-ui/src/Dropdown/Dropdown.tsx +++ b/packages/maru-ui/src/Dropdown/Dropdown.tsx @@ -42,7 +42,7 @@ const Dropdown = ({ }; return ( -
+
{label && } @@ -54,7 +54,7 @@ const Dropdown = ({ )} - + {data?.map((item, index) => ( Date: Thu, 14 Sep 2023 01:58:47 +0900 Subject: [PATCH 08/10] =?UTF-8?q?ADD=20::=20=EC=9B=90=EC=84=9C=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=ED=8D=BC=EB=B8=94?= =?UTF-8?q?=EB=A6=AC=EC=8B=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/admin/src/app/page.tsx | 55 ++++++++++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 10 deletions(-) diff --git a/apps/admin/src/app/page.tsx b/apps/admin/src/app/page.tsx index c9de1ed35..0731fac69 100644 --- a/apps/admin/src/app/page.tsx +++ b/apps/admin/src/app/page.tsx @@ -1,9 +1,13 @@ 'use client'; +import ButtonMenu from '@/components/common/ButtonMenu/ButtonMenu'; +import ButtonMenuItem from '@/components/common/ButtonMenu/ButtonMenuItem/ButtonMenuItem'; import FormList from '@/components/main/FormList/FormList'; import AppLayout from '@/layouts/AppLayout'; import initMockAPI from '@/mocks'; -import { Button, Column, Row, SearchInput, Text } from '@maru/ui'; +import { IconCheckDocument, IconEditDocument, IconPrint, IconUpload } from '@maru/icon'; +import { color } from '@maru/theme'; +import { Column, Row, SearchInput, Text } from '@maru/ui'; import { flex } from '@maru/utils'; import { styled } from 'styled-components'; @@ -11,20 +15,51 @@ if (process.env.NODE_ENV === 'development') { initMockAPI(); } -const Home = () => { +const MainPage = () => { return ( 원서 관리 - - - - - + + + + + 검토해야 하는 원서 모아보기 + + , + + + + 2차 전형 점수 입력하기 + + , + + + + 명단 엑셀로 내보내기 + + , + + + + 원서 출력하기 + + , + ]} + /> @@ -33,7 +68,7 @@ const Home = () => { ); }; -export default Home; +export default MainPage; const StyledHome = styled.div` ${flex({ flexDirection: 'column' })} From b5387bcadcf336b65160f2a4608877c411e9a7c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=AA=85=EC=9E=AC?= Date: Sun, 17 Sep 2023 21:17:59 +0900 Subject: [PATCH 09/10] =?UTF-8?q?ADD=20::=20=EC=9B=90=EC=84=9C=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=20=EC=A0=9C=EC=9E=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/main/FormList/FormList.tsx | 4 ++ .../main/FormListHeader/FormListHeader.tsx | 17 ++++-- .../main/FormListItem/FormListItem.tsx | 52 ++++++++++++++----- apps/admin/src/services/form/api.ts | 2 +- apps/admin/src/types/main/client.ts | 16 +++++- 5 files changed, 72 insertions(+), 19 deletions(-) diff --git a/apps/admin/src/components/main/FormList/FormList.tsx b/apps/admin/src/components/main/FormList/FormList.tsx index 1c5220dc4..0d197892f 100644 --- a/apps/admin/src/components/main/FormList/FormList.tsx +++ b/apps/admin/src/components/main/FormList/FormList.tsx @@ -21,6 +21,10 @@ const FormList = () => { school={item.school} status={item.status} type={item.type} + totalScore={item.totalScore} + hasDocument={item.hasDocument} + firstRoundPassed={item.firstRoundPassed} + secondRoundPassed={item.secondRoundPassed} /> ))} diff --git a/apps/admin/src/components/main/FormListHeader/FormListHeader.tsx b/apps/admin/src/components/main/FormListHeader/FormListHeader.tsx index 2516cf070..217de6b2d 100644 --- a/apps/admin/src/components/main/FormListHeader/FormListHeader.tsx +++ b/apps/admin/src/components/main/FormListHeader/FormListHeader.tsx @@ -21,9 +21,20 @@ const FormListHeader = () => { 전형 - - 상태 - + + + 제출서류 + + + 1차 결과 + + + 최종 점수 + + + 2차 결과 + + ); }; diff --git a/apps/admin/src/components/main/FormListItem/FormListItem.tsx b/apps/admin/src/components/main/FormListItem/FormListItem.tsx index 6f8d067cc..120fc6cb4 100644 --- a/apps/admin/src/components/main/FormListItem/FormListItem.tsx +++ b/apps/admin/src/components/main/FormListItem/FormListItem.tsx @@ -1,19 +1,29 @@ import TableItem from '@/components/common/TableItem/TableItem'; import { KoreanFormType } from '@/constants/main/constants'; -import { FormStatus, FormType, GraduationType } from '@/types/main/client'; +import { Form, FormType } from '@/types/main/client'; +import { color } from '@maru/theme'; import { Row, Text } from '@maru/ui'; -interface Props { - id: number; - name: string; - birthday: string; - graduationType: GraduationType; - school: string; - status: FormStatus; - type: FormType; -} +const FormListItem = ({ + id, + name, + birthday, + graduationType, + school, + type, + totalScore, + hasDocument, + firstRoundPassed, + secondRoundPassed, +}: Form) => { + const getStatusColor = (status: boolean | null) => { + return typeof status !== 'boolean' ? color.gray600 : status ? color.maruDefault : color.red; + }; + + const getStatusString = (status: boolean | null, trueString: string, falseString: string) => { + return typeof status !== 'boolean' ? '미정' : status ? trueString : falseString; + }; -const FormListItem = ({ id, name, birthday, graduationType, school, type, status }: Props) => { return ( @@ -33,9 +43,23 @@ const FormListItem = ({ id, name, birthday, graduationType, school, type, status {KoreanFormType[type as FormType]} - - {status} - + + + {getStatusString(hasDocument, '제출', '미제출')} + + + {getStatusString(firstRoundPassed, '합격', '불합격')} + + + {typeof totalScore !== 'number' ? '미정' : totalScore} + + + {getStatusString(secondRoundPassed, '합격', '불합격')} + + ); }; diff --git a/apps/admin/src/services/form/api.ts b/apps/admin/src/services/form/api.ts index 9872fb0dd..aa9b4e14e 100644 --- a/apps/admin/src/services/form/api.ts +++ b/apps/admin/src/services/form/api.ts @@ -3,7 +3,7 @@ import { authorization } from '@/apis/token'; import { GetFormReviewListRes } from '@/types/main/remote'; export const getFormReviewList = async () => { - const { data } = await maru.get('/form/review', authorization()); + const { data } = await maru.get('/form', authorization()); return data; }; diff --git a/apps/admin/src/types/main/client.ts b/apps/admin/src/types/main/client.ts index 2b6fc1850..bbacdf0d5 100644 --- a/apps/admin/src/types/main/client.ts +++ b/apps/admin/src/types/main/client.ts @@ -14,7 +14,17 @@ export type FormType = export type GraduationType = 'EXPECTED' | 'GRADUATED' | 'QUALIFICATION_EXAMINATION'; -export type FormStatus = '최종 제출됨' | '반려됨'; +export type FormStatus = + | '접수됨' + | '1차 불합격' + | '불합격' + | '최종 제출됨' + | '제출됨' + | '승인됨' + | '불참' + | '1차 합격' + | '최종 합격' + | '반려됨'; export interface Form { id: number; @@ -24,4 +34,8 @@ export interface Form { school: string; status: FormStatus; type: FormType; + totalScore: number | null; + hasDocument: boolean; + firstRoundPassed: boolean | null; + secondRoundPassed: boolean | null; } From 0fb1b6992c58c5a208eb57afdf6c78e18aed73d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=AA=85=EC=9E=AC?= Date: Mon, 18 Sep 2023 11:24:46 +0900 Subject: [PATCH 10/10] =?UTF-8?q?FIX=20::=20=EB=B9=8C=EB=93=9C=20=EC=97=90?= =?UTF-8?q?=EB=9F=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/admin/src/mocks/handlers/main.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/apps/admin/src/mocks/handlers/main.ts b/apps/admin/src/mocks/handlers/main.ts index 3a5094819..09618ef5a 100644 --- a/apps/admin/src/mocks/handlers/main.ts +++ b/apps/admin/src/mocks/handlers/main.ts @@ -10,6 +10,10 @@ const MAIN_FORM_DATA: Form[] = [ school: '비전중학교', status: '최종 제출됨', type: 'REGULAR', + totalScore: null, + hasDocument: false, + firstRoundPassed: null, + secondRoundPassed: null, }, { id: 1, @@ -19,6 +23,10 @@ const MAIN_FORM_DATA: Form[] = [ school: '비전중학교', status: '반려됨', type: 'REGULAR', + totalScore: null, + hasDocument: false, + firstRoundPassed: null, + secondRoundPassed: null, }, { id: 2, @@ -28,6 +36,10 @@ const MAIN_FORM_DATA: Form[] = [ school: '비전중학교', status: '최종 제출됨', type: 'MULTICULTURAL', + totalScore: null, + hasDocument: false, + firstRoundPassed: null, + secondRoundPassed: null, }, ];