-
Notifications
You must be signed in to change notification settings - Fork 1
Feat: 홈화면에서 식물과 대화정도 있는 부분 추가, 친구 프로필 조회, 친구 삭제 #20
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.
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
lemoncurdyogurt
wants to merge
64
commits into
develop
Choose a base branch
from
feat/17-home
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 37 commits
Commits
Show all changes
64 commits
Select commit
Hold shift + click to select a range
d987702
refactor: 헤더 공용으로 수정 및 알람디자인 수정
08cdfe8
feat: 로고있는 홈헤더 추가
3946ce4
feat: 이번주대화 정도 목록 컴포넌트 추가
7131b0d
feat: progressData 정렬 함수 추가
5ab38e8
feat: 식물 상태에 따른 배경색 지정
521425b
chore: swiper 패키지 설치
8793593
feat: 식물상태에 따른 버블색 지정
1845ced
rename: 파일명 변경
b8c6962
design: 하단바 inactive상태 디자인 변경
35a1964
feat: 키우는 식물에 물주기 현황 컴포넌트 추가
530156a
chore: 홈에서 사용되는 아이콘 설치
1683eb8
fix: merge 오류 수정
385fd2d
fix: global.css오류수정
e697cf5
design: 하단네비바 gap추가
b6acf6b
refactor: 홈화면에서 사용되는 orange, blue색상 추가
d14ed18
feat: 식물명에 글래스 스타일 추가
e5e41be
feat: getPlantStatus에 식물없는 경우 추가
d007bd9
refactor: 텍스트로 된 이모지 svg로 변경
326bf5f
refactor: 커서포인터 추가
d9d6030
feat: 친구목록 서치필드 추가
d13d572
design: 서치필드 마이크 아이콘 위치 수정 및 placeholder부분 디자인 수정
309b276
chore: friendList 목데이터 추가
8904fcf
refactor: subtitle부분 커서포인터 추가 및 버튼 시맨틱태그 변경
b874903
feat: 친구목록 ui 추가
98809e4
design: 친구목록 호버시 색상 추가
7f3d3a9
design: 서치필드 클릭시 색상 변화 추가
f568d1f
feat: 서치필드용 폰트 설정 추가
7cc7aa2
feat: 서치필드에 검색시, 검색어에 해당하는 친구리스트만 반환
b8daf9e
rename: 서치필드 컴포넌트 파일 위치 커먼으로 수정
8112889
fix: 서치필드 포커스될때만 클릭 활성화
57f0393
feat: 설정아이콘 추가
4dd3ff9
feat: 친구프로필 타입 추가
bb0b3db
feat: 친구리스트 클릭시 해당 유저 프로필모달 UI추가
efc8a3a
feat: 모달 활성화 시, 타이틀헤더 안보이게 표시
7236dd2
feat: 친구검색시, 전체친구수 안보이게 처리
9c03b2c
feat: 친구설정 페이지 추가
dfbcfd6
feat: 편집모드에 들어가서 친구클릭시 체크아이콘 추가
ca318e5
design: x icon 얇은버전, 굵은버전 분리
92b3de8
feat: edit모드에서 선택한 인원갯수 추가
f5a0a70
feat: 삭제단계에서 프로필 선택의 경우 하단 버튼 추가
7a8c33e
feat: 코드입력시 친구 추가확인 페이지
5104af0
feat: 친구추가 초대코드 있는 페이지 추가
086eb55
feat: glassStyle 헤더 추가
fa58bed
feat: 친구코드 입력하는 필드 추가
9ece218
feat: 초대코드 위치하는 QRCodeWrapper 컴포넌트 추가
f918eaf
feat: QR코드활성화, 초대코드 활성화에 따른 화면 분리
f0b1d6f
feat: 백헤더 타이틀 없는 경우 높이 36px로 고정
9ba18d1
feat: 친구추가 확인 페이지 ui추가
c7f43a1
fix: 프로필 이미지 정사각형으로 보이게 수정
332ecb2
fix: 화면 길이 축소에 따른 겹치는 부분 마진추가
7862b4c
feat: 친구설정화면에 백헤더 추가
7915f94
feat: 프로필이미지피커와 이름 입력필드 합쳐서 컴포넌트 제작
e3e4a0d
feat: 친구설정페이지 설정된 정보 불러오도록 설정 추가
bc9dd81
feat: 친구설정한 친구가 아닌 경우 데이터값 입력받도록 코드 수정
8532179
feat: 대화빈도 선택 모달 추가
999b044
feat: 친구 선택 값 상단에 프로필띄우기 추가
4eb6a03
refactor: 프로필 이미지 없는 경우 대응 컴포넌트 적용
fe8d636
refactor: props로 너비, 높이, radius 받을 수 있도록 설정 추가
1594607
fix: 프로필이미지 옵셔널로 수정
8658ccb
fix: 프로필이미지 옵셔널로 수정
4df8da1
feat: 삭제 모달 추가
620c8b0
feat: 홈화면 남은시간, 지난시간 카운팅 ui추가
f2fda38
chore: todo 주석추거
39d3567
refactor: 대화빈도 선택한게 없는 경우 문구
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| "use client"; | ||
| import { useState } from "react"; | ||
|
|
||
| import FriendAddIcon from "@/assets/person-plus.svg"; | ||
|
|
||
| import { BackHeader } from "@/components/common/BackHeader"; | ||
| import { SearchField } from "@/components/common/SearchField"; | ||
| import { FriendList } from "@/components/friends/FrinedList"; | ||
|
|
||
| const FriendsListPage = () => { | ||
| const [searchText, setSearchText] = useState(""); | ||
| const [modalOpen, setModalOpen] = useState(false); | ||
| const [isEditMode, setIsEditMode] = useState(false); | ||
| const [selectedIds, setSelectedIds] = useState<number[]>([]); | ||
| const [isButtonClick, setIsButtonClick] = useState(false); | ||
|
|
||
| const toggleFriend = (userId: number) => { | ||
| setSelectedIds(prev => | ||
| prev.includes(userId) | ||
| ? prev.filter(id => id !== userId) | ||
| : [...prev, userId], | ||
| ); | ||
| }; | ||
|
|
||
| return ( | ||
| <main className="relative w-full"> | ||
| {!modalOpen && ( | ||
| <div className="mt-[8.5px]"> | ||
| <BackHeader | ||
| title="친구목록" | ||
| subtext="편집하기" | ||
| onClickEdit={() => setIsEditMode(prev => !prev)} | ||
| /> | ||
coderabbitai[bot] marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| </div> | ||
| )} | ||
|
|
||
| <div | ||
| className={`${modalOpen ? "mt-[95px]" : "mt-[30.5px]"} flex flex-col gap-5`} | ||
| > | ||
| <SearchField onChangeSearchText={setSearchText} /> | ||
| <FriendList | ||
| searchText={searchText} | ||
| setModalOpen={setModalOpen} | ||
| isEditMode={isEditMode} | ||
| selectedIds={selectedIds} | ||
| onToggleFriend={toggleFriend} | ||
| /> | ||
| </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; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| const FriendSetting = () => { | ||
| return <div>친구설정하기</div>; | ||
| }; | ||
|
|
||
| export default FriendSetting; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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> | ||
| ); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
요기 friends/FrinedList오타있어용
=>파일 이름 자체를 바꿔야할듯