Skip to content
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

feat : 친구 정보 모달 api 이식, 웹소켓 적용 #325

Merged
merged 28 commits into from
Feb 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
143187d
test: useState 사용 테스트 (임시)
bluedog129 Feb 21, 2024
967f959
feat: fetch 이전까지 세팅
bluedog129 Feb 21, 2024
5d153b3
Merge remote-tracking branch 'origin/main' into 265-feat-친구-정보-모달-api-이식
bluedog129 Feb 21, 2024
478a656
feat: fetch 적용 (데이터 들어오면 확인 필요)
bluedog129 Feb 22, 2024
75b7a08
test: useState 사용 테스트 (임시)
bluedog129 Feb 21, 2024
094b9df
feat: fetch 이전까지 세팅
bluedog129 Feb 21, 2024
c420dfb
feat: fetch 적용 (데이터 들어오면 확인 필요)
bluedog129 Feb 22, 2024
801bd96
feat: 친구목록 fetch를 통해 받아온 데이터 렌더링 완성
bluedog129 Feb 22, 2024
fcbc621
feat: 친구 delete요청 구현
bluedog129 Feb 23, 2024
015182e
Merge remote-tracking branch 'origin/265-feat-친구-정보-모달-api-이식' into 2…
bluedog129 Feb 23, 2024
5477e76
feat: 유저찾기 이벤트 setting
bluedog129 Feb 23, 2024
2b754f0
Merge remote-tracking branch 'origin/main' into 265-feat-친구-정보-모달-api-이식
bluedog129 Feb 23, 2024
1bf63f6
feat: 친구 delete 구현 완료
bluedog129 Feb 23, 2024
b4dfbf1
feat: 유저찾기 우선 구현 (한번 찾고 이후 먹통되는 ver)
bluedog129 Feb 23, 2024
36ac9da
feat: 유저찾기 구현 완료 (우선 엔터키 ver)
bluedog129 Feb 23, 2024
9c364b9
feat: 유저찾기 구현 완료 (간지 ver)
bluedog129 Feb 23, 2024
60d9b8c
feat: 유저찾기 css 변경
bluedog129 Feb 23, 2024
31c1962
feat: 분기별로 icon-image의 id값을 다르게 적용 (각각 다른 이벤트를 적용하기 위함)
bluedog129 Feb 25, 2024
800b067
feat: 친구요청 보내기 api 완료
bluedog129 Feb 25, 2024
091407e
feat: 요청 거절 API 이식완료
bluedog129 Feb 25, 2024
e7a233d
feat: 친구 요청 거절 API이식 완료
bluedog129 Feb 26, 2024
6f78761
refactor: 디버깅 흔적 지우기
bluedog129 Feb 26, 2024
dc24bed
refactor: 친구정보카드 height고정
bluedog129 Feb 26, 2024
cc0ee65
feat: 웹소켓 세팅
bluedog129 Feb 26, 2024
08b09c7
feat: 웹소켓 이식 완료
bluedog129 Feb 26, 2024
a7c01a7
feat: spinner 스타일 적용
bluedog129 Feb 26, 2024
5253d59
feat: spinner 스타일 적용
bluedog129 Feb 26, 2024
d9123cb
Merge branch 'main' into 265-feat-친구-정보-모달-api-이식
bluedog129 Feb 26, 2024
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
12 changes: 5 additions & 7 deletions frontend/assets/css/friendsInfoModal.css
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,11 @@
height: 100%;
}

#user-search {
#user-search-list {
overflow: auto;
overflow-y: scroll;
border: 0.3vw solid #FF52A0;
height: 100%;
}

#friend-request-list {
Expand All @@ -52,11 +54,6 @@
color: #FF52A0;
}

#user-search {
border: 0.3vw solid #FF52A0;
height: 100%;
}

#friend-request-list-wrapper {
color: #29ABE2;
}
Expand All @@ -77,12 +74,13 @@
color: white;
padding: 0.8vh 1vw;
margin: 1.3vh 0 1.3vh 1vh;
width: calc(100% - 5vh - 0.6vw - 1vh - 0.4vw);
width: calc(100% - 5vh - 0.6vw - 1vh - 3vw);
font-size: 2.5vh;
font-family: Galmuri11-Bold, serif;
}

.friend-card-wrapper {
height: 11vh;
display: grid;
grid-gap: 7%;
grid-template-columns: 1fr 4fr 1fr;
Expand Down
Loading
Loading