-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* feat: reset.css내 margin추가 * refactor: 아티스트 카드 컴포넌트 width 반응형으로 수정 * feat: 아이콘 경로 추가 * feat: Footer 하단 고정 * feat: ArtistCard export 추가 * feat: 마이페이지 아티스트 및 공연 섹션 추가
- Loading branch information
Showing
21 changed files
with
305 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
import { style } from '@vanilla-extract/css'; | ||
|
||
export const container = style({ | ||
display: 'grid', | ||
gridTemplateColumns: 'repeat(3, 1fr)', | ||
gap: '3.2rem', | ||
margin: '0.8rem 0 1.2rem 0', | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
import { ArtistCard } from '@confeti/design-system'; | ||
import * as styles from './artist-section.css'; | ||
|
||
type Artist = { | ||
artistId: string; | ||
name: string; | ||
profileUrl: string; | ||
}; | ||
|
||
interface ArtistSectionProps { | ||
artists: Artist[]; | ||
} | ||
|
||
const ArtistSection = ({ artists }: ArtistSectionProps) => { | ||
return ( | ||
<div className={styles.container}> | ||
{artists.map((artist) => ( | ||
<ArtistCard | ||
key={artist.artistId} | ||
artistId={artist.artistId} | ||
title={artist.name} | ||
imageSrc={artist.profileUrl} | ||
size="lg" | ||
/> | ||
))} | ||
</div> | ||
); | ||
}; | ||
|
||
export default ArtistSection; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
import { themeVars } from '@confeti/design-system/styles'; | ||
import { style } from '@vanilla-extract/css'; | ||
|
||
export const container = style({ | ||
padding: '2.4rem 2rem', | ||
}); | ||
|
||
export const header = style({ | ||
display: 'flex', | ||
justifyContent: 'space-between', | ||
alignItems: 'center', | ||
marginBottom: '2rem', | ||
}); | ||
|
||
export const title = style({ | ||
...themeVars.fontStyles.title4_b_16, | ||
color: themeVars.color.gray500, | ||
}); | ||
|
||
export const buttonWrapper = style({ | ||
display: 'flex', | ||
alignItems: 'center', | ||
}); | ||
|
||
export const button = style({ | ||
...themeVars.fontStyles.subtitle5_sb_12, | ||
color: themeVars.color.gray500, | ||
}); | ||
|
||
export const icon = style({ | ||
width: '1.2rem', | ||
height: '1.2rem', | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
import { IcArrowGray16 } from '@confeti/design-system/icons'; | ||
import * as styles from './box.css'; | ||
|
||
interface BoxProps { | ||
title: string; | ||
children: React.ReactNode; | ||
showMore?: boolean; | ||
} | ||
|
||
const Box = ({ title, children, showMore = false }: BoxProps) => { | ||
return ( | ||
<section className={styles.container}> | ||
<div className={styles.header}> | ||
<h3 className={styles.title}>{title}</h3> | ||
{showMore && ( | ||
<div className={styles.buttonWrapper}> | ||
<button className={styles.button}>더보기</button> | ||
<IcArrowGray16 className={styles.icon} /> | ||
</div> | ||
)} | ||
</div> | ||
<div>{children}</div> | ||
</section> | ||
); | ||
}; | ||
|
||
export default Box; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
import { style } from '@vanilla-extract/css'; | ||
|
||
export const container = style({ | ||
display: 'grid', | ||
gridTemplateColumns: 'repeat(3, 1fr)', | ||
gap: '1.8rem', | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
import { FestivalCard } from '@confeti/design-system'; | ||
import * as styles from './confeti-section.css'; | ||
|
||
type Confeti = { | ||
performanceId: number; | ||
title: string; | ||
posterUrl: string; | ||
}; | ||
|
||
interface ConfetiProps { | ||
confeti: Confeti[]; | ||
} | ||
|
||
const ConfetiSection = ({ confeti }: ConfetiProps) => { | ||
return ( | ||
<div className={styles.container}> | ||
{confeti.map((confeti) => ( | ||
<FestivalCard | ||
key={confeti.performanceId} | ||
title={confeti.title} | ||
imageSrc={confeti.posterUrl} | ||
/> | ||
))} | ||
</div> | ||
); | ||
}; | ||
|
||
export default ConfetiSection; |
20 changes: 20 additions & 0 deletions
20
apps/client/src/pages/my/components/no-artist-section.css.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
import { themeVars } from '@confeti/design-system/styles'; | ||
import { style } from '@vanilla-extract/css'; | ||
|
||
export const wrapper = style({ | ||
...themeVars.display.flexCenter, | ||
flexDirection: 'column', | ||
}); | ||
|
||
export const title = style({ | ||
...themeVars.fontStyles.body3_m_14, | ||
margin: '2rem', | ||
color: themeVars.color.gray500, | ||
whiteSpace: 'pre-line', | ||
lineHeight: '100%', | ||
fontWeight: '500', | ||
}); | ||
|
||
export const button = style({ | ||
width: '18rem', | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
import { Button } from '@confeti/design-system'; | ||
import * as styles from './no-artist-section.css'; | ||
|
||
const NoArtistSection = () => { | ||
return ( | ||
<div className={styles.wrapper}> | ||
<p className={styles.title}> | ||
{`관심있는 아티스트가 궁금해요! \n | ||
아티스트를 선택하러 가볼까요?`} | ||
</p> | ||
|
||
<div className={styles.button}> | ||
<Button text="아티스트 선택하기" /> | ||
</div> | ||
</div> | ||
); | ||
}; | ||
|
||
export default NoArtistSection; |
9 changes: 9 additions & 0 deletions
9
apps/client/src/pages/my/components/no-confeti-section.css.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
import { themeVars } from '@confeti/design-system/styles'; | ||
import { style } from '@vanilla-extract/css'; | ||
|
||
export const wrapper = style({ | ||
...themeVars.display.flexCenter, | ||
...themeVars.fontStyles.body3_m_14, | ||
color: themeVars.color.gray500, | ||
padding: '6.4rem', | ||
}); |
11 changes: 11 additions & 0 deletions
11
apps/client/src/pages/my/components/no-confeti-section.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
import * as styles from './no-confeti-section.css'; | ||
|
||
const NoConfetiSection = () => { | ||
return ( | ||
<div className={styles.wrapper}> | ||
<p>아직 My Confeti가 없어요</p> | ||
</div> | ||
); | ||
}; | ||
|
||
export default NoConfetiSection; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
export const ARTISTS_DATA = { | ||
data: { | ||
artists: [ | ||
{ | ||
artistId: '5kVZa4lFUmAQlBogl1fkd6', | ||
name: 'Aimyon', | ||
profileUrl: | ||
'https://i.scdn.co/image/ab6761610000f17893db4a195c102e95153eb2e5', | ||
}, | ||
{ | ||
artistId: '5kVZa4lFUmAQlBogl1fkd6', | ||
name: 'Aimyon', | ||
profileUrl: | ||
'https://i.scdn.co/image/ab6761610000f17893db4a195c102e95153eb2e5', | ||
}, | ||
{ | ||
artistId: '5kVZa4lFUmAQlBogl1fkd6', | ||
name: 'Aimyon', | ||
profileUrl: | ||
'https://i.scdn.co/image/ab6761610000f17893db4a195c102e95153eb2e5', | ||
}, | ||
], | ||
}, | ||
} as const; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.