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주차] 박지수 미션 제출합니다. #17

Open
wants to merge 27 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
1f5148f
docs: 폴더 구조 설정
jsomnium Sep 26, 2024
8cd8815
feat: 기본 화면 설정, 채팅방 라우팅
jsomnium Sep 27, 2024
1e73df5
feat, design: 기본 UI 구현
jsomnium Sep 27, 2024
d63fcd5
feat: 현재 시간 표시
jsomnium Sep 27, 2024
796ee33
feat: 사용자에 따라 랜더링 되는 것 변경하기
jsomnium Sep 27, 2024
fb60e8d
feat: 메세지 전송 기능
jsomnium Sep 27, 2024
fdc967f
feat: 메세지 전송 시 하단 스크롤 이동
jsomnium Sep 27, 2024
468dbb3
feat: DateDivider 랜더링 조건 추가
jsomnium Sep 27, 2024
6cbb0fa
style: 메세지박스 스타일 수정
jsomnium Sep 27, 2024
cd18646
Merge pull request #1 from jsomnium/jsomnium
jsomnium Sep 27, 2024
2b60e0e
feat: 프로필 클릭 시 사용자 전환
jsomnium Sep 28, 2024
18f5fc3
style: 패딩 등 UI 규격 설정
jsomnium Sep 29, 2024
f1aa703
style: 상세 규격 설정
jsomnium Sep 29, 2024
b89b7ae
feat: 요일 표시
jsomnium Sep 29, 2024
5ebef57
style: 텍스트 너비 설정
jsomnium Sep 29, 2024
42b05e1
feat: 필요한 icon 추가, 간단 UI 구성
jsomnium Nov 2, 2024
fef40b5
feat: 로컬 스토리지에서 메세지 불러오고 저장하는 기능 추가
jsomnium Nov 2, 2024
bd87c55
style: 채팅방 목록 스타일 설정
jsomnium Nov 2, 2024
27990f6
style: 채팅방 목록 UI 구현
jsomnium Nov 2, 2024
49afc60
feat: 친구 목록 UI 구현
jsomnium Nov 2, 2024
06444b4
feat: 현재 경로에 따라 아이콘 변경
jsomnium Nov 2, 2024
e33c683
feat: 유저 json 파일 기반 랜더링, 생일인 친구 필터링
jsomnium Nov 2, 2024
b915ac0
feat: 채팅방 목록 구현 (1)
jsomnium Nov 2, 2024
6e2f87c
feat: 채팅방 목록 구현 (2)
jsomnium Nov 2, 2024
9411d13
feat: 뒤로가기 라우팅 설정
jsomnium Nov 2, 2024
35ab7ca
Merge branch 'CEOS-Developers:master' into master
jsomnium Nov 2, 2024
868b96f
style: 친구 목록 디자인 정확하게 구현
jsomnium Nov 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
478 changes: 387 additions & 91 deletions package-lock.json

Large diffs are not rendered by default.

22 changes: 18 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@
"@testing-library/user-event": "^13.5.0",
"@types/jest": "^27.5.2",
"@types/node": "^16.18.91",
"@types/react": "^18.2.69",
"@types/react-dom": "^18.2.22",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"autoprefixer": "^10.4.20",
"postcss": "^8.4.47",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.26.2",
"react-scripts": "5.0.1",
"typescript": "^4.9.5",
"web-vitals": "^2.1.4"
Expand Down Expand Up @@ -39,5 +41,17 @@
"last 1 firefox version",
"last 1 safari version"
]
}
},
"devDependencies": {
"@types/react": "^18.3.9",
"file-loader": "^6.2.0",
"tailwindcss": "^3.4.13",
"webpack": "^5.95.0",
"webpack-cli": "^5.1.4"
},
"description": "안녕하세요 🙌🏻 20기 프론트 운영진 김동혁입니다. 이번 미션에서는 드디어 투두리스트에서 벗어나 새로운 프로젝트인 **messenger** 만들기를 진행합니다.",
"main": "tailwind.config.js",
"keywords": [],
"author": "",
"license": "ISC"
}
Binary file removed public/favicon.ico
Binary file not shown.
23 changes: 23 additions & 0 deletions public/htmlStyle.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
html,
body {
height: 100%;
width: 100%;
margin: 0;
padding: 0;
display: flex;
justify-content: center;
align-items: center;
font-family: 'AppleSDGothicNeo', sans-serif;
}

#root {
width: 100%;
max-width: 375px;
height: 100%;
max-height: 812px;
border-radius: 20px;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
display: flex;
flex-direction: column;
overflow: hidden;
}
52 changes: 14 additions & 38 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,43 +1,19 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.

Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
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`.
-->
<title>React App</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link href="htmlStyle.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/tailwind.min.css" rel="stylesheet">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/fonts-archive/AppleSDGothicNeo/AppleSDGothicNeo.css"
type="text/css" />
<title>React App</title>
</head>

You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.
<body class="">
<div id="root"></div>
<script src="../src/App.tsx" type="module"></script>
</body>

To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>
</html>
Binary file removed public/logo192.png
Binary file not shown.
Binary file removed public/logo512.png
Binary file not shown.
25 changes: 0 additions & 25 deletions public/manifest.json

This file was deleted.

3 changes: 0 additions & 3 deletions public/robots.txt

This file was deleted.

38 changes: 0 additions & 38 deletions src/App.css

This file was deleted.

17 changes: 14 additions & 3 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
import React from 'react';
import { BrowserRouter as Router, Route, Routes } from 'react-router-dom';
import ChatRoom from '../src/pages/chatRoom';
import ChatListRoom from './pages/chatListRoom';
import FriendListRoom from './pages/friendListRoom';

function App() {
return (
<div>
<h1>20기 프론트엔드 파이팅!!! 디자인과 사이좋게 지내요~~~</h1>
</div>
<Router>
<Routes>
{/* 기본 경로: FriendListRoom => 친구 목록 */}
<Route path="/" element={<FriendListRoom />} />
<Route path="/chatRoom/:userId" element={<ChatRoom />} />
<Route path="/chatListRoom" element={<ChatListRoom />} />
</Routes>
</Router>
);
}

Expand Down
3 changes: 3 additions & 0 deletions src/assets/addFriendIcon.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/angryImoIcon.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/backArrowImg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file added src/assets/badImoIcon.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/battery.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/chatIcon.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/chatIcon_on.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/chatMoreIcon.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/defaultProfileImg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading