From 61022fb9723e0221e4379a27cfa38c2acfba3894 Mon Sep 17 00:00:00 2001 From: clkim Date: Wed, 17 Sep 2025 18:03:19 +0900 Subject: [PATCH] =?UTF-8?q?fix.=20main=20=EC=BB=B4=ED=8F=AC=EB=84=8C?= =?UTF-8?q?=ED=8A=B8=20=EB=B3=80=EA=B2=BD,=20=EC=88=98=EC=A0=95=EB=90=9C?= =?UTF-8?q?=20api=20=EA=B5=AC=EC=A1=B0=EC=97=90=20=EB=A7=9E=EC=B6=B0=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/app.vue | 141 +++++++--- app/pages/[d1]/[d2]/[d3].vue | 34 +-- app/pages/[d1]/[d2]/index.vue | 34 +-- app/pages/[d1]/index.vue | 34 +-- app/pages/index.vue | 41 +-- app/pages/test-lang.vue | 160 ----------- layers/components/atoms/Button.vue | 21 +- layers/components/layouts/Main.vue | 52 +++- layers/composables/useGameColors.ts | 26 -- layers/composables/useGameKeyCodeColors.ts | 28 ++ layers/layouts/default.vue | 8 +- layers/templates/GrVisual01/index.vue | 29 -- layers/types/api/gameData.ts | 301 ++++++--------------- layers/types/api/pageData.ts | 102 ++----- 14 files changed, 347 insertions(+), 664 deletions(-) delete mode 100644 app/pages/test-lang.vue delete mode 100644 layers/composables/useGameColors.ts create mode 100644 layers/composables/useGameKeyCodeColors.ts diff --git a/app/app.vue b/app/app.vue index 9bd036a..9dc314a 100644 --- a/app/app.vue +++ b/app/app.vue @@ -1,73 +1,134 @@ - - + + diff --git a/app/pages/[d1]/[d2]/[d3].vue b/app/pages/[d1]/[d2]/[d3].vue index 6dee22b..487fb3a 100644 --- a/app/pages/[d1]/[d2]/[d3].vue +++ b/app/pages/[d1]/[d2]/[d3].vue @@ -1,37 +1,25 @@ diff --git a/app/pages/[d1]/[d2]/index.vue b/app/pages/[d1]/[d2]/index.vue index 6dee22b..487fb3a 100644 --- a/app/pages/[d1]/[d2]/index.vue +++ b/app/pages/[d1]/[d2]/index.vue @@ -1,37 +1,25 @@ diff --git a/app/pages/[d1]/index.vue b/app/pages/[d1]/index.vue index 6dee22b..487fb3a 100644 --- a/app/pages/[d1]/index.vue +++ b/app/pages/[d1]/index.vue @@ -1,37 +1,25 @@ diff --git a/app/pages/index.vue b/app/pages/index.vue index cef160f..487fb3a 100644 --- a/app/pages/index.vue +++ b/app/pages/index.vue @@ -1,46 +1,25 @@ diff --git a/app/pages/test-lang.vue b/app/pages/test-lang.vue deleted file mode 100644 index ed4f26e..0000000 --- a/app/pages/test-lang.vue +++ /dev/null @@ -1,160 +0,0 @@ - - - diff --git a/layers/components/atoms/Button.vue b/layers/components/atoms/Button.vue index 5526ed1..cc3cc4b 100644 --- a/layers/components/atoms/Button.vue +++ b/layers/components/atoms/Button.vue @@ -4,8 +4,8 @@ import type { ButtonConfig, ButtonProps, } from '#layers/types/components/button' +import type { GameDataKeyCodeCodes } from '#layers/types/api/gameData' -// Props 정의 const props = withDefaults(defineProps(), { size: 'medium', backgroundColor: 'var(--primary)', @@ -14,6 +14,15 @@ const props = withDefaults(defineProps(), { disabled: false, }) +// 색상 코드 키 목록 key_code_codes +const PARSED_KEY_CODE_CODES_KEYS: (keyof GameDataKeyCodeCodes)[] = [ + 'primary', + 'text-primary', + 'text-secondary', + 'alternative-01', + 'alternative-02', +] + // 버튼 크기별 설정 상수 const BUTTON_CONFIGS: Record = { large: { @@ -42,6 +51,12 @@ const BUTTON_CONFIGS: Record = { }, } as const +// 색상 값을 CSS 변수로 변환하는 헬퍼 함수 +const getColorValue = (color: string) => + PARSED_KEY_CODE_CODES_KEYS.includes(color as keyof GameDataKeyCodeCodes) + ? `var(--${color})` + : color + const currentConfig = computed(() => BUTTON_CONFIGS[props.size]) const buttonClasses = computed(() => [ 'group relative inline-flex items-center justify-center font-medium border border-gray-600/30 overflow-hidden', @@ -49,8 +64,8 @@ const buttonClasses = computed(() => [ props.disabled ? 'cursor-default' : 'cursor-pointer', ]) const buttonStyles = computed(() => ({ - backgroundColor: props.backgroundColor, - color: props.textColor, + backgroundColor: getColorValue(props.backgroundColor), + color: getColorValue(props.textColor), })) const overlayClasses = computed(() => [ 'absolute inset-0 -m-px transition-opacity duration-200', diff --git a/layers/components/layouts/Main.vue b/layers/components/layouts/Main.vue index 1726cc7..274c6f3 100644 --- a/layers/components/layouts/Main.vue +++ b/layers/components/layouts/Main.vue @@ -1,34 +1,70 @@