# Conflicts:
#	src/components/Roof2.jsx
This commit is contained in:
hyojun.choi 2024-08-14 15:12:06 +09:00
commit b0ee9200cc
10 changed files with 16 additions and 27 deletions

View File

@ -1,14 +1,12 @@
'use client'
import Hero from '@/components/Hero' import Hero from '@/components/Hero'
import Archive from '@/components/community/Archive' import Archive from '@/components/community/Archive'
export default function CommunityArchivePage() { export default function CommunityArchivePage() {
return ( return (
<> <>
<Hero title="자료 다운로드"/> <Hero title="자료 다운로드" />
<div className="container flex flex-wrap items-center justify-between mx-auto p-4 m-4 border"> <div className="container flex flex-wrap items-center justify-between mx-auto p-4 m-4 border">
<Archive/> <Archive />
</div> </div>
</> </>
) )

View File

@ -1,14 +1,12 @@
'use client'
import Hero from '@/components/Hero' import Hero from '@/components/Hero'
import Faq from '@/components/community/Faq' import Faq from '@/components/community/Faq'
export default function CommunityFaqPage() { export default function CommunityFaqPage() {
return ( return (
<> <>
<Hero title="FAQ"/> <Hero title="FAQ" />
<div className="container flex flex-wrap items-center justify-between mx-auto p-4 m-4 border"> <div className="container flex flex-wrap items-center justify-between mx-auto p-4 m-4 border">
<Faq/> <Faq />
</div> </div>
</> </>
) )

View File

@ -1,14 +1,12 @@
'use client'
import Hero from '@/components/Hero' import Hero from '@/components/Hero'
import Notice from '@/components/community/Notice' import Notice from '@/components/community/Notice'
export default function CommunityNoticePage() { export default function CommunityNoticePage() {
return ( return (
<> <>
<Hero title="공지사항"/> <Hero title="공지사항" />
<div className="container flex flex-wrap items-center justify-between mx-auto p-4 m-4 border"> <div className="container flex flex-wrap items-center justify-between mx-auto p-4 m-4 border">
<Notice/> <Notice />
</div> </div>
</> </>
) )

View File

@ -1,14 +1,12 @@
'use client'
import Hero from '@/components/Hero' import Hero from '@/components/Hero'
import Plan from '@/components/management/Plan' import Plan from '@/components/management/Plan'
export default function ManagementPlanPage() { export default function ManagementPlanPage() {
return ( return (
<> <>
<Hero title="도면관리"/> <Hero title="도면관리" />
<div className="container flex flex-wrap items-center justify-between mx-auto p-4 m-4 border"> <div className="container flex flex-wrap items-center justify-between mx-auto p-4 m-4 border">
<Plan/> <Plan />
</div> </div>
</> </>
) )

View File

@ -1,5 +1,3 @@
'use client'
import Hero from '@/components/Hero' import Hero from '@/components/Hero'
import Stuff from '@/components/management/Stuff' import Stuff from '@/components/management/Stuff'
@ -8,7 +6,7 @@ export default function ManagementStuffPage() {
<> <>
<Hero title="물건관리" /> <Hero title="물건관리" />
<div className="container flex flex-wrap items-center justify-between mx-auto p-4 m-4 border"> <div className="container flex flex-wrap items-center justify-between mx-auto p-4 m-4 border">
<Stuff/> <Stuff />
</div> </div>
</> </>
) )

View File

@ -1,14 +1,12 @@
'use client'
import Hero from '@/components/Hero' import Hero from '@/components/Hero'
import Company from '@/components/master/Company' import Company from '@/components/master/Company'
export default function MasterCompanyPage() { export default function MasterCompanyPage() {
return ( return (
<> <>
<Hero title="회사정보 조회"/> <Hero title="회사정보 조회" />
<div className="container flex flex-wrap items-center justify-between mx-auto p-4 m-4 border"> <div className="container flex flex-wrap items-center justify-between mx-auto p-4 m-4 border">
<Company/> <Company />
</div> </div>
</> </>
) )

View File

@ -1,5 +1,3 @@
'use client'
import Hero from '@/components/Hero' import Hero from '@/components/Hero'
import Price from '@/components/master/Price' import Price from '@/components/master/Price'

View File

@ -1,5 +1,3 @@
'use client'
import Hero from '@/components/Hero' import Hero from '@/components/Hero'
import Roof from '@/components/Roof' import Roof from '@/components/Roof'

View File

@ -19,6 +19,7 @@ import { getCanvasState, insertCanvasState } from '@/lib/canvas'
import { calculateIntersection } from '@/util/canvas-util' import { calculateIntersection } from '@/util/canvas-util'
import { QPolygon } from '@/components/fabric/QPolygon' import { QPolygon } from '@/components/fabric/QPolygon'
import { useAxios } from '@/hooks/useAxios' import { useAxios } from '@/hooks/useAxios'
import ThumbnailLIst from './ui/ThumbnailLIst'
export default function Roof2() { export default function Roof2() {
const { canvas, handleRedo, handleUndo, setCanvasBackgroundWithDots, saveImage, addCanvas } = useCanvas('canvas') const { canvas, handleRedo, handleUndo, setCanvasBackgroundWithDots, saveImage, addCanvas } = useCanvas('canvas')
@ -691,6 +692,7 @@ export default function Roof2() {
</div> </div>
</> </>
)} )}
<ThumbnailLIst />
<div className="flex justify-start my-8 mx-2 w-full"> <div className="flex justify-start my-8 mx-2 w-full">
<canvas id="canvas" style={{ border: '1px solid black' }} /> <canvas id="canvas" style={{ border: '1px solid black' }} />
</div> </div>

View File

@ -0,0 +1,3 @@
export default function ThumbnailLIst() {
return <div className="flex justify-center m-4 w-full">thumbnails</div>
}