Release - user v1.0.7, admin v1.0.1

apps/admin/next.config.js

@@ -1,6 +1,9 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
     transpilePackages: ['@maru/theme'],
+    images: {
+        domains: ['s3.ap-northeast-2.amazonaws.com'],
+    },
 };
 
 module.exports = nextConfig;

apps/admin/package.json

@@ -42,8 +42,10 @@
     "@maru/utils": "workspace:*",
     "@tanstack/react-query": "^4.32.6",
     "@tanstack/react-query-devtools": "^4.32.6",
+    "@toss/react": "^1.5.0",
+    "@toss/use-overlay": "^1.3.6",
     "axios": "^1.4.0",
-    "next": "13.4.6",
+    "next": "13.5.2",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-toastify": "^9.1.3",

apps/admin/src/app/faq/[id]/page.tsx

@@ -16,7 +16,6 @@ interface Props {
 }
 
 const FaqDetailPage = ({ params: { id } }: Props) => {
-    // TODO :: 수정, 삭제 기능 추가하기
     return (
         <AppLayout>
             <StyledNoticeDetail>
@@ -44,8 +43,8 @@ const StyledNoticeDetail = styled.div`
 `;
 
 const DirectLink = styled(Link)`
-    ${flex({ alignItems: 'center' })}
+    ${flex({ alignItems: 'center' })};
     gap: 2px;
-    ${font.p3}
+    ${font.p3};
     color: ${color.gray600};
 `;

apps/admin/src/app/faq/edit/[id]/page.tsx

@@ -0,0 +1,50 @@
+'use client';
+
+import FaqEdit from '@/components/faq/FaqEdit/FaqEdit';
+import { ROUTES } from '@/constants/common/constant';
+import AppLayout from '@/layouts/AppLayout';
+import { IconArrowLeft } from '@maru/icon';
+import { color, font } from '@maru/theme';
+import { Loader } from '@maru/ui';
+import { flex } from '@maru/utils';
+import Link from 'next/link';
+import { Suspense } from 'react';
+import styled from 'styled-components';
+
+interface Props {
+    params: { id: number };
+}
+
+const FaqEditPage = ({ params: { id } }: Props) => {
+    return (
+        <AppLayout>
+            <StyledFaqEdit>
+                <DirectLink href={`${ROUTES.FAQ}/${id}`}>
+                    <IconArrowLeft width={18} height={18} />
+                    돌아가기
+                </DirectLink>
+                <Suspense fallback={<Loader />}>
+                    <FaqEdit id={id} />
+                </Suspense>
+            </StyledFaqEdit>
+        </AppLayout>
+    );
+};
+
+export default FaqEditPage;
+
+const StyledFaqEdit = styled.div`
+    position: relative;
+    ${flex({ flexDirection: 'column' })}
+    gap: 24px;
+    width: 100%;
+    min-height: 100vh;
+    padding: 64px 75px;
+`;
+
+const DirectLink = styled(Link)`
+    ${flex({ alignItems: 'center' })}
+    gap: 2px;
+    ${font.p3}
+    color: ${color.gray600};
+`;

apps/admin/src/app/faq/post/page.tsx

@@ -14,22 +14,22 @@ import styled from 'styled-components';
 const FaqPostPage = () => {
     return (
         <AppLayout>
-            <StyledFaqDetail>
+            <StyledFaqPost>
                 <DirectLink href={ROUTES.FAQ}>
                     <IconArrowLeft width={18} height={18} />
                     돌아가기
                 </DirectLink>
                 <Suspense fallback={<Loader />}>
                     <FaqPost />
                 </Suspense>
-            </StyledFaqDetail>
+            </StyledFaqPost>
         </AppLayout>
     );
 };
 
 export default FaqPostPage;
 
-const StyledFaqDetail = styled.div`
+const StyledFaqPost = styled.div`
     position: relative;
     ${flex({ flexDirection: 'column' })}
     gap: 24px;

apps/admin/src/app/form.hooks.ts

@@ -0,0 +1,53 @@
+import { useEditSecondRoundResultMutation } from '@/services/form/mutations';
+import { useDownloadFormUrlQuery } from '@/services/form/queries';
+import { useFormToPrintValueStore } from '@/store/form/formToPrint';
+import { useSecondRoundResultValueStore } from '@/store/form/secondRoundResult';
+import { useEffect } from 'react';
+
+export const useSecondRoundResultEditAction = () => {
+    const secondRoundResult = useSecondRoundResultValueStore();
+    const secondRoundResultData = {
+        formList: Object.entries(secondRoundResult).map(([formId, passStatus]) => {
+            return {
+                formId: Number(formId),
+                pass: passStatus === '미정' ? null : passStatus === '합격',
+            };
+        }),
+    };
+    const { editSecondRoundResult } = useEditSecondRoundResultMutation(secondRoundResultData);
+
+    const handleSecondRoundResultEditCompleteButtonClick = () => {
+        editSecondRoundResult();
+    };
+
+    return { handleSecondRoundResultEditCompleteButtonClick };
+};
+
+export const useDownloadFormURLAction = () => {
+    const formToPrint = useFormToPrintValueStore();
+    const formIdList = Object.entries(formToPrint).reduce(
+        (acc: number[], [formId, isSelected]) => (isSelected ? [...acc, Number(formId)] : acc),
+        [],
+    );
+
+    const { data: formListData, refetch, status } = useDownloadFormUrlQuery(formIdList);
+
+    useEffect(() => {
+        if (formListData && status === 'success') {
+            formListData.forEach((form) => {
+                const link = document.createElement('a');
+                link.href = form.formUrl;
+                link.download = `${form.examinationNumber}.pdf`;
+                document.body.appendChild(link);
+                link.click();
+                link.remove();
+            });
+        }
+    }, [formListData]);
+
+    const handleDownloadFormUrlButtonClick = () => {
+        refetch();
+    };
+
+    return { handleDownloadFormUrlButtonClick };
+};

apps/admin/src/app/form/[id]/page.tsx

@@ -0,0 +1,50 @@
+'use client';
+
+import FormDetailContent from '@/components/form/FormDetailContent/FormDetailContent';
+import { ROUTES } from '@/constants/common/constant';
+import AppLayout from '@/layouts/AppLayout';
+import { IconArrowLeft } from '@maru/icon';
+import { color, font } from '@maru/theme';
+import { Loader } from '@maru/ui';
+import { flex } from '@maru/utils';
+import Link from 'next/link';
+import { Suspense } from 'react';
+import styled from 'styled-components';
+
+interface Props {
+    params: { id: number };
+}
+
+const FormDetailPage = ({ params: { id } }: Props) => {
+    return (
+        <AppLayout>
+            <StyledFormDetail>
+                <DirectLink href={ROUTES.MAIN}>
+                    <IconArrowLeft width={18} height={18} />
+                    돌아가기
+                </DirectLink>
+                <Suspense fallback={<Loader />}>
+                    <FormDetailContent id={id} />
+                </Suspense>
+            </StyledFormDetail>
+        </AppLayout>
+    );
+};
+
+export default FormDetailPage;
+
+const StyledFormDetail = styled.div`
+    position: relative;
+    ${flex({ flexDirection: 'column' })}
+    gap: 24px;
+    width: 100%;
+    min-height: 100vh;
+    padding: 48px 60px 82px;
+`;
+
+const DirectLink = styled(Link)`
+    ${flex({ alignItems: 'center' })}
+    gap: 2px;
+    ${font.p3}
+    color: ${color.gray600};
+`;

apps/admin/src/app/notice/[id]/page.tsx

@@ -15,7 +15,6 @@ interface Props {
 }
 
 const NoticeDetailPage = ({ params: { id } }: Props) => {
-    // TODO :: 수정, 삭제 기능 추가하기
     return (
         <AppLayout>
             <StyledNoticeDetail>

apps/admin/src/app/notice/page.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import NoticeList from '@/components/notice/NoticeList/NoticeList';
+import NoticeTable from '@/components/notice/NoticeTable/NoticeTable';
 import AppLayout from '@/layouts/AppLayout';
 import { Button, Column, Loader, Row, SearchInput, Text } from '@maru/ui';
 import { flex } from '@maru/utils';
@@ -26,7 +26,7 @@ const NoticePage = () => {
                         </Button>
                     </Row>
                     <Suspense fallback={<Loader />}>
-                        <NoticeList />
+                        <NoticeTable />
                     </Suspense>
                 </Column>
             </StyledNoticePage>