Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commit169dfc1

Browse files
committed
Merge branch 'pages' into dev
2 parents7ddd30e +5b7e1cb commit169dfc1

File tree

67 files changed

+1541
-141
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+1541
-141
lines changed

‎components/AuthorCard/ReactonNumbers.js‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,26 @@ import {
77
Number,
88
}from'./styles/reaction_numbers'
99

10-
constReactionNumbers=({ user})=>(
11-
<Wrapper>
12-
<ReactionNum>
13-
<NumDesc>声望</NumDesc>
14-
<Number>{user.achievement.reputation}</Number>
15-
</ReactionNum>
16-
<ReactionNum>
17-
<NumDesc>关注者</NumDesc>
18-
<Number>{user.followersCount}</Number>
19-
</ReactionNum>
20-
<ReactionNum>
21-
<NumDesc>关注中</NumDesc>
22-
<Number>{user.followingsCount}</Number>
23-
</ReactionNum>
24-
</Wrapper>
25-
)
10+
constReactionNumbers=({ user})=>{
11+
// early user has no reutation
12+
constachievement=user.achievement||{reputation:0}
13+
14+
return(
15+
<Wrapper>
16+
<ReactionNum>
17+
<NumDesc>声望</NumDesc>
18+
<Number>{achievement.reputation}</Number>
19+
</ReactionNum>
20+
<ReactionNum>
21+
<NumDesc>关注者</NumDesc>
22+
<Number>{user.followersCount}</Number>
23+
</ReactionNum>
24+
<ReactionNum>
25+
<NumDesc>关注中</NumDesc>
26+
<Number>{user.followingsCount}</Number>
27+
</ReactionNum>
28+
</Wrapper>
29+
)
30+
}
2631

2732
exportdefaultReactionNumbers
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
importReactfrom'react'
2+
import{Button}from'antd'
3+
4+
import{ICON_CMD}from'../../config'
5+
6+
importSectionLabelfrom'../SectionLabel'
7+
import{Wrapper,Divider}from'./styles/content'
8+
9+
constContent=()=>(
10+
<Wrapper>
11+
<Divider/>
12+
<SectionLabel
13+
title="侵权举报"
14+
iconSrc={`${ICON_CMD}/police1.svg`}
15+
desc="该内容侵犯了我的版权, 或包含盗版 / 违规转载等。"
16+
addonNode={
17+
<Buttonsize="small"type="primary"ghost>
18+
是的, 去举报
19+
</Button>
20+
}
21+
/>
22+
<Divider/>
23+
<SectionLabel
24+
title="违法信息举报"
25+
iconSrc={`${ICON_CMD}/police2.svg`}
26+
desc="该内容涉及政治，色情，暴力，民族宗教, 地域攻击等违法信息。"
27+
addonNode={
28+
<Buttonsize="small"type="primary"ghost>
29+
是的, 去举报
30+
</Button>
31+
}
32+
/>
33+
</Wrapper>
34+
)
35+
36+
exportdefaultContent
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
/*
2+
*
3+
* BadContentRepot
4+
*
5+
*/
6+
7+
importReactfrom'react'
8+
importPropTypesfrom'prop-types'
9+
10+
import{ICON_CMD}from'../../config'
11+
12+
importModalfrom'../Modal'
13+
import{Wrapper,Title,Icon}from'./styles'
14+
importContentfrom'./Content'
15+
16+
import{makeDebugger}from'../../utils'
17+
18+
/* eslint-disable no-unused-vars */
19+
constdebug=makeDebugger('c:BadContentRepot:index')
20+
/* eslint-enable no-unused-vars */
21+
22+
classBadContentRepotextendsReact.Component{
23+
state={
24+
show:false,
25+
}
26+
27+
componentDidMount(){}
28+
29+
componentWillUnmount(){}
30+
31+
toggleModal(){
32+
const{ show}=this.state
33+
this.setState({show:!show})
34+
}
35+
36+
render(){
37+
const{ title}=this.props
38+
const{ show}=this.state
39+
40+
return(
41+
<React.Fragment>
42+
<Modal
43+
width="500px"
44+
show={show}
45+
showCloseBtn
46+
onClose={this.toggleModal.bind(this)}
47+
>
48+
<Content/>
49+
</Modal>
50+
<WrapperonClick={this.toggleModal.bind(this)}>
51+
<Iconsrc={`${ICON_CMD}/flag.svg`}/>
52+
<Title>{title}</Title>
53+
</Wrapper>
54+
</React.Fragment>
55+
)
56+
}
57+
}
58+
59+
BadContentRepot.propTypes={
60+
// https://www.npmjs.com/package/prop-types
61+
title:PropTypes.string,
62+
}
63+
64+
BadContentRepot.defaultProps={
65+
title:'举报内容',
66+
}
67+
68+
exportdefaultBadContentRepot
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
importstyledfrom'styled-components'
2+
3+
// import { Img } from '../../../components'
4+
// import { theme } from '../../../utils'
5+
6+
exportconstWrapper=styled.div`
7+
display: flex;
8+
flex-direction: column;
9+
padding: 20px;
10+
`
11+
exportconstDivider=styled.div`
12+
margin-top: 30px;
13+
`
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
importstyledfrom'styled-components'
2+
3+
importImgfrom'../../Img'
4+
import{theme}from'../../../utils'
5+
6+
exportconstWrapper=styled.div`
7+
display: flex;
8+
align-items: center;
9+
`
10+
exportconstTitle=styled.div`
11+
color:${theme('thread.articleDigest')};
12+
${Wrapper}:hover & {
13+
color:${theme('thread.articleTitle')};
14+
}
15+
&:hover {
16+
cursor: pointer;
17+
}
18+
`
19+
exportconstIcon=styled(Img)`
20+
fill:${theme('thread.articleDigest')};
21+
width: 16px;
22+
height: 16px;
23+
display: block;
24+
margin-right: 3px;
25+
${Wrapper}:hover & {
26+
color:${theme('thread.articleTitle')};
27+
}
28+
&:hover {
29+
cursor: pointer;
30+
}
31+
`
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// import React from 'react'
2+
// import { shallow } from 'enzyme'
3+
4+
// import BadContentRepot from '../index'
5+
6+
describe('TODO <BadContentRepot />',()=>{
7+
it('Expect to have unit tests specified',()=>{
8+
expect(true).toEqual(true)
9+
})
10+
})

