Skip to content

Commit

Permalink
Merge pull request #149 from DDD-Community/feature/new-year-theme
Browse files Browse the repository at this point in the history
[FEATURE] 새해 테마 추가
  • Loading branch information
junseublim authored Dec 31, 2024
2 parents 17bad00 + 2e12f4d commit e18d284
Showing 15 changed files with 607 additions and 1 deletion.
Binary file added public/images/boardThemas/B-8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/boardThemas/B-9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
461 changes: 461 additions & 0 deletions public/images/polaroidFrames/F-20.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions public/images/polaroidFrames/F-21.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
67 changes: 67 additions & 0 deletions public/images/polaroidFrames/F-22.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/polaroidThemas/F-19.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/polaroidThemas/F-20.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/polaroidThemas/F-21.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/polaroidThemas/F-22.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/Polaroid/Base/PolaroidDescription.tsx
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ const PolaroidDescription = ({
}: PolaroidDescriptionProps) => {
return (
<div
className={`${twMerge('flex flex-col gap-0.5 px-4 pb-2', className)}`}
className={`${twMerge('flex flex-col gap-0.5 px-4 py-2', className)}`}
style={{
background: THEMAS[themaKey].descriptionStyle,
}}
12 changes: 12 additions & 0 deletions src/lib/constants/boardConfig.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { BoardThemaKeyType, BoardThemaType } from '@/types'

export const ORDERED_BOARDTHEMAS: BoardThemaKeyType[] = [
'B-8',
'B-9',
'B-4',
'B-5',
'B-7',
@@ -52,4 +54,14 @@ export const BOARDTHEMAS: Record<BoardThemaKeyType, BoardThemaType> = {
theme: 'LIGHT',
gtm: 'snow',
},
'B-8': {
title: '새해 폭죽',
theme: 'LIGHT',
gtm: 'newyear1',
},
'B-9': {
title: '새해 부적',
theme: 'LIGHT',
gtm: 'newyear2',
},
} as const
26 changes: 26 additions & 0 deletions src/lib/constants/polaroidConfig.ts
Original file line number Diff line number Diff line change
@@ -8,6 +8,10 @@ export const FILTERS = {
} as const

export const ORDERED_THEMAS: ThemaKeyType[] = [
'F-19',
'F-20',
'F-21',
'F-22',
'F-0',
'F-12',
'F-13',
@@ -135,6 +139,28 @@ export const THEMAS: Record<ThemaKeyType, ThemaType> = {
descriptionStyle: 'linear-gradient(180deg, #C7EEDB 0%, #83DCAF 100%)',
gtm: 'greenargyle',
},
'F-19': {
className:
'bg-[linear-gradient(180deg,_#FFA032_0.14%,_#FE9329_25.69%,_#F75A22_70.88%)]',
descriptionStyle:
'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%)',
gtm: 'sunrise',
},
'F-20': {
className: 'bg-[#FFFEF2]',
descriptionStyle: 'linear-gradient(180deg, #DBFFD3 0%, #A4FF65 100%)',
gtm: 'clover',
},
'F-21': {
className: 'bg-[#FFFEF2]',
descriptionStyle: '#CBCBCB',
gtm: 'film1',
},
'F-22': {
className: 'bg-[#FFFEF2]',
descriptionStyle: '#CBCBCB',
gtm: 'film2',
},
} as const

export const FONTS: Record<FontKeyType, FontType> = {
3 changes: 3 additions & 0 deletions src/lib/utils/polaroid.ts
Original file line number Diff line number Diff line change
@@ -17,6 +17,9 @@ const isPolaroidWithFrame = (themaKey: ThemaKeyType) => {
'F-15',
'F-16',
'F-17',
'F-20',
'F-21',
'F-22',
]

return polaroidWithFrame.includes(themaKey)
2 changes: 2 additions & 0 deletions src/types/board.ts
Original file line number Diff line number Diff line change
@@ -26,6 +26,8 @@ export type BoardThemaKeyType =
| 'B-5'
| 'B-6'
| 'B-7'
| 'B-8'
| 'B-9'

export interface BoardThemaType {
title: string
4 changes: 4 additions & 0 deletions src/types/polaroid.ts
Original file line number Diff line number Diff line change
@@ -47,6 +47,10 @@ export type ThemaKeyType =
| 'F-15'
| 'F-16'
| 'F-17'
| 'F-19'
| 'F-20'
| 'F-21'
| 'F-22'

export interface ThemaType {
className: string

0 comments on commit e18d284

Please sign in to comment.