-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
마을 기사 읽기 페이지 UI작업 #107
Merged
Merged
마을 기사 읽기 페이지 UI작업 #107
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
417c048
feat: 기사 페이지 구성
stopmin ee1273a
feat: 기사 밑에 지도 추가 및 헤드라인 설정
stopmin b0b5cfe
feat: 말풍 추가
stopmin 2cd0a81
feat: 헤드라인 원복
stopmin e7fa2f5
feat: KakaoMap 수정
stopmin 7528294
feat: latitude, longitude
stopmin 1217b29
feat: viewcount 수정
stopmin d4f94a8
feat: marker 클릭 가능한지 아닌지 구분
stopmin 2cd4204
Merge branch 'main' into feature/ISSUE-104
stopmin 40ecba9
feat: 기사 클릭하면 이동하도록 설정
stopmin 58f5158
feat: 링크 범위 확장
stopmin ed1adb3
feat: 멘트수정
stopmin 456ccd4
feat: async 빼기
stopmin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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,69 @@ | ||
'use client'; | ||
|
||
import Image from 'next/image'; | ||
|
||
import { Box, Card, CardContent, Stack, Typography } from '@mui/material'; | ||
|
||
import CommentCard from '@/components/CommentCard'; | ||
import GradientBox from '@/components/GradientBox'; | ||
import Headline from '@/components/Headline'; | ||
import KakaoMap from '@/components/KakaoMap'; | ||
import color from '@/constants/color'; | ||
import hiddenGems from '@/mocks/villages'; | ||
|
||
const Page = async ({ params }: { params: { id: number } }) => { | ||
const village = hiddenGems[params.id - 1]; | ||
|
||
return ( | ||
<GradientBox> | ||
<Stack alignItems="center" p={10}> | ||
<Box sx={{ maxWidth: '600px' }}> | ||
<Box sx={{ marginBottom: '2rem' }}> | ||
<Headline | ||
source="경단" | ||
title={village.title} | ||
uploadDate={village.publishedAt} | ||
viewCount={village.viewCount} | ||
/> | ||
</Box> | ||
<CommentCard isCharacter isStroke content={`오늘은 ${village.title}에 대해 소개해줄게😃`} /> | ||
<Box mt="2.5rem"> | ||
<Box> | ||
{village.imageUrl && ( | ||
<Image | ||
priority | ||
alt="articleImage" | ||
height={400} | ||
src={village.imageUrl} | ||
style={{ objectFit: 'contain' }} | ||
width={600} | ||
/> | ||
)} | ||
</Box> | ||
<Card sx={{ marginTop: '2rem', backgroundColor: 'transparent', boxShadow: 'none' }}> | ||
<CardContent sx={{ padding: 0 }}> | ||
<Typography fontSize="16px" py={2} variant="body2" whiteSpace="pre-line"> | ||
{village.content} | ||
</Typography> | ||
</CardContent> | ||
</Card> | ||
</Box> | ||
<Typography color={color.blue} fontSize="20px" py={2} variant="h3" /> | ||
<CommentCard isCharacter isChat content={`${village.title} 위치는 여기야`} /> | ||
<CommentCard isChat content="다음에 같이 가보자!" /> | ||
</Box> | ||
<Box style={{ alignItems: 'center' }} width={600}> | ||
<KakaoMap | ||
initialLat={village.latitude} | ||
initialLon={village.longitude} | ||
isMarkerClicked={false} | ||
level={7} | ||
villages={[village]} | ||
/> | ||
</Box> | ||
</Stack> | ||
</GradientBox> | ||
); | ||
}; | ||
|
||
export default Page; |
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
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Client components cannot be async functions.
라고 합니다!!async
빼주세요~!