Skip to content

Commit 3c9a174

Browse files
authored
Merge pull request #142 from starlight-dari/main
merge main into deploy
2 parents b2477dd + cdb5655 commit 3c9a174

5 files changed

Lines changed: 37 additions & 24 deletions

File tree

src/app/memoryAlbum/layout.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,8 @@ const Body = styled.div`
4040
color: #fff;
4141
`;
4242

43-
const Content = styled.div``;
43+
const Content = styled.div`
44+
width: calc(100vw - 300px);
45+
display: flex;
46+
justify-content: center;
47+
`;

src/app/starCommunity/page.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ const Body = styled.div`
139139

140140
const TitleWrapper = styled.div`
141141
display: flex;
142-
width: 68vw;
142+
width: 1190px;
143143
padding: 30px 0;
144144
align-items: end;
145145
gap: 15px;
@@ -156,7 +156,7 @@ const Subtitle = styled.div`
156156

157157
const Container = styled.div`
158158
height: 926px;
159-
width: 1189px;
159+
width: 1190px;
160160
position: relative;
161161
overflow-y: auto;
162162
`;

src/components/chatbotModal.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ const questions: QuestionData[] = [
3737
id: 3,
3838
category: "펫로스증후군 극복 프로그램",
3939
question: `다음은 펫로스 증후군 극복 프로그램 링크 목록입니다.\n
40-
[마인드카페 센터_바로가기](https://center.mindcafe.co.kr/program_petloss)\n
41-
[마음치유모임 with 펫로스_바로가기](https://www.gangnam.go.kr/contents/mind_healing/1/view.do?mid=ID04_04075401)`,
40+
<a href="https://center.mindcafe.co.kr/program_petloss" style="color:#ADC3F3;">마인드카페 센터_바로가기</a>\n
41+
<a href="https://www.gangnam.go.kr/contents/mind_healing/1/view.do?mid=ID04_04075401" style="color:#ADC3F3;">마음치유모임 with 펫로스_바로가기</a>`,
4242
},
4343
];
4444

src/components/memoryAlbumContent.tsx

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,18 @@ const AlbumContent: React.FC<PetAlbumContentProps> = ({ petId }) => {
4444
<Container>
4545
<Title>도착한 편지들</Title>
4646
{petAlbumContent && petAlbumContent.length > 0 ? (
47-
petAlbumContent?.map((item, index) => (
48-
<Letter
49-
key={index}
50-
onClick={() => handleLetterClick(item.letter_id)}
51-
>
52-
<LetterTitle>{item.title}</LetterTitle>
53-
<LetterContent>{item.content}</LetterContent>
54-
{!item.opened && <AlertBadge />}
55-
</Letter>
56-
))
47+
<LetterWrapper>
48+
{petAlbumContent?.map((item, index) => (
49+
<Letter
50+
key={index}
51+
onClick={() => handleLetterClick(item.letter_id)}
52+
>
53+
<LetterTitle>{item.title}</LetterTitle>
54+
<LetterContent>{item.content}</LetterContent>
55+
{!item.opened && <AlertBadge />}
56+
</Letter>
57+
))}
58+
</LetterWrapper>
5759
) : (
5860
<NoLetter>
5961
<p>아직 도착한 편지가 없어요. 조금만 기다려주세요.</p>
@@ -71,7 +73,7 @@ const Container = styled.div`
7173
display: flex;
7274
flex-direction: column;
7375
align-items: start;
74-
padding: 50px 110px;
76+
padding: 50px 0;
7577
gap: 6px;
7678
width: 1200px;
7779
height: calc(-200px + 100vh);
@@ -83,6 +85,15 @@ const Title = styled.div`
8385
padding-bottom: 20px;
8486
`;
8587

88+
const LetterWrapper = styled.div`
89+
display: flex;
90+
flex-direction: column;
91+
gap: 6px;
92+
font-weight: 400;
93+
height: 650px
94+
overflow-y: auto;
95+
`;
96+
8697
const Letter = styled.div`
8798
display: flex;
8899
flex-direction: column;

src/components/starModal.tsx

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,8 @@ const StarPage: React.FC<StarPageModalProps> = ({ onClose, memoryId }) => {
272272
<PostImage
273273
src={starPage.img_url}
274274
alt="Post Image"
275-
width={600}
276-
height={600}
275+
width={500}
276+
height={500}
277277
/>
278278
<Title>{starPage.name}</Title>
279279
<InfoContainer>
@@ -419,8 +419,8 @@ const ModalContent = styled.div`
419419
display: flex;
420420
position: relative;
421421
background: #101827;
422-
width: 1200px;
423-
height: 900px;
422+
width: 1100px;
423+
height: 800px;
424424
padding: 40px 30px;
425425
color: #fff;
426426
// overflow: auto;
@@ -438,8 +438,6 @@ const Title = styled.h1`
438438
const AuthorName = styled.div`
439439
font-size: 1.2rem;
440440
font-weight: bold;
441-
// color: #a1cfff;
442-
margin-bottom: 15px;
443441
`;
444442

445443
const PostImage = styled(Image)`
@@ -472,7 +470,7 @@ const Content = styled.p`
472470
line-height: 1.6;
473471
margin: 20px 0;
474472
color: #c0c0c0;
475-
height: 85px;
473+
height: 112px;
476474
overflow-y: auto;
477475
`;
478476

@@ -482,7 +480,7 @@ const CommentSection = styled.div`
482480
border-top: 1px solid rgba(255, 255, 255, 0.2);
483481
padding-top: 15px;
484482
position: relative;
485-
height: 830px;
483+
height: 708px;
486484
`;
487485

488486
const CommentWrapper = styled.div`

0 commit comments

Comments
 (0)