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

[4주차] 이가빈 과제 제출합니다. #13

Open
wants to merge 54 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
ad25c81
Feat: 프로젝트 기본 폴더 구조 정리
billy0904 Sep 25, 2024
ff8f351
Feat: 상단바 시간 및 아이콘 구현
billy0904 Sep 25, 2024
bdf3cfa
Feat: 채팅창 헤더 요소 배치
billy0904 Sep 25, 2024
3b94bbd
Feat: IOS 홈 인디케이터 배치
billy0904 Sep 25, 2024
2ed83e8
Feat: 채팅 입력창 구현 및 배치
billy0904 Sep 25, 2024
80c6cdc
Feat: 채팅 입력 내용 로컬스토리지 저장
billy0904 Sep 25, 2024
1e056db
Feat: 내가 보낸 메시지 렌더링
billy0904 Sep 25, 2024
de805ec
Fix: 메시지 렌더링 창 스크롤바 숨기기
billy0904 Sep 25, 2024
45d60db
Feat: 사용자에 따라 메시지 위치 및 스타일 전환
billy0904 Sep 25, 2024
8241b65
Chore: 안 쓰는 변수 삭제
billy0904 Sep 25, 2024
8e7eae0
Fix: 입력창 이모티콘 버튼과 텍스트 겹침 문제 해결
billy0904 Sep 25, 2024
8a41ef1
Feat: 메시지 타임스탬프 및 상대방 프로필 출력
billy0904 Sep 26, 2024
e97c398
Feat: 채팅 내용 로컬스토리지 저장 및 불러오기
billy0904 Sep 26, 2024
b274718
Fix: 상대방 프로필 중복 출력 문제 해결
billy0904 Sep 26, 2024
7bfca7b
Design: 타임스탬프 위치(마진) 수정
billy0904 Sep 26, 2024
4b5ac55
Refactor: 타임스탬프 유틸 함수 분리
billy0904 Sep 26, 2024
1c496b4
Fix: 타임스탬프 날짜 포맷팅 적용
billy0904 Sep 26, 2024
a19c472
Feat: 메시지 전송 버튼 추가
billy0904 Sep 26, 2024
2a0ab9b
Feat: 메시지를 전송하면 채팅방 하단으로 스크롤 이동
billy0904 Sep 26, 2024
d86b6b5
Fix: 채팅바 이모티콘 버튼 위치 조정
billy0904 Sep 26, 2024
225d003
Feat: initialMessageData 및 로컬스토리지 저장 데이터 병합 활용 기능 구현
billy0904 Sep 27, 2024
2c7bb6a
Chore: 메시지 데이터 타임스탬프 날짜 수정
billy0904 Sep 27, 2024
5e790c1
Fix: 입력창 클릭 시 전송 버튼이 나타나지 않는 문제 해결
billy0904 Sep 29, 2024
ff42727
Fix: 전송된 새 메시지 렌더링 안되는 오류 해결
billy0904 Sep 29, 2024
91544c7
Design: 이모티콘 버튼 위치 수정
billy0904 Sep 29, 2024
873f1f8
Fix: 채팅창 전송 버튼 css 오류 수정
billy0904 Sep 29, 2024
bec83a3
Fix: 로컬스토리지에 MessageData 중복 저장하는 문제 해결
billy0904 Sep 29, 2024
47102a0
Feat: 채팅 리스트 페이지 구조 설정
billy0904 Oct 23, 2024
1bf5c91
Feat: 네비게이션바 컴포넌트 퍼블리싱
billy0904 Oct 23, 2024
b331194
Feat: 네비게이션 바 클릭 시 색상 변경 및 라우팅
billy0904 Oct 23, 2024
eca3c88
Design: 버튼 색상 코드 조정
billy0904 Oct 23, 2024
4245a07
Feat: 채팅 목록 컴포넌트 최근 메시지 불러오기 기능 구현
billy0904 Oct 23, 2024
be81dfc
Fix: NavBar 및 채팅방 컴포넌트 height 수정
billy0904 Oct 23, 2024
89335e5
Fix: 채팅 목록 컴포넌트 텍스트 오버플로우 설정
billy0904 Oct 27, 2024
1fff126
Feat: 채팅방 헤더 뒤로가기 버튼 기능 추가
billy0904 Oct 27, 2024
cc24d25
Feat: 내 프로필 페이지 헤더 추가
billy0904 Oct 27, 2024
b4dbf82
Feat: 내 프로필 페이지 구현
billy0904 Oct 27, 2024
90e1129
Feat: 친구 목록 페이지 구현
billy0904 Oct 27, 2024
d247207
Feat: 친구 목록 페이지 UserData 연결
billy0904 Oct 29, 2024
93b61c4
Feat: 내 프로필 클릭 시 내 프로필 페이지로 이동
billy0904 Oct 29, 2024
23971a2
Feat: 서비스 준비중 페이지 구현
billy0904 Oct 29, 2024
2167830
Feat: 친구 목록 페이지 컴포넌트 접기 기능 추가
billy0904 Oct 29, 2024
3696110
Fix: 채팅방 리스트 컴포넌트 사용자 이름 위치 수정
billy0904 Oct 29, 2024
eb99037
Fix: 채팅방 내 뒤로가기 버튼 클릭 시 라우팅 수정
billy0904 Oct 29, 2024
ec11438
Feat: user 정보 context API 관리
billy0904 Oct 29, 2024
18ba32a
Feat: UserData에 있는 모든 사용자와 채팅 가능
billy0904 Oct 29, 2024
de8abef
Fix: 친구 목록에서 본인 프로필은 제외
billy0904 Oct 29, 2024
8636ed9
Feat: currentUser 로컬스토리지에 저장
billy0904 Oct 29, 2024
2856851
Feat: NavBar에 안 읽은 메시지 개수 표시
billy0904 Oct 29, 2024
2b82cd7
Fix: NavBar 안 읽은 메시지 개수 반영 문제 해결
billy0904 Oct 29, 2024
a4986c7
Fix: 펑 기능 프로필 이미지 추가
billy0904 Oct 29, 2024
960ed2d
Fix: totalUnread 위치 조정
billy0904 Oct 29, 2024
3811d60
Feat: 리액션 기능 추가
billy0904 Nov 1, 2024
5a45108
Remove: 안 쓰는 메시지 데이터 폴더 삭제
billy0904 Nov 1, 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
65 changes: 61 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@tailwindcss/line-clamp": "^0.4.4",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
Expand All @@ -12,7 +13,9 @@
"@types/react-dom": "^18.2.22",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.27.0",
"react-scripts": "5.0.1",
"tailwind-scrollbar-hide": "^1.1.7",
"typescript": "^4.9.5",
"web-vitals": "^2.1.4"
},
Expand All @@ -39,5 +42,8 @@
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"tailwindcss": "^3.4.13"
}
}
31 changes: 28 additions & 3 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,33 @@
import ChatRoomPage from './pages/ChatRoomPage';
import ChatRoomListPage from './pages/ChatRoomListPage';
import FriendListPage from './pages/FriendListPage';
import { Route, Routes } from 'react-router-dom';
import MyProfilePage from './pages/MyProfilePage';
import NotYetPage from './pages/NotYetPage';
import { UserProvider } from './contexts/UserContext';
import { UnreadProvider } from './contexts/UnreadContext';

