[3팀] 디포네 1차 과제 제출

firestore.rules

@@ -9,10 +9,14 @@ service cloud.firestore {
       allow write: if request.auth != null && request.auth.uid == userId;
     }
 
-    // QNA 컬렉션: 모두 읽기 가능, 로그인한 사용자만 작성/수정/삭제 가능
+    // QNA 컬렉션: 모두 읽기 가능, 로그인한 사용자 작성 가능, 
+    // 삭제/수정은 작성자 본인이거나 관리자만 가능
     match /QNA/{document} {
       allow read: if true;
-      allow create, update, delete: if request.auth != null;
+      allow create: if request.auth != null;
+      allow update, delete: if request.auth != null && 
+        (request.auth.uid == resource.data.uid || 
+         get(/databases/$(database)/documents/users/$(request.auth.uid)).data.role == 'ADMIN');
     }
 
     // QNA 댓글: 모두 읽기 가능, 로그인한 사용자만 작성 가능

src/app/(main)/[datas]/[id]/page.tsx

@@ -1,10 +1,14 @@
 'use client';
 
-import { useParams } from 'next/navigation';
+import { useParams, useRouter } from 'next/navigation';
 import React, { useEffect, useState } from 'react';
 import Link from 'next/link';
 import Loading from '@/components/ui/loading';
+import { useToastStore } from '@/store/toast';
 import makeDocument from "@/util/makeDocument";
+import { DeleteQA } from '@/app/api/q&a';
+import { DeleteAnnouncement } from '@/app/api/announcement';
+import { DeleteActivity } from '@/app/api/activity';
 
 type IndexType = {
   prevId: string | null;
@@ -20,6 +24,7 @@ type CommentType = {
 export default function DetailPage() {
   const [commentText, setCommentText] = useState('');
   const [role, setRole] = useState<string | null>(null);
+  const [userId, setUserId] = useState<string | null>(null);
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const [item, setItem] = useState<any>(null);
@@ -28,6 +33,7 @@ export default function DetailPage() {
   const [comments, setComments] = useState<CommentType | null>(null);
 
   const params = useParams();
+  const router = useRouter();
   const { datas, id } = params as { datas: string; id: string };
 
   const [name, setName] = useState('');
@@ -48,12 +54,14 @@ export default function DetailPage() {
 
       onAuthStateChanged(auth, async (user) => {
         if (user) {
+          setUserId(user.uid);
           const userDoc = await getDoc(doc(db, "users", user.uid));
           if (userDoc.exists()) {
             const userData = userDoc.data();
             setRole(userData.role || 'USER'); // Assuming role is stored in user doc
           }
         } else {
+          setUserId(null);
           setRole(null);
         }
       });
@@ -92,25 +100,34 @@ export default function DetailPage() {
           const data = docSnap.data();
           setItem({ id: docSnap.id, ...data });
 
-          // Fetch Comments (Answer)
-          if (data.answer) {
-            // Assuming answer field exists in the doc directly or in 'comment' field
-            // Based on legacy logic, it updates 'comment' field.
-          }
           if (data.comment) {
             setComments({ comment: data.comment });
           }
 
+          // 조회수 증가 (매번 1씩 증가)
+          try {
+            const currentViews = data.views || 0;
+            const { updateDoc } = await import("firebase/firestore");
+            await updateDoc(docRef, { views: currentViews + 1 });
+          } catch (err) {
+            console.log('조회수 증가 실패', err);
+          }
+
           // Fetch Prev/Next
           if (data.createdAt) {
+            const { getFirebaseDb } = await import("@/lib/firebase");
+            const db = await getFirebaseDb();
+            if (!db) return;
+            const collectionName = getCollectionName(datas);
             const colRef = collection(db, collectionName);
-            // Prev (Newer)
-            const prevQuery = query(colRef, orderBy("createdAt", "asc"), startAfter(data.createdAt), limit(1));
+
+            // 이전글 (Older): 현재 글보다 이전에 작성된 글 중 가장 최근 것
+            const prevQuery = query(colRef, orderBy("createdAt", "desc"), startAfter(docSnap), limit(1));
             const prevSnap = await getDocs(prevQuery);
             const prevdoc = prevSnap.empty ? null : prevSnap.docs[0];
 
-            // Next (Older)
-            const nextQuery = query(colRef, orderBy("createdAt", "desc"), startAfter(data.createdAt), limit(1));
+            // 다음글 (Newer): 현재 글보다 나중에 작성된 글 중 가장 오래된 것
+            const nextQuery = query(colRef, orderBy("createdAt", "asc"), startAfter(docSnap), limit(1));
             const nextSnap = await getDocs(nextQuery);
             const nextdoc = nextSnap.empty ? null : nextSnap.docs[0];
 
@@ -153,11 +170,37 @@ export default function DetailPage() {
       setCommentText("");
       setIsWritingComment(false);
     } catch (e) {
-      console.error(e);
-      alert("댓글 작성 실패");
+      useToastStore.getState().addToast("댓글 작성에 실패했습니다.", "error");
     }
   }
 
+  const handleDelete = async () => {
+    if (!window.confirm("정말로 삭제하시겠습니까?")) return;
+
+    let result;
+    let redirectPath = "/";
+
+    if (datas === "QNA" || datas === "qna") {
+      result = await DeleteQA(id);
+      redirectPath = "/qna";
+    } else if (datas === "announcement") {
+      result = await DeleteAnnouncement(id);
+      redirectPath = "/announcement";
+    } else if (datas === "act" || datas === "activity") {
+      result = await DeleteActivity(id);
+      redirectPath = "/act";
+    }
+
+    if (result && result.status === 200) {
+      useToastStore.getState().addToast("성공적으로 삭제되었습니다.", "success");
+      router.push(redirectPath);
+    } else if (result) {
+      useToastStore.getState().addToast(result.message || "삭제에 실패했습니다.", "error");
+    } else {
+      useToastStore.getState().addToast("이 메뉴에서는 삭제 기능을 제공하지 않습니다.", "error");
+    }
+  };
+
   if (!item) return (
     <div className="flex justify-center items-center min-h-[95vh]">
       <Loading />
@@ -189,7 +232,17 @@ export default function DetailPage() {
               )}
 
               <div className="flex flex-1 flex-col">
-                <h1 className="text-2xl font-bold">{item.title}</h1>
+                <div className="flex justify-between items-start">
+                  <h1 className="text-2xl font-bold">{item.title}</h1>
+                  {role === 'ADMIN' && (
+                    <button
+                      onClick={handleDelete}
+                      className="px-3 py-1 bg-red-50 text-red-500 border border-red-200 rounded hover:bg-red-100 transition-colors text-sm font-medium whitespace-nowrap"
+                    >
+                      삭제
+                    </button>
+                  )}
+                </div>
                 <p className="mt-1 text-sm text-gray-500">{formatDate(item.createdAt)}</p>
 
                 <hr className="my-4 border-[#EBEBEB]" />
@@ -201,9 +254,19 @@ export default function DetailPage() {
           </div>
         ) : (
           <div className="flex flex-col gap-6">
-            <div className="space-y-1">
-              <h1 className="text-2xl font-bold break-words">{name === 'QnA' ? 'Q. ' : ''}{item.title}</h1>
-              <p className="text-sm text-gray-500">{formatDate(item.createdAt)}</p>
+            <div className="flex justify-between items-start">
+              <div className="space-y-1">
+                <h1 className="text-2xl font-bold break-words">{name === 'QnA' ? 'Q. ' : ''}{item.title}</h1>
+                <p className="text-sm text-gray-500">{formatDate(item.createdAt)}</p>
+              </div>
+              {(role === 'ADMIN' || (userId === item.uid && (name === 'QnA' || datas === 'QNA'))) && (
+                <button
+                  onClick={handleDelete}
+                  className="px-3 py-1 bg-red-50 text-red-500 border border-red-200 rounded hover:bg-red-100 transition-colors text-sm font-medium whitespace-nowrap"
+                >
+                  삭제
+                </button>
+              )}
             </div>
             <div className="rounded-xl border border-[#EAEAEA] bg-white p-4 text-base leading-relaxed">
               {makeDocument(item.content)}

src/app/(main)/layout.tsx

@@ -7,9 +7,9 @@ export default function RootLayout({
   children: React.ReactNode;
 }>) {
   return (
-    <div>
+    <div className="flex flex-col min-h-screen">
       <Header />
-      {children}
+      <main className="flex-grow">{children}</main>
       <Footer />
     </div>
   );

src/app/(main)/page.tsx

@@ -58,7 +58,7 @@ export default function Home() {
   return (
     <div>
       <ContentContainer>
-        <Image src={Main} alt={"background"} className="absolute top-[-20px] z-0 left-0" />
+        <Image src={Main} alt={"background"} className="absolute top-[-20px] z-0 left-1/2 -translate-x-1/2" />
         <HomeBanner />
       </ContentContainer>
       <NoticeContainer />

src/app/(main)/privacy/page.tsx

@@ -0,0 +1,18 @@
+import React from 'react';
+import ContentContainer from '@/containers/main/ContentContainer';
+import { PRIVACY_POLICY } from '@/util/termsData';
+
+export default function PrivacyPage() {
+  return (
+    <ContentContainer className="py-20 min-h-screen">
+      <div className="max-w-4xl mx-auto">
+        <h1 className="text-3xl font-bold mb-10 text-gray-900">개인정보처리방침</h1>
+        <div className="bg-white rounded-lg border border-gray-200 p-8 shadow-sm">
+          <div className="prose prose-sm max-w-none text-gray-700 whitespace-pre-wrap leading-relaxed">
+            {PRIVACY_POLICY}
+          </div>
+        </div>
+      </div>
+    </ContentContainer>
+  );
+}