Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
7be8fb9
fix: style오타 수정
jjjsun Aug 10, 2026
7f0ecf9
fix: 타임라인바 모바일 화면에서 케밥 위치 일부확보(대신 텍스트 한글자 더 보이도록 작게 수정)
jjjsun Aug 10, 2026
8322bcb
fix: 드랍다운 메뉴 열린채 스크롤이나 크기 변경시 상하좌우 재계산 되도록 수정
jjjsun Aug 10, 2026
c1315c7
fix: 데스크탑 스랙 미연동시 위치 이상 해결
jjjsun Aug 10, 2026
0949dc2
feat: hasChange 상태추가 및 저장버튼 스타일/문구 수정
jjjsun Aug 10, 2026
54d71f5
feat: 로고/설명 높이 축소
jjjsun Aug 10, 2026
e3c4cf1
feat: 워크스페이스 삭제 버튼 축소
jjjsun Aug 10, 2026
912bb0a
feat: 텍스트 텀 수정
jjjsun Aug 10, 2026
3378d85
feat: 변경사항 저장하기 버튼 크기/문구 수정 및 로딩상태 disabled 추가
jjjsun Aug 10, 2026
296a531
feat: profileSection UX개선
jjjsun Aug 10, 2026
a7b3724
fix: 이름비교도 동일한 정규화 기준 추가
jjjsun Aug 10, 2026
d1f5451
feat: 타입정리
jjjsun Aug 10, 2026
eb35cd2
feat: 역할별 권한 안내표로 수정
jjjsun Aug 10, 2026
b4c1cbf
fix: 안쓰는 import 수정
jjjsun Aug 10, 2026
83f4364
feat: 권한에 타임라인 관련 내용 추가
jjjsun Aug 10, 2026
4ec33fa
feat: 문구수정
jjjsun Aug 10, 2026
ada6722
fix: 코드래빗 수정사항 반영
jjjsun Aug 10, 2026
576b539
Merge pull request #449 from WhereYouAd/feature/#448
jjjsun Aug 10, 2026
0b9c866
refactor: 타임라인 수정모달/패널/기간선택/요약 훅분리
jjjsun Aug 11, 2026
734d51d
refactor: 타임라인 툴바 컴포넌트 분리
jjjsun Aug 11, 2026
1e3e43c
refactor: 타임라인캔버스 컴포넌트 분리
jjjsun Aug 11, 2026
2617ef5
refactor: 타임라인 삭제 모달 컴포넌트 분리
jjjsun Aug 11, 2026
11a7b45
fix: 타임라인 삭제모달 함수명 정의
jjjsun Aug 11, 2026
8889bab
fix: 선택 변경하거나 성과 패널 닫힐때 폴링 상태 리셋 추가
jjjsun Aug 11, 2026
53a82a0
Merge branch 'develop' into feature/#431
jjjsun Aug 11, 2026
3dfad43
Merge branch 'develop' into feature/#443
jjjsun Aug 11, 2026
717b05e
Merge pull request #446 from WhereYouAd/feature/#444
jjjsun Aug 11, 2026
a4870d8
Merge branch 'develop' into refactor/#450
jjjsun Aug 11, 2026
bc034b1
Merge branch 'develop' into feature/#443
jjjsun Aug 11, 2026
556a482
Merge branch 'develop' into feature/#431
jjjsun Aug 11, 2026
1714c0c
Merge pull request #441 from WhereYouAd/feature/#431
jjjsun Aug 11, 2026
4f25fd8
Merge pull request #445 from WhereYouAd/feature/#443
jjjsun Aug 11, 2026
48945a6
Merge pull request #451 from WhereYouAd/refactor/#450
jjjsun Aug 11, 2026
203f204
fix: 로그아웃시 캐시 초기화
jjjsun Aug 12, 2026
b811512
refactor: 팀원초대 링크 복사 관련 UI/로직 삭제
jjjsun Aug 12, 2026
2cfde79
fix: import 경로 별칭으로 수정
jjjsun Aug 12, 2026
13d5598
refactor: 랜딩가이드 워크스페이스파트 팀원초대 링크복사 UI 제거
jjjsun Aug 12, 2026
7066d1f
Merge pull request #454 from WhereYouAd/bugfix/#452
jjjsun Aug 12, 2026
6298624
Merge pull request #456 from WhereYouAd/refactor/#455
jjjsun Aug 12, 2026
021be84
refactor: 타입 분리
jjjsun Aug 12, 2026
f2cdfa8
refactor: setting페이지 커스텀 훅 분리
jjjsun Aug 12, 2026
8122478
fix: 파일명 변경
jjjsun Aug 12, 2026
b739a66
fix: 함수 참조가 아니라 호출로 변경
jjjsun Aug 12, 2026
d3c87a2
fix: import 경로 별칭으로 수정
jjjsun Aug 12, 2026
dbdb8c9
fix: 파일명 수정
jjjsun Aug 12, 2026
11ecb18
fix: useSettingPassword 파일명 대소문자 수정
jjjsun Aug 12, 2026
ca3c706
fix: 미저장 draft값 연동 요청에 넣도록 수정
jjjsun Aug 12, 2026
fe90eb2
fix: 슬랙 웹훅 연동 URL 검증 추가
jjjsun Aug 12, 2026
9f97464
fix: 설정 저장 부분 실패시에도 어디서 실패했는지 에러 메세지 추가
jjjsun Aug 12, 2026
64fd9fc
fix: saved는 항상 갱신되도록 하고, draft는 데이터바뀔때만
jjjsun Aug 12, 2026
c87304d
Merge pull request #458 from WhereYouAd/refactor/#457
jjjsun Aug 12, 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
2 changes: 1 addition & 1 deletion src/assets/icon/common/close.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 29 additions & 12 deletions src/components/common/dropdownmenu/DropdownMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -159,19 +159,36 @@ export function DropdownMenu({
const el = ref.current;
if (!el) return;

if (placement === "bottom") {
setResolvedPlacement("bottom");
} else if (placement === "top") {
setResolvedPlacement("top");
} else {
setResolvedPlacement(resolveAutoPlacement(el, items.length));
}
const updatePosition = () => {
if (placement === "bottom") {
setResolvedPlacement("bottom");
} else if (placement === "top") {
setResolvedPlacement("top");
} else {
setResolvedPlacement(resolveAutoPlacement(el, items.length));
}

if (!fullWidth) {
setHorizontalAlign(resolveHorizontalAlign(el));
} else {
setHorizontalAlign("right");
}
if (!fullWidth) {
setHorizontalAlign(resolveHorizontalAlign(el));
} else {
setHorizontalAlign("right");
}
};

updatePosition();

window.addEventListener("resize", updatePosition);

window.addEventListener("scroll", updatePosition, true);

const resizeObserver = new ResizeObserver(updatePosition);
resizeObserver.observe(el);

return () => {
window.removeEventListener("resize", updatePosition);
window.removeEventListener("scroll", updatePosition, true);
resizeObserver.disconnect();
};
}, [open, placement, items.length, inFlow, fullWidth]);

