Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
5f481d0
chore: .prettierrc 파일 생성
songess Mar 26, 2024
73815b5
chore: styled-components 설치
songess Mar 26, 2024
5f1c4fc
style: globalStyle 및 theme 설정
songess Mar 26, 2024
348558f
feat: svg, svg.d.ts 파일 생성
songess Mar 26, 2024
f3c30ce
feat: 필요없는 파일 제거
songess Mar 26, 2024
160690d
chore: 절대경로 설정
songess Mar 26, 2024
6408700
feat: tsconfig.paths.json에 assets 절대 경로 추가
songess Mar 27, 2024
5256a15
feat: Chathead 컴포넌트 구현
songess Mar 27, 2024
721f57e
ChatBottom 컴포넌트 구현
songess Mar 27, 2024
fe0701b
fix: ChatHead margin 수정
songess Mar 27, 2024
d8cfc29
chore: recoil 설치
songess Mar 27, 2024
6a352d7
feat: 이름 클릭 시 반전
songess Mar 27, 2024
bc2440e
feat: 메시지 출력함수 구현
songess Mar 27, 2024
294e908
fix: 메시지 출력함수 수정
songess Mar 27, 2024
ed49991
feat: MyChat 구현
songess Mar 27, 2024
4ab1954
feat: OppoChat 구현
songess Mar 27, 2024
961879e
feat: OppoChangeChat 구현
songess Mar 27, 2024
c377408
feat: type.d.ts 파일 생성
songess Mar 27, 2024
5842eeb
feat: Chatting 컴포넌트 구현
songess Mar 27, 2024
2aeb732
feat: 채팅 추가기능 구현
songess Mar 27, 2024
b5d677d
feat: 날짜변경 구현
songess Mar 27, 2024
c305c96
feat: 채팅창 overflow시 동작 구현
songess Mar 27, 2024
174d617
feat: 날짜가 바뀔때도 OppochangeChat 컴포넌트 호출
songess Mar 27, 2024
f884c8b
feat: localStorage를 통한 상태관리 구현
songess Mar 27, 2024
4740e79
feat: 배포테스트
songess Mar 27, 2024
3649082
style: 이름과 말풍선 간격 조정
songess Mar 28, 2024
38daf64
refactor: 전송 버튼 교체
songess Mar 28, 2024
4540f80
feat: 더블클릭 커스텀훅 생성
songess Mar 28, 2024
4a5c4b1
style: 하트컴포넌트 스타일 추가
songess Mar 29, 2024
ee5b0fb
refactor: 윈도우에서 깨짐현상 수정
songess Mar 29, 2024
3fb91cb
feat: readme.md 추가
songess Mar 29, 2024
a9c4803
style: 반응형 구현
songess Apr 2, 2024
15ac834
fix: 스타일 수정 및 반응형 구현
songess Apr 4, 2024
ba246cb
fix: 모바일 화면구성을 위해 vh->dvh로 변경
songess Apr 4, 2024
d6095c5
fix: margin-bottom 조정
songess Apr 4, 2024
359ba34
fix: ChatBottom 스타일 수정 및 position 변경
songess Apr 4, 2024
3f71995
fix: Chatting 최하단 margin 수정
songess Apr 4, 2024
6bb3d79
fix: 모바일환경에서 'pretendard'폰트 적용되도록 수정
songess Apr 4, 2024
49cac6c
refactor: root에 스타일 적용하는 방법 변경
songess Apr 29, 2024
f4daf9d
fix: key값을 매직넘버에서 고유한 날짜값으로 변경
songess Apr 29, 2024
34a330a
refactor: week3 피드백 반영
songess Apr 30, 2024
28204ce
feat: README 업데이트
songess May 1, 2024
9240977
refactor: @type 절대경로 설정
songess May 1, 2024
845bd41
chore: react-router-dom 설치
songess May 1, 2024
986d230
refactor: statusBox 컴포넌트 분리
songess May 1, 2024
110a919
fix: Statusbox URL에 따른 색상 변경
songess May 2, 2024
edb9085
feat: ChatCard 컴포넌트 구현
songess May 2, 2024
cb8b09d
feat: MainHeader 컴포넌트 구현
songess May 2, 2024
2d6b978
feat: input 컴포넌트 구현
songess May 2, 2024
c8fb686
feat: MainFooter 컴포넌트 구현
songess May 2, 2024
b6327e5
feat: chattinglist, chattingroom 페이지 연결
songess May 3, 2024
4952598
fix: searchSvg 색상 변경
songess May 3, 2024
a7cab56
feat: chattinglist에서 보여지는카드들의 채팅정보가 마지막채팅에 관한 정보가 보이도록 구현
songess May 3, 2024
a89fa3d
fix: ChattingRoom에서 상대방의 올바른 프로필사진이 렌더링되도록 수정
songess May 3, 2024
8f2a51e
feat: 채팅전송 시 올바른 채팅방에 채팅이 전송되도록 구현
songess May 3, 2024
2624261
feat: 채팅보내면 unReadCount 초기화
songess May 3, 2024
8d272de
feat: FriendListPage 생성
songess May 3, 2024
d9bb8bb
fix: 동적스타일링 warning 제거
songess May 3, 2024
4461fa0
feat: ProfileCard 생성
songess May 3, 2024
2872ef1
feat: Hr 컴포넌트 구현
songess May 3, 2024
35eb441
fix: 더미 데이터 수정
songess May 3, 2024
355a2aa
feat: 업데이트된 프로필 필터링하는 함수 구현
songess May 3, 2024
0691a0f
feat: UpdatedProfileCard 컴포넌트 구현
songess May 3, 2024
0f5c10b
feat: FriendCard 컴포넌트 구현
songess May 3, 2024
416f0cd
feat: MyprofilePage 페이지 생성
songess May 3, 2024
730e09f
feat: EditProfile 컴포넌트 구현
songess May 3, 2024
c822466
feat: ProfileInfo 컴포넌트 구현
songess May 3, 2024
0782b90
feat: SNSBox 컴포넌트 구현
songess May 3, 2024
dbfd639
feat: 페이지간 라우팅 구현
songess May 3, 2024
f0708b6
feat: NotFoundPage 생성
songess May 3, 2024
fd869d9
refactor: semantics tag 사용
songess May 3, 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
6 changes: 6 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"trailingComma": "es5",
"tabWidth": 2,
"semi": true,
"singleQuote": true
}
296 changes: 251 additions & 45 deletions README.md

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions craco.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
const { CracoAliasPlugin } = require('react-app-alias');

module.exports = {
plugins: [
{
plugin: CracoAliasPlugin,
options: {
source: 'tsconfig',
baseUrl: './src',
tsConfigPath: './tsconfig.paths.json', // 위에서 작성한 tsconfig.paths.json입니다.
},
},
],
};
4,474 changes: 4,307 additions & 167 deletions package-lock.json

Large diffs are not rendered by default.

14 changes: 11 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,17 @@
"@types/react-dom": "^18.2.22",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.23.0",
"react-scripts": "5.0.1",
"recoil": "^0.7.7",
"styled-components": "^6.1.8",
"typescript": "^4.9.5",
"web-vitals": "^2.1.4"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"start": "craco start",
"build": "craco build",
"test": "craco test",
"eject": "react-scripts eject"
},
"eslintConfig": {
Expand All @@ -39,5 +42,10 @@
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"@types/styled-components": "^5.1.34",
"craco": "^0.0.3",
"react-app-alias": "^2.2.2"
}
}
Binary file added public/HappEmo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Introduce.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/behance.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/computer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/github.png
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 public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<link
href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/variable/pretendardvariable.css"
rel="stylesheet"
/>
<title>React App</title>
</head>
<body>
Expand Down
Binary file added public/instagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/pic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 0 additions & 38 deletions src/App.css

This file was deleted.

14 changes: 9 additions & 5 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
import { router } from '@util/routes';
import { RouterProvider } from 'react-router-dom';
import { RecoilRoot } from 'recoil';

function App() {
return (
<div>
<h1>19기 프론트엔드 파이팅!!! 디자인과 사이좋게 지내요~~~</h1>
</div>
);
return (
<RecoilRoot>
<RouterProvider router={router} />
</RecoilRoot>
);
}

