diff --git a/@noctaCrdt/dist/Crdt.d.ts b/@noctaCrdt/dist/Crdt.d.ts deleted file mode 100644 index c18fa772..00000000 --- a/@noctaCrdt/dist/Crdt.d.ts +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=Crdt.d.ts.map \ No newline at end of file diff --git a/@noctaCrdt/dist/Crdt.d.ts.map b/@noctaCrdt/dist/Crdt.d.ts.map deleted file mode 100644 index 296f43c5..00000000 --- a/@noctaCrdt/dist/Crdt.d.ts.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Crdt.d.ts","sourceRoot":"","sources":["../Crdt.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/@noctaCrdt/dist/Crdt.js b/@noctaCrdt/dist/Crdt.js deleted file mode 100644 index dde9413f..00000000 --- a/@noctaCrdt/dist/Crdt.js +++ /dev/null @@ -1,2 +0,0 @@ -"use strict"; -//# sourceMappingURL=Crdt.js.map \ No newline at end of file diff --git a/@noctaCrdt/dist/Crdt.js.map b/@noctaCrdt/dist/Crdt.js.map deleted file mode 100644 index dea3b8d8..00000000 --- a/@noctaCrdt/dist/Crdt.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Crdt.js","sourceRoot":"","sources":["../Crdt.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/@noctaCrdt/dist/Interfaces.d.ts b/@noctaCrdt/dist/Interfaces.d.ts deleted file mode 100644 index 00f43a55..00000000 --- a/@noctaCrdt/dist/Interfaces.d.ts +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=Interfaces.d.ts.map \ No newline at end of file diff --git a/@noctaCrdt/dist/Interfaces.d.ts.map b/@noctaCrdt/dist/Interfaces.d.ts.map deleted file mode 100644 index 2c99ef16..00000000 --- a/@noctaCrdt/dist/Interfaces.d.ts.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Interfaces.d.ts","sourceRoot":"","sources":["../Interfaces.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/@noctaCrdt/dist/Interfaces.js b/@noctaCrdt/dist/Interfaces.js deleted file mode 100644 index 04b8a87d..00000000 --- a/@noctaCrdt/dist/Interfaces.js +++ /dev/null @@ -1,2 +0,0 @@ -"use strict"; -//# sourceMappingURL=Interfaces.js.map \ No newline at end of file diff --git a/@noctaCrdt/dist/Interfaces.js.map b/@noctaCrdt/dist/Interfaces.js.map deleted file mode 100644 index f5f7494b..00000000 --- a/@noctaCrdt/dist/Interfaces.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Interfaces.js","sourceRoot":"","sources":["../Interfaces.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/@noctaCrdt/dist/LinkedList.d.ts b/@noctaCrdt/dist/LinkedList.d.ts deleted file mode 100644 index 5e7fec9e..00000000 --- a/@noctaCrdt/dist/LinkedList.d.ts +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=LinkedList.d.ts.map \ No newline at end of file diff --git a/@noctaCrdt/dist/LinkedList.d.ts.map b/@noctaCrdt/dist/LinkedList.d.ts.map deleted file mode 100644 index 22f7d5a6..00000000 --- a/@noctaCrdt/dist/LinkedList.d.ts.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"LinkedList.d.ts","sourceRoot":"","sources":["../LinkedList.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/@noctaCrdt/dist/LinkedList.js b/@noctaCrdt/dist/LinkedList.js deleted file mode 100644 index bca2e8bd..00000000 --- a/@noctaCrdt/dist/LinkedList.js +++ /dev/null @@ -1,2 +0,0 @@ -"use strict"; -//# sourceMappingURL=LinkedList.js.map \ No newline at end of file diff --git a/@noctaCrdt/dist/LinkedList.js.map b/@noctaCrdt/dist/LinkedList.js.map deleted file mode 100644 index e9833e5c..00000000 --- a/@noctaCrdt/dist/LinkedList.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"LinkedList.js","sourceRoot":"","sources":["../LinkedList.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/@noctaCrdt/dist/Node.d.ts b/@noctaCrdt/dist/Node.d.ts deleted file mode 100644 index 5dc1fc3c..00000000 --- a/@noctaCrdt/dist/Node.d.ts +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=Node.d.ts.map \ No newline at end of file diff --git a/@noctaCrdt/dist/Node.d.ts.map b/@noctaCrdt/dist/Node.d.ts.map deleted file mode 100644 index 97d301b8..00000000 --- a/@noctaCrdt/dist/Node.d.ts.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Node.d.ts","sourceRoot":"","sources":["../Node.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/@noctaCrdt/dist/Node.js b/@noctaCrdt/dist/Node.js deleted file mode 100644 index 27b1e7e8..00000000 --- a/@noctaCrdt/dist/Node.js +++ /dev/null @@ -1,2 +0,0 @@ -"use strict"; -//# sourceMappingURL=Node.js.map \ No newline at end of file diff --git a/@noctaCrdt/dist/Node.js.map b/@noctaCrdt/dist/Node.js.map deleted file mode 100644 index 22bd2e45..00000000 --- a/@noctaCrdt/dist/Node.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Node.js","sourceRoot":"","sources":["../Node.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/@noctaCrdt/dist/tsconfig.tsbuildinfo b/@noctaCrdt/dist/tsconfig.tsbuildinfo deleted file mode 100644 index 9b9c312d..00000000 --- a/@noctaCrdt/dist/tsconfig.tsbuildinfo +++ /dev/null @@ -1 +0,0 @@ -{"program":{"fileNames":["../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es5.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2015.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2016.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2017.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2018.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2019.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2020.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2021.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.dom.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.dom.iterable.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.webworker.importscripts.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.scripthost.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2015.core.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2015.collection.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2015.generator.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2015.iterable.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2015.promise.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2015.proxy.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2015.reflect.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2015.symbol.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2015.symbol.wellknown.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2016.array.include.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2017.date.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2017.object.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2017.sharedmemory.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2017.string.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2017.intl.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2017.typedarrays.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2018.asyncgenerator.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2018.asynciterable.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2018.intl.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2018.promise.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2018.regexp.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2019.array.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2019.object.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2019.string.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2019.symbol.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2019.intl.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2020.bigint.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2020.date.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2020.promise.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2020.sharedmemory.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2020.string.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2020.symbol.wellknown.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2020.intl.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2020.number.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2021.promise.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2021.string.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2021.weakref.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2021.intl.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.decorators.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.decorators.legacy.d.ts","../../node_modules/.pnpm/typescript@5.3.3/node_modules/typescript/lib/lib.es2021.full.d.ts","../crdt.ts","../interfaces.ts","../linkedlist.ts","../node.ts"],"fileInfos":[{"version":"f33e5332b24c3773e930e212cbb8b6867c8ba3ec4492064ea78e55a524d57450","affectsGlobalScope":true},"45b7ab580deca34ae9729e97c13cfd999df04416a79116c3bfb483804f85ded4","26f2f787e82c4222710f3b676b4d83eb5ad0a72fa7b746f03449e7a026ce5073","9a68c0c07ae2fa71b44384a839b7b8d81662a236d4b9ac30916718f7510b1b2d","5e1c4c362065a6b95ff952c0eab010f04dcd2c3494e813b493ecfd4fcb9fc0d8","68d73b4a11549f9c0b7d352d10e91e5dca8faa3322bfb77b661839c42b1ddec7","5efce4fc3c29ea84e8928f97adec086e3dc876365e0982cc8479a07954a3efd4","feecb1be483ed332fad555aff858affd90a48ab19ba7272ee084704eb7167569",{"version":"21e41a76098aa7a191028256e52a726baafd45a925ea5cf0222eb430c96c1d83","affectsGlobalScope":true},{"version":"35299ae4a62086698444a5aaee27fc7aa377c68cbb90b441c9ace246ffd05c97","affectsGlobalScope":true},{"version":"80e18897e5884b6723488d4f5652167e7bb5024f946743134ecc4aa4ee731f89","affectsGlobalScope":true},{"version":"cd034f499c6cdca722b60c04b5b1b78e058487a7085a8e0d6fb50809947ee573","affectsGlobalScope":true},{"version":"138fb588d26538783b78d1e3b2c2cc12d55840b97bf5e08bca7f7a174fbe2f17","affectsGlobalScope":true},{"version":"dc2df20b1bcdc8c2d34af4926e2c3ab15ffe1160a63e58b7e09833f616efff44","affectsGlobalScope":true},{"version":"4443e68b35f3332f753eacc66a04ac1d2053b8b035a0e0ac1d455392b5e243b3","affectsGlobalScope":true},{"version":"bc47685641087c015972a3f072480889f0d6c65515f12bd85222f49a98952ed7","affectsGlobalScope":true},{"version":"0dc1e7ceda9b8b9b455c3a2d67b0412feab00bd2f66656cd8850e8831b08b537","affectsGlobalScope":true},{"version":"ce691fb9e5c64efb9547083e4a34091bcbe5bdb41027e310ebba8f7d96a98671","affectsGlobalScope":true},{"version":"8d697a2a929a5fcb38b7a65594020fcef05ec1630804a33748829c5ff53640d0","affectsGlobalScope":true},{"version":"4ff2a353abf8a80ee399af572debb8faab2d33ad38c4b4474cff7f26e7653b8d","affectsGlobalScope":true},{"version":"93495ff27b8746f55d19fcbcdbaccc99fd95f19d057aed1bd2c0cafe1335fbf0","affectsGlobalScope":true},{"version":"6fc23bb8c3965964be8c597310a2878b53a0306edb71d4b5a4dfe760186bcc01","affectsGlobalScope":true},{"version":"38f0219c9e23c915ef9790ab1d680440d95419ad264816fa15009a8851e79119","affectsGlobalScope":true},{"version":"bb42a7797d996412ecdc5b2787720de477103a0b2e53058569069a0e2bae6c7e","affectsGlobalScope":true},{"version":"4738f2420687fd85629c9efb470793bb753709c2379e5f85bc1815d875ceadcd","affectsGlobalScope":true},{"version":"2f11ff796926e0832f9ae148008138ad583bd181899ab7dd768a2666700b1893","affectsGlobalScope":true},{"version":"4de680d5bb41c17f7f68e0419412ca23c98d5749dcaaea1896172f06435891fc","affectsGlobalScope":true},{"version":"9fc46429fbe091ac5ad2608c657201eb68b6f1b8341bd6d670047d32ed0a88fa","affectsGlobalScope":true},{"version":"61c37c1de663cf4171e1192466e52c7a382afa58da01b1dc75058f032ddf0839","affectsGlobalScope":true},{"version":"b541a838a13f9234aba650a825393ffc2292dc0fc87681a5d81ef0c96d281e7a","affectsGlobalScope":true},{"version":"e0275cd0e42990dc3a16f0b7c8bca3efe87f1c8ad404f80c6db1c7c0b828c59f","affectsGlobalScope":true},{"version":"811ec78f7fefcabbda4bfa93b3eb67d9ae166ef95f9bff989d964061cbf81a0c","affectsGlobalScope":true},{"version":"717937616a17072082152a2ef351cb51f98802fb4b2fdabd32399843875974ca","affectsGlobalScope":true},{"version":"d7e7d9b7b50e5f22c915b525acc5a49a7a6584cf8f62d0569e557c5cfc4b2ac2","affectsGlobalScope":true},{"version":"71c37f4c9543f31dfced6c7840e068c5a5aacb7b89111a4364b1d5276b852557","affectsGlobalScope":true},{"version":"576711e016cf4f1804676043e6a0a5414252560eb57de9faceee34d79798c850","affectsGlobalScope":true},{"version":"89c1b1281ba7b8a96efc676b11b264de7a8374c5ea1e6617f11880a13fc56dc6","affectsGlobalScope":true},{"version":"49ed889be54031e1044af0ad2c603d627b8bda8b50c1a68435fe85583901d072","affectsGlobalScope":true},{"version":"e93d098658ce4f0c8a0779e6cab91d0259efb88a318137f686ad76f8410ca270","affectsGlobalScope":true},{"version":"063600664504610fe3e99b717a1223f8b1900087fab0b4cad1496a114744f8df","affectsGlobalScope":true},{"version":"934019d7e3c81950f9a8426d093458b65d5aff2c7c1511233c0fd5b941e608ab","affectsGlobalScope":true},{"version":"bf14a426dbbf1022d11bd08d6b8e709a2e9d246f0c6c1032f3b2edb9a902adbe","affectsGlobalScope":true},{"version":"ec0104fee478075cb5171e5f4e3f23add8e02d845ae0165bfa3f1099241fa2aa","affectsGlobalScope":true},{"version":"2b72d528b2e2fe3c57889ca7baef5e13a56c957b946906d03767c642f386bbc3","affectsGlobalScope":true},{"version":"acae90d417bee324b1372813b5a00829d31c7eb670d299cd7f8f9a648ac05688","affectsGlobalScope":true},{"version":"368af93f74c9c932edd84c58883e736c9e3d53cec1fe24c0b0ff451f529ceab1","affectsGlobalScope":true},{"version":"af3dd424cf267428f30ccfc376f47a2c0114546b55c44d8c0f1d57d841e28d74","affectsGlobalScope":true},{"version":"995c005ab91a498455ea8dfb63aa9f83fa2ea793c3d8aa344be4a1678d06d399","affectsGlobalScope":true},{"version":"51e547984877a62227042850456de71a5c45e7fe86b7c975c6e68896c86fa23b","affectsGlobalScope":true},{"version":"62a4966981264d1f04c44eb0f4b5bdc3d81c1a54725608861e44755aa24ad6a5","affectsGlobalScope":true},{"version":"33358442698bb565130f52ba79bfd3d4d484ac85fe33f3cb1759c54d18201393","affectsGlobalScope":true},{"version":"782dec38049b92d4e85c1585fbea5474a219c6984a35b004963b00beb1aab538","affectsGlobalScope":true},"c1e8d979afc15d66e2bd5a58c732d5a2ba3ccaae41ac7d5a2c539e6de66a8e51","e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"],"root":[[54,57]],"options":{"allowSyntheticDefaultImports":true,"composite":true,"declaration":true,"declarationMap":true,"emitDecoratorMetadata":true,"experimentalDecorators":true,"module":99,"outDir":"./","removeComments":true,"rootDir":"..","skipLibCheck":true,"sourceMap":true,"strict":true,"target":8},"referencedMap":[],"exportedModulesMap":[],"semanticDiagnosticsPerFile":[54,55,56,57,51,52,9,10,14,13,2,15,16,17,18,19,20,21,22,3,4,23,27,24,25,26,28,29,30,5,31,32,33,34,6,38,35,36,37,39,7,40,45,46,41,42,43,44,8,53,50,47,48,49,1,12,11],"latestChangedDtsFile":"./Node.d.ts"},"version":"5.3.3"} \ No newline at end of file diff --git a/client/Dockerfile b/client/Dockerfile index e3802265..804e213f 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -3,15 +3,17 @@ FROM node:20 AS build WORKDIR /app # 2. 모노레포 루트에서 필요한 파일 복사 -COPY ./package.json ./pnpm-lock.yaml ./pnpm-workspace.yaml ./ -COPY ./client/package.json ./client/ +COPY . . +# COPY ./package.json ./pnpm-lock.yaml ./pnpm-workspace.yaml ./ +# COPY ./client/package.json ./client/panda.config.ts ./client/vite.config.ts ./client/tsconfig.json ./client/ +# COPY ./client/src/styles ./client/src/styles +# COPY ./@noctaCrdt/package.json ./@noctaCrdt/ # 3. pnpm 설치 및 의존성 설치 RUN npm install -g pnpm RUN pnpm install # 4. 애플리케이션 빌드 -COPY . . RUN pnpm --filter client run build # 5. 빌드된 정적 파일 준비 (Nginx에서 제공) diff --git a/client/panda.config.ts b/client/panda.config.ts index 53f93dde..b358dcf9 100644 --- a/client/panda.config.ts +++ b/client/panda.config.ts @@ -1,12 +1,12 @@ import { defineConfig } from "@pandacss/dev"; -import { radii } from "@styles/tokens/radii"; -import { colors } from "@styles/tokens/color"; -import { shadows } from "@styles/tokens/shadow"; -import { spacing } from "@styles/tokens/spacing"; -import { textStyles } from "@styles/typography"; -import { globalStyles } from "@styles/global"; -import { glassContainerRecipe } from "@styles/recipes/glassContainerRecipe"; -import { sizes } from "@styles/tokens/sizes"; +import { radii } from "./src/styles/tokens/radii"; +import { colors } from "./src/styles/tokens/color"; +import { shadows } from "./src/styles/tokens/shadow"; +import { spacing } from "./src/styles/tokens/spacing"; +import { sizes } from "./src/styles/tokens/sizes"; +import { textStyles } from "./src/styles/typography"; +import { globalStyles } from "./src/styles/global"; +import { glassContainerRecipe } from "./src/styles/recipes/glassContainerRecipe"; export default defineConfig({ preflight: true, diff --git a/client/src/components/bottomNavigator/BottomNavigator.tsx b/client/src/components/bottomNavigator/BottomNavigator.tsx index 8aef4203..fcfc6f50 100644 --- a/client/src/components/bottomNavigator/BottomNavigator.tsx +++ b/client/src/components/bottomNavigator/BottomNavigator.tsx @@ -1,6 +1,6 @@ +import { Page } from "@src/types/page"; import { motion } from "framer-motion"; import { IconButton } from "@components/button/IconButton"; -import { Page } from "src/types/page"; import { animation } from "./BottomNavigator.animation"; import { bottomNavigatorContainer } from "./BottomNavigator.style"; diff --git a/client/src/components/sidebar/Sidebar.tsx b/client/src/components/sidebar/Sidebar.tsx index 53849c19..596d4e2a 100644 --- a/client/src/components/sidebar/Sidebar.tsx +++ b/client/src/components/sidebar/Sidebar.tsx @@ -1,7 +1,7 @@ +import { useIsSidebarOpen, useSidebarActions } from "@src/stores/useSidebarStore"; +import { Page } from "@src/types/page"; import { motion } from "framer-motion"; import { IconButton } from "@components/button/IconButton"; -import { useIsSidebarOpen, useSidebarActions } from "src/stores/useSidebarStore"; -import { Page } from "src/types/page"; import { MenuButton } from "./MenuButton"; import { PageItem } from "./PageItem"; import { animation, contentVariants, sidebarVariants } from "./Sidebar.animation"; diff --git a/client/src/features/page/Page.tsx b/client/src/features/page/Page.tsx index d234fc88..7c03267a 100644 --- a/client/src/features/page/Page.tsx +++ b/client/src/features/page/Page.tsx @@ -1,7 +1,7 @@ +import { Page as PageType } from "@src/types/page"; import { motion, AnimatePresence } from "framer-motion"; -import { useRef, useState } from "react"; +import { useRef } from "react"; import { Editor } from "@features/editor/Editor"; -import { Page as PageType } from "src/types/page"; import { pageAnimation, resizeHandleAnimation } from "./Page.animation"; import { pageContainer, pageHeader, resizeHandle } from "./Page.style"; diff --git a/client/src/features/page/hooks/usePage.ts b/client/src/features/page/hooks/usePage.ts index 30defcd6..2ec215b0 100644 --- a/client/src/features/page/hooks/usePage.ts +++ b/client/src/features/page/hooks/usePage.ts @@ -1,8 +1,8 @@ +import { useIsSidebarOpen } from "@src/stores/useSidebarStore"; +import { Position, Size } from "@src/types/page"; import { useEffect, useState } from "react"; import { PAGE, SIDE_BAR } from "@constants/size"; import { SPACING } from "@constants/spacing"; -import { useIsSidebarOpen } from "src/stores/useSidebarStore"; -import { Position, Size } from "src/types/page"; const PADDING = SPACING.MEDIUM * 2; diff --git a/client/src/features/workSpace/hooks/usePagesManage.ts b/client/src/features/workSpace/hooks/usePagesManage.ts index 50ee0a2e..957ce3dc 100644 --- a/client/src/features/workSpace/hooks/usePagesManage.ts +++ b/client/src/features/workSpace/hooks/usePagesManage.ts @@ -1,5 +1,5 @@ +import { Page } from "@src/types/page"; import { useState } from "react"; -import { Page } from "src/types/page"; interface usePagesManageProps { pages: Page[]; diff --git a/client/src/hooks/useMarkdownGrammer/handlers/backSpace.ts b/client/src/hooks/useMarkdownGrammer/handlers/backSpace.ts index 9b34890f..8c71a6dc 100644 --- a/client/src/hooks/useMarkdownGrammer/handlers/backSpace.ts +++ b/client/src/hooks/useMarkdownGrammer/handlers/backSpace.ts @@ -17,7 +17,8 @@ export const useBackspaceKeyHandler = ({ const { parentNode } = currentNode; const wasRoot = parentNode === editorState.rootNode; - let focusNode; + let focusNode: EditorNode; + if (parentNode.prevNode?.type === "checkbox") { // undefined가 될 수 있는 상황 체크 const prevFirstChild = parentNode.prevNode.firstChild; @@ -192,14 +193,14 @@ export const useBackspaceKeyHandler = ({ currentNode.type = "p"; setEditorState((prev) => ({ ...prev })); } else { - let focusNode; + let focusNode: EditorNode; if (currentNode.prevNode?.type === "checkbox") { // 이전 노드가 체크박스면 그 체크박스의 content 노드로 포커스 - focusNode = currentNode.prevNode.firstChild; + focusNode = currentNode.prevNode.firstChild as EditorNode; } else if (currentNode.prevNode?.type === "ul" || currentNode.prevNode?.type === "ol") { - focusNode = editorList.getLastChild(currentNode.prevNode); + focusNode = editorList.getLastChild(currentNode.prevNode) as EditorNode; } else { - focusNode = currentNode.prevNode || currentNode.parentNode; + focusNode = (currentNode.prevNode || currentNode.parentNode) as EditorNode; } // 현재 노드 제거 전에 연결 관계 정리 diff --git a/client/src/styles/tokens/color.ts b/client/src/styles/tokens/color.ts index 63f77f53..2dbf4edd 100644 --- a/client/src/styles/tokens/color.ts +++ b/client/src/styles/tokens/color.ts @@ -1,4 +1,4 @@ -import { COLOR } from "src/constants/color"; +import { COLOR } from "@constants/color"; export const colors = { white: { diff --git a/client/src/styles/tokens/sizes.ts b/client/src/styles/tokens/sizes.ts index 9bcf1403..3780197a 100644 --- a/client/src/styles/tokens/sizes.ts +++ b/client/src/styles/tokens/sizes.ts @@ -1,4 +1,4 @@ -import { SIDE_BAR } from "src/constants/size"; +import { SIDE_BAR } from "@constants/size"; export const sizes = { sidebar: { diff --git a/client/src/styles/tokens/spacing.ts b/client/src/styles/tokens/spacing.ts index 1e67ab0a..f355c7fd 100644 --- a/client/src/styles/tokens/spacing.ts +++ b/client/src/styles/tokens/spacing.ts @@ -1,4 +1,4 @@ -import { SPACING } from "src/constants/spacing"; +import { SPACING } from "@constants/spacing"; export const spacing = { sm: { value: `${SPACING.SMALL}px` }, diff --git a/client/tsconfig.json b/client/tsconfig.json index 7abbe2ed..9af798bf 100644 --- a/client/tsconfig.json +++ b/client/tsconfig.json @@ -19,6 +19,7 @@ "types": ["vite/client"], "baseUrl": ".", "paths": { + "@src/*": ["src/*"], "@styled-system/*": ["styled-system/*"], "@components/*": ["src/components/*"], "@assets/*": ["src/assets/*"], diff --git a/client/vite.config.ts b/client/vite.config.ts index 5f5414bc..c857bc33 100644 --- a/client/vite.config.ts +++ b/client/vite.config.ts @@ -5,9 +5,5 @@ import tsconfigPaths from "vite-tsconfig-paths"; export default defineConfig({ plugins: [react(), tsconfigPaths()], - resolve: { - alias: { - "@noctaCrdt": path.resolve(__dirname, "../@noctaCrdt"), - }, - }, + resolve: { alias: { "@noctaCrdt": path.resolve(__dirname, "../@noctaCrdt") } }, }); diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 340a2a67..a085c227 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,4 +1,4 @@ packages: - "client" - "server" - - "@noctaCrdt" + - "./@noctaCrdt" diff --git a/server/Dockerfile b/server/Dockerfile index f18a47c9..9b752fbd 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -5,6 +5,7 @@ WORKDIR /app # 2. 모노레포 루트에서 필요한 파일 복사 COPY ./package.json ./pnpm-lock.yaml ./pnpm-workspace.yaml ./ COPY ./server/package.json ./server/ +COPY ./@noctaCrdt/package.json ./@noctaCrdt/ # 3. pnpm 설치 및 의존성 설치 RUN npm install -g pnpm