Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
d987702
refactor: 헤더 공용으로 수정 및 알람디자인 수정
Jan 13, 2026
08cdfe8
feat: 로고있는 홈헤더 추가
Jan 14, 2026
3946ce4
feat: 이번주대화 정도 목록 컴포넌트 추가
Jan 14, 2026
7131b0d
feat: progressData 정렬 함수 추가
Jan 14, 2026
5ab38e8
feat: 식물 상태에 따른 배경색 지정
Jan 15, 2026
521425b
chore: swiper 패키지 설치
Jan 15, 2026
8793593
feat: 식물상태에 따른 버블색 지정
Jan 15, 2026
1845ced
rename: 파일명 변경
Jan 15, 2026
b8c6962
design: 하단바 inactive상태 디자인 변경
Jan 15, 2026
35a1964
feat: 키우는 식물에 물주기 현황 컴포넌트 추가
Jan 15, 2026
530156a
chore: 홈에서 사용되는 아이콘 설치
Jan 15, 2026
1683eb8
fix: merge 오류 수정
Jan 15, 2026
385fd2d
fix: global.css오류수정
Jan 15, 2026
e697cf5
design: 하단네비바 gap추가
Jan 15, 2026
b6acf6b
refactor: 홈화면에서 사용되는 orange, blue색상 추가
Jan 15, 2026
d14ed18
feat: 식물명에 글래스 스타일 추가
Jan 15, 2026
e5e41be
feat: getPlantStatus에 식물없는 경우 추가
Jan 15, 2026
d007bd9
refactor: 텍스트로 된 이모지 svg로 변경
Jan 15, 2026
326bf5f
refactor: 커서포인터 추가
Jan 15, 2026
d9d6030
feat: 친구목록 서치필드 추가
Jan 15, 2026
d13d572
design: 서치필드 마이크 아이콘 위치 수정 및 placeholder부분 디자인 수정
Jan 15, 2026
309b276
chore: friendList 목데이터 추가
Jan 15, 2026
8904fcf
refactor: subtitle부분 커서포인터 추가 및 버튼 시맨틱태그 변경
Jan 15, 2026
b874903
feat: 친구목록 ui 추가
Jan 15, 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
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"react-dom": "19.2.1",
"react-lottie-player": "^2.1.0",
"react-query": "^3.39.3",
"swiper": "^12.0.3",
"zustand": "^5.0.9"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions src/app/day-log/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { HeaderWithIcon } from "@/components/common/HeaderWithIcon";
import { NavBar } from "@/components/common/NavBar";
import { Header } from "@/components/dailyRecord/Header";
import { RecordMissionFeed } from "@/components/dailyRecord/MissionFeed";
import { RecordMissionInfo } from "@/components/dailyRecord/MissionInfo";
import { SharedDiaryCard } from "@/components/dailyRecord/SharedDiaryCard";
Expand All @@ -12,7 +12,7 @@ const DailyRecordPage = () => {

return (
<main className="flex w-full flex-col pb-[112px]">
<Header />
<HeaderWithIcon title="하루기록" havePencil={true} />
<RecordMissionInfo hasMyRecord={hasMyRecord} />
<div className="mt-[17.5px]">
<RecordMissionFeed />
Expand Down
28 changes: 28 additions & 0 deletions src/app/friends/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
"use client";
import FriendAddIcon from "@/assets/person-plus.svg";

import { BackHeader } from "@/components/common/BackHeader";
import { FriendList } from "@/components/friends/FrinedList";
import { SearchField } from "@/components/friends/SearchField";

const FriendsListPage = () => {
return (
<main className="relative w-full">
<div className="mt-[8.5px]">
<BackHeader title="친구목록" subtext="편집하기" />
</div>
<div className="mt-[30.5px] flex flex-col gap-5">
<SearchField />
<FriendList />
</div>
<div className="fixed inset-x-0 bottom-[33px] z-50">
<div className="mx-auto w-full max-w-[440px]">
<button className="bg-mint-01 mr-4 ml-auto flex h-[70px] w-[70px] items-center justify-center rounded-full shadow-[0_0_10px_0_rgba(0,0,0,0.10)]">
<FriendAddIcon className="h-10 w-10 text-white" />
</button>
</div>
</div>
</main>
);
};
export default FriendsListPage;
23 changes: 22 additions & 1 deletion src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
import { NavBar } from "@/components/common/NavBar";
import { ChatProgress } from "@/components/home/ChatProgress";
import { Header } from "@/components/home/Header";
import { PlantProgress } from "@/components/home/PlantProgress";

export default function HomePage() {
return <div>홈 화면</div>;
return (
<main className="w-full">
<div className="mt-[8.5px]">
<Header />
</div>

<div className="pt-[23.5px] pb-[75px]">
<PlantProgress />
</div>
<div className="pb-[119px]">
<ChatProgress />
</div>
<div className="fixed bottom-0 w-full max-w-[440px]">
<NavBar />
</div>
</main>
);
}
6 changes: 3 additions & 3 deletions src/app/shared-diary/[id]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import { useParams } from "next/navigation";

import { Header } from "@/components/dailyRecord/Header";
import { HeaderWithIcon } from "@/components/common/HeaderWithIcon";
import { SharedDiaryItem } from "@/components/dailyRecord/ShareDiaryItem";

import SharedDiaryData from "@/mock/sharedDiary.json";
Expand All @@ -21,8 +21,8 @@ const SharedDiaryPage = () => {
}

return (
<div className="flex w-full flex-col">
<Header />
<div className="flex w-full flex-col justify-center">
<HeaderWithIcon title="공유일기" havePencil={true} />
<SharedDiaryItem key={diaryData.id} item={diaryData} commentMode />
</div>
);
Expand Down
10 changes: 6 additions & 4 deletions src/assets/GalleryIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
import GalleryIcon from "@/assets/gallery.svg";
import HandIcon from "@/assets/hand-with-pen.svg";
import EyesIcon from "@/assets/two-eyes.svg";

export const GalleryAssets = () => {
return (
<div className="flex" role="img" aria-label="갤러리 아이콘">
<GalleryIcon className="z-20 h-[15px] w-[15px]" />
<div className="bg-orange-00 text-sub2-sb z-10 -ml-[3px] flex h-[15px] w-[15px] items-center justify-center rounded-full">
👀
<div className="bg-orange-00 z-10 -ml-[3px] flex h-[15px] w-[15px] items-center justify-center rounded-full">
<EyesIcon className="w-[18px]" />
</div>
<div className="bg-green-01 text-sub3 -ml-[3px] flex h-[15px] w-[15px] items-center justify-center rounded-full">
✍🏻
<div className="bg-green-01 -ml-[3px] flex h-[15px] w-[15px] items-center justify-center rounded-full">
<HandIcon className="w-[13px]" />
</div>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion src/assets/bell.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/assets/clock.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions src/assets/friend.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions src/assets/hand-with-pen.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading