Skip to content

feat: 보관함 안 읽은 뉴스레터 필터 추가 #295

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

Open
jaeyoung-kwon wants to merge 12 commits into
base: dev
Choose a base branch
from
Open

feat: 보관함 안 읽은 뉴스레터 필터 추가 #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0effa9d
design: 보관함 안 읽은 뉴스레터 필터 UI 추가
jaeyoung-kwon Jul 18, 2026
8dae3ea
feat: 보관함 안 읽은 뉴스레터 필터 연동
jaeyoung-kwon Jul 18, 2026
08f9809
fix: 진행 바 캡션 높이 계산 오류 수정
jaeyoung-kwon Jul 18, 2026
165ca00
design: 모바일 보관함 검색 UI 변경
jaeyoung-kwon Jul 18, 2026
5ea83eb
design: 모바일 보관함 컨트롤 배치 조정
jaeyoung-kwon Jul 18, 2026
64edc80
design: 모바일 뉴스레터 카테고리 여백 조정
jaeyoung-kwon Jul 18, 2026
96ca1f4
fix: 플로팅 버튼 빈 레이아웃 요소 제거
jaeyoung-kwon Jul 18, 2026
e51cd49
refactor: 아티클 조회 파라미터 생성 타입 적용
jaeyoung-kwon Jul 18, 2026
bceb8c7
refactor: API 쿼리 boolean 직렬화 공통화
jaeyoung-kwon Jul 18, 2026
e006a65
refactor: 보관함 필터 상태 및 선택 UI 단순화
jaeyoung-kwon Jul 18, 2026
1c8e455
feat: 보관함 검색과 안 읽음 필터 상호 비활성화
jaeyoung-kwon Jul 18, 2026
d325193
refactor: 아티클 검색과 안 읽음 조회 타입 분리
jaeyoung-kwon Jul 18, 2026
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
5 changes: 3 additions & 2 deletions shared/src/core/apis/fetcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ const DEFAULT_ERROR_MESSAGES: Record<number, string> = {
};

type JsonBody = Record<string, unknown> | unknown[];
type Query = Record<string, string | number | boolean | undefined | string[]>;

type FetcherOptions<TRequest extends JsonBody> = {
path: string;
baseUrl?: string;
query?: Record<string, string | number | undefined | string[]>;
query?: Query;
body?: TRequest;
headers?: HeadersInit;
};
Expand Down Expand Up @@ -69,7 +70,7 @@ type RequestOptions<TRequest> = {
path: string;
baseUrl?: string;
method: FetchMethod;
query?: Record<string, string | number | undefined | string[]>;
query?: Query;
body?: TRequest;
headers?: HeadersInit;
};
Expand Down
3 changes: 3 additions & 0 deletions web/src/apis/articles/articles.api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ export type GetArticlesWithSearchParams =
components['schemas']['ArticleSearchOptionsRequest'] &
components['schemas']['Pageable'];

export type GetStorageArticlesParams = GetArticlesParams &
Pick<components['schemas']['ArticleSearchOptionsRequest'], 'keyword'>;

export const getArticlesWithSearch = async (
params: GetArticlesWithSearchParams,
) => {
Expand Down
6 changes: 4 additions & 2 deletions web/src/components/FloatingActionButton/FloatingActionButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import styled from '@emotion/styled';
import { useState } from 'react';
import { createPortal } from 'react-dom';
import { useClickOutsideRef } from '@/hooks/useClickOutsideRef';
import type { ReactNode } from 'react';

Expand All @@ -22,11 +23,12 @@ const FloatingActionButton = ({
setIsOpen(false);
});

return (
return createPortal(
<div ref={floatingRef}>
<FloatingButton onClick={toggleMenu}>{icon}</FloatingButton>
{isOpen && <FloatingMenu>{children}</FloatingMenu>}
</div>
</div>,
document.body,
);
};

Expand Down
19 changes: 12 additions & 7 deletions web/src/components/ProgressBar/ProgressBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,30 +24,35 @@ const ProgressBar = ({
variant = 'rounded',
...props
}: ProgressBarProps) => {
const hasCaption = Boolean(caption);

return (
<Container {...props}>
<ProgressOverlay variant={variant}>
<Container hasCaption={hasCaption} {...props}>
<ProgressOverlay variant={variant} hasCaption={hasCaption}>
<ProgressGauge
rate={rate}
transitionDuration={transition === true ? 0.5 : transition}
variant={variant}
/>
</ProgressOverlay>
<ProgressCaption>{caption}</ProgressCaption>
{caption && <ProgressCaption>{caption}</ProgressCaption>}
</Container>
);
};

export default ProgressBar;

export const Container = styled.div`
export const Container = styled.div<{ hasCaption: boolean }>`
width: 100%;
height: 10px;
height: ${({ hasCaption }) => (hasCaption ? 'auto' : '10px')};

@jaeyoung-kwon jaeyoung-kwon Jul 18, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ProgressBar 높이가 10px로 고정되어 있어서 수정했어요.
의도된 코드라면 알려주세요!

`;

const ProgressOverlay = styled.div<{ variant: 'rounded' | 'rectangular' }>`
const ProgressOverlay = styled.div<{
variant: 'rounded' | 'rectangular';
hasCaption: boolean;
}>`
width: 100%;
height: 100%;
height: ${({ hasCaption }) => (hasCaption ? '10px' : '100%')};
border-radius: ${({ variant }) => (variant === 'rounded' ? '10px' : '0')};
background-color: ${({ theme }) => theme.colors.primaryLight};
Expand Down
4 changes: 2 additions & 2 deletions web/src/components/ProgressBar/ProgressBarSkeleton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ interface ProgressBarSkeletonProps {

const ProgressBarSkeleton = ({ hasCaption }: ProgressBarSkeletonProps) => {
return (
<Container>
<Container hasCaption={Boolean(hasCaption)}>
<SkeletonBox
width="100%"
height="100%"
height={hasCaption ? '10px' : '100%'}
borderRadius="10px"
as={ProgressGauge}
/>
Expand Down
Loading
Loading