From 50d36f32ac062f20f07550adf3726250bdcf7a33 Mon Sep 17 00:00:00 2001 From: Honghyeonji <66579773+Honghyeonji@users.noreply.github.com> Date: Wed, 13 Nov 2024 17:15:01 +0900 Subject: [PATCH 1/8] =?UTF-8?q?=F0=9F=99=80=20chore:=20server=20build=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EB=B3=80=EA=B2=BD=20(#95)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/server/package.json | 4 +- pnpm-lock.yaml | 92 +++++++++++++++++++++++++++++++++++----- 2 files changed, 84 insertions(+), 12 deletions(-) diff --git a/apps/server/package.json b/apps/server/package.json index 9283cbf2..c1f4a6c9 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "scripts": { "dev": "cross-env nodemon --exec ts-node -r tsconfig-paths/register src/index.ts", - "build": "tsc", + "build": "tsc && tsc-alias", "start": "node dist/index.js", "swagger-auto": "ts-node src/docs/swaggerAutogen.ts" }, @@ -25,6 +25,6 @@ "swagger-jsdoc": "^6.2.8", "swagger-ui-express": "^5.0.1", "ts-node": "^10.0.0", - "tsconfig-paths": "^4.2.0" + "tsc-alias": "^1.8.10" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2a64cd95..e0f29b11 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -175,9 +175,6 @@ importers: '@types/swagger-ui-express': specifier: ^4.1.7 version: 4.1.7 - cross-env: - specifier: ^7.0.3 - version: 7.0.3 nodemon: specifier: ^3.1.7 version: 3.1.7 @@ -193,9 +190,9 @@ importers: ts-node: specifier: ^10.0.0 version: 10.9.2(@types/node@22.8.7)(typescript@5.6.3) - tsconfig-paths: - specifier: ^4.2.0 - version: 4.2.0 + tsc-alias: + specifier: ^1.8.10 + version: 1.8.10 packages/tsconfig: {} @@ -1350,6 +1347,10 @@ packages: array-flatten@1.1.1: resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==} + array-union@2.1.0: + resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==} + engines: {node: '>=8'} + asn1@0.2.6: resolution: {integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==} @@ -1566,6 +1567,10 @@ packages: resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} engines: {node: '>= 8'} + cross-spawn@7.0.5: + resolution: {integrity: sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==} + engines: {node: '>= 8'} + css.escape@1.5.1: resolution: {integrity: sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==} @@ -1651,6 +1656,10 @@ packages: resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==} engines: {node: '>=0.3.1'} + dir-glob@3.0.1: + resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} + engines: {node: '>=8'} + dlv@1.1.3: resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==} @@ -1948,6 +1957,10 @@ packages: resolution: {integrity: sha512-1+gLErljJFhbOVyaetcwJiJ4+eLe45S2E7P5UiZ9xGfeq3ATQf5DOv9G7MH3gGbKQLkzmNh2DxfZwLdw+j6oTQ==} engines: {node: '>=18'} + globby@11.1.0: + resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==} + engines: {node: '>=10'} + goober@2.1.16: resolution: {integrity: sha512-erjk19y1U33+XAMe1VTvIONHYoSqE4iS7BYUZfHaqeohLmnC0FdxEh7rQU+6MZ4OajItzjZFSRtVANrQwNq6/g==} peerDependencies: @@ -2338,6 +2351,10 @@ packages: ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} + mylas@2.1.13: + resolution: {integrity: sha512-+MrqnJRtxdF+xngFfUUkIMQrUUL0KsxbADUkn23Z/4ibGg192Q+z+CQyiYwvWTsYjJygmMR8+w3ZDa98Zh6ESg==} + engines: {node: '>=12.0.0'} + mz@2.7.0: resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} @@ -2483,6 +2500,10 @@ packages: resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==} engines: {node: '>= 6'} + plimit-lit@1.6.1: + resolution: {integrity: sha512-B7+VDyb8Tl6oMJT9oSO2CW8XC/T4UcJGrwOVoNGwOQsQYhlpfajmrMj5xeejqaASq3V/EqThyOeATEOMuSEXiA==} + engines: {node: '>=12'} + polished@4.3.1: resolution: {integrity: sha512-OBatVyC/N7SCW/FaDHrSd+vn0o5cS855TOmYi4OkdWUMSJCET/xip//ch8xGUvtr3i44X9LVyWwQlRMTN3pwSA==} engines: {node: '>=10'} @@ -2631,6 +2652,10 @@ packages: querystringify@2.2.0: resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==} + queue-lit@1.5.2: + resolution: {integrity: sha512-tLc36IOPeMAubu8BkW8YDBV+WyIgKlYU7zUNs0J5Vk9skSZ4JfGlPOqplP0aHdfv7HL0B2Pg6nwiq60Qc6M2Hw==} + engines: {node: '>=12'} + queue-microtask@1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} @@ -2825,6 +2850,10 @@ packages: sister@3.0.2: resolution: {integrity: sha512-p19rtTs+NksBRKW9qn0UhZ8/TUI9BPw9lmtHny+Y3TinWlOa9jWh9xB0AtPSdmOy49NJJJSSe0Ey4C7h0TrcYA==} + slash@3.0.0: + resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} + engines: {node: '>=8'} + snake-case@3.0.4: resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==} @@ -3017,6 +3046,10 @@ packages: '@swc/wasm': optional: true + tsc-alias@1.8.10: + resolution: {integrity: sha512-Ibv4KAWfFkFdKJxnWfVtdOmB0Zi1RJVxcbPGiCDsFpCQSsmpWyuzHG3rQyI5YkobWwxFPEyQfu1hdo4qLG2zPw==} + hasBin: true + tsconfig-paths@4.2.0: resolution: {integrity: sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==} engines: {node: '>=6'} @@ -4432,6 +4465,8 @@ snapshots: array-flatten@1.1.1: {} + array-union@2.1.0: {} + asn1@0.2.6: dependencies: safer-buffer: 2.1.2 @@ -4605,8 +4640,7 @@ snapshots: commander@6.2.0: {} - commander@9.5.0: - optional: true + commander@9.5.0: {} concat-map@0.0.1: {} @@ -4656,7 +4690,7 @@ snapshots: cross-env@7.0.3: dependencies: - cross-spawn: 7.0.3 + cross-spawn: 7.0.5 cross-spawn@7.0.3: dependencies: @@ -4664,6 +4698,12 @@ snapshots: shebang-command: 2.0.0 which: 2.0.2 + cross-spawn@7.0.5: + dependencies: + path-key: 3.1.1 + shebang-command: 2.0.0 + which: 2.0.2 + css.escape@1.5.1: {} cssesc@3.0.0: {} @@ -4719,6 +4759,10 @@ snapshots: diff@4.0.2: {} + dir-glob@3.0.1: + dependencies: + path-type: 4.0.0 + dlv@1.1.3: {} doctrine@3.0.0: @@ -5021,7 +5065,7 @@ snapshots: foreground-child@3.3.0: dependencies: - cross-spawn: 7.0.3 + cross-spawn: 7.0.5 signal-exit: 4.1.0 form-data@4.0.1: @@ -5101,6 +5145,15 @@ snapshots: globals@15.12.0: {} + globby@11.1.0: + dependencies: + array-union: 2.1.0 + dir-glob: 3.0.1 + fast-glob: 3.3.2 + ignore: 5.3.2 + merge2: 1.4.1 + slash: 3.0.0 + goober@2.1.16(csstype@3.1.3): dependencies: csstype: 3.1.3 @@ -5447,6 +5500,8 @@ snapshots: ms@2.1.3: {} + mylas@2.1.13: {} + mz@2.7.0: dependencies: any-promise: 1.3.0 @@ -5575,6 +5630,10 @@ snapshots: pirates@4.0.6: {} + plimit-lit@1.6.1: + dependencies: + queue-lit: 1.5.2 + polished@4.3.1: dependencies: '@babel/runtime': 7.26.0 @@ -5660,6 +5719,8 @@ snapshots: querystringify@2.2.0: {} + queue-lit@1.5.2: {} + queue-microtask@1.2.3: {} range-parser@1.2.1: {} @@ -5895,6 +5956,8 @@ snapshots: sister@3.0.2: {} + slash@3.0.0: {} + snake-case@3.0.4: dependencies: dot-case: 3.0.4 @@ -6113,6 +6176,15 @@ snapshots: v8-compile-cache-lib: 3.0.1 yn: 3.1.1 + tsc-alias@1.8.10: + dependencies: + chokidar: 3.6.0 + commander: 9.5.0 + globby: 11.1.0 + mylas: 2.1.13 + normalize-path: 3.0.0 + plimit-lit: 1.6.1 + tsconfig-paths@4.2.0: dependencies: json5: 2.2.3 From 64598723b5be6710998d915a2832bd09bfbf0b72 Mon Sep 17 00:00:00 2001 From: Honghyeonji Date: Wed, 13 Nov 2024 17:19:57 +0900 Subject: [PATCH 2/8] =?UTF-8?q?=F0=9F=99=80=20chore:=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=95=88=ED=95=98=EB=8A=94=20import=20=EC=84=A0=EC=96=B8=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/client/src/pages/HomePage.tsx | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/apps/client/src/pages/HomePage.tsx b/apps/client/src/pages/HomePage.tsx index 70a04d71..52d0ce62 100644 --- a/apps/client/src/pages/HomePage.tsx +++ b/apps/client/src/pages/HomePage.tsx @@ -1,10 +1,4 @@ -import { - EmptyWorkspace, - GuidesBox, - HomeHeader, - WorkspaceContainer, - WorkspaceModal, -} from '@/widgets'; +import { GuidesBox, HomeHeader, WorkspaceContainer, WorkspaceModal } from '@/widgets'; import { Loading } from '@/shared/ui'; import { useLoadingStore } from '@/shared/store'; From 514d391b809a2f131056a204086574a353de1658 Mon Sep 17 00:00:00 2001 From: inhachoi <80045891+inhachoi@users.noreply.github.com> Date: Wed, 13 Nov 2024 17:28:27 +0900 Subject: [PATCH 3/8] =?UTF-8?q?[#18]=20=E2=80=9C=EB=AF=B8=EB=A6=AC?= =?UTF-8?q?=EB=B3=B4=EA=B8=B0=E2=80=9D,=20=E2=80=9CHTML=E2=80=9D,=20?= =?UTF-8?q?=E2=80=9CCSS=E2=80=9D=20=EC=B4=9D=203=EA=B0=9C=EC=9D=98=20?= =?UTF-8?q?=ED=83=AD=EC=9D=84=20=EB=B3=BC=20=EC=88=98=20=EC=9E=88=EB=8B=A4?= =?UTF-8?q?.=20(#93)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ๐Ÿ’„ design: ๋ฏธ๋ฆฌ๋ณด๊ธฐ ๋ทฐ ์Šคํƒ€์ผ + ๋ฐฐ์น˜ ๊ฐœ์„  ๋ฐ ํƒญ ์ ์šฉ * โœจ feat: html ํŒŒ์‹ฑ ๋“ค์—ฌ์“ฐ๊ธฐ (preํƒœ๊ทธ + whitespace-pre-wrap ์†์„ฑ ํ™œ์šฉ) * ๐Ÿ’„ design: ์Šคํฌ๋กค๋ฐ” ์ปค์Šคํ…€ --- apps/client/src/app/index.css | 9 ++++ .../widgets/workspace/CssPropsSelectBox.tsx | 6 +-- .../widgets/workspace/WorkspaceContent.tsx | 46 +++++++++++++++---- 3 files changed, 49 insertions(+), 12 deletions(-) diff --git a/apps/client/src/app/index.css b/apps/client/src/app/index.css index 20121cc6..5cc2a290 100644 --- a/apps/client/src/app/index.css +++ b/apps/client/src/app/index.css @@ -57,3 +57,12 @@ body { font-family: 'SUIT Variable', serif; } + +::-webkit-scrollbar { + width: 8px; +} + +::-webkit-scrollbar-thumb { + background: #CDD9E4; + border-radius: 4px; +} \ No newline at end of file diff --git a/apps/client/src/widgets/workspace/CssPropsSelectBox.tsx b/apps/client/src/widgets/workspace/CssPropsSelectBox.tsx index 3cfb773d..a3f4bdde 100644 --- a/apps/client/src/widgets/workspace/CssPropsSelectBox.tsx +++ b/apps/client/src/widgets/workspace/CssPropsSelectBox.tsx @@ -49,8 +49,8 @@ export const CssPropsSelectBox = () => { }; return ( -
-