Skip to content

Commit

Permalink
hotfix: API Type 동기화
Browse files Browse the repository at this point in the history
  • Loading branch information
moong23 committed Sep 14, 2024
1 parent e1e12c8 commit 60ba9a3
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion src/api/hooks/useFetchMailQuery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ interface fetchUnreadMailsParams {
}

export type MailDataType = {
isRead: boolean;
read: boolean;
mailId: string;
subject: string;
date: Date;
Expand Down
6 changes: 3 additions & 3 deletions src/app/main/DigestTab/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ const DigestTab = () => {

return isFetched ? (
<div className='flex flex-row justify-center w-full h-full gap-16'>
<div className='flex flex-col h-full pt-3 gap-3'>
<div className='flex flex-col h-full gap-3 pt-3'>
<TopSection selectedTab={selectedTab} setSelectedTab={setSelectedTab} handleRefresh={() => refetch()} />
{data?.filter(d => (selectedTab === 'all' ? true : d.isRead === false)).length === 0 ? (
{data?.filter(d => (selectedTab === 'all' ? true : d.read === false)).length === 0 ? (
<div className='h-[calc(100vh-8rem-60px)] overflow-visible w-articleCard'>
<EmptyMailView />
</div>
) : (
data
?.filter(d => (selectedTab === 'all' ? true : d.isRead === false))
?.filter(d => (selectedTab === 'all' ? true : d.read === false))
.map((article, index) => (
<div
key={article.mailId}
Expand Down
4 changes: 2 additions & 2 deletions src/components/Article/ArticleCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ interface ArticleCardProps extends MailDataType {
currentTab?: string;
}

const ArticleCard = ({ subject, mailId, snippet, date, isRead, payload, from, isToday = false }: ArticleCardProps) => {
const ArticleCard = ({ subject, mailId, snippet, date, read, payload, from, isToday = false }: ArticleCardProps) => {
return (
<Link
// https://stackoverflow.com/questions/66821351/nextjs-error-message-failed-prop-type-the-prop-href-expects-a-string-or-o
href={{ pathname: isToday ? `/main` : `/article/${mailId}`, hash: isToday ? mailId : null }}
scroll={true}
className={`${isToday ? 'border-gradient_horizontal bg-white' : isRead ? 'bg-background_grey' : 'border border-lightgrey bg-white'} flex rounded-xl w-articleCard `}
className={`${isToday ? 'border-gradient_horizontal bg-white' : read ? 'bg-background_grey' : 'border border-lightgrey bg-white'} flex rounded-xl w-articleCard `}
>
<div className='flex flex-row items-center justify-between px-6 py-5'>
<div className='flex flex-col gap-6 w-[460px]'>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const DomainInteractionArea = ({ domainArticleData }: DomainInteractionAreaProps
{domainArticleData
?.filter(article => {
if (currentTab === 'unread') {
return !article.isRead;
return !article.read;
}
return true;
})
Expand Down
18 changes: 9 additions & 9 deletions src/mocks/data/mailListData.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"mails": [
{
"isRead": false,
"read": false,
"mailId": "19165ca4de7e6d20",
"subject": "🙋🏻‍♀️ 방석진 님이 관심 가질 만한 5명의 프로필을 엄선했어요.",
"date": "2024-09-10T14:00:41.000Z",
Expand All @@ -24,7 +24,7 @@
]
},
{
"isRead": "false",
"read": "false",
"mailId": "19164dd524cbf749",
"subject": "임채현 left a comment in 얍",
"date": "2024-09-10T09:41:50.000Z",
Expand Down Expand Up @@ -52,7 +52,7 @@
]
},
{
"isRead": "false",
"read": "false",
"mailId": "19164b803a16c248",
"subject": "chaeminnie left a comment in 얍",
"date": "2024-09-10T09:01:05.000Z",
Expand Down Expand Up @@ -80,7 +80,7 @@
]
},
{
"isRead": "false",
"read": "false",
"mailId": "19164ac48649cd73",
"subject": "🗞️ Weekly Roundup feat. Figma, Cultizm & RocketPunch",
"date": "2024-09-10T08:48:17.000Z",
Expand Down Expand Up @@ -108,7 +108,7 @@
]
},
{
"isRead": "false",
"read": "false",
"mailId": "191648cbfa35e43a",
"subject": "임채현 replied to a thread in 얍",
"date": "2024-09-10T08:13:48.000Z",
Expand Down Expand Up @@ -136,7 +136,7 @@
]
},
{
"isRead": "false",
"read": "false",
"mailId": "191646ac5f978ac6",
"subject": "chaeminnie replied to a thread in 얍",
"date": "2024-09-10T07:36:44.000Z",
Expand Down Expand Up @@ -164,7 +164,7 @@
]
},
{
"isRead": false,
"read": false,
"mailId": "19164675c0a17ebe",
"subject": "보는 눈이 있으시네요.",
"date": "2024-09-10T07:32:51.000Z",
Expand Down Expand Up @@ -207,7 +207,7 @@
"mimeType": "multipart/alternative",
"payload": [
{
"isRead": "false",
"read": "false",
"partId": "0",
"mimeType": "text/plain",
"body": "아래처럼 해보고 더 많은 목표를 이루세요.\r\n\r\n업무에 도움이 될 사람들을 팔로우하기\r\n박민수님의 프로필을 조회하신 것을 참고함\r\n이동욱\r\n인프랩 개발자\r\n이동욱님 팔로우:https://www.linkedin.com/comm/build-relation/people-follow/?entityName=%EB%8F%99%EC%9A%B1-%EC%9D%B4-575160177&entityUrn=ADoAACnY5SkBRiJMoxSALCMv9P2EF2BPMajeMjE&lipi=urn%3Ali%3Apage%3Aemail_email_next_best_action_digest_01%3Bb4Sn%2BoOARH2SiFTGbDVmwQ%3D%3D&midSig=3qJwq7WZt5rro1&midToken=AQH9wB4Z93MvBQ&trkEmail=eml-email_next_best_action_digest_01-people%7Efollow%7Ecohort-0-one%7Eclick%7Efollow%7Ecta-null-h2mbmj%7Elzz7xu2v%7Ex6-null-null&trk=eml-email_next_best_action_digest_01-people%7Efollow%7Ecohort-0-one%7Eclick%7Efollow%7Ecta\r\n \r\nDaniel Young Lee\r\nSoftware Engineer at Google\r\nDaniel Young님 팔로우:https://www.linkedin.com/comm/build-relation/people-follow/?entityName=danielylee&entityUrn=ADoAAAfc_0cBVUPBdLb0RzsXOSGvcXWF8qdeulU&lipi=urn%3Ali%3Apage%3Aemail_email_next_best_action_digest_01%3Bb4Sn%2BoOARH2SiFTGbDVmwQ%3D%3D&midSig=3qJwq7WZt5rro1&midToken=AQH9wB4Z93MvBQ&trkEmail=eml-email_next_best_action_digest_01-people%7Efollow%7Ecohort-0-one%7Eclick%7Efollow%7Ecta-null-h2mbmj%7Elzz7xu2v%7Ex6-null-null&trk=eml-email_next_best_action_digest_01-people%7Efollow%7Ecohort-0-one%7Eclick%7Efollow%7Ecta\r\n \r\n팔로우 추천 회원 더보기:https://www.linkedin.com/comm/mynetwork/?lipi=urn%3Ali%3Apage%3Aemail_email_next_best_action_digest_01%3Bb4Sn%2BoOARH2SiFTGbDVmwQ%3D%3D&midToken=AQH9wB4Z93MvBQ&midSig=3qJwq7WZt5rro1&trk=eml-email_next_best_action_digest_01-people~follow~cohort-0-see~more~cta&trkEmail=eml-email_next_best_action_digest_01-people~follow~cohort-0-see~more~cta-null-h2mbmj~lzz7xu2v~x6-null-null&eid=h2mbmj-lzz7xu2v-x6&otpToken=MTMwNTFkZTIxMTJjY2NjM2I2MmQwZmViNDExY2U0YmQ4OWNhZDQ0OTk4YWY4OTZjN2JjZjAzNjc0YjVmNWNmNmYzZDNkNWU5NmRlNGY5ZmU3ODk4ZTBjMWMwMzQ4Y2NmNGQzMGZlMDliM2YwZWQ1MDJmOWE5YjA4LDEsMQ%3D%3D\r\n\r\n\r\n\r\n경력 개발에 도움 될 인맥 키우기\r\n최근검색어를 참고함\r\nSeungyeon Jung\r\nUX Designer\r\nSeungyeon님과 1촌 맺기:https://www.linkedin.com/comm/mynetwork/send-invite/jungseungyeon/?lipi=urn%3Ali%3Apage%3Aemail_email_next_best_action_digest_01%3Bb4Sn%2BoOARH2SiFTGbDVmwQ%3D%3D&midSig=3qJwq7WZt5rro1&midToken=AQH9wB4Z93MvBQ&trkEmail=eml-email_next_best_action_digest_01-pymk%7Ecohort-0-connect%7Ecta-null-h2mbmj%7Elzz7xu2v%7Ex6-null-null&trk=eml-email_next_best_action_digest_01-pymk%7Ecohort-0-connect%7Ecta&_sig=39bAex4p15rro1\r\n \r\nGahui Yun\r\nUW MS HCDE '26 | HCI+D Researcher\r\nGahui님과 1촌 맺기:https://www.linkedin.com/comm/mynetwork/send-invite/gahuiyun-ux/?lipi=urn%3Ali%3Apage%3Aemail_email_next_best_action_digest_01%3Bb4Sn%2BoOARH2SiFTGbDVmwQ%3D%3D&midSig=3qJwq7WZt5rro1&midToken=AQH9wB4Z93MvBQ&trkEmail=eml-email_next_best_action_digest_01-pymk%7Ecohort-0-connect%7Ecta-null-h2mbmj%7Elzz7xu2v%7Ex6-null-null&trk=eml-email_next_best_action_digest_01-pymk%7Ecohort-0-connect%7Ecta&_sig=39bAex4p15rro1\r\n \r\n아는 사람 더 찾기:https://www.linkedin.com/comm/mynetwork/?lipi=urn%3Ali%3Apage%3Aemail_email_next_best_action_digest_01%3Bb4Sn%2BoOARH2SiFTGbDVmwQ%3D%3D&midToken=AQH9wB4Z93MvBQ&midSig=3qJwq7WZt5rro1&trk=eml-email_next_best_action_digest_01-pymk~cohort-0-see~more~cta&trkEmail=eml-email_next_best_action_digest_01-pymk~cohort-0-see~more~cta-null-h2mbmj~lzz7xu2v~x6-null-null&eid=h2mbmj-lzz7xu2v-x6&otpToken=MTMwNTFkZTIxMTJjY2NjM2I2MmQwZmViNDExY2U0YmQ4OWNhZDQ0OTk4YWY4OTZjN2JjZjAzNjc0YjVmNWNmNmYzZDNkNWU5NmRlNGY5ZmU3ODk4ZTBjMWMwMzQ4Y2NmNGQzMGZlMDliM2YwZWQ1MDJmOWE5YjA4LDEsMQ%3D%3D\r\n\r\n\r\n\r\n아래 대화들을 확인해 보세요.\r\n정지혜님의 업데이트를 조회하신 것을 참고함\r\n정지혜업데이트 공유: 1. 최근 채널톡의 운영사 채널코퍼레이션이 여러 논란에 휘말렸습니다. 최근 SNS와 블라인드를 통해 채널톡의 재직자 혹은 퇴직자로 추측되는 인물들이 회사에 대한 여러 불만을 털어놓았고 그것이 일파만파 퍼진 겁니다.\r\n\r\n2. 불만은 크게 세 가지로 정리 가능한데요…\r\n추천 관심있음 53\r\n채널톡 논란, 대표에게 직접 물어봤습니다\r\n\r\n더보기: https://www.linkedin.com/comm/feed/update/share:7227457153324789760?lipi=urn%3Ali%3Apage%3Aemail_email_next_best_action_digest_01%3Bb4Sn%2BoOARH2SiFTGbDVmwQ%3D%3D&midToken=AQH9wB4Z93MvBQ&midSig=3qJwq7WZt5rro1&trk=eml-email_next_best_action_digest_01-network~post~cta~text-0-read~more&trkEmail=eml-email_next_best_action_digest_01-network~post~cta~text-0-read~more-null-h2mbmj~lzz7xu2v~x6-null-null&eid=h2mbmj-lzz7xu2v-x6&otpToken=MTMwNTFkZTIxMTJjY2NjM2I2MmQwZmViNDExY2U0YmQ4OWNhZDQ0OTk4YWY4OTZjN2JjZjAzNjc0YjVmNWNmNmYzZDNkNWU5NmRlNGY5ZmU3ODk4ZTBjMWMwMzQ4Y2NmNGQzMGZlMDliM2YwZWQ1MDJmOWE5YjA4LDEsMQ%3D%3D\r\n\r\n더보기:https://www.linkedin.com/comm/in/%EC%A7%80%ED%98%9C-%EC%A0%95-a31200192/recent-activity/?lipi=urn%3Ali%3Apage%3Aemail_email_next_best_action_digest_01%3Bb4Sn%2BoOARH2SiFTGbDVmwQ%3D%3D&midToken=AQH9wB4Z93MvBQ&midSig=3qJwq7WZt5rro1&trk=eml-email_next_best_action_digest_01-feed~post~cohort-0-see~more~cta&trkEmail=eml-email_next_best_action_digest_01-feed~post~cohort-0-see~more~cta-null-h2mbmj~lzz7xu2v~x6-null-null&eid=h2mbmj-lzz7xu2v-x6&otpToken=MTMwNTFkZTIxMTJjY2NjM2I2MmQwZmViNDExY2U0YmQ4OWNhZDQ0OTk4YWY4OTZjN2JjZjAzNjc0YjVmNWNmNmYzZDNkNWU5NmRlNGY5ZmU3ODk4ZTBjMWMwMzQ4Y2NmNGQzMGZlMDliM2YwZWQ1MDJmOWE5YjA4LDEsMQ%3D%3D\r\n\r\n\r\n\r\n----------------------------------------\r\n\r\nSeok Jin Bang님에게 발송된 이메일입니다(중앙대학교 학생).\r\n자세히 보기: https://www.linkedin.com/help/linkedin/answer/4788?lang=ko&lipi=urn%3Ali%3Apage%3Aemail_email_next_best_action_digest_01%3Bb4Sn%2BoOARH2SiFTGbDVmwQ%3D%3D&midToken=AQH9wB4Z93MvBQ&midSig=3qJwq7WZt5rro1&trk=eml-email_next_best_action_digest_01-SecurityHelp-0-textfooterglimmer&trkEmail=eml-email_next_best_action_digest_01-SecurityHelp-0-textfooterglimmer-null-h2mbmj~lzz7xu2v~x6-null-null&eid=h2mbmj-lzz7xu2v-x6&otpToken=MTMwNTFkZTIxMTJjY2NjM2I2MmQwZmViNDExY2U0YmQ4OWNhZDQ0OTk4YWY4OTZjN2JjZjAzNjc0YjVmNWNmNmYzZDNkNWU5NmRlNGY5ZmU3ODk4ZTBjMWMwMzQ4Y2NmNGQzMGZlMDliM2YwZWQ1MDJmOWE5YjA4LDEsMQ%3D%3D\r\n회원님과 비슷한 회원도 이러한 조치를 취했기 때문에 이 이메일을 보내드립니다.\r\n\r\n이메일 받지 않기: https://www.linkedin.com/comm/psettings/email-unsubscribe?lipi=urn%3Ali%3Apage%3Aemail_email_next_best_action_digest_01%3Bb4Sn%2BoOARH2SiFTGbDVmwQ%3D%3D&midToken=AQH9wB4Z93MvBQ&midSig=3qJwq7WZt5rro1&trk=eml-email_next_best_action_digest_01-unsubscribe-0-textfooterglimmer&trkEmail=eml-email_next_best_action_digest_01-unsubscribe-0-textfooterglimmer-null-h2mbmj~lzz7xu2v~x6-null-null&eid=h2mbmj-lzz7xu2v-x6&loid=AQHwWOlV76t94wAAAZFkSl5z9fTyBZrt-O01m3zcFO77u_k5ATji_a0liGKWJW8crK4EvRHyfZwX1YdhLyNnlkVQGT4ODMimzkTw3UnC-GkpONVfX4dpPtnbsDuHc1Lbfw\r\n도움말: https://www.linkedin.com/help/linkedin/answer/67?lang=ko&lipi=urn%3Ali%3Apage%3Aemail_email_next_best_action_digest_01%3Bb4Sn%2BoOARH2SiFTGbDVmwQ%3D%3D&midToken=AQH9wB4Z93MvBQ&midSig=3qJwq7WZt5rro1&trk=eml-email_next_best_action_digest_01-help-0-textfooterglimmer&trkEmail=eml-email_next_best_action_digest_01-help-0-textfooterglimmer-null-h2mbmj~lzz7xu2v~x6-null-null&eid=h2mbmj-lzz7xu2v-x6&otpToken=MTMwNTFkZTIxMTJjY2NjM2I2MmQwZmViNDExY2U0YmQ4OWNhZDQ0OTk4YWY4OTZjN2JjZjAzNjc0YjVmNWNmNmYzZDNkNWU5NmRlNGY5ZmU3ODk4ZTBjMWMwMzQ4Y2NmNGQzMGZlMDliM2YwZWQ1MDJmOWE5YjA4LDEsMQ%3D%3D\r\n\r\n© 2024 LinkedIn Ireland Unlimited Company, Wilton Plaza, Wilton Place, Dublin 2.LinkedIn은 LinkedIn Ireland Unlimited Company의 등록 사업자명입니다.\r\nLinkedIn과 LinkedIn 로고는 LinkedIn의 등록 상표입니다."
Expand All @@ -220,7 +220,7 @@
]
},
{
"isRead": "false",
"read": "false",
"mailId": "19164453987444d9",
"subject": "8 new comments in 얍",
"date": "2024-09-10T06:55:42.000Z",
Expand Down
6 changes: 3 additions & 3 deletions src/mocks/handlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ export const handlers = [
'국가는 평생교육을 진흥하여야 한다. 국가안전보장에 관련되는 대외정책·군사정책과 국내정책의 수립에 관하여 국무회의의 심의에 앞서 대통령의 자문에 응하기 위하여 국가안전보장회의를 둔다. 모든 국민은 법률이 정하는 바에 의하여 공무담임권을 가진다. 광물 기타 중요한 지하자원·수산자원·수력과 경제상 이용할 수 있는 자연력은 법률이 정하는 바에 의하여 일정한 기간 그 채취·개발 또는 이용을 특허할 수 있다.',
date: '2024-07-13',
thumbnail: 'https://picsum.photos/156',
isRead: false,
read: false,
from: {
domain: 'official@git',
profile: 'https://picsum.photos/36',
Expand All @@ -218,7 +218,7 @@ export const handlers = [
'국가는 평생교육을 진흥하여야 한다. 국가안전보장에 관련되는 대외정책·군사정책과 국내정책의 수립에 관하여 국무회의의 심의에 앞서 대통령의 자문에 응하기 위하여 국가안전보장회의를 둔다. 모든 국민은 법률이 정하는 바에 의하여 공무담임권을 가진다. 광물 기타 중요한 지하자원·수산자원·수력과 경제상 이용할 수 있는 자연력은 법률이 정하는 바에 의하여 일정한 기간 그 채취·개발 또는 이용을 특허할 수 있다.',
date: '2024-07-13',
thumbnail: 'https://picsum.photos/156',
isRead: false,
read: false,
from: {
domain: 'official@git',
profile: 'https://picsum.photos/36',
Expand All @@ -233,7 +233,7 @@ export const handlers = [
'국가는 평생교육을 진흥하여야 한다. 국가안전보장에 관련되는 대외정책·군사정책과 국내정책의 수립에 관하여 국무회의의 심의에 앞서 대통령의 자문에 응하기 위하여 국가안전보장회의를 둔다. 모든 국민은 법률이 정하는 바에 의하여 공무담임권을 가진다. 광물 기타 중요한 지하자원·수산자원·수력과 경제상 이용할 수 있는 자연력은 법률이 정하는 바에 의하여 일정한 기간 그 채취·개발 또는 이용을 특허할 수 있다.',
date: '2024-07-13',
thumbnail: 'https://picsum.photos/156',
isRead: false,
read: false,
from: {
domain: 'official@git',
profile: 'https://picsum.photos/36',
Expand Down
2 changes: 1 addition & 1 deletion src/types/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export interface ArticleType {
content?: string;
date: string;
thumbnail?: string;
isRead?: boolean;
read?: boolean;
from: {
domain: string;
profile: string;
Expand Down

0 comments on commit 60ba9a3

Please sign in to comment.