Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev
# Conflicts: # src/components/Roof2.jsx
This commit is contained in:
commit
3143acce93
@ -18,7 +18,7 @@ import { QLine } from '@/components/fabric/QLine'
|
|||||||
import { getCanvasState, insertCanvasState } from '@/lib/canvas'
|
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 ThumbnailLIst from './ui/ThumbnailLIst'
|
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')
|
||||||
@ -50,6 +50,12 @@ export default function Roof2() {
|
|||||||
|
|
||||||
const wall = useRecoilValue(wallState)
|
const wall = useRecoilValue(wallState)
|
||||||
|
|
||||||
|
//canvas 썸네일
|
||||||
|
const [thumbnails, setThumbnails] = useState([])
|
||||||
|
const thumbnailProps = {
|
||||||
|
thumbnails,
|
||||||
|
}
|
||||||
|
|
||||||
const {
|
const {
|
||||||
mode,
|
mode,
|
||||||
setMode,
|
setMode,
|
||||||
@ -691,7 +697,7 @@ export default function Roof2() {
|
|||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
<ThumbnailLIst />
|
<ThumbnailList {...thumbnailProps} />
|
||||||
<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>
|
||||||
|
|||||||
@ -1,3 +1,20 @@
|
|||||||
export default function ThumbnailLIst() {
|
import { Card, Image } from '@nextui-org/react'
|
||||||
return <div className="flex justify-center m-4 w-full">thumbnails</div>
|
|
||||||
|
export default function ThumbnailList(props) {
|
||||||
|
const { thumbnails } = props
|
||||||
|
console.log(props)
|
||||||
|
console.log(thumbnails)
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<div className="flex justify-center m-4 w-full">
|
||||||
|
{thumbnails.length > 0 &&
|
||||||
|
thumbnails.map((thumbnail, index) => (
|
||||||
|
<Card isFooterBlurred radius="lg" className="border-none m-2">
|
||||||
|
<Image alt="Woman listing to music" className="object-cover" height={200} src="https://nextui.org/images/hero-card.jpeg" width={200} />
|
||||||
|
</Card>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user