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.

Commitf7f1c4a

Browse files
committed
refactor(cheatsheet): UI / UX refactor
1 parent2813a98 commitf7f1c4a

File tree

34 files changed

+1381
-49
lines changed

34 files changed

+1381
-49
lines changed

‎components/CommunityContent/index.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ import ReposThread from '../../containers/ReposThread'
1313
importWikiThreadfrom'../../containers/WikiThread'
1414
importJobsThreadfrom'../../containers/JobsThread'
1515
importUsersThreadfrom'../../containers/UsersThread'
16-
importCheatSheetPaperfrom'../../containers/CheatSheetPaper'
16+
importCheatsheetThreadfrom'../../containers/CheatsheetThread'
17+
// import CheatSheetPaper from '../../containers/CheatSheetPaper'
1718

1819
import{Wrapper}from'./styles'
1920
import{makeDebugger,ROUTE}from'../../utils'
@@ -42,8 +43,9 @@ const ComunityContent = ({ curRoute }) => {
4243
caseROUTE.WIKI:{
4344
return<WikiThread/>
4445
}
45-
case'cheatsheet':{
46-
return<CheatSheetPaper/>
46+
caseROUTE.CHEATSHEET:{
47+
// return <CheatSheetPaper />
48+
return<CheatsheetThread/>
4749
}
4850
default:{
4951
return<div>default</div>
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
/*
2+
*
3+
* ContributorList
4+
*
5+
*/
6+
7+
importReactfrom'react'
8+
importPropTypesfrom'prop-types'
9+
10+
importMaybefrom'../Maybe'
11+
importPopoverfrom'../Popover'
12+
importGithubUserCardfrom'../GithubUserCard'
13+
importAvatarAdderfrom'../../containers/AvatarAdder'
14+
15+
import{Wrapper,AvatarLink,Avatar,CardWrapper}from'./styles'
16+
17+
import{makeDebugger,uid}from'../../utils'
18+
/* eslint-disable no-unused-vars */
19+
constdebug=makeDebugger('c:ContributorList:index')
20+
/* eslint-enable no-unused-vars */
21+
22+
constContributorList=({ users, showAdder, addContributor})=>(
23+
<Wrapper>
24+
{users.map(user=>(
25+
<Popover
26+
content={
27+
<CardWrapper>
28+
<GithubUserCarduser={user}/>
29+
</CardWrapper>
30+
}
31+
placement="bottom"
32+
trigger="hover"
33+
key={uid.gen()}
34+
>
35+
<AvatarLink>
36+
<Avatarsrc={user.avatar}/>
37+
</AvatarLink>
38+
</Popover>
39+
))}
40+
41+
<Maybetest={showAdder}>
42+
<AvatarAdderonConfirm={addContributor}/>
43+
</Maybe>
44+
</Wrapper>
45+
)
46+
47+
ContributorList.propTypes={
48+
users:PropTypes.arrayOf(
49+
PropTypes.shape({
50+
avatar:PropTypes.string,
51+
nickname:PropTypes.string,
52+
bio:PropTypes.string,
53+
company:PropTypes.string,
54+
location:PropTypes.string,
55+
htmlUrl:PropTypes.string,
56+
})
57+
).isRequired,
58+
addContributor:PropTypes.func,
59+
showAdder:PropTypes.bool,
60+
}
61+
62+
ContributorList.defaultProps={
63+
addContributor:debug,
64+
showAdder:false,
65+
}
66+
67+
exportdefaultContributorList

‎containers/WikiThread/styles/avatar_list.js‎renamed to ‎components/ContributorList/styles/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
importstyledfrom'styled-components'
22

3-
importImgfrom'../../../components/Img'
4-
/* import { theme } from '../../../utils' */
3+
importImgfrom'../../Img'
4+
// import { theme } from '../../../utils'
55

66
exportconstWrapper=styled.div`
77
display: flex;
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 ContributorList from '../index'
5+
6+
describe('TODO <ContributorList />',()=>{
7+
it('Expect to have unit tests specified',()=>{
8+
expect(true).toEqual(true)
9+
})
10+
})

‎components/index.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ export { default as SectionLabel } from './SectionLabel'
4343
export{defaultasBuyMeChuanChuan}from'./BuyMeChuanChuan'
4444
export{defaultasVideoSourceInfo}from'./VideoSourceInfo'
4545

46+
export{defaultasContributorList}from'./ContributorList'
4647
export{defaultasGithubRepoPage}from'./GithubRepoPage'
4748
export{defaultasGithubUserCard}from'./GithubUserCard'
4849

‎containers/AvatarAdder/AdderPanel.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import React from 'react'
22

33
import{ICON_CMD}from'../../config'
44

5-
import{GithubUserCard,Maybe}from'../../components'
5+
importMaybefrom'../../components/Maybe'
6+
importGithubUserCardfrom'../../components/GithubUserCard'
67

78
import{
89
Wrapper,

‎containers/AvatarAdder/index.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
* AvatarAdder
44
*
55
*/
6-
76
importReactfrom'react'
87
import{inject,observer}from'mobx-react'
98
importPropTypesfrom'prop-types'
109

11-
import{Popover}from'../../components'
10+
importPopoverfrom'../../components/Popover'
1211

1312
import{Wrapper,AddText}from'./styles'
14-
1513
importAdderPanelfrom'./AdderPanel'
1614

1715
import{makeDebugger,storePlug}from'../../utils'

‎containers/AvatarAdder/styles/adder_panel.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
importstyledfrom'styled-components'
22

3-
// import { Input } from 'antd'
43
importImgfrom'../../../components/Img'
54
import{theme}from'../../../utils'
65

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
importReactfrom'react'
2+
importMasonryfrom'react-masonry-component'
3+
importRemarkablefrom'remarkable'
4+
importremarkableemojfrom'remarkable-emoji'
5+
// import Prism from 'mastani-codehighlight'
6+
7+
import{Wrapper,CardWrapper}from'./styles/cheatsheet'
8+
importCheatSheetStylefrom'./styles/CheatsheetMarkStyles'
9+
10+
import{uid}from'../../utils'
11+
12+
constmd=newRemarkable()
13+
md.use(remarkableemoj)
14+
15+
constCards=({ cards})=>
16+
cards.map(item=>(
17+
<CardWrapperkey={uid.gen()}>
18+
<CheatSheetStyle>
19+
<div
20+
className="cheatsheet-body"
21+
dangerouslySetInnerHTML={{
22+
__html:md.render(item),
23+
}}
24+
/>
25+
</CheatSheetStyle>
26+
</CardWrapper>
27+
))
28+
29+
constCheatsheet=({ source})=>(
30+
<Wrapper>
31+
{source.map(item=>(
32+
<CheatSheetStylekey={uid.gen()}>
33+
<div
34+
className="cheatsheet-body"
35+
dangerouslySetInnerHTML={{
36+
__html:md.render(item.header),
37+
}}
38+
/>
39+
<Masonry>
40+
<Cardscards={item.cards}/>
41+
</Masonry>
42+
</CheatSheetStyle>
43+
))}
44+
</Wrapper>
45+
)
46+
47+
exportdefaultCheatsheet
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
importReactfrom'react'
2+
3+
import{DotDivider,ContributorList}from'../../components'
4+
5+
import{
6+
Wrapper,
7+
Divider,
8+
Text,
9+
Title,
10+
JoinText,
11+
ViewsText,
12+
}from'./styles/note'
13+
14+
importfakeusersfrom'./fakeusers'
15+
16+
constNote=()=>(
17+
<Wrapper>
18+
<Divider/>
19+
<Text>
20+
<Title>本页贡献者</Title><DotDivider/><JoinText>参与编辑</JoinText>
21+
<ViewsText>浏览: 244</ViewsText>
22+
</Text>
23+
<ContributorListusers={fakeusers}showAdder/>
24+
</Wrapper>
25+
)
26+
27+
exportdefaultNote

0 commit comments

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