dm: 충돌 해결

apps/dm/app/(with-layout)/status/greywater/page.tsx

@@ -1,16 +1,7 @@
 "use client";
 
 import SubPageHeader from "@/components/SubPageHeader";
-<<<<<<< Updated upstream
-import BusinessSubNav from "@/components/BusinessSubNav";
-
-import greywaterOverall from "@/public/images/landing/cases/greywater_overall.png";
-import greywaterFactory from "@/public/images/landing/cases/greywater_factory.png";
-import greywaterBuilding from "@/public/images/landing/cases/greywater_building.png";
-import greywaterUsage from "@/public/images/landing/cases/greywater_usage.png";
-=======
 import React from "react";
->>>>>>> Stashed changes
 
 // 공통 섹션 타이틀 컴포넌트
 function SectionTitle({ children }: { children: React.ReactNode }) {
@@ -22,58 +13,11 @@ function SectionTitle({ children }: { children: React.ReactNode }) {
   );
 }
 
-<<<<<<< Updated upstream
-=======
 // 구분선
->>>>>>> Stashed changes
 function Hr({ className = "" }: { className?: string }) {
   return <div className={`h-[2px] w-full bg-black/10 ${className}`} />;
 }
 
-<<<<<<< Updated upstream
-function ImgCard({ src, alt }: { src: StaticImageData; alt: string }) {
-  return (
-    <div className="w-full overflow-x-auto">
-      <Image
-        src={src}
-        alt={alt}
-        className="mx-auto block max-w-none"
-        style={{ width: "auto", height: "auto" }}
-      />
-    </div>
-  );
-}
-
-function SectionShell({
-  id,
-  title,
-  children,
-  className = "",
-}: {
-  id: string;
-  title: string;
-  children: React.ReactNode;
-  className?: string;
-}) {
-  return (
-    <section id={id} className={`scroll-mt-[140px] ${className}`}>
-      <SectionTitle>{title}</SectionTitle>
-      <div className="mt-8">{children}</div>
-    </section>
-  );
-}
-
-export default function GreywaterStatusPage() {
-  return (
-    <div className="relative bg-white">
-      <BusinessSubNav />
-
-      <SubPageHeader
-        title="중수도(현황)"
-        crumbs={[
-          { label: "Home", href: "/main" },
-          { label: "물 재이용 현황", href: "/status/rain" },
-=======
 // 출처 텍스트
 function SourceText() {
   return (
@@ -104,7 +48,6 @@ export default function GreywaterPage() {
         crumbs={[
           { label: "Home", href: "/reuse" },
           { label: "물 재이용 현황", href: "/reuse/cases/rain" },
->>>>>>> Stashed changes
           { label: "중수도(현황)" },
         ]}
         hideFooterLine
@@ -115,15 +58,6 @@ export default function GreywaterPage() {
       <div className="pr-0">
         <Hr className="my-7" />
 
-<<<<<<< Updated upstream
-        <SectionShell
-          id="status-greywater-overall"
-          title="전체 중수도 설치 및 이용 현황 (공장 및 발전시설 제외)"
-          className="mt-6"
-        >
-          <ImgCard src={greywaterOverall} alt="전체 중수도 설치 및 이용 현황" />
-        </SectionShell>
-=======
       {/* 1) 전체 중수도 설치 및 이용 현황 (공장 및 발전시설 제외) */}
       <section className="mt-10">
         <SectionTitle>전체 중수도 설치 및 이용 현황 (공장 및 발전시설 제외)</SectionTitle>
@@ -214,18 +148,9 @@ export default function GreywaterPage() {
           <SourceText />
         </div>
       </section>
->>>>>>> Stashed changes
 
         <Hr className="my-11" />
 
-<<<<<<< Updated upstream
-        <SectionShell
-          id="status-greywater-factory"
-          title="공장 및 발전시설 내 중수도 설치 및 이용 현황"
-        >
-          <ImgCard src={greywaterFactory} alt="공장 및 발전시설 중수도 현황" />
-        </SectionShell>
-=======
       {/* 2) 공장 및 발전시설 내 중수도 설치 및 이용 현황 */}
       <section>
         <SectionTitle>공장 및 발전시설 내 중수도 설치 및 이용 현황</SectionTitle>
@@ -312,18 +237,9 @@ export default function GreywaterPage() {
           <SourceText />
         </div>
       </section>
->>>>>>> Stashed changes
 
         <Hr className="my-11" />
 
-<<<<<<< Updated upstream
-        <SectionShell
-          id="status-greywater-building"
-          title="중수도 건축물별 이용량 현황"
-        >
-          <ImgCard src={greywaterBuilding} alt="중수도 건축물별 이용량" />
-        </SectionShell>
-=======
       {/* 3) 중수도 건축물별 이용량 현황 */}
       <section className="pb-16">
         <SectionTitle>중수도 건축물별 이용량 현황</SectionTitle>
@@ -382,20 +298,9 @@ export default function GreywaterPage() {
           <SourceText />
         </div>
       </section>
->>>>>>> Stashed changes
 
         <Hr className="my-11" />
 
-<<<<<<< Updated upstream
-        <SectionShell
-          id="status-greywater-usage"
-          title="중수도 용도별 이용량 현황"
-          className="pb-[200px]"
-        >
-          <ImgCard src={greywaterUsage} alt="중수도 용도별 이용량" />
-        </SectionShell>
-      </div>
-=======
       {/* 4) 중수도 용도별 이용량 현황 */}
       <section className="pb-[200px]">
         <SectionTitle>중수도 용도별 이용량 현황</SectionTitle>
@@ -451,8 +356,8 @@ export default function GreywaterPage() {
           </div>
           <SourceText />
         </div>
-      </section>      
->>>>>>> Stashed changes
+      </section> 
+      </div>     
     </div>
   );
 }

apps/dm/app/(with-layout)/status/rain/page.tsx

@@ -1,14 +1,6 @@
 "use client";
 
 import SubPageHeader from "@/components/SubPageHeader";
-<<<<<<< Updated upstream
-import BusinessSubNav from "@/components/BusinessSubNav";
-
-import rainwaterBuilding from "@/public/images/landing/cases/rainwater_building.png";
-import rainwaterUsage from "@/public/images/landing/cases/rainwater_usage.png";
-import rainwaterUsageAmount from "@/public/images/landing/cases/rainwater_usage_amount.png";
-=======
->>>>>>> Stashed changes
 
 // 공통 섹션 타이틀 컴포넌트
 function SectionTitle({ children }: { children: React.ReactNode }) {
@@ -20,58 +12,11 @@ function SectionTitle({ children }: { children: React.ReactNode }) {
   );
 }
 
-<<<<<<< Updated upstream
-=======
 // 구분선
->>>>>>> Stashed changes
 function Hr({ className = "" }: { className?: string }) {
   return <div className={`h-[2px] w-full bg-black/10 ${className}`} />;
 }
 
-<<<<<<< Updated upstream
-function ImgCard({ src, alt }: { src: StaticImageData; alt: string }) {
-  return (
-    <div className="w-full overflow-x-auto">
-      <Image
-        src={src}
-        alt={alt}
-        className="mx-auto block max-w-none"
-        style={{ width: "auto", height: "auto" }}
-      />
-    </div>
-  );
-}
-
-function SectionShell({
-  id,
-  title,
-  children,
-  className = "",
-}: {
-  id: string;
-  title: string;
-  children: React.ReactNode;
-  className?: string;
-}) {
-  return (
-    <section id={id} className={`scroll-mt-[140px] ${className}`}>
-      <SectionTitle>{title}</SectionTitle>
-      <div className="mt-8">{children}</div>
-    </section>
-  );
-}
-
-export default function RainStatusPage() {
-  return (
-    <div className="relative bg-white">
-      <BusinessSubNav />
-
-      <SubPageHeader
-        title="빗물이용시설(현황)"
-        crumbs={[
-          { label: "Home", href: "/main" },
-          { label: "물 재이용 현황", href: "/status/rain" },
-=======
 // 출처 텍스트
 function SourceText() {
   return (
@@ -101,7 +46,6 @@ export default function RainwaterStatusPage() {
         crumbs={[
           { label: "Home", href: "/reuse" },
           { label: "물 재이용 현황", href: "/reuse/cases/rain" },
->>>>>>> Stashed changes
           { label: "빗물이용시설(현황)" },
         ]}
         hideFooterLine
@@ -112,18 +56,6 @@ export default function RainwaterStatusPage() {
       <div className="pr-0">
         <Hr className="my-7" />
 
-<<<<<<< Updated upstream
-        <SectionShell
-          id="status-rain-building"
-          title="빗물이용시설의 건축물별 빗물이용량 현황"
-          className="mt-6"
-        >
-          <ImgCard
-            src={rainwaterBuilding}
-            alt="빗물이용시설의 건축물별 빗물이용량 현황"
-          />
-        </SectionShell>
-=======
       {/* 1) 빗물이용시설의 건축물별 빗물이용량 현황 */}
       <section className="mt-10">
         <SectionTitle>빗물이용시설의 건축물별 빗물이용량 현황</SectionTitle>
@@ -171,21 +103,9 @@ export default function RainwaterStatusPage() {
           <SourceText />
         </div>
       </section>
->>>>>>> Stashed changes
 
         <Hr className="my-11" />
 
-<<<<<<< Updated upstream
-        <SectionShell
-          id="status-rain-purpose-distribution"
-          title="빗물이용시설의 용도별 분포(2023년 기준)"
-        >
-          <ImgCard
-            src={rainwaterUsage}
-            alt="빗물이용시설의 용도별 분포(2023년 기준)"
-          />
-        </SectionShell>
-=======
       {/* 2) 빗물이용시설의 용도별 분포 (2023년 기준) */}
       <section>
         <SectionTitle>빗물이용시설의 용도별 분포 (2023년 기준)</SectionTitle>
@@ -242,23 +162,9 @@ export default function RainwaterStatusPage() {
           <SourceText />
         </div>
       </section>
->>>>>>> Stashed changes
 
         <Hr className="my-11" />
 
-<<<<<<< Updated upstream
-        <SectionShell
-          id="status-rain-purpose-usage"
-          title="빗물이용시설의 용도별 빗물이용량 현황"
-          className="pb-[200px]"
-        >
-          <ImgCard
-            src={rainwaterUsageAmount}
-            alt="빗물이용시설의 용도별 빗물이용량 현황"
-          />
-        </SectionShell>
-      </div>
-=======
       {/* 3) 빗물이용시설의 용도별 빗물이용량 현황 */}
       <section className="pb-[200px]">
         <SectionTitle>빗물이용시설의 용도별 빗물이용량 현황</SectionTitle>
@@ -306,7 +212,7 @@ export default function RainwaterStatusPage() {
           <SourceText />
         </div>
       </section>
->>>>>>> Stashed changes
+      </div>
     </div>
   );
 }

apps/dm/app/(with-layout)/status/sewage/page.tsx

@@ -2,15 +2,6 @@
 
 import React from "react";
 import SubPageHeader from "@/components/SubPageHeader";
-<<<<<<< Updated upstream
-import BusinessSubNav from "@/components/BusinessSubNav";
-
-import treatedWaterYear from "@/public/images/landing/cases/treated_water_year.png";
-import treatedWaterUsage from "@/public/images/landing/cases/treated_water_usage.png";
-import treatedWaterFacility from "@/public/images/landing/cases/treated_water_facility.png";
-import treatedWaterRegion from "@/public/images/landing/cases/treated_water_region.png";
-=======
->>>>>>> Stashed changes
 
 // 공통 섹션 타이틀 컴포넌트
 function SectionTitle({ children }: { children: React.ReactNode }) {
@@ -22,40 +13,11 @@ function SectionTitle({ children }: { children: React.ReactNode }) {
   );
 }
 
-<<<<<<< Updated upstream
-=======
 // 구분선
->>>>>>> Stashed changes
 function Hr({ className = "" }: { className?: string }) {
   return <div className={`h-[2px] w-full bg-black/10 ${className}`} />;
 }
 
-<<<<<<< Updated upstream
-function ImgCard({ src, alt }: { src: StaticImageData; alt: string }) {
-  return (
-    <div className="w-full overflow-x-auto">
-      <Image
-        src={src}
-        alt={alt}
-        className="mx-auto block max-w-none"
-        style={{ width: "auto", height: "auto" }}
-      />
-    </div>
-  );
-}
-
-function SectionShell({
-  id,
-  title,
-  children,
-  className = "",
-}: {
-  id: string;
-  title: string;
-  children: React.ReactNode;
-  className?: string;
-}) {
-=======
 // 출처 텍스트
 function SourceText() {
   return (
@@ -78,20 +40,19 @@ const tableStyles = {
   headerBg: "bg-[#E3E7EA]",
 };
 
-export default function TreatedWaterPage() {
->>>>>>> Stashed changes
-  return (
-    <section id={id} className={`scroll-mt-[140px] ${className}`}>
-      <SectionTitle>{title}</SectionTitle>
-      <div className="mt-8">{children}</div>
-    </section>
-  );
-}
+// export default function TreatedWaterPage() {
+//   return (
+//     <section id={id} className={`scroll-mt-[140px] ${className}`}>
+//       <SectionTitle>{title}</SectionTitle>
+//       <div className="mt-8">{children}</div>
+//     </section>
+//   );
+// }
 
 export default function TreatedStatusPage() {
   return (
     <div className="relative bg-white">
-      <BusinessSubNav />
+      {/* <BusinessSubNav /> */}
 
       <SubPageHeader
         title="하수처리수 재이용시설(현황)"
@@ -108,18 +69,6 @@ export default function TreatedStatusPage() {
       <div className="pr-0">
         <Hr className="my-7" />
 
-<<<<<<< Updated upstream
-        <SectionShell
-          id="status-treated-year"
-          title="연도별 하수처리수 재이용 현황"
-          className="mt-6"
-        >
-          <ImgCard
-            src={treatedWaterYear}
-            alt="연도별 하수처리수 재이용 현황"
-          />
-        </SectionShell>
-=======
       {/* 1) 연도별 하수처리수 재이용 현황 */}
       <section className="mt-10">
         <SectionTitle>연도별 하수처리수 재이용 현황</SectionTitle>
@@ -209,21 +158,9 @@ export default function TreatedStatusPage() {
           <SourceText />
         </div>
       </section>
->>>>>>> Stashed changes
 
         <Hr className="my-11" />
 
-<<<<<<< Updated upstream
-        <SectionShell
-          id="status-treated-usage"
-          title="용도별 하수처리수 재이용 현황"
-        >
-          <ImgCard
-            src={treatedWaterUsage}
-            alt="용도별 하수처리수 재이용 현황"
-          />
-        </SectionShell>
-=======
       {/* 2) 용도별 하수처리수 재이용 현황 */}
       <section>
         <SectionTitle>용도별 하수처리수 재이용 현황</SectionTitle>
@@ -301,21 +238,9 @@ export default function TreatedStatusPage() {
           <SourceText />
         </div>
       </section>
->>>>>>> Stashed changes
 
         <Hr className="my-11" />
 
-<<<<<<< Updated upstream
-        <SectionShell
-          id="status-treated-facility"
-          title="하수처리시설 설치 및 이용 현황"
-        >
-          <ImgCard
-            src={treatedWaterFacility}
-            alt="하수처리시설 설치 및 이용 현황"
-          />
-        </SectionShell>
-=======
       {/* 3) 하수처리시설 설치 및 이용 현황 */}
       <section>
         <SectionTitle>하수처리시설 설치 및 이용 현황</SectionTitle>
@@ -402,23 +327,9 @@ export default function TreatedStatusPage() {
           <SourceText />
         </div>
       </section>
->>>>>>> Stashed changes
 
         <Hr className="my-11" />
 
-<<<<<<< Updated upstream
-        <SectionShell
-          id="status-treated-region"
-          title="시도별 하수처리수 재이용 현황"
-          className="pb-[200px]"
-        >
-          <ImgCard
-            src={treatedWaterRegion}
-            alt="시도별 하수처리수 재이용 현황"
-          />
-        </SectionShell>
-      </div>
-=======
       {/* 4) 시도별 하수처리수 재이용 현황 */}
       <section className="pb-[200px]">
         <SectionTitle>시도별 하수처리수 재이용 현황</SectionTitle>
@@ -500,7 +411,8 @@ export default function TreatedStatusPage() {
           <SourceText />
         </div>
       </section>
->>>>>>> Stashed changes
+
+      </div>
     </div>
   );
 }