useEffect(() => {
Expand Down
9 changes: 3 additions & 6 deletions src/components/landing/GuideWorkspace.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import CopyIcon from "@/assets/icon/common/link.svg?react";
import MailIcon from "@/assets/icon/common/mail.svg?react";
import UserIcon from "@/assets/icon/common/user.svg?react";

const MEMBERS = [
Expand All @@ -11,12 +11,9 @@ export default function GuideWorkspace() {
return (
<div className="h-75 w-full bg-transparent md:h-85" aria-hidden="true">
<div className="h-full rounded-[28px] bg-surface-100 border border-surface-400/60 shadow-Soft overflow-hidden flex flex-col">
<div className="flex items-center justify-between px-6 pt-5 pb-3 shrink-0">
<div className="flex justify-center items-center py-6 pb-3 gap-3">
<MailIcon className="h-6 w-6 text-primary-400" />
<p className="font-heading4 text-text-title">팀원 초대하기</p>
<div className="flex items-center gap-1.5 text-primary-500">
<CopyIcon className="w-4 h-4" />
<span className="font-body2">링크 복사</span>
</div>
</div>

<div className="px-6 pb-3 shrink-0">
Expand Down
10 changes: 5 additions & 5 deletions src/components/setting/NotificationSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ export default function NotificationSection({
</Button>
</div>
) : (
<div className="flex items-center gap-3 tablet:w-full tablet:flex-col tablet:items-stretch">
<>
<Input
aria-label="슬랙 Webhook URL"
placeholder="https://hooks.slack.com/..."
Expand Down Expand Up @@ -217,7 +217,7 @@ export default function NotificationSection({
>
연동
</Button>
</div>
</>
)}
</div>
)}
Expand Down Expand Up @@ -257,7 +257,7 @@ export default function NotificationSection({
</Button>
</div>
) : (
<div className="flex items-center gap-3 tablet:w-full tablet:flex-col tablet:items-stretch">
<>
<Input
aria-label="디스코드 Webhook URL"
placeholder="https://discord.com/api/webhooks/..."
Expand All @@ -266,7 +266,7 @@ export default function NotificationSection({
error={!!discordWebhookError}
helperText={discordWebhookError}
disabled={channelDisabled || isAnyOrgPending}
wrapperClassName="w-1/4 shrink-0 tablet:w-fill"
wrapperClassName="w-1/4 shrink-0 tablet:w-full"
containerClassName="h-10 rounded-lg"
inputClassName="px-3 font-body2"
/>
Expand All @@ -285,7 +285,7 @@ export default function NotificationSection({
>
연동
</Button>
</div>
</>
)}
</div>
)}
Expand Down
10 changes: 5 additions & 5 deletions src/components/setting/ProfileSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default function ProfileSection({
<h2 className="font-heading4 text-text-title">프로필</h2>
</div>
</header>
<div className="flex flex-row gap-10 tablet:flex-col tablet:gap-8">
<div className="flex flex-row items-center gap-8 tablet:flex-col tablet:gap-8">
<div className="flex flex-col items-center basis-1/4 shrink-0 tablet:w-full">
<div className="mb-4 w-full select-none text-text-title tablet:text-center">
프로필 이미지
Expand All @@ -55,7 +55,7 @@ export default function ProfileSection({
type="button"
onClick={openFilePicker}
aria-label="프로필 이미지 업로드 또는 변경"
className="relative flex h-45 w-45 cursor-pointer items-center justify-center overflow-hidden rounded-full border border-surface-400 bg-surface-200 outline-none transition-colors hover:bg-surface-300/70 focus-visible:ring-2 focus-visible:ring-primary-500/40"
className="relative flex h-36 w-36 cursor-pointer items-center justify-center overflow-hidden rounded-full border border-surface-400 bg-surface-200 outline-none transition-colors hover:bg-surface-300/70 focus-visible:ring-2 focus-visible:ring-primary-500/40"
>
{preview ? (
<img
Expand Down Expand Up @@ -85,14 +85,14 @@ export default function ProfileSection({
type="button"
onClick={resetImage}
className="h-7! rounded-3xl border border-surface-400 bg-surface-100 px-4 font-body2 text-text-auth-sub transition-colors duration-200 ease-in-out hover:bg-surface-200 disabled:cursor-not-allowed disabled:opacity-40"
aria-label="프로필 이미지 초기화 버튼"
aria-label="프로필 이미지 삭제 버튼"
disabled={!preview}
>
초기화
삭제
</Button>
</div>
</div>
<div className="grid w-full basis-3/4 grid-cols-2 gap-x-6 gap-y-4 tablet:grid-cols-1 tablet:gap-y-5">
<div className="grid w-full basis-3/4 grid-cols-2 gap-x-6 gap-y-3 tablet:grid-cols-1 tablet:gap-y-5">
<div className="col-span-2 tablet:col-span-1">
<Input
label="이름"
Expand Down
7 changes: 6 additions & 1 deletion src/components/timeline/TimelineBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,12 @@ export default function TimelineBar({
status.accent,
)}
/>
<div className="flex min-w-0 flex-1 flex-col gap-0.5">
<div
className={twMerge(
"flex min-w-0 flex-1 flex-col gap-0.5",
showActions && "pr-3",
)}
>
<div className="flex min-w-0 items-center gap-1.5">
{providers.length > 0 ? (
<div
Expand Down
86 changes: 86 additions & 0 deletions src/components/timeline/TimelineCanvas.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
import type { RefObject } from "react";

import type {
ITimelineCampaignBar,
ITimelineGridColumn,
TTimelineViewUnit,
} from "@/types/timeline/ui";

import TimelineAxis from "./TimelineAxis";
import TimelineBar from "./TimelineBar";
import TimelineGrid from "./TimelineGrid";

interface ITimelineCanvasProps {
scrollRef: RefObject<HTMLDivElement | null>;
totalWidth: number;
columns: ITimelineGridColumn[];
colWidth: number;
bars: ITimelineCampaignBar[];
maxRow: number;
viewUnit: TTimelineViewUnit;
hasNoVisibleBars: boolean;
selectedBarId: number | null;
isPanelOpen: boolean;
onBarClick: (bar: ITimelineCampaignBar) => void;
onEdit: (id: number) => void;
onDelete: (target: { id: number; name: string }) => void;
}

export default function TimelineCanvas({
scrollRef,
totalWidth,
columns,
colWidth,
bars,
maxRow,
viewUnit,
hasNoVisibleBars,
selectedBarId,
isPanelOpen,
onBarClick,
onEdit,
onDelete,
}: ITimelineCanvasProps) {
return (
<div
ref={scrollRef}
className="flex min-h-0 w-full flex-1 flex-col overflow-auto"
>
<div
style={{ width: totalWidth, minHeight: "100%" }}
className="flex min-h-full flex-1 flex-col"
>
<TimelineAxis
columns={columns}
colWidth={colWidth}
className="sticky top-0"
/>
{hasNoVisibleBars ? (
<div className="flex min-h-0 flex-1 flex-col items-center justify-center gap-2 px-6 py-16 text-center">
<p className="font-heading4 text-text-title">
이 기간에 표시할 타임라인이 없어요
</p>
<p className="max-w-sm font-body2 text-text-muted">
다른 기간으로 이동하거나 보기 단위를 변경해 보세요
</p>
</div>
) : (
<TimelineGrid columns={columns} rowCount={maxRow} colWidth={colWidth}>
{bars.map((bar) => (
<TimelineBar
key={`${viewUnit}-${bar.id}`}
bar={bar}
colWidth={colWidth}
menuPlacement={bar.row === maxRow ? "top" : "auto"}
isSelected={selectedBarId === bar.id && isPanelOpen}
onBarClick={onBarClick}
onEdit={() => onEdit(bar.id)}
onDelete={() => onDelete({ id: bar.id, name: bar.title })}
/>
))}
</TimelineGrid>
)}
</div>
</div>
);
}
41 changes: 41 additions & 0 deletions src/components/timeline/TimelineDeleteModal.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import Modal from "../common/modal/Modal";
import ModalContent from "../common/modal/ModalContent";

import TrashIcon from "@/assets/icon/common/trash.svg?react";

interface ITimelineDeleteModalProps {
target: { id: number; name: string } | null;
isDeleting: boolean;
onClose: () => void;
onConfirm: () => void;
}

export default function TimelineDeleteModal({
target,
isDeleting,
onClose,
onConfirm,
}: ITimelineDeleteModalProps) {
return (
<Modal
isOpen={target != null}
onClose={onClose}
title="타임라인 삭제"
disableOverlayClick={isDeleting}
>
<ModalContent
icon={<TrashIcon className="h-7 w-7 text-info-red" />}
title="해당 타임라인을 삭제할까요?"
description={
target
? `"${target.name}" 타임라인을 삭제하면 복구할 수 없습니다`
: ""
}
buttonText="삭제하기"
onConfirm={onConfirm}
isLoading={isDeleting}
variant="danger"
/>
</Modal>
);
}
94 changes: 94 additions & 0 deletions src/components/timeline/TimelineToolbar.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
import { twMerge } from "tailwind-merge";

import type { TTimelineSort } from "@/types/timeline/api";
import type { TTimelineViewUnit } from "@/types/timeline/ui";
import type { TTimelineStatusFilter } from "@/constants/timeline/filterSort";

import TimelineFilterSortMenus from "./TimelineFilterSortMenus";
import {
TimelinePeriodNav,
TimelineViewUnitSegment,
} from "./TimelinePeriodSelector";
import TimelineStatusLegend from "./TimelineStatusLegend";
import Button from "../common/button/Button";

import PlusIcon from "@/assets/icon/common/plus.svg?react";

interface ITimelineToolbarProps {
viewUnit: TTimelineViewUnit;
periodLabel: string;
onViewUnitChange: (unit: TTimelineViewUnit) => void;
onPrevPeriod: () => void;
onNextPeriod: () => void;
onGoToToday: () => void;
statusFilter: TTimelineStatusFilter;
sort: TTimelineSort;
onStatusFilterChange: (value: TTimelineStatusFilter) => void;
onSortChange: (value: TTimelineSort) => void;
onCreate: () => void;
}

export default function TimelineToolbar({
viewUnit,
periodLabel,
onViewUnitChange,
onPrevPeriod,
onNextPeriod,
onGoToToday,
statusFilter,
sort,
onStatusFilterChange,
onSortChange,
onCreate,
}: ITimelineToolbarProps) {
return (
<div className="flex shrink-0 flex-col gap-4 border-b border-surface-400/80 px-5 py-5 tablet:px-4 tablet:py-4 tablet:gap-3">
<div className="flex items-center justify-between gap-8 tablet:flex-col tablet:items-stretch tablet:gap-3">
<TimelineStatusLegend className="min-w-0 flex-1" />
<Button
type="button"
size="small"
variant="custom"
onClick={onCreate}
leftIcon={
<PlusIcon
className="h-4 w-4 shrink-0 text-primary-500"
aria-hidden
/>
}
className={twMerge(
"h-10 shrink-0 rounded-2xl px-4",
"bg-primary-400/20 text-primary-500",
"font-body2 shadow-Soft",
"transition-ui-smooth hover:bg-primary-500/30",
"tablet:w-full tablet:justify-center",
)}
>
타임라인 생성
</Button>
</div>

<div className="grid grid-cols-[1fr_auto_1fr] items-center gap-4 tablet:grid-cols-1 tablet:gap-3">
<TimelineViewUnitSegment
viewUnit={viewUnit}
onViewUnitChange={onViewUnitChange}
className="justify-self-start tablet:justify-self-stretch tablet:w-full"
/>
<TimelinePeriodNav
periodLabel={periodLabel}
onPrevPeriod={onPrevPeriod}
onNextPeriod={onNextPeriod}
onGoToToday={onGoToToday}
className="justify-self-center"
/>
<TimelineFilterSortMenus
statusFilter={statusFilter}
sort={sort}
onStatusFilterChange={onStatusFilterChange}
onSortChange={onSortChange}
className="justify-self-end"
/>
</div>
</div>
);
}
Loading
Loading