Skip to content

Commit 936f615

Browse files
sGOMsGOM
authored
Merge pull request #145 from CartoonIsArt/lhs
네비게이터/포탈(메인 타임라인 페이지) 관련 사항 수정
2 parents f470f84 + 4c5778f commit 936f615

30 files changed

Lines changed: 1008 additions & 557 deletions

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@
44
"private": true,
55
"homepage": "https://cartoonisart.github.io",
66
"dependencies": {
7-
"antd": "2.13.11",
7+
"antd": "3.26.19",
88
"axios": "0.21.1",
99
"connected-react-router": "^6.8.0",
1010
"history": "^4.6.1",
1111
"moment": "^2.29.1",
1212
"prop-types": "^15.5.10",
13-
"react": "16.4.2",
14-
"react-dom": "16.4.2",
15-
"react-markdown": "^2.5.0",
13+
"react": "16.8",
14+
"react-dom": "16.8",
15+
"react-dropzone": "^11.3.2",
16+
"react-markdown": "^5.0.3",
1617
"react-redux": "6.0.1",
1718
"react-router": "5.2.0",
1819
"react-router-dom": "^5.2.0",
@@ -26,7 +27,6 @@
2627
"babel-core": "6.22.1",
2728
"babel-jest": "18.0.0",
2829
"babel-loader": "7.1.4",
29-
"babel-plugin-import": "^1.13.3",
3030
"babel-preset-react-app": "^2.2.0",
3131
"babel-runtime": "^6.20.0",
3232
"case-sensitive-paths-webpack-plugin": "^2.4.0",

‎src/App.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class App extends Component {
5151
return (
5252
<div style={{ background: '#dfdfdf' }}>
5353
{isNavEnabled(this.props.history) && <Nav />}
54-
<div className="Container">
54+
<div className="Container" style={{ marginTop: '4px' }} >
5555
{routes.map((route, idx) =>
5656
// eslint-disable-next-line
5757
(

‎src/actions/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ export const getCommentedTimeline = (username, page = 1, keyword = undefined) =>
163163
const parameter = keyword ? { page, keyword } : { page }
164164
const queryString = new URLSearchParams(parameter).toString()
165165

166-
axios.get(`/timeline/${username}/commented?${queryString}`)
166+
axios.get(`/timeline/${username}/comments?${queryString}`)
167167
.then((r) => {
168168
dispatch(page == 1 ? setTimeline(r.data) : appendTimeline(r.data))
169169
})

‎src/components/Activity.js‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React, { Component } from 'react'
2+
import { Link } from 'react-router-dom'
23
import PropTypes from 'prop-types'
34

45
class Activity extends Component {
@@ -15,22 +16,31 @@ class Activity extends Component {
1516
}}
1617
>
1718
<div style={{ width: '34%' }}>
18-
<div style={{ height: '50%' }}> 글</div>
19-
<a className="ant-anchor-link-title" href="#">
19+
<div style={{ height: '50%' }}>글</div>
20+
<Link
21+
className="ant-anchor-link-title"
22+
to={`/members/${user.username}`}
23+
>
2024
{user.documentsCount}
21-
</a>
25+
</Link>
2226
</div>
2327
<div style={{ width: '33%' }}>
24-
<div style={{ height: '50%' }}> 댓글 </div>
25-
<a className="ant-anchor-link-title" href="#">
28+
<div style={{ height: '50%' }}>댓글</div>
29+
<Link
30+
className="ant-anchor-link-title"
31+
to={`/members/${user.username}/comments`}
32+
>
2633
{user.commentsCount}
27-
</a>
34+
</Link>
2835
</div>
2936
<div style={{ width: '33%' }}>
30-
<div style={{ height: '50%' }}> 좋아요 </div>
31-
<a className="ant-anchor-link-title" href="#">
37+
<div style={{ height: '50%' }}>좋아요</div>
38+
<Link
39+
className="ant-anchor-link-title"
40+
to={`/members/${user.username}/likes`}
41+
>
3242
{user.likedDocumentsCount}
33-
</a>
43+
</Link>
3444
</div>
3545
</div>
3646
)

‎src/components/Album.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React, { Component } from 'react'
22
import { PropTypes } from 'prop-types'
3-
4-
const Modal = require('antd/lib/modal')
3+
import { Modal } from 'antd'
54

65
class Album extends Component {
76
constructor(props) {

‎src/components/Comment.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ import Recomments from './Recomments'
66
import Namecard from './Namecard'
77
import { printTime } from '../policy'
88
import { postCommentLike, deleteCommentLike } from '../actions'
9-
10-
const Button = require('antd/lib/button')
11-
const Popover = require('antd/lib/popover')
9+
import { Button, Popover } from 'antd'
1210

1311
class Comment extends Component {
1412
constructor(props) {

‎src/components/Doc.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ import { printTime } from '../policy'
99
// import Album from './Album'
1010
import Write from './Write'
1111
import { getUser, postDocumentLike, deleteDocumentLike } from '../actions'
12-
13-
const Button = require('antd/lib/button')
14-
const Popover = require('antd/lib/popover')
12+
import { Button, Popover } from 'antd'
1513

1614
class Doc extends Component {
1715
constructor(props) {
@@ -93,7 +91,7 @@ class Doc extends Component {
9391
</div>
9492
</div>
9593
<div style={{ margin: '4px 0px' }}>
96-
<ReactMarkdown source={content.content} />
94+
<ReactMarkdown children={content.content} />
9795
</div>
9896
{ /* <Album content={images} height="320px" /> */ }
9997
<div style={isAppend ? { display: 'block' } : { display: 'none' }}>

‎src/components/Noti.js‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
import React, { Component } from 'react'
2+
import { withRouter } from 'react-router'
23
import PropTypes from 'prop-types'
34
import Namecard from './Namecard'
45
import Line from './Line'
56
import { printTime } from '../policy'
6-
7-
const Popover = require('antd/lib/popover')
7+
import { Popover } from 'antd'
88

99
class Noti extends Component {
10+
routeToFeed(feedId) {
11+
this.props.history.push(`/feed/${feedId}`)
12+
}
13+
1014
render() {
1115
const noti = this.props.content
12-
console.log(noti)
1316
const nickname = `${noti.from.nTh}기 ${noti.from.fullname}`
1417
return (
1518
<div key={noti.id}>
1619
<div
1720
className="noti"
1821
// eslint-disable-next-line
19-
onClick={() => console.log(noti.id)}
22+
onClick={() => this.routeToFeed(noti.id)}
2023
style={
2124
noti.had_read
2225
? { height: '56px', display: 'flex', alignItems: 'stretch' }
@@ -48,21 +51,19 @@ class Noti extends Component {
4851
placement="leftTop"
4952
content={<Namecard content={noti.from} />}
5053
>
51-
<a href="#">
52-
{' '}
54+
<a style={{ fontSize: '10pt' }} href="#">
5355
{nickname}
5456
</a>
5557
</Popover>
5658
</div>
57-
<div style={{ color: 'rgba(1,1,1,0.5)' }}>
58-
{' '}
59+
<div style={{ fontSize: '9pt', color: 'rgba(1,1,1,0.5)' }}>
5960
{printTime(noti.createdAt)}
60-
{' '}
6161
</div>
6262
</div>
6363
<div style={{ flexGrow: '1', display: 'flex', marginLeft: '12px' }}>
6464
<a href="#">
6565
<div style={{
66+
fontSize: '9pt',
6667
color: 'rgba(0,0,0, 0.8)', wordWrap: 'break-word', WebkitBoxOrient: 'vertical', WebkitLineClamp: '2', width: '232px', textOverflow: 'ellipsis', overflow: 'hidden', display: '-webkit-box',
6768
}}
6869
>
@@ -80,6 +81,7 @@ class Noti extends Component {
8081

8182
Noti.propTypes = {
8283
content: PropTypes.object.isRequired,
84+
history: PropTypes.object.isRequired,
8385
}
8486

85-
export default Noti
87+
export default withRouter(Noti)

‎src/components/PostComment.js‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ import { connect } from 'react-redux'
33
import PropTypes from 'prop-types'
44
import koKR from 'antd/lib/locale-provider/ko_KR'
55
import { postComment } from '../actions'
6-
7-
const Mention = require('antd/lib/mention')
8-
const Button = require('antd/lib/button')
9-
const LocaleProvider = require('antd/lib/locale-provider')
6+
import { isSpace } from '../lib'
7+
import { Button, Mention, LocaleProvider, notification } from 'antd'
108

119
const { toString, toContentState } = Mention
1210

@@ -20,10 +18,19 @@ class PostComment extends Component {
2018

2119
onButtonClicked() {
2220
const content = toString(this.state.contentState).replace(/(?=.*(?<! \n)$)(?=\n$)/, ' \n')
23-
this.props.postComment({
24-
documentId: this.props.feedId,
25-
content,
26-
})
21+
if (isSpace(content)) {
22+
notification.warning({
23+
message: '댓글을 확인해주세요!',
24+
description: '업로드하고자 하는 댓글 내용이 없습니다',
25+
duration: 3,
26+
})
27+
}
28+
else {
29+
this.props.postComment({
30+
documentId: this.props.feedId,
31+
content,
32+
})
33+
}
2734
this.setState({ contentState: toContentState('') })
2835
}
2936

‎src/components/PostRecomment.js‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ import React, { Component } from 'react'
22
import { connect } from 'react-redux'
33
import koKR from 'antd/lib/locale-provider/ko_KR'
44
import { postComment } from '../actions'
5-
6-
const Mention = require('antd/lib/mention')
7-
const Button = require('antd/lib/button')
8-
const LocaleProvider = require('antd/lib/locale-provider')
5+
import { isSpace } from '../lib'
6+
import { Button, Mention, LocaleProvider, notification } from 'antd'
97

108
const { toString, toContentState } = Mention
119

@@ -19,10 +17,19 @@ class PostRecomment extends Component {
1917

2018
onButtonClicked() {
2119
const content = toString(this.state.contentState).replace(/(?=.*(?<! \n)$)(?=\n$)/, ' \n')
22-
this.props.postComment({
23-
commentId: this.props.commentId,
24-
content,
25-
})
20+
if (isSpace(content)) {
21+
notification.warning({
22+
message: '댓글을 확인해주세요!',
23+
description: '업로드하고자 하는 댓글 내용이 없습니다',
24+
duration: 3,
25+
})
26+
}
27+
else {
28+
this.props.postComment({
29+
commentId: this.props.commentId,
30+
content,
31+
})
32+
}
2633
this.setState({ contentState: toContentState('') })
2734
}
2835

0 commit comments

Comments
 (0)
⚡