-
Notifications
You must be signed in to change notification settings - Fork 11
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주차] 김지원 미션 제출합니다. #19
Open
geeoneee
wants to merge
25
commits into
CEOS-Developers:master
Choose a base branch
from
geeoneee:messenger_ver1
base: master
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 all commits
Commits
Show all changes
25 commits
Select commit
Hold shift + click to select a range
55e2444
feat : 초기 프로젝트 세팅
geeoneee c16ffdd
feat : 초기 프로젝트 세팅 2
geeoneee da530ab
feat : ChatRoom 상단 바
geeoneee 1a6742e
feat : ChatRoom 하단 바
geeoneee 6a8cc4b
chore : ChatRoom 상단바 하단바 스크롤 방지
geeoneee 26722b8
feat : ChatRoom 프로필 표시, 시간 오류 수정
geeoneee e07981e
chore : ChatRoom send 버튼 hover
geeoneee e6b5e9b
feat : ChatRoom 날짜 표시 기능
geeoneee f7b0eac
feat : GlobalHeader 작성
geeoneee 05de4aa
feat : GlobalFooter 작성
geeoneee ff56172
feat : GlobalFooter 화면 이동 및 색상 변경
geeoneee 8c4ca96
feat : MyPage 컴포넌트 작성 및 외부 링크 연결
geeoneee ffb1afc
feat : Friend 작성
geeoneee 6da668a
feat : GlobalHeader Search Icon 페이지 연결 및 색 변경 기능 추가
geeoneee 9e394f2
feat : FriendSearch 검색 기능 구현
geeoneee 2a0ea76
feat : 채팅목록 및 채팅 목록 검색 기능 구현
geeoneee 8a3842e
feat : 채팅방 연결
geeoneee a829402
chore : ChatRoom 날짜 컴포넌트 수정
geeoneee be3d848
fix : ChatRoom 장문 대화 상대방 프로필 및 시간 수정
geeoneee 9055edd
test : fixed 수정
geeoneee 40ab029
chore : css 수정
geeoneee 2adc168
test : 배포
geeoneee 47c722f
fix : 오류 수정 및 채팅방 연결
geeoneee f2072ea
fix : 배포 오류 수정
geeoneee 6cc9908
test : 재배포용
geeoneee 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
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains 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.
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.
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.
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.
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.
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.
This file contains 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,38 +1,10 @@ | ||
.App { | ||
text-align: center; | ||
} | ||
|
||
.App-logo { | ||
height: 40vmin; | ||
pointer-events: none; | ||
} | ||
|
||
@media (prefers-reduced-motion: no-preference) { | ||
.App-logo { | ||
animation: App-logo-spin infinite 20s linear; | ||
} | ||
@font-face { | ||
font-family: "Pretendard-Regular"; | ||
src: url("https://cdn.jsdelivr.net/gh/Project-Noonnu/[email protected]/Pretendard-Regular.woff") | ||
format("woff"); | ||
font-style: normal; | ||
} | ||
|
||
.App-header { | ||
background-color: #282c34; | ||
min-height: 100vh; | ||
display: flex; | ||
flex-direction: column; | ||
align-items: center; | ||
justify-content: center; | ||
font-size: calc(10px + 2vmin); | ||
color: white; | ||
} | ||
|
||
.App-link { | ||
color: #61dafb; | ||
} | ||
|
||
@keyframes App-logo-spin { | ||
from { | ||
transform: rotate(0deg); | ||
} | ||
to { | ||
transform: rotate(360deg); | ||
} | ||
.App { | ||
font-family: "Pretendard-Regular"; | ||
} |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains 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,61 @@ | ||
import React from "react"; | ||
import "./App.css"; | ||
import { BrowserRouter, Route, Routes } from "react-router-dom"; | ||
import { styled, createGlobalStyle } from "styled-components"; | ||
|
||
import Chat from "./pages/chat/Chat"; | ||
import ChatRoom from "./pages/chatroom/ChatRoom"; | ||
import Friend from "./pages/friend/Friend"; | ||
import MyPage from "pages/mypage/MyPage"; | ||
import ChatSearch from "pages/chat/ChatSearch"; | ||
import FriendSearch from "pages/friend/FriendSearch"; | ||
|
||
const App: React.FC = () => { | ||
return ( | ||
<BrowserRouter> | ||
<Wrapper> | ||
<StatusBarImage src="/assets/status_bar.svg" alt="back img" /> | ||
<Container> | ||
<Routes> | ||
<Route path="/" element={<Friend />} /> | ||
<Route path="/friendsearch" element={<FriendSearch />} /> | ||
<Route path="/chat" element={<Chat />} /> | ||
<Route path="/chatsearch" element={<ChatSearch />} /> | ||
<Route path="/mypage" element={<MyPage />} /> | ||
<Route path="/chatroom/:chatId" element={<ChatRoom />} /> | ||
</Routes> | ||
</Container> | ||
<HomeImage src="/assets/home.svg" alt="home img" /> | ||
</Wrapper> | ||
<GlobalStyles /> | ||
</BrowserRouter> | ||
); | ||
}; | ||
|
||
export default App; | ||
|
||
const Wrapper = styled.div``; | ||
|
||
const Container = styled.div``; | ||
|
||
export const GlobalStyles = createGlobalStyle` | ||
*::-webkit-scrollbar { | ||
width: 0; | ||
} | ||
body { | ||
background-color: #f6f6f6; | ||
font-family: "Pretendard-Regular"; | ||
display: flex; | ||
justify-content: center; | ||
align-items: center; | ||
min-height: 100vh; | ||
} | ||
|
||
#root { | ||
background-color: white; | ||
} | ||
`; | ||
Comment on lines
+41
to
+57
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 전역으로 스타일 정해서 전체 적용해주신 것 좋은 것 같아요! |
||
|
||
const StatusBarImage = styled.img``; | ||
|
||
const HomeImage = styled.img``; |
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.
React.FC를 사용해서 타입 지정 하셨네요! 처음 typescript를 사용할 때 컴포넌트 타입을 어떻게 지정할지 고민이 많았는데 상당히 많은 방법이 있더라구요! 저는 일반적으로 컴포넌트 prop에 타입을 지정하는 편이에요! 찾아보니 FC에 대해 부정적인 생각들이 많더라구요
아래 링크 한 번 읽어보심 좋을 것 같아요~
https://bkjeon1614.tistory.com/768