Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
f09ac47
chore: #812 스페이스 내 회고 갯수 넘버링 컬러 반영
supersett Feb 16, 2026
63aafa9
chore: 계정 설정 완료 버튼 disabled 상태 추가
supersett Feb 16, 2026
c65ade1
fix: 계정탈퇴 ui 변경
supersett Feb 16, 2026
d7ae7f1
chore: #816 회고 작성하기 하단 버튼 라인 정렬
supersett Feb 16, 2026
7281a62
fix: #818 회고 작성 질문 전체보기의 컨텐츠 wrap 영역 없이 무제한 펼쳐져 아래 버튼들과 겹치는 이슈 해결
supersett Feb 16, 2026
5dfb241
Merge pull request #813 from depromeet/feat/issue-812
supersett Feb 16, 2026
65384e3
Merge pull request #815 from depromeet/feat/issue-814
supersett Feb 16, 2026
cee7a2f
Merge pull request #817 from depromeet/feat/issue-816
supersett Feb 16, 2026
bf4b751
Merge pull request #819 from depromeet/feat/issue-818
supersett Feb 16, 2026
34290cf
refactor: 스페이스 생성 시 템플릿 리스트 탭 제거
JaeIn1 Feb 18, 2026
56de922
refactor: 퍼널 모달 헤더 통합
JaeIn1 Feb 18, 2026
ea617a8
remove: 기존 퍼널 모달 헤더 제거
JaeIn1 Feb 18, 2026
9d577e7
refactor: 불필요한 onclose 제거 및 export 제거
JaeIn1 Feb 18, 2026
8b0690e
fix: #788 진행 중인 회고 스타일 변경 및 텍스트 변경 (#806)
prgmr99 Feb 18, 2026
c880242
fix: #805 템플릿 질문 리스트 편집 후 완료버튼 클릭 시 수정 완료 토스트 제공 (#807)
prgmr99 Feb 18, 2026
1024d48
chore: #809 아이콘 변경 (#810)
prgmr99 Feb 18, 2026
6eedd5c
fix: 배경색이 적용 되지 않는 이슈 수정
JaeIn1 Feb 18, 2026
4b3a10a
remove: 불필요한 콘솔 제거
JaeIn1 Feb 18, 2026
56df56a
Merge branch 'develop' of https://github.com/depromeet/layer into 811…
JaeIn1 Feb 18, 2026
c6fbd99
Merge pull request #820 from depromeet/811-스페이스-생성-템플릿-리스트에서-보기-탭-제거
JaeIn1 Feb 18, 2026
a296c15
version up to 2.0.4
klmhyeonwoo Feb 18, 2026
939cec3
version up to 2.0.4
klmhyeonwoo Feb 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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -150,4 +150,5 @@ dist

# Claude Code configuration
CLAUDE.md
.claude//
.claude
.omc
2 changes: 1 addition & 1 deletion apps/mobile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@layer/mobile",
"main": "expo-router/entry",
"types": "./bridge/native.ts",
"version": "2.0.3",
"version": "2.0.4",
"scripts": {
"start": "expo start",
"reset-project": "node ./scripts/reset-project.js",
Expand Down
2 changes: 1 addition & 1 deletion apps/web/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@layer/web",
"private": true,
"version": "2.0.3",
"version": "2.0.4",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ import "swiper/css/navigation";
import { useGetAllRetrospects } from "@/hooks/api/retrospect/useApiOptionsGetRetrospects";
import { LoadingSpinner } from "@/component/space/view/LoadingSpinner";
import RetrospectCard from "../RetrospectCard";
import EmptyInProgressRetrospects from "./EmptyInProgressRetrospects";

export default function InProgressRetrospectsWrapper() {
// * 작성중인 모든 회고 리스트 요청
// * 진행 중인 모든 회고 리스트 요청
const { data: retrospects, isPending: isRetrospectsPending } = useGetAllRetrospects({
select: (data) => data.retrospects.filter((retrospect) => retrospect.writeStatus === "PROCEEDING"),
});
Expand All @@ -27,10 +26,10 @@ export default function InProgressRetrospectsWrapper() {
>
{/* ---------- 제목 ---------- */}
<Typography variant="body15Bold" color="gray800">
작성중인 회고 ({retrospects?.length || 0})
진행 중인 회고 ({retrospects?.length || 0})
</Typography>

{/* ---------- 작성중인 회고 컨텐츠 ---------- */}
{/* ---------- 진행 중인 회고 컨텐츠 ---------- */}
<Swiper
modules={[Navigation]}
spaceBetween={12}
Expand Down Expand Up @@ -156,3 +155,22 @@ export default function InProgressRetrospectsWrapper() {
</section>
);
}

function EmptyInProgressRetrospects() {
return (
<div
css={css`
display: flex;
justify-content: center;
align-items: center;
height: 13.8rem;
border-radius: 1.6rem;
background-color: ${DESIGN_TOKEN_COLOR.gray00};
`}
>
<Typography variant="body15Medium" color="gray500">
진행 중인 회고가 없어요
</Typography>
</div>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export function TemplateListItem({ id, title, tag, imageUrl }: DesktopTemplateLi
padding: 1.6rem;
border: 0.1rem solid ${DESIGN_SYSTEM_COLOR.grey100};
border-radius: 0.8rem;
background-color: #fff;
cursor: pointer;
`}
onClick={handleClickDetail}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { css } from "@emotion/react";

import { useTabs } from "@/hooks/useTabs";
import { DESIGN_TOKEN_COLOR } from "@/style/designTokens";
import { useFunnelModal } from "@/hooks/useFunnelModal";

export type TabProps<T extends string> = Omit<ReturnType<typeof useTabs<T>>, "tabs"> & { tab: T };

Expand All @@ -10,13 +11,21 @@ type TabsProps<T extends string> = ReturnType<typeof useTabs<T>> & {
};

export function TemplateListTab<T extends string>({ tabs, curTab, selectTab, TabComp }: TabsProps<T>) {
const { funnelModalState } = useFunnelModal();

const BACKGROUND_COLORS: Record<string, string> = {
listTemplate: DESIGN_TOKEN_COLOR.gray100,
};

const curBackgroundColor = (funnelModalState.step && BACKGROUND_COLORS[funnelModalState.step]) ?? "#fff";

return (
<div
css={[
css`
position: sticky;
top: 5.7rem;
background-color: #fff;
background-color: ${curBackgroundColor};
display: inline-flex;
gap: 0.8rem;
padding-top: 2rem;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export function TemplateList() {
{/* ---------- 템플릿 카드 리스트 UI ---------- */}
<div
css={css`
margin-top: 0.8rem;
margin-top: 2rem;
`}
>
<TemplateListPageContext.Provider value={{ spaceId, isLeader: isLeader.current }}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@ type MainQuestionsContentsProps = {
handleContentChange: (index: number, newContent: string) => void;
};

export default function MainQuestionsContents({ questions, isDeleteMode, handleDelete, handleDragEnd, handleContentChange }: MainQuestionsContentsProps) {
export default function MainQuestionsContents({
questions,
isDeleteMode,
handleDelete,
handleDragEnd,
handleContentChange,
}: MainQuestionsContentsProps) {
const { toast } = useToast();

const originalContentRef = useRef<{ [key: number]: string }>({});
Expand Down Expand Up @@ -190,7 +196,6 @@ export default function MainQuestionsContents({ questions, isDeleteMode, handleD
cursor: grab;
display: flex;
align-items: center;
padding: 0.4rem;

&:active {
cursor: grabbing;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,13 +211,18 @@ export default function QuestionEditSection({ onClose }: QuestionEditSectionProp
* 삭제 모드 완료 핸들러
*/
const handleDeleteModeComplete = () => {
const hasChanged = !isEqual(originalQuestions, editingQuestions);
const hasDeleted = questions.length < backupQuestions.length;
setIsDeleteMode(false);
setBackupQuestions([]);

if (hasDeleted) {
toast.success("삭제가 완료되었어요!");
}

if (hasChanged) {
toast.success("수정이 완료되었어요!");
}
};

// 제출 완료 핸들러
Expand All @@ -237,6 +242,10 @@ export default function QuestionEditSection({ onClose }: QuestionEditSectionProp
setRetrospectQuestions(editingQuestions);
}

if (hasChanged) {
toast.success("수정이 완료되었어요!");
}

onClose();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,17 @@ export function QuestionsOverview({ isAnswerFilled, hasChanges, onSaveTemporary,
display: flex;
flex-direction: column;
width: 29.4rem;
height: 100%;
`}
>
<div
css={css`
border: 0.1rem solid ${DESIGN_TOKEN_COLOR.opacity8};
border-radius: 1.8rem;
display: flex;
flex-direction: column;
flex: 1;
min-height: 0;
`}
>
{/* -------- 질믄 전체보기 상단 UI------- */}
Expand All @@ -49,6 +54,7 @@ export function QuestionsOverview({ isAnswerFilled, hasChanges, onSaveTemporary,
justify-content: space-between;
align-items: center;
padding: 1.6rem 1.6rem 0.8rem;
flex-shrink: 0;
`}
>
<Typography variant="subtitle14Strong" color="gray800" as="p">
Expand All @@ -68,6 +74,9 @@ export function QuestionsOverview({ isAnswerFilled, hasChanges, onSaveTemporary,
<ul
css={css`
padding: 0 0.8rem 0.8rem;
flex: 1;
overflow-y: auto;
min-height: 0;
`}
>
{data?.questions.map((question, index) => {
Expand Down Expand Up @@ -121,6 +130,7 @@ export function QuestionsOverview({ isAnswerFilled, hasChanges, onSaveTemporary,
display: flex;
align-items: center;
gap: 1.2rem;
flex-shrink: 0;
`}
>
<button
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ export function WriteDialog({ isOverviewVisible, handleToggleOverview }: WriteDi
css={css`
display: flex;
flex: 1;
height: 100%;
min-height: 0;
padding: 2.4rem 0 0 5.6rem;
`}
>
Expand Down
6 changes: 6 additions & 0 deletions apps/web/src/assets/svgs/space/ic_member.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions apps/web/src/assets/svgs/space/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ export { default as ic_people_color } from "./ic_people_color.svg?react";
export { default as icon_file_open } from "./icon_file_open.svg?react";
export { default as ic_crown } from "./ic_crown.svg?react";
export { default as ic_new_clock } from "./ic_new_clock.svg?react";
export { default as ic_member } from "./ic_member.svg?react";
Loading