export default App;
204 changes: 204 additions & 0 deletions src/assets/data/chattingRoomData.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,204 @@
{
"chattings": [
{
"id": "1",
"name": "플래시",
"img": "/pic.png",
"isUpdated": true,
"stateMessage": "오늘은 비가올거야. 막걸리 먹을사람",
"unReadCount": 0,
"chat": [
{
"chatId": "1",
"to": "송은수",
"from": "플래시",
"content": "내일 저녁은 햄버거를 먹을거야. 왜냐하면 어제 파스타를 먹었고 오늘은 한끼도 못먹었거든.",
"date": "2024-03-01",
"time": "19:00",
"isDisplay": false,
"isRead": true
},
{
"chatId": "2",
"to": "송은수",
"from": "플래시",
"content": "너는 먹고 싶은게 있어?",
"date": "2024-03-01",
"time": "19:00",
"isDisplay": true,
"isRead": true
},
{
"chatId": "3",
"to": "플래시",
"from": "송은수",
"content": "음...",
"date": "2024-03-01",
"time": "19:01",
"isDisplay": true,
"isRead": true
},
{
"chatId": "4",
"to": "송은수",
"from": "플래시",
"content": "현기증 나니깐 얼른 답변해줘.",
"date": "2024-03-02",
"time": "08:31",
"isDisplay": true,
"isRead": true
},
{
"chatId": "5",
"to": "플래시",
"from": "송은수",
"content": "조금만 기다려",
"date": "2024-03-03",
"time": "12:02",
"isDisplay": false,
"isRead": false
},
{
"chatId": "6",
"to": "플래시",
"from": "송은수",
"content": "고민좀 해볼게",
"date": "2024-03-03",
"time": "12:02",
"isDisplay": true,
"isRead": false
}
]
},
{
"id": "2",
"name": "이그나이트",
"img": "/HappEmo.png",
"isUpdated": false,
"stateMessage": "뜨거운 감자",
"unReadCount": 1,
"chat": [
{
"chatId": "1",
"to": "송은수",
"from": "이그나이트",
"content": "야야야양야",
"date": "2024-03-01",
"time": "19:00",
"isDisplay": false,
"isRead": true
},
{
"chatId": "2",
"to": "송은수",
"from": "이그나이트",
"content": "하이하이하이하이",
"date": "2024-03-01",
"time": "19:01",
"isDisplay": false,
"isRead": true
},
{
"chatId": "3",
"to": "송은수",
"from": "이그나이트",
"content": "너는 먹고 싶은게 있어?",
"date": "2024-03-01",
"time": "19:00",
"isDisplay": true,
"isRead": true
},
{
"chatId": "4",
"to": "이그나이트",
"from": "송은수",
"content": "음...",
"date": "2024-03-01",
"time": "19:01",
"isDisplay": true,
"isRead": true
},
{
"chatId": "5",
"to": "송은수",
"from": "이그나이트",
"content": "걍 나가.",
"date": "2024-03-02",
"time": "08:31",
"isDisplay": true,
"isRead": true
}
]
},
{
"id": "3",
"name": "마이크",
"img": "/computer.png",
"isUpdated": true,
"stateMessage": "나는야 경찰관",
"unReadCount": 1,
"chat": [
{
"chatId": "1",
"to": "송은수",
"from": "마이크",
"content": "mic drop let's go",
"date": "2024-02-11",
"time": "08:31",
"isDisplay": true,
"isRead": true
},
{
"chatId": "2",
"to": "송은수",
"from": "마이크",
"content": "읽씹노노",
"date": "2024-02-11",
"time": "08:34",
"isDisplay": true,
"isRead": true
}
]
},
{
"id": "4",
"name": "몬스터",
"img": "/logo192.png",
"isUpdated": false,
"stateMessage": "해치지 않아요",
"unReadCount": 0,
"chat": [
{
"chatId": "1",
"to": "송은수",
"from": "몬스터",
"content": "걍 나가.",
"date": "2024-02-02",
"time": "08:31",
"isDisplay": true,
"isRead": true
},
{
"chatId": "2",
"to": "몬스터",
"from": "송은수",
"content": "엥",
"date": "2024-02-02",
"time": "08:31",
"isDisplay": false,
"isRead": true
},
{
"chatId": "3",
"to": "몬스터",
"from": "송은수",
"content": "무슨소리임",
"date": "2024-02-02",
"time": "08:31",
"isDisplay": true,
"isRead": true
}
]
}
]
}
Binary file added src/assets/img/HappEmo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/capture.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/pic.png
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/svg/arrowLeft.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/svg/chat.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/svg/clock.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/svg/edit.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/svg/emoji.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions src/assets/svg/etc.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/svg/friends.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions src/assets/svg/heart.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading