refactor(misc): missing schema & style

Author: mydearxym

components/Footer/styles/index.js

@@ -1,10 +1,10 @@
 import styled from 'styled-components'
-import { cs } from '../../../utils'
+import { cs, theme } from '../../../utils'
 
 const Link = styled.a`
   text-decoration: none;
   font-weight: bolder;
-  color: #9fc0c5;
+  color: ${theme('banner.title')};
   transition: color 0.3s;
   &:hover {
     text-decoration: underline;
@@ -27,15 +27,15 @@ export const BeianInfo = styled.div`
 export const Divider = styled.div`
   margin-left: 12px;
   margin-right: 12px;
-  color: #b9cace;
+  color: ${theme('banner.title')};
 `
 
 export const GitSource = styled.div`
   margin-top: 2px;
   ${cs.smokey};
 `
 export const Powerby = styled.div`
-  color: #b7c6d0;
+  color: ${theme('banner.title')};
 `
 
 export const PowerbyLink = styled(Link)``

containers/CommunitiesBanner/index.js

@@ -104,6 +104,10 @@ class CommunitiesBannerContainer extends React.Component {
     logic.init(communitiesBanner)
   }
 
+  componentWillUnmount() {
+    logic.uninit()
+  }
+
   render() {
     const { communitiesBanner } = this.props
     const { curRoute } = communitiesBanner

containers/CommunitiesBanner/logic.js

@@ -23,9 +23,10 @@ const debug = makeDebugger('L:communitiesBanner')
 /* eslint-enable no-unused-vars */
 
 let store = null
+let sub$ = null
 
 export function loadCommunities() {
-  sr71$.query(S.pagedCommunities, { filter: {} })
+  sr71$.query(S.pagedCommunities, { filter: {}, userHasLogin: false })
 }
 
 export function loadTags() {
@@ -91,8 +92,10 @@ const DataSolver = [
   },
   {
     match: asyncRes('pagedCategories'),
-    action: ({ pagedCategories: { totalCount } }) =>
-      store.markState({ categoriesTotalCount: totalCount }),
+    action: ({ pagedCategories: { totalCount } }) => {
+      debug('get pagedCategories: ', totalCount)
+      store.markState({ categoriesTotalCount: totalCount })
+    },
   },
   {
     match: asyncRes('pagedPosts'),
@@ -148,7 +151,17 @@ const ErrSolver = [
   },
 ]
 
-export function init(selectedStore) {
-  store = selectedStore
+export function init(_store) {
+  store = _store
+  if (sub$) return loadCommunities() // loadCategories()
   sr71$.data().subscribe($solver(DataSolver, ErrSolver))
+  loadCommunities()
+  // loadCategories()
+}
+
+export function uninit() {
+  if (!sub$) return false
+  debug('===== do uninit')
+  sub$.unsubscribe()
+  sub$ = null
 }

containers/CommunitiesContent/logic.js

@@ -42,6 +42,7 @@ export function loadCommunities(page = 1) {
   const size = PAGE_SIZE.D
   const args = {
     filter: { page, size },
+    userHasLogin: false,
   }
   scrollIntoEle(TYPE.APP_HEADER_ID)
 
@@ -54,7 +55,6 @@ export function loadCommunities(page = 1) {
 
 export function loadCategories(page = 1) {
   scrollIntoEle(TYPE.APP_HEADER_ID)
-  console.log('the fuck store: ', store)
   store.markRoute({ page })
   store.markState({ categoriessLoading: true })
 
@@ -112,14 +112,14 @@ export function loadCommunitiesIfOnClient() {
 export function loadTagsIfOnClient() {
   if (!store.pagedTags) {
     debug('loadTagsIfOnClient')
-    loadTags()
+    // loadTags()
   }
 }
 
 export function loadThreadsIfOnClient() {
   if (!store.pagedThreads) {
     debug('loadThreadsIfOnClient')
-    loadThreads()
+    // loadThreads()
   }
 }
 
@@ -244,11 +244,7 @@ const DataSolver = [
     match: asyncRes('pagedCommunities'),
     action: ({ pagedCommunities }) => {
       cancleLoading()
-      debug(
-        '## loadCommunities in the client .... pagedCommunities: ',
-        pagedCommunities.pageNumber
-      )
-
+      debug('pagedCommunities: ', pagedCommunities)
       store.markState({ pagedCommunities })
     },
   },
@@ -398,10 +394,10 @@ const ErrSolver = [
 export function init(_store) {
   store = _store
 
-  if (sub$) return loadCategories()
+  if (sub$) return loadCommunities() // loadCategories()
   sub$ = sr71$.data().subscribe($solver(DataSolver, ErrSolver))
 
-  loadCategories()
+  loadCommunities() // loadCategories()
 }
 
 export function uninit() {

containers/CommunitiesContent/styles/index.js

@@ -1,13 +1,15 @@
 import styled from 'styled-components'
 
 import { Img } from '../../../components'
+import { theme } from '../../../utils'
+
+export const Wrapper = styled.div``
 
 export const CommunityIcon = styled(Img)`
+  fill: ${theme('banner.title')};
   width: 30px;
   height: 30px;
 `
-export const Wrapper = styled.div``
-
 export const OperationWrapper = styled.div`
   display: flex;
   justify-content: center;

containers/Sidebar/styles/menu.js

@@ -31,7 +31,7 @@ export const MenuItemEach = styled.div`
   height: 50px;
   width: 100%;
   box-sizing: border-box;
-  color: ${theme('sidebar.menu_link')};
+  color: ${theme('sidebar.menuLink')};
 `
 export const MenuRow = styled.div`
   display: flex;
@@ -42,7 +42,7 @@ export const MenuRow = styled.div`
   padding-left: 15px;
 
   a {
-    color: ${theme('sidebar.menu_link')};
+    color: ${theme('sidebar.menuLink')};
     display: block;
     flex-grow: 1;
     max-width: 50%;
@@ -52,20 +52,20 @@ export const MenuRow = styled.div`
   &:hover {
     background-color: #047fbd;
     a {
-      color: ${theme('sidebar.menu_link')};
+      color: ${theme('sidebar.menuLink')};
     }
   }
 `
 
 export const MenuTitle = styled.div`
-  color: ${theme('sidebar.menu_link')};
+  color: ${theme('sidebar.menuLink')};
   display: block;
   flex-grow: 1;
   max-width: 50%;
   opacity: 0.6;
 
   &:hover {
-    color: ${theme('sidebar.menu_link')};
+    color: ${theme('sidebar.menuLink')};
     cursor: pointer;
   }
 `
@@ -104,23 +104,24 @@ export const MiniChartText = styled.div`
 `
 
 export const MenuItemIcon = styled(Img)`
+  fill: ${theme('sidebar.menuLink')};
   opacity: ${props => (props.active ? 1 : 0.5)};
   width: 22px;
   height: 22px;
   display: block;
 `
 export const MenuCommunitiesIcon = styled(MenuItemIcon)`
-  fill: ${theme('sidebar.menu_link')};
+  fill: ${theme('sidebar.menuLink')};
 `
 
+// margin-top: ${props => (props.active ? '10px' : '0px')};
+// margin-bottom: ${props => (props.active ? '10px' : '0px')};
 export const ChildrenWrapper = styled.div`
   padding-left: 23px;
   padding-top: ${props => (props.active ? '10px' : '0px')};
   padding-bottom: ${props => (props.active ? '10px' : '0px')};
   border-left: 1px solid #007baa;
   background: #006a9f;
-  margin-top: ${props => (props.active ? '10px' : '0px')};
-  margin-bottom: ${props => (props.active ? '10px' : '0px')};
   overflow: hidden;
   max-height: ${props => (props.active ? '400px' : '0px')};
   transition: max-height 0.5s ease-in-out;

containers/ThemeWrapper/AntOverWrite.js

@@ -237,6 +237,7 @@ const AntOverWrite = styled.div`
     background-color: ${theme('pagination.item_bg')};
     border-color: ${theme('pagination.item_border_color')};
   }
+
   .ant-pagination-item a {
     color: ${theme('pagination.inactive_num')};
   }
@@ -263,6 +264,7 @@ const AntOverWrite = styled.div`
   .ant-pagination-item-active {
     background: ${theme('button.primary')};
     border-radius: 50%;
+    border-color: ${theme('button.primary')};
   }
 
   .ant-pagination-item-active a {
@@ -318,9 +320,6 @@ const AntOverWrite = styled.div`
   }
 
   .ant-btn-red {
-    color: white;
-    background-color: tomato;
-    border-color: tomato;
   }
   .ant-btn-background-ghost.ant-btn-red {
     color: tomato;

containers/schemas/fragments/base.js

@@ -2,22 +2,9 @@ export const community = `
   id
   title
   raw
+  index
   desc
   logo
-  subscribersCount
-  insertedAt
-  updatedAt
-`
-
-export const category = `
-  id
-  title
-  raw
-`
-export const thread = `
-  id
-  title
-  raw
 `
 export const post = `
   id
@@ -85,11 +72,17 @@ export const tag = `
   id
   title
   color
+  thread
+  topic {
+    id
+    raw
+  }
 `
 export const author = `
   id
-  avatar
+  login
   nickname
+  avatar
 `
 export const user = `
   ${author}
@@ -111,10 +104,20 @@ export const user = `
   followersCount
   followingsCount
 `
+export const c11n = `
+  bannerLayout
+  contentsLayout
+  contentDivider
+  markViewed
+  displayDensity
+`
 export const achievement = `
   reputation
   contentsStaredCount
   contentsFavoritedCount
+  donateMember
+  seniorMember
+  sponsorMember
 `
 export const userBackgrounds = `
   workBackgrounds {
@@ -145,6 +148,7 @@ export const comment = `
     id
     nickname
     avatar
+    login
   }
   likesCount
   dislikesCount

containers/schemas/fragments/index.js

@@ -10,15 +10,14 @@
 
 import {
   community,
-  category,
-  thread,
   post,
   job,
   video,
   repo,
   author,
   tag,
   user,
+  c11n,
   achievement,
   userBackgrounds,
   userContributes,
@@ -31,8 +30,6 @@ import { pagedPosts, pagedJobs, pagedVideos, pagedRepos } from './paged'
 
 const F = {
   community,
-  category,
-  thread,
   post,
   job,
   video,
@@ -45,6 +42,7 @@ const F = {
   pagedRepos,
 
   user,
+  c11n,
   achievement,
   userBackgrounds,
   userContributes,

containers/schemas/pages/cheatsheet.js

@@ -0,0 +1,22 @@
+// import F from '../fragments'
+
+const cheatsheet = `
+  query($community: String!) {
+    cheatsheet(community: $community) {
+      id
+      views
+      readme
+      lastSync
+      contributors {
+        avatar
+        nickname
+        htmlUrl
+        bio
+        location
+        company
+      }
+    }
+  }
+`
+
+export default cheatsheet