Commitc9eca37

committed

refactor(jobviewer): ui: add homepage link & popver .. etc

1 parentce3a663 commitc9eca37Copy full SHA for c9eca37

File tree

+57

-11

lines changed

+57

-11

lines changed

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`importReactfrom'react'`
`2`	`2`	`importTimeAgofrom'timeago-react'`
`3`	`3`
	`4`	`+import{ICON_CMD}from'../../config'`
	`5`	`+`
`4`	`6`	`import{DotDivider}from'..'`
`5`	`7`
`6`	`8`	`import{`
`@@ -9,6 +11,9 @@ import {`
`9`	`11`	`Title,`
`10`	`12`	`PublishAt,`
`11`	`13`	`Username,`
	`14`	`+HomtPage,`
	`15`	`+HomeIcon,`
	`16`	`+HomepageLink,`
`12`	`17`	`}from'./styles/company_info'`
`13`	`18`
`14`	`19`	`import{cutFrom}from'../../utils'`
`@@ -18,6 +23,16 @@ const CompanyInfo = ({ company, insertedAt, author }) => (`
`18`	`23`	`<Logosrc={company.logo}alt="user_avatar"/>`
`19`	`24`	`<div>`
`20`	`25`	`<Title>{cutFrom(company.title,14)}</Title>`
	`26`	`+<HomtPage>`
	`27`	+<HomeIconsrc={`${ICON_CMD}/home.svg`}/>
	`28`	`+<HomepageLink`
	`29`	`+href="https://github.com"`
	`30`	`+rel="noopener noreferrer"`
	`31`	`+target="_blank"`
	`32`	`+>`
	`33`	`+ https://github.com/mydearxym`
	`34`	`+</HomepageLink>`
	`35`	`+</HomtPage>`
`21`	`36`	`<PublishAt>`
`22`	`37`	`<Username>{author.nickname}</Username>`
`23`	`38`	`<DotDivider/>`

Lines changed: 21 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -14,6 +14,24 @@ export const Title = styled.div`
`14`	`14`	`color:${theme('thread.articleTitle')};`
`15`	`15`	`margin-top: 2px;`
`16`	`16`	`
	`17`	+exportconstHomtPage=styled.div`
	`18`	`+ display: flex;`
	`19`	`+ align-items: center;`
	`20`	+`
	`21`	+exportconstHomeIcon=styled(Img)`
	`22`	`+ fill:${theme('thread.articleDigest')};`
	`23`	`+ width: 15px;`
	`24`	`+ height: 15px;`
	`25`	`+ display: block;`
	`26`	+`
	`27`	+exportconstHomepageLink=styled.a`
	`28`	`+ color:${theme('thread.articleDigest')};`
	`29`	`+ margin-left: 3px;`
	`30`	`+ &:hover {`
	`31`	`+ text-decoration: underline;`
	`32`	`+ color:${theme('thread.articleTitle')};`
	`33`	`+ }`
	`34`	+`
`17`	`35`	exportconstUsername=styled.div`
`18`	`36`	`font-size: 0.9rem;`
`19`	`37`	`
@@ -25,7 +43,7 @@ export const PublishAt = styled.div`
`25`	`43`	`
`26`	`44`	exportconstLogo=styled(Img)`
`27`	`45`	`border-radius: 3px;`
`28`		`- width:44px;`
`29`		`- height:44px;`
`30`		`- margin-right:10px;`
	`46`	`+ width:64px;`
	`47`	`+ height:64px;`
	`48`	`+ margin-right:12px;`
`31`	`49`	`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ import R from 'ramda'`
`3`	`3`
`4`	`4`	`import{Maybe}from'../../components'`
`5`	`5`	`import{Wrapper,Item,Hightlight}from'./styles/selected'`
	`6`	`+import{uid}from'../../utils'`
`6`	`7`
`7`	`8`	`constrenderItems=items=>{`
`8`	`9`	`if(items.length===1){`
`@@ -31,7 +32,9 @@ const renderReadonlyItems = items => {`
`31`	`32`
`32`	`33`	`return(`
`33`	`34`	`<Item>`
`34`		`-<Hightlight>{items[0]}, ..</Hightlight>`
	`35`	`+{items.map(item=>(`
	`36`	`+<Hightlightkey={uid.gen()}>{item}</Hightlight>`
	`37`	`+))}`
`35`	`38`	`</Item>`
`36`	`39`	`)`
`37`	`40`	`}`

Lines changed: 13 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import { inject, observer } from 'mobx-react'`
`12`	`12`	`import{Popover,Maybe}from'../../components'`
`13`	`13`	`importOptionsfrom'./Options'`
`14`	`14`	`importSelectedfrom'./Selected'`
`15`		`-import{Wrapper,LabelItem,LabelIcon,Title}from'./styles'`
	`15`	`+import{Wrapper,LabelItem,LabelIcon,Title,PopHint}from'./styles'`
`16`	`16`
`17`	`17`	`importoptionMapfrom'./option_map'`
`18`	`18`	`import{makeDebugger,storePlug,uid}from'../../utils'`
`@@ -64,12 +64,18 @@ class LabelerContainer extends React.Component {`
`64`	`64`	`return(`
`65`	`65`	`<Wrapper>`
`66`	`66`	`<Maybetest={readonly}>`
`67`		`-<LabelItem>`
`68`		`-<LabelIconsrc={optionMap[label].iconSrc}/>`
`69`		`-<Title>`
`70`		`-<Selecteditems={selected}readonly={readonly}/>`
`71`		`-</Title>`
`72`		`-</LabelItem>`
	`67`	`+<Popover`
	`68`	`+content={<PopHint>{trans[label]}</PopHint>}`
	`69`	`+placement="bottom"`
	`70`	`+trigger="hover"`
	`71`	`+>`
	`72`	`+<LabelItem>`
	`73`	`+<LabelIconsrc={optionMap[label].iconSrc}/>`
	`74`	`+<Title>`
	`75`	`+<Selecteditems={selected}readonly={readonly}/>`
	`76`	`+</Title>`
	`77`	`+</LabelItem>`
	`78`	`+</Popover>`
`73`	`79`	`</Maybe>`
`74`	`80`	`<Maybetest={!readonly}>`
`75`	`81`	`{targetIndex>=0 ?(`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -34,3 +34,7 @@ export const Title = styled.div`
`34`	`34`	`color:${theme('editor.footerHover')};`
`35`	`35`	`}`
`36`	`36`	`
	`37`	+exportconstPopHint=styled.div`
	`38`	`+ padding: 5px 8px;`
	`39`	`+ color:${theme('thread.articleDigest')};`
	`40`	+`

Comments

(0)