‎components/ContentBanner/ReactionNumbers.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ import { prettyNum, numberWithCommas } from '../../utils'
1313
constReactionNumbers=({data:{ views, favoritedCount, starredCount}})=>(
1414
<NumbersInfo>
1515
<NumberSectiondead>
16-
<NumberTitledead>阅读</NumberTitle>
16+
<NumberTitledead>浏览</NumberTitle>
1717
<NumberItemdead>{prettyNum(views)}</NumberItem>
1818
</NumberSection>
19-
<NumberDivider/>
2019
{starredCount>=0 ?(
2120
<React.Fragment>
21+
<NumberDivider/>
2222
<NumberSection>
2323
<NumberTitle>喜欢</NumberTitle>
2424
<NumberItem>{numberWithCommas(starredCount)}</NumberItem>

‎components/index.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ export { default as ThreadSelector } from './ThreadSelector'
5656
export{defaultasCommunityList}from'./CommunityList'
5757
export{defaultasAuthorCard}from'./AuthorCard'
5858
export{defaultasContentSourceCard}from'./ContentSourceCard'
59+
export{defaultasBadContentRepot}from'./BadContentRepot'
5960

6061
// loading component
6162
export{

‎containers/Banner/index.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import { inject, observer } from 'mobx-react'
1010
importUserBannerfrom'../UserBanner'
1111
importPostBannerfrom'../PostBanner'
1212
importJobBannerfrom'../JobBanner'
13+
importVideoBannerfrom'../VideoBanner'
14+
importRepoBannerfrom'../RepoBanner'
1315
importCommunitiesBannerfrom'../CommunitiesBanner'
1416
importCommunityBannerfrom'../CommunityBanner'
1517

@@ -41,6 +43,12 @@ const BannerContent = ({ curRoute }) => {
4143
caseROUTE.JOB:{
4244
return<JobBanner/>
4345
}
46+
caseROUTE.VIDEO:{
47+
return<VideoBanner/>
48+
}
49+
caseROUTE.REPO:{
50+
return<RepoBanner/>
51+
}
4452
caseROUTE.USER:{
4553
return<UserBanner/>
4654
}

‎containers/Content/index.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import CommunitiesContent from '../CommunitiesContent'
1111
importCheatSheetContentfrom'../CheatSheetContent'
1212
importPostContentfrom'../PostContent'
1313
importJobContentfrom'../JobContent'
14+
importVideoContentfrom'../VideoContent'
15+
importRepoContentfrom'../RepoContent'
1416
importUserContentfrom'../UserContent'
1517

1618
importCommunityContentfrom'../../components/CommunityContent'
@@ -38,6 +40,12 @@ const renderContent = curRoute => {
3840
caseROUTE.JOB:{
3941
return<JobContent/>
4042
}
43+
caseROUTE.VIDEO:{
44+
return<VideoContent/>
45+
}
46+
caseROUTE.REPO:{
47+
return<RepoContent/>
48+
}
4149
caseROUTE.USER:{
4250
return<UserContent/>
4351
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp