chore: merge branch 'dev'

mydearxym · mydearxym · commit 7bca17b87deb · 2019-02-06T23:43:45.000+08:00
diff --git a/components/JobItem/DigestView.js b/components/JobItem/DigestView.js
@@ -3,9 +3,14 @@ import React from 'react'
 import JobInfo from './JobInfo'
 import CompanyInfo from './CompanyInfo'
 
-const DigestView = ({ entry, community, onPreview }) => (
+const DigestView = ({ entry, community, onPreview, onAuthorSelect }) => (
   <React.Fragment>
-    <JobInfo entry={entry} onPreview={onPreview} community={community} />
+    <JobInfo
+      entry={entry}
+      onPreview={onPreview}
+      onAuthorSelect={onAuthorSelect}
+      community={community}
+    />
     <CompanyInfo entry={entry} onPreview={onPreview} />
   </React.Fragment>
 )
diff --git a/components/JobItem/JobInfo.js b/components/JobItem/JobInfo.js
@@ -38,6 +38,7 @@ const JobInfo = ({
     communities,
   },
   onPreview,
+  onAuthorSelect,
   community,
 }) => (
   <Wrapper>
@@ -58,9 +59,9 @@ const JobInfo = ({
         <InlineTags data={tags} />
       </TagsWrapper>
     </Middle>
-    <Footer onClick={onPreview}>
+    <Footer>
       <Extra>
-        <PublishInfo>
+        <PublishInfo onClick={onAuthorSelect.bind(this, author)}>
           {author.nickname} <DotDivider />
           <TimeAgo datetime={insertedAt} locale="zh_CN" />
           <DotDivider />
diff --git a/components/JobItem/index.js b/components/JobItem/index.js
@@ -21,7 +21,14 @@ import { getOpacity } from './helper'
 /* eslint-disable-next-line */
 const debug = makeDebugger('c:JobItem:index')
 
-const JobItem = ({ entry, active, onPreview, accountInfo, community }) => {
+const JobItem = ({
+  entry,
+  active,
+  onPreview,
+  onAuthorSelect,
+  accountInfo,
+  community,
+}) => {
   const {
     customization: { contentsLayout, contentDivider, contentHover },
   } = accountInfo
@@ -38,7 +45,12 @@ const JobItem = ({ entry, active, onPreview, accountInfo, community }) => {
         topoffset="9px"
       />
       {contentsLayout === C11N.DIGEST ? (
-        <DigestView entry={entry} onPreview={onPreview} community={community} />
+        <DigestView
+          entry={entry}
+          onPreview={onPreview}
+          onAuthorSelect={onAuthorSelect}
+          community={community}
+        />
       ) : (
         <ListView entry={entry} onPreview={onPreview} />
       )}
@@ -84,10 +96,12 @@ JobItem.propTypes = {
   }),
   community: PropTypes.string.isRequired,
   onPreview: PropTypes.func,
+  onAuthorSelect: PropTypes.func,
 }
 
 JobItem.defaultProps = {
   onPreview: debug,
+  onAuthorSelect: debug,
   active: {},
   accountInfo: {
     isLogin: false,
diff --git a/components/JobItem/styles/index.js b/components/JobItem/styles/index.js
@@ -18,7 +18,6 @@ export const Wrapper = styled.article`
   border-bottom-color: ${theme('thread.articleDivider')};
 
   &:hover {
-    cursor: pointer;
     background: ${({ hover }) => (hover ? theme('thread.articleHover') : '')};
   }
 `
diff --git a/components/JobItem/styles/job_info.js b/components/JobItem/styles/job_info.js
@@ -10,11 +10,17 @@ export const Wrapper = styled.div`
 `
 export const Header = styled.div`
   ${cs.flex('align-center')};
+  &:hover {
+    cursor: pointer;
+  }
 `
 export const Middle = styled.div`
   ${cs.flex('align-end')};
   padding: 5px 0;
   margin-bottom: 2px;
+  &:hover {
+    cursor: pointer;
+  }
 `
 export const Footer = styled.div`
   color: ${theme('thread.articleDigest')};
@@ -64,7 +70,13 @@ export const ExpDivider = styled.div`
 `
 
 export const PublishInfo = styled.div`
+  ${cs.flex('align-center')};
   ${cs.media.tablet`
     display: none;
   `};
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
 `
diff --git a/components/Modal/styles/index.js b/components/Modal/styles/index.js
@@ -31,8 +31,8 @@ export const Wrapper = styled.div`
     mode === 'default' ? theme('modal.border') : theme('baseColor.error')};
   animation: ${animate.zoomInRule};
 
-  ${cs.media.mobile`width: 300px`};
-  ${cs.media.mobile`width: 400px`};
+  ${cs.media.tablet`width: 460px`};
+  ${cs.media.mobile`width: 320px`};
 `
 export const ChildrenWrapper = styled.div`
   min-height: 320px;
diff --git a/components/PagedContents/JobsList.js b/components/PagedContents/JobsList.js
@@ -17,6 +17,7 @@ const JobsList = ({ props }) => {
     thread,
     emptyPrefix,
     onPreview,
+    onAuthorSelect,
     accountInfo,
   } = props
 
@@ -32,6 +33,7 @@ const JobsList = ({ props }) => {
               active={active}
               accountInfo={accountInfo}
               onPreview={onPreview.bind(this, entry)}
+              onAuthorSelect={onAuthorSelect}
             />
           ))}
         </React.Fragment>
diff --git a/components/PagedContents/PostsList.js b/components/PagedContents/PostsList.js
@@ -19,6 +19,7 @@ const PostsList = ({ props }) => {
     emptyPrefix,
     onPreview,
     onUserSelect,
+    onAuthorSelect,
     accountInfo,
   } = props
 
@@ -34,6 +35,7 @@ const PostsList = ({ props }) => {
               active={active}
               accountInfo={accountInfo}
               onUserSelect={onUserSelect}
+              onAuthorSelect={onAuthorSelect}
               onPreview={onPreview.bind(this, entry)}
             />
           ))}
diff --git a/components/PagedContents/index.js b/components/PagedContents/index.js
@@ -23,6 +23,7 @@ const PagedContents = ({
   onPageChange,
   onPreview,
   onUserSelect,
+  onAuthorSelect,
   emptyPrefix,
   community,
   accountInfo,
@@ -38,6 +39,7 @@ const PagedContents = ({
       community={community}
       onPreview={onPreview}
       onUserSelect={onUserSelect}
+      onAuthorSelect={onAuthorSelect}
       accountInfo={accountInfo}
     />
 
@@ -73,6 +75,7 @@ PagedContents.propTypes = {
   onPageChange: PropTypes.func,
   onPreview: PropTypes.func,
   onUserSelect: PropTypes.func,
+  onAuthorSelect: PropTypes.func,
   accountInfo: PropTypes.shape({
     isLogin: PropTypes.bool,
     customization: PropTypes.shape({
@@ -93,6 +96,7 @@ PagedContents.defaultProps = {
   onPageChange: debug,
   onPreview: debug,
   onUserSelect: debug,
+  onAuthorSelect: debug,
   accountInfo: {
     isLogin: false,
     customization: PropTypes.shape({
diff --git a/components/PostItem/DigestView.js b/components/PostItem/DigestView.js
@@ -8,6 +8,7 @@ import AvatarsRow from 'components/AvatarsRow'
 import InlineTags from 'components/InlineTags'
 
 import {
+  AvatarWrapper,
   Avatar,
   TitleLink,
   LinkIcon,
@@ -25,10 +26,18 @@ import {
 
 // import { Wrapper } from './styles'
 
-const DigestView = ({ entry, cover, onPreview, onUserSelect }) => (
+const DigestView = ({
+  entry,
+  cover,
+  onPreview,
+  onUserSelect,
+  onAuthorSelect,
+}) => (
   <React.Fragment>
     {cover === 'avatar' ? (
-      <Avatar src={entry.author.avatar} />
+      <AvatarWrapper onClick={onAuthorSelect.bind(this, entry.author)}>
+        <Avatar src={entry.author.avatar} />
+      </AvatarWrapper>
     ) : (
       <Avatar
         src={entry.linkIcon || `${ICON_BASE}/radar_source/default_radar.svg`}
diff --git a/components/PostItem/index.js b/components/PostItem/index.js
@@ -25,6 +25,7 @@ const PostItem = ({
   active,
   onPreview,
   onUserSelect,
+  onAuthorSelect,
   accountInfo,
 }) => {
   // debug('customization --> ', customization)
@@ -45,9 +46,15 @@ const PostItem = ({
           cover={cover}
           onPreview={onPreview}
           onUserSelect={onUserSelect}
+          onAuthorSelect={onAuthorSelect}
         />
       ) : (
-        <ListView entry={entry} cover={cover} onPreview={onPreview} />
+        <ListView
+          entry={entry}
+          cover={cover}
+          onPreview={onPreview}
+          onAuthorSelect={onAuthorSelect}
+        />
       )}
     </Wrapper>
   )
@@ -79,11 +86,13 @@ PostItem.propTypes = {
   }),
   onPreview: PropTypes.func,
   onUserSelect: PropTypes.func,
+  onAuthorSelect: PropTypes.func,
 }
 
 PostItem.defaultProps = {
   onPreview: debug,
   onUserSelect: debug,
+  onAuthorSelect: debug,
   active: {},
   cover: 'avatar',
   accountInfo: {
diff --git a/components/PostItem/styles/index.js b/components/PostItem/styles/index.js
@@ -30,7 +30,11 @@ export const SecondHalf = styled.div`
   margin-left: 10px;
   margin-top: -10px;
 `
-
+export const AvatarWrapper = styled.div`
+  &:hover {
+    cursor: pointer;
+  }
+`
 export const Avatar = styled(Img)`
   ${cs.circle('42px')};
   fill: ${theme('thread.articleTitle')};
diff --git a/containers/Header/UserAccount.js b/containers/Header/UserAccount.js
@@ -33,7 +33,7 @@ const UserAccount = ({ isLogin, accountInfo }) => (
             </LoginBadge>
             <MenuDivider />
             <MenuItem onClick={previewAccount.bind(this, 'account')}>
-              预览
+              主页面板
             </MenuItem>
             <MenuLink
               href={`/user/${accountInfo.login}`}
diff --git a/containers/JobsThread/index.js b/containers/JobsThread/index.js
@@ -88,6 +88,7 @@ class JobsThreadContainer extends React.Component {
             active={activeJob}
             accountInfo={accountInfo}
             onPreview={logic.onPreview}
+            onAuthorSelect={logic.onUserSelect}
             onPageChange={logic.loadJobs}
           />
         </LeftPart>
diff --git a/containers/JobsThread/logic.js b/containers/JobsThread/logic.js
@@ -111,6 +111,12 @@ export const onC11NChange = option => {
   }
 }
 
+export const onUserSelect = user =>
+  dispatchEvent(EVENT.PREVIEW_OPEN, {
+    type: TYPE.PREVIEW_USER_VIEW,
+    data: user,
+  })
+
 // ###############################
 // Data & Error handlers
 // ###############################
diff --git a/containers/PostsThread/index.js b/containers/PostsThread/index.js
@@ -134,6 +134,7 @@ class PostsThreadContainer extends React.Component {
                 active={activePost}
                 accountInfo={accountInfo}
                 onUserSelect={logic.onUserSelect}
+                onAuthorSelect={logic.onUserSelect}
                 onPreview={logic.onPreview}
                 onPageChange={logic.loadPosts}
               />
diff --git a/containers/Preview/logic.js b/containers/Preview/logic.js
@@ -3,6 +3,7 @@ import {
   $solver,
   makeDebugger,
   EVENT,
+  TYPE,
   holdPage,
   unholdPage,
   dispatchEvent,
@@ -44,16 +45,21 @@ const DataResolver = [
     match: asyncRes(EVENT.PREVIEW_OPEN),
     action: res => {
       const payload = res[EVENT.PREVIEW_OPEN]
-
       /*
          debug('should open payload thread: ', payload.thread)
          debug('should open payload id: ', payload.data.id)
          debug('payload curCommunity: ', store.curCommunity.raw)
        */
-      Global.innerWidth <= cs.mediaBreakPoints.mobile
+
       if (Global.innerWidth <= cs.mediaBreakPoints.tablet) {
-        const { thread, data } = payload
-        const targetUrl = `/${store.curCommunity.raw}/${thread}/${data.id}`
+        const { thread, data, type } = payload
+        let targetUrl
+        if (type === TYPE.PREVIEW_USER_VIEW) {
+          targetUrl = `/user/${data.login}`
+        } else {
+          targetUrl = `/${store.curCommunity.raw}/${thread}/${data.id}`
+        }
+
         Global.location.href = targetUrl
         return false
       }
diff --git a/containers/UserLister/styles/user_list.js b/containers/UserLister/styles/user_list.js
@@ -24,15 +24,23 @@ export const UserAvatar = styled(Img)`
   height: 55px;
   border-radius: 4px;
   display: block;
-`
 
+  ${cs.media.mobile`
+    width: 30px;
+    height: 30px;
+`};
+`
 export const UserBrief = styled.div`
   ${cs.flexColumnGrow('justify-between')};
   margin-left: 18px;
 `
 export const Title = styled.div`
   ${cs.flex('align-center')};
   color: ${theme('thread.articleTitle')};
+
+  ${cs.media.tablet`
+    ${cs.flexColumn('align-start')};
+  `};
 `
 export const Nickname = styled.div`
   font-size: 1rem;
@@ -41,6 +49,18 @@ export const Location = styled.div`
   ${cs.flex('align-center')};
   color: ${theme('thread.articleDigest')};
   margin-left: 10px;
+
+  ${cs.media.tablet`
+    ${cs.truncate('80px')};
+    margin-left: 0;
+    margin-bottom: 3px;
+  `};
+
+  ${cs.media.mobile`
+    ${cs.truncate('60px')};
+    margin-left: 0;
+    margin-bottom: 3px;
+  `};
 `
 export const GeoIcon = styled(Img)`
   fill: ${theme('thread.articleDigest')};
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
@@ -18,7 +18,6 @@ export const Wrapper = styled.article`
`18`	`18`	`border-bottom-color: ${theme('thread.articleDivider')};`
`19`	`19`
`20`	`20`	`&:hover {`
`21`		`- cursor: pointer;`
`22`	`21`	`background: ${({ hover }) => (hover ? theme('thread.articleHover') : '')};`
`23`	`22`	`}`
`24`	`23`	`