Skip to content
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.

Sign up for GitHub

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

feat: [LINKER-120] 지인페이지 관심주제 구현 #77

Merged
merged 4 commits into from
Feb 23, 2024
Merged

feat: [LINKER-120] 지인페이지 관심주제 구현 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4047955
fix: 아이콘 안나오는 문제 수정
danivelop Feb 23, 2024
214bffb
fix: 트렌드 핫이슈 카드의 more button에 링크 연결
danivelop Feb 23, 2024
9075c6d
feat: 지인페이지 관심주제 구현
danivelop Feb 23, 2024
f13457f
Merge branch 'develop' into feat/LINKER-120
danivelop Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 39 additions & 2 deletions services/web/src/app/friend/[id]/subject/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,42 @@
function SubjectPage() {
return <div>관심주제</div>;
import { NewsDTO } from '@/types/news';
import { TagDTO } from '@/types/tag';
import { NewsList } from '@features/news-list';
import { ky } from '@linker/ky';

import { getTokens } from '@utils/token/server';

export interface FriendNewsListDTO {
recommendations: Array<{
tags: TagDTO[];
newsList: {
data: NewsDTO[];
nextCursor: number | null;
hasNext: boolean;
};
}>;
}

function getFriendNewsList(contactId: string, size = 20) {
return ky.get<FriendNewsListDTO>(`/v1/contacts/${contactId}/interest/news?size=${size}`);
}

async function SubjectPage({ params }: { params: { id: string } }) {
const accessToken = getTokens().accessToken;

if (accessToken == null) {
return;
}

const { recommendations } = await getFriendNewsList(params.id);

return (
<div>
{/* <Link href="">
<div className={addSubjectButon}>+ 관심주제 추가하기</div>
</Link> */}
<NewsList recommendations={recommendations} />
</div>
);
}

export default SubjectPage;
39 changes: 21 additions & 18 deletions services/web/src/app/my/feed/trend/components/MoreButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,32 @@
import { Button, Txt } from '@linker/lds';
import { colors } from '@linker/styles';
import Image from 'next/image';
import Link from 'next/link';

import { button } from './MoreButton.css';

function MoreButton() {
return (
<Button className={button}>
<Image
src="https://static.im-linker.com/icons/refresh.png"
width={20}
height={20}
alt="pencil-icon"
/>
<Txt typography="b3" color={colors.blue500}>
관심사 최신뉴스&nbsp;
</Txt>
<Txt typography="b3" color={colors.gray500}>
더 보기&nbsp;
</Txt>
{/** @todo 기획적으로 명확하지 않아 임시로 markup만 작성. 추후 구현필요 */}
<Txt typography="b3" color={colors.gray500}>
1/5
</Txt>
</Button>
<Link href="/trend">
<Button className={button}>
<Image
src="https://static.im-linker.com/icons/refresh.png"
width={20}
height={20}
alt="pencil-icon"
/>
<Txt typography="b3" color={colors.blue500}>
관심사 최신뉴스&nbsp;
</Txt>
<Txt typography="b3" color={colors.gray500}>
더 보기&nbsp;
</Txt>
{/** @todo 기획적으로 명확하지 않아 임시로 markup만 작성. 추후 구현필요 */}
<Txt typography="b3" color={colors.gray500}>
1/5
</Txt>
</Button>
</Link>
);
}

Expand Down
2 changes: 1 addition & 1 deletion services/web/src/app/my/feed/trend/components/Trend.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ async function Trend() {

return (
<List>
<Link href="">
<Link href="/trend">
<List.Header
title="트렌드 핫 이슈"
typograyphy="h7"
Expand Down
Loading
Loading