From 845a469d4328ed57a3233fb7943d3f881dee150f Mon Sep 17 00:00:00 2001 From: nalpari Date: Mon, 8 Jul 2024 13:17:40 +0900 Subject: [PATCH] Auto stash before rebase of "feature/ui-add" onto "feature/test" --- package.json | 2 + src/app/UIProvider.js | 5 + src/app/layout.js | 5 +- src/components/Roof2.jsx | 46 +- tailwind.config.js | 20 +- yarn.lock | 2086 +++++++++++++++++++++++++++++++++++++- 6 files changed, 2123 insertions(+), 41 deletions(-) create mode 100644 src/app/UIProvider.js diff --git a/package.json b/package.json index 468b23e1..78ce1907 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,9 @@ "lint": "next lint" }, "dependencies": { + "@nextui-org/react": "^2.4.2", "fabric": "^5.3.0", + "framer-motion": "^11.2.13", "next": "14.2.3", "react": "^18", "react-dom": "^18", diff --git a/src/app/UIProvider.js b/src/app/UIProvider.js new file mode 100644 index 00000000..02a21441 --- /dev/null +++ b/src/app/UIProvider.js @@ -0,0 +1,5 @@ +import { NextUIProvider } from '@nextui-org/react' + +export default function UIProvider({ children }) { + return {children} +} diff --git a/src/app/layout.js b/src/app/layout.js index 84095436..156536aa 100644 --- a/src/app/layout.js +++ b/src/app/layout.js @@ -2,6 +2,7 @@ import { Inter } from 'next/font/google' import './globals.css' import Headers from '@/components/Headers' import RecoilRootWrapper from './RecoilWrapper' +import UIProvider from './UIProvider' const inter = Inter({ subsets: ['latin'] }) @@ -15,7 +16,9 @@ export default function RootLayout({ children }) { - {children} + + {children} + ) diff --git a/src/components/Roof2.jsx b/src/components/Roof2.jsx index 9ee82c4e..77a5fd38 100644 --- a/src/components/Roof2.jsx +++ b/src/components/Roof2.jsx @@ -7,7 +7,11 @@ import QPolygon from '@/components/fabric/QPolygon' import RangeSlider from './ui/RangeSlider' import { useRecoilState, useRecoilValue } from 'recoil' -import { canvasSizeState, fontSizeState, sortedPolygonArray } from '@/store/canvasAtom' +import { + canvasSizeState, + fontSizeState, + sortedPolygonArray, +} from '@/store/canvasAtom' export default function Roof2() { const { @@ -165,9 +169,9 @@ export default function Roof2() { <> {canvas && ( <> -
+
현재 줌 : {zoom}%