From 86f9798f517bc4106521939f87bd3620c9242470 Mon Sep 17 00:00:00 2001 From: bicochan Date: Tue, 4 Mar 2025 11:20:27 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20chart=20=EC=BB=B4=ED=8F=AC=EB=84=8C?= =?UTF-8?q?=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/common/assets/.gitignore | 1 + packages/common/assets/src/styles/base.css | 23 +++--- packages/common/components/package.json | 3 + packages/common/components/src/index.ts | 1 + packages/common/components/src/lib/index.ts | 1 + packages/common/components/src/lib/utils.ts | 12 +++ .../src/ui/bar-chart/chart.stories.tsx | 78 +++++++++++++++++++ pnpm-lock.yaml | 30 +++++++ 8 files changed, 139 insertions(+), 10 deletions(-) create mode 100644 packages/common/assets/.gitignore create mode 100644 packages/common/components/src/lib/index.ts create mode 100644 packages/common/components/src/ui/bar-chart/chart.stories.tsx diff --git a/packages/common/assets/.gitignore b/packages/common/assets/.gitignore new file mode 100644 index 000000000..53c37a166 --- /dev/null +++ b/packages/common/assets/.gitignore @@ -0,0 +1 @@ +dist \ No newline at end of file diff --git a/packages/common/assets/src/styles/base.css b/packages/common/assets/src/styles/base.css index ce53e5046..bd9accda9 100644 --- a/packages/common/assets/src/styles/base.css +++ b/packages/common/assets/src/styles/base.css @@ -24,11 +24,12 @@ --input: #e5e5e5; --label: #666666; --ring: #0a0a0a; - --chart-1: #d95b43; - --chart-2: #299392; - --chart-3: #263e4d; - --chart-4: #dfb938; - --chart-5: #f08634; + --chart-1: #2094fa; + --chart-2: #00dfe5; + --chart-3: #02e587; + --chart-4: #ffd841; + --chart-5: #ff7865; + --chart-6: #e65db5; --radius: 1rem; } [data-mode="dark"] { @@ -52,10 +53,12 @@ --input: #262626; --label: #f1f1f1; --ring: #d4d4d4; - --chart-1: #3399ff; - --chart-2: #339966; - --chart-3: #ff9933; - --chart-4: #cc66ff; - --chart-5: #ff3399; + --chart-1: #66b3ff; + --chart-2: #66f0f2; + --chart-3: #66f9b8; + --chart-4: #ffeb99; + --chart-5: #ffbcad; + --chart-6: #f4a0d3; + --radius: 1rem; } } diff --git a/packages/common/components/package.json b/packages/common/components/package.json index 85c88ff1b..12ae80037 100644 --- a/packages/common/components/package.json +++ b/packages/common/components/package.json @@ -38,16 +38,19 @@ "@radix-ui/react-switch": "^1.1.3", "@radix-ui/react-tabs": "^1.1.3", "@tanstack/react-table": "^8.21.2", + "chart.js": "^4.4.8", "class-variance-authority": "^0.7.1", "clsx": "^2.1.1", "date-fns": "^3.6.0", "lucide-react": "^0.474.0", + "react-chartjs-2": "^5.3.0", "react-day-picker": "^8.10.1", "tailwind-merge": "^3.0.1", "tailwindcss-animate": "^1.0.7" }, "devDependencies": { "@eslint/js": "^9.17.0", + "@faker-js/faker": "^9.5.0", "@storybook/addon-essentials": "^8.5.3", "@storybook/addon-interactions": "^8.5.3", "@storybook/addon-onboarding": "^8.5.3", diff --git a/packages/common/components/src/index.ts b/packages/common/components/src/index.ts index 4aedf5936..40118e9ca 100644 --- a/packages/common/components/src/index.ts +++ b/packages/common/components/src/index.ts @@ -1 +1,2 @@ +export * from "./lib"; export * from "./ui"; diff --git a/packages/common/components/src/lib/index.ts b/packages/common/components/src/lib/index.ts new file mode 100644 index 000000000..178cd64f8 --- /dev/null +++ b/packages/common/components/src/lib/index.ts @@ -0,0 +1 @@ +export * from "./utils"; diff --git a/packages/common/components/src/lib/utils.ts b/packages/common/components/src/lib/utils.ts index a5ef19350..1a32c46c9 100644 --- a/packages/common/components/src/lib/utils.ts +++ b/packages/common/components/src/lib/utils.ts @@ -4,3 +4,15 @@ import { twMerge } from "tailwind-merge"; export function cn(...inputs: ClassValue[]) { return twMerge(clsx(inputs)); } + +export const getCssVariableValue = (variableName: string): string => { + if (typeof window === "undefined") return ""; + + const value = getComputedStyle(document.documentElement).getPropertyValue( + variableName, + ); + + if (value.trim() === "") return "#2094fa"; + + return value.trim(); +}; diff --git a/packages/common/components/src/ui/bar-chart/chart.stories.tsx b/packages/common/components/src/ui/bar-chart/chart.stories.tsx new file mode 100644 index 000000000..efeb0b745 --- /dev/null +++ b/packages/common/components/src/ui/bar-chart/chart.stories.tsx @@ -0,0 +1,78 @@ +import type { Meta, StoryObj } from "@storybook/react"; + +import { + Chart as ChartJS, + CategoryScale, + LinearScale, + BarElement, + Title, + Tooltip, + Legend, + type ChartOptions, +} from "chart.js"; +import { Bar } from "react-chartjs-2"; +import { fakerKO as faker } from "@faker-js/faker"; +import { getCssVariableValue } from "../../lib/utils"; + +const meta: Meta = { + title: "Chart/Bar", + component: Bar, +}; + +export default meta; +type Story = StoryObj; + +export const Default: Story = { + render: () => { + ChartJS.register( + CategoryScale, + LinearScale, + BarElement, + Title, + Tooltip, + Legend, + ); + + const options: ChartOptions<"bar"> = { + responsive: true, + plugins: { + legend: { + position: "top", + }, + title: { + display: true, + text: "Chart.js Bar Chart", + }, + }, + }; + + const labels = [ + "January", + "February", + "March", + "April", + "May", + "June", + "July", + ]; + + const data = { + labels, + datasets: [ + { + label: "Dataset 1", + data: labels.map(() => faker.number.int({ min: 10, max: 100 })), + backgroundColor: labels.map((_, i) => + getCssVariableValue(`--chart-${i + 1}`), + ), + }, + ], + }; + + return ( +
+ +
+ ); + }, +}; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b2fd8e2fb..155b112bb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -136,6 +136,9 @@ importers: '@tanstack/react-table': specifier: ^8.21.2 version: 8.21.2(react-dom@18.3.1)(react@18.3.1) + chart.js: + specifier: ^4.4.8 + version: 4.4.8 class-variance-authority: specifier: ^0.7.1 version: 0.7.1 @@ -148,6 +151,9 @@ importers: lucide-react: specifier: ^0.474.0 version: 0.474.0(react@18.3.1) + react-chartjs-2: + specifier: ^5.3.0 + version: 5.3.0(chart.js@4.4.8)(react@18.3.1) react-day-picker: specifier: ^8.10.1 version: 8.10.1(date-fns@3.6.0)(react@18.3.1) @@ -161,6 +167,9 @@ importers: '@eslint/js': specifier: ^9.17.0 version: 9.21.0 + '@faker-js/faker': + specifier: ^9.5.0 + version: 9.5.0 '@storybook/addon-essentials': specifier: ^8.5.3 version: 8.6.0(@types/react@18.3.18)(storybook@8.6.0) @@ -1304,6 +1313,10 @@ packages: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.5.0 + /@kurkle/color@0.3.4: + resolution: {integrity: sha512-M5UknZPHRu3DEDWoipU6sE8PdkZ6Z/S+v4dD+Ke8IaNlpdSQah50lz1KtcFBa2vsdOnwbbnxJwVM4wty6udA5w==} + dev: false + /@mdx-js/react@3.1.0(@types/react@18.3.18)(react@18.3.1): resolution: {integrity: sha512-QjHtSaoameoalGnKDT3FoIl4+9RwyTmo9ZJGBdLOks/YOiWHoRDI3PUwEzOE7kEmGcV3AFcp9K6dYu9rEuKLAQ==} peerDependencies: @@ -3462,6 +3475,13 @@ packages: supports-color: 7.2.0 dev: true + /chart.js@4.4.8: + resolution: {integrity: sha512-IkGZlVpXP+83QpMm4uxEiGqSI7jFizwVtF3+n5Pc3k7sMO+tkd0qxh2OzLhenM0K80xtmAONWGBn082EiBQSDA==} + engines: {pnpm: '>=8'} + dependencies: + '@kurkle/color': 0.3.4 + dev: false + /check-error@2.1.1: resolution: {integrity: sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==} engines: {node: '>= 16'} @@ -5808,6 +5828,16 @@ packages: resolution: {integrity: sha512-twwRO/ilhlG/FIgYeKGFqyHhoEhqgnKVkcmqMKi2r524gz3ZbDTcyFt38E9xjJI2vT+KbRNHVbnJ/e0I25Azwg==} dev: true + /react-chartjs-2@5.3.0(chart.js@4.4.8)(react@18.3.1): + resolution: {integrity: sha512-UfZZFnDsERI3c3CZGxzvNJd02SHjaSJ8kgW1djn65H1KK8rehwTjyrRKOG3VTMG8wtHZ5rgAO5oTHtHi9GCCmw==} + peerDependencies: + chart.js: ^4.1.1 + react: ^18.3.1 + dependencies: + chart.js: 4.4.8 + react: 18.3.1 + dev: false + /react-day-picker@8.10.1(date-fns@3.6.0)(react@18.3.1): resolution: {integrity: sha512-TMx7fNbhLk15eqcMt+7Z7S2KF7mfTId/XJDjKE8f+IUcFn0l08/kI4FiYTL/0yuOLmEcbR4Fwe3GJf/NiiMnPA==} peerDependencies: