chore: Merge branch 'dev'

Author: mydearxym

components/AvatarsRow/index.js

@@ -29,6 +29,20 @@ const validUser = R.compose(
   R.isNil
 )
 
+const getUniqueArray = (arr, comp) => {
+  const unique = arr
+    .map(e => e[comp])
+
+    // store the keys of the unique objects
+    .map((e, i, final) => final.indexOf(e) === i && i)
+
+    // eliminate the dead keys & store unique objects
+    .filter(e => arr[e])
+    .map(e => arr[e])
+
+  return unique
+}
+
 const AvatarsRow = ({
   users,
   total,
@@ -42,7 +56,7 @@ const AvatarsRow = ({
     return <span />
   }
 
-  users = R.filter(validUser, users)
+  users = R.filter(validUser, getUniqueArray(users, 'id'))
   const sortedUsers = reverse ? users : R.reverse(users)
 
   return (

containers/Comments/logic.js

@@ -34,6 +34,7 @@ const defaultArgs = {
 
 export const loadComents = (args = {}) => {
   // log('loadComents passed in: ', args)
+  if (store.loading || store.loadingFresh) return false
   args = R.mergeDeepRight(defaultArgs, args)
   args.id = store.viewingData.id
   args.userHasLogin = store.isLogin
@@ -123,7 +124,10 @@ export const createReplyComment = () => {
     })
   }
 
-  sr71$.mutate(S.replyComment, {
+  if (store.replying) return false
+
+  store.markState({ replying: true })
+  return sr71$.mutate(S.replyComment, {
     id: store.replyToComment.id,
     body: store.replyContent,
     community: store.curCommunity.raw,
@@ -308,6 +312,7 @@ const DataSolver = [
     action: () => {
       store.markState({
         showReplyBox: false,
+        replying: false,
         replyToComment: null,
       })
       scrollIntoEle('lists-info')
@@ -402,9 +407,10 @@ export const useInit = (_store, ssr) => {
   useEffect(() => {
     // log('effect init')
     store = _store
-    sub$ = sr71$.data().subscribe($solver(DataSolver, ErrSolver))
-
-    if (!ssr) loadComents({ filter: { sort: TYPE.DESC_INSERTED } })
+    if (!sub$) {
+      sub$ = sr71$.data().subscribe($solver(DataSolver, ErrSolver))
+      if (!ssr) loadComents({ filter: { sort: TYPE.DESC_INSERTED } })
+    }
 
     return () => {
       // log('effect uninit')
@@ -417,22 +423,3 @@ export const useInit = (_store, ssr) => {
     }
   }, [_store, ssr])
 }
-
-/*
-export const init = (_store, ssr = false) => {
-  store = _store
-
-  if (sub$) return false
-  sub$ = sr71$.data().subscribe($solver(DataSolver, ErrSolver))
-
-  if (!ssr) return loadComents({ filter: { sort: TYPE.DESC_INSERTED } })
-}
-
-export const uninit = () => {
-  if (store.loading || store.loadingFresh || !sub$) return false
-  stopDraftTimmer()
-  sr71$.stop()
-  sub$.unsubscribe()
-  sub$ = null
-}
-*/

containers/Comments/schema.js

@@ -34,7 +34,7 @@ const pagedComments = gql`
   }
 `
 const createComment = gql`
-  mutation(
+  mutation createComment(
     $community: String!
     $thread: CmsThread
     $id: ID!
@@ -64,7 +64,7 @@ const updateComment = gql`
 `
 
 const replyComment = gql`
-  mutation(
+  mutation replyComment(
     $community: String!
     $thread: CmsThread
     $id: ID!

containers/Footer/styles/bottom_info.js

@@ -12,6 +12,7 @@ export const Wrapper = styled.div`
 `
 export const InnerWrapper = styled.div`
   ${cs.flex('justify-between')};
+  align-items: center;
   width: 100%;
   max-width: ${cs.MAX_CONTENT_WIDTH};
   padding: 0 5vw;

containers/JobContent/styles/index.js

@@ -3,7 +3,7 @@ import styled from 'styled-components'
 import { theme, cs } from '@utils'
 
 export const Wrapper = styled.article`
-  ${cs.flex('justify-center')};
+  ${cs.flexGrow('justify-center')};
   padding: 20px;
   min-height: 300px;
   ${cs.media.tablet`
@@ -20,6 +20,7 @@ export const InnerWrapper = styled.div`
   `};
 `
 export const MainWrapper = styled.div`
+  flex-grow: 1;
   ${cs.media.tablet`
     width: 100%;
   `};
@@ -34,7 +35,7 @@ export const ArticleWrapper = styled.div`
   background: ${theme('preview.articleBg')};
   border-radius: 5px;
   padding: 35px 40px;
-  min-height: 60vh;
+  min-height: 200px;
   box-shadow: 0 1px 4px rgba(0, 0, 0, 0.04);
 
   ${cs.media.tablet`
@@ -60,7 +61,7 @@ export const MobileWrapper = styled.div`
   ${cs.flexColumn('align-center')};
   display: none;
   ${cs.media.tablet`
-${cs.flex()};
+    ${cs.flex()};
   `};
 `
 export const MobileContentCard = styled.div`

containers/PostContent/styles/index.js

@@ -3,7 +3,7 @@ import styled from 'styled-components'
 import { theme, cs } from '@utils'
 
 export const Wrapper = styled.article`
-  ${cs.flex('justify-center')};
+  ${cs.flexGrow('justify-center')};
   padding-top: 20px;
   min-height: 300px;
 
@@ -21,6 +21,8 @@ export const InnerWrapper = styled.div`
   `};
 `
 export const MainWrapper = styled.div`
+  flex-grow: 1;
+
   ${cs.media.tablet`
     width: 100%;
   `};
@@ -36,6 +38,7 @@ export const ArticleWrapper = styled.div`
   border-radius: 5px;
   padding: 35px 40px;
   box-shadow: 0 1px 4px rgba(0, 0, 0, 0.04);
+  min-height: 200px;
   ${cs.media.mobile`
     padding: 30px 20px;
     min-height: 20vh;

containers/RepoContent/styles/index.js

@@ -3,7 +3,7 @@ import styled from 'styled-components'
 import { theme, cs } from '@utils'
 
 export const Wrapper = styled.article`
-  ${cs.flex('justify-center')};
+  ${cs.flexGrow('justify-center')};
   padding: 20px;
   min-height: 300px;
   ${cs.media.tablet`
@@ -20,6 +20,7 @@ export const InnerWrapper = styled.div`
   `};
 `
 export const MainWrapper = styled.div`
+  flex-grow: 1;
   ${cs.media.tablet`
     width: 100%;
   `};
@@ -34,7 +35,7 @@ export const ArticleWrapper = styled.div`
   background: ${theme('preview.articleBg')};
   border-radius: 5px;
   padding: 35px 40px;
-  min-height: 60vh;
+  min-height: 200px;
   box-shadow: 0 1px 4px rgba(0, 0, 0, 0.04);
   ${cs.media.tablet`
     padding: 30px 20px;

containers/VideoContent/styles/index.js

@@ -3,7 +3,7 @@ import styled from 'styled-components'
 import { theme, cs } from '@utils'
 
 export const Wrapper = styled.article`
-  ${cs.flex('justify-center')};
+  ${cs.flexGrow('justify-center')};
   padding: 20px;
   min-height: 300px;
   ${cs.media.tablet`
@@ -20,6 +20,7 @@ export const InnerWrapper = styled.div`
   `};
 `
 export const MainWrapper = styled.div`
+  flex-grow: 1;
   ${cs.media.tablet`
     width: 100%;
   `};