function App() {
return (
<div>
<h1>20기 프론트엔드 파이팅!!! 디자인과 사이좋게 지내요~~~</h1>
</div>
<UserProvider>
<UnreadProvider>
<div className='flex items-center justify-center h-screen bg-Gray/2'>
<div className='w-width h-height'>
<Routes>
<Route path='/' element={<FriendListPage />}></Route>
<Route path='/chat/:chatKey' element={<ChatRoomPage />}></Route>
<Route path='/chatlist' element={<ChatRoomListPage />}></Route>

<Route path='/friends' element={<FriendListPage />}></Route>
<Route path='/my' element={<MyProfilePage />}></Route>
<Route path='/openedChat' element={<NotYetPage />}></Route>
<Route path='/shopping' element={<NotYetPage />}></Route>
<Route path='/more' element={<NotYetPage />}></Route>
</Routes>
</div>
</div>
</UnreadProvider>
</UserProvider>
);
}

Expand Down
8 changes: 8 additions & 0 deletions src/assets/ChatRoom/addMedia.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions src/assets/ChatRoom/back.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions src/assets/ChatRoom/emoticonbtn.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions src/assets/ChatRoom/menu.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/assets/ChatRoom/profile.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions src/assets/ChatRoom/search.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/ChatRoom/sendbtn.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/ChatRoomList/chatting_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/ChatRoomList/friend_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/assets/ChatRoomList/more_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/assets/ChatRoomList/newChat_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/ChatRoomList/openedChat_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/assets/ChatRoomList/setting_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions src/assets/ChatRoomList/shopping_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading