Master 강제 병합

package.json

@@ -14,6 +14,7 @@
     "@heroui/system": "^2.4.7",
     "@heroui/theme": "^2.4.6",
     "@nextui-org/react": "^2.6.11",
+    "@react-google-maps/api": "^2.20.7",
     "@splidejs/react-splide": "^0.7.12",
     "@splidejs/splide": "^4.1.4",
     "@splidejs/splide-extension-auto-scroll": "^0.5.3",

src/app/admin/member-manager/page.jsx

@@ -23,11 +23,11 @@ import AdminTableBottomContent from '@/components/admin/AdminTableBottomContent'
 
 /** 백엔드 enum과 일치하는 값(전송용) */
 const ROLE_OPTIONS = ['GUEST', 'MEMBER', 'CORE', 'LEAD', 'ORGANIZER', 'ADMIN'];
-const TEAM_ENUM_VALUES = ['BD', 'HR', 'TECH', 'PR_DESIGN'];
+const TEAM_ENUM_VALUES = ['BD', 'HR', 'TECH', 'PR_DESIGN', 'HQ'];
 
 /** 화면 표시용 라벨 */
 const TEAM_LABEL = {
-    BD: 'BD', HR: 'HR', TECH: 'TECH', PR_DESIGN: 'PR/DESIGN',
+    BD: 'BD', HR: 'HR', TECH: 'TECH', PR_DESIGN: 'PR/DESIGN', HQ: 'HQ',
 };
 
 const roleColor = (r) => ({

src/app/core-attendance/page.jsx

@@ -14,6 +14,32 @@ const setQS = (entries) => {
     window.history.replaceState({}, '', u.toString());
 };
 
+// ===== CSV 저장 공통 헬퍼 =====
+const saveResponseAsFile = (res, fallbackName) => {
+    // Excel 한글 깨짐 방지용 BOM
+    const BOM = new Uint8Array([0xEF, 0xBB, 0xBF]);
+    const blob = new Blob([BOM, res.data], { type: 'text/csv;charset=utf-8' });
+
+    // 서버가 파일명 내려주면 우선 사용
+    let filename = fallbackName;
+    const cd = res.headers && (res.headers['content-disposition'] || res.headers['Content-Disposition']);
+    if (cd) {
+        const m = /filename\*=UTF-8''([^;]+)|filename="?([^"]+)"?/i.exec(cd);
+        const decoded = m && decodeURIComponent((m[1] || m[2] || '').trim());
+        if (decoded) filename = decoded;
+    }
+
+    const url = URL.createObjectURL(blob);
+    const a = document.createElement('a');
+    a.href = url;
+    a.download = filename;
+    document.body.appendChild(a);
+    a.click();
+    a.remove();
+    URL.revokeObjectURL(url);
+};
+
+
 export default function AttendancePage() {
     const {apiClient} = useAuthenticatedApi();
 
@@ -49,6 +75,17 @@ export default function AttendancePage() {
         })).data.data,
 
         summary: async (d) => (await apiClient.get(`/core-attendance/meetings/${d}/summary`)).data.data,
+
+        downloadSummaryCsvForDateAndSave: async (d) => {
+            const res = await apiClient.get(`/core-attendance/meetings/${d}/summary.csv`, { responseType: 'blob' });
+            saveResponseAsFile(res, `attendance-${d}.csv`);
+        },
+
+        downloadSummaryCsvAllAndSave: async () => {
+            const res = await apiClient.get('/core-attendance/meetings/summary.csv', { responseType: 'blob' });
+            saveResponseAsFile(res, 'attendance-summary.csv');
+        },
+
     };
 
     /** URL 동기화 */
@@ -366,6 +403,25 @@ export default function AttendancePage() {
             <Card className="bg-default-100 dark:bg-default-50">
                 <CardBody className="gap-3 text-white">
                     <b>요약</b>
+                    <Button
+                        size="sm"
+                        variant="flat"
+                        color="primary"
+                        onPress={() => api.downloadSummaryCsvForDateAndSave(date)}
+                        isDisabled={!date}
+                    >
+                        날짜 CSV
+                    </Button>
+
+                    <Button
+                        size="sm"
+                        variant="flat"
+                        color="secondary"
+                        onPress={() => api.downloadSummaryCsvAllAndSave()}
+                    >
+                        전체 CSV
+                    </Button>
+
                     {summary ? (<div className="text-sm">
                         <div className="mb-2">전체 {summary.present} / {summary.total}</div>
                         <Divider/>

src/app/homecoming/layout.js

@@ -0,0 +1,15 @@
+import { Suspense } from "react";
+import Loader from '@/components/ui/common/Loader.jsx';
+
+export const metadata = {
+    title: "Homecoming",
+    description: "GDGoC INHA 제1회 홈커밍 데이 행사 안내 및 참여 페이지",
+};
+
+export default function HomecomingLayout({ children }) {
+    return (
+        <Suspense fallback={ <Loader /> }>
+            {children}
+        </Suspense>
+    );
+}