Skip to content

Commit e18d284

Browse files
authored
Merge pull request #149 from DDD-Community/feature/new-year-theme
[FEATURE] 새해 테마 추가
2 parents 17bad00 + 2e12f4d commit e18d284

File tree

15 files changed

+607
-1
lines changed

15 files changed

+607
-1
lines changed

public/images/boardThemas/B-8.png

599 KB
Loading

public/images/boardThemas/B-9.png

71.1 KB
Loading

public/images/polaroidFrames/F-20.svg

+461
Loading

public/images/polaroidFrames/F-21.svg

+31
Loading

public/images/polaroidFrames/F-22.svg

+67
Loading

public/images/polaroidThemas/F-19.png

35.6 KB
Loading

public/images/polaroidThemas/F-20.png

31.7 KB
Loading

public/images/polaroidThemas/F-21.png

8.79 KB
Loading

public/images/polaroidThemas/F-22.png

9.22 KB
Loading

src/components/Polaroid/Base/PolaroidDescription.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const PolaroidDescription = ({
1515
}: PolaroidDescriptionProps) => {
1616
return (
1717
<div
18-
className={`${twMerge('flex flex-col gap-0.5 px-4 pb-2', className)}`}
18+
className={`${twMerge('flex flex-col gap-0.5 px-4 py-2', className)}`}
1919
style={{
2020
background: THEMAS[themaKey].descriptionStyle,
2121
}}

src/lib/constants/boardConfig.ts

+12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { BoardThemaKeyType, BoardThemaType } from '@/types'
22

33
export const ORDERED_BOARDTHEMAS: BoardThemaKeyType[] = [
4+
'B-8',
5+
'B-9',
46
'B-4',
57
'B-5',
68
'B-7',
@@ -52,4 +54,14 @@ export const BOARDTHEMAS: Record<BoardThemaKeyType, BoardThemaType> = {
5254
theme: 'LIGHT',
5355
gtm: 'snow',
5456
},
57+
'B-8': {
58+
title: '새해 폭죽',
59+
theme: 'LIGHT',
60+
gtm: 'newyear1',
61+
},
62+
'B-9': {
63+
title: '새해 부적',
64+
theme: 'LIGHT',
65+
gtm: 'newyear2',
66+
},
5567
} as const

src/lib/constants/polaroidConfig.ts

+26
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ export const FILTERS = {
88
} as const
99

1010
export const ORDERED_THEMAS: ThemaKeyType[] = [
11+
'F-19',
12+
'F-20',
13+
'F-21',
14+
'F-22',
1115
'F-0',
1216
'F-12',
1317
'F-13',
@@ -135,6 +139,28 @@ export const THEMAS: Record<ThemaKeyType, ThemaType> = {
135139
descriptionStyle: 'linear-gradient(180deg, #C7EEDB 0%, #83DCAF 100%)',
136140
gtm: 'greenargyle',
137141
},
142+
'F-19': {
143+
className:
144+
'bg-[linear-gradient(180deg,_#FFA032_0.14%,_#FE9329_25.69%,_#F75A22_70.88%)]',
145+
descriptionStyle:
146+
'linear-gradient(180deg, rgba(255, 255, 255, 0.20) 10.71%, rgba(255, 255, 255, 0.10) 57.96%, rgba(255, 255, 255, 0.00) 100%), linear-gradient(180deg, #FFE731 0%, #FF7827 100%)',
147+
gtm: 'sunrise',
148+
},
149+
'F-20': {
150+
className: 'bg-[#FFFEF2]',
151+
descriptionStyle: 'linear-gradient(180deg, #DBFFD3 0%, #A4FF65 100%)',
152+
gtm: 'clover',
153+
},
154+
'F-21': {
155+
className: 'bg-[#FFFEF2]',
156+
descriptionStyle: '#CBCBCB',
157+
gtm: 'film1',
158+
},
159+
'F-22': {
160+
className: 'bg-[#FFFEF2]',
161+
descriptionStyle: '#CBCBCB',
162+
gtm: 'film2',
163+
},
138164
} as const
139165

140166
export const FONTS: Record<FontKeyType, FontType> = {

src/lib/utils/polaroid.ts

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ const isPolaroidWithFrame = (themaKey: ThemaKeyType) => {
1717
'F-15',
1818
'F-16',
1919
'F-17',
20+
'F-20',
21+
'F-21',
22+
'F-22',
2023
]
2124

2225
return polaroidWithFrame.includes(themaKey)

src/types/board.ts

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ export type BoardThemaKeyType =
2626
| 'B-5'
2727
| 'B-6'
2828
| 'B-7'
29+
| 'B-8'
30+
| 'B-9'
2931

3032
export interface BoardThemaType {
3133
title: string

src/types/polaroid.ts

+4
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ export type ThemaKeyType =
4747
| 'F-15'
4848
| 'F-16'
4949
| 'F-17'
50+
| 'F-19'
51+
| 'F-20'
52+
| 'F-21'
53+
| 'F-22'
5054

5155
export interface ThemaType {
5256
className: string

0 commit comments

Comments
 (0)