chore: merge branch 'restructure' into dev

Author: mydearxym

.babelrc

@@ -53,18 +53,19 @@
       {
         "root": ["./"],
         "alias": {
-          "@containers": "./containers",
-          "@components": "./components",
-          "@services": "./services",
+          "@containers": "./src/containers",
+          "@components": "./src/components",
+          "@services": "./src/services",
           "@constant": "./utils/constant/",
-          "@hooks": "./components/Hooks",
+          "@hooks": "./src/hooks",
+          "@hoc": "./src/hoc",
           "@config": "./config",
-          "@stores": "./stores",
-          "@model": "./stores/SharedModel",
+          "@stores": "./src/stores",
+          "@model": "./src/stores/SharedModel",
           "@utils": "./utils",
-          "@schemas": "./containers/schemas",
-          "@Img": "./components/Img",
-          "@SvgIcons": "./components/SvgIcons"
+          "@schemas": "./src/schemas",
+          "@Img": "./src/components/Img",
+          "@SvgIcons": "./src/components/SvgIcons"
         }
       }
     ]

.travis.yml

@@ -31,6 +31,7 @@ before_script:
 script:
   # - codecov
   - rm -rf .next
+  - cp config/config.ci.json config/config.json
   - nvm exec 10.12.0 npm run build.ci
   - nvm exec 10.12.0 npm run test:ci
 

Makefile

@@ -20,15 +20,18 @@ dep:
 
 # shortcut for serve.local
 dev:
+	cp config/config.local.json config/config.json
 	npm run local
 
 build:
 	npm build
 
 build.dev:
+	cp config/config.dev.json config/config.json
 	npm run build.dev
 
 build.prod:
+	cp config/config.prod.json config/config.json
 	npm run build.prod
 
 serve.help:

config/assets.js

@@ -1,4 +1,6 @@
-export const ASSETS_ENDPOINT = 'https://cps-oss.oss-cn-shanghai.aliyuncs.com'
+import * as CONFIG from './config.json'
+
+export const { ASSETS_ENDPOINT } = CONFIG
 // process.env.ALI_OSS_ADDR
 // export const ASSETS_ENDPOINT = 'https://coderplanets.oss-cn-beijing.aliyuncs.com'
 

config/config.ci.json

@@ -0,0 +1,22 @@
+{
+  "// endpoint configs //": "--------------------------------",
+  "ASSETS_ENDPOINT": "https://cps-oss.oss-cn-shanghai.aliyuncs.com",
+  "GRAPHQL_ENDPOINT": "http://localhost:4001/graphiql",
+
+  "// general configs //": "--------------------------------",
+  "DEFAULT_THEME": "cyan",
+  "SENIOR_AMOUNT_THRESHOLD": 51.2,
+  "SPONSOR_AMOUNT_THRESHOLD": 3999,
+  "PAGE_SIZE": {
+    "S": 10,
+    "D": 20,
+    "M": 30,
+    "L": 40
+  },
+
+  "// contact configs //": "--------------------------------",
+  "EMAIL_CLUB": "club@group.coderplanets.com",
+  "EMAIL_SUPPORT": "support@group.coderplanets.com",
+  "EMAIL_HELLO": "hello@group.coderplanets.com",
+  "EMAIL_BUSINESS": "business@group.coderplanets.com"
+}

config/config.dev.json

@@ -0,0 +1,22 @@
+{
+  "// endpoint configs //": "--------------------------------",
+  "ASSETS_ENDPOINT": "https://cps-oss.oss-cn-shanghai.aliyuncs.com",
+  "GRAPHQL_ENDPOINT": "https://devapi.coderplanets.com/graphiql",
+
+  "// general configs //": "--------------------------------",
+  "DEFAULT_THEME": "cyan",
+  "SENIOR_AMOUNT_THRESHOLD": 51.2,
+  "SPONSOR_AMOUNT_THRESHOLD": 3999,
+  "PAGE_SIZE": {
+    "S": 10,
+    "D": 20,
+    "M": 30,
+    "L": 40
+  },
+
+  "// contact configs //": "--------------------------------",
+  "EMAIL_CLUB": "club@group.coderplanets.com",
+  "EMAIL_SUPPORT": "support@group.coderplanets.com",
+  "EMAIL_HELLO": "hello@group.coderplanets.com",
+  "EMAIL_BUSINESS": "business@group.coderplanets.com"
+}

config/config.json

@@ -0,0 +1,23 @@
+{
+  "// endpoint configs //": "--------------------------------",
+  "ASSETS_ENDPOINT": "https://cps-oss.oss-cn-shanghai.aliyuncs.com",
+  "GRAPHQL_ENDPOINT": "https://api.coderplanets.com/graphiql",
+  "//GRAPHQL_ENDPOINT": "http://localhost:4001/graphiql",
+
+  "// general configs //": "--------------------------------",
+  "DEFAULT_THEME": "cyan",
+  "SENIOR_AMOUNT_THRESHOLD": 51.2,
+  "SPONSOR_AMOUNT_THRESHOLD": 3999,
+  "PAGE_SIZE": {
+    "S": 10,
+    "D": 20,
+    "M": 30,
+    "L": 40
+  },
+
+  "// contact configs //": "--------------------------------",
+  "EMAIL_CLUB": "club@group.coderplanets.com",
+  "EMAIL_SUPPORT": "support@group.coderplanets.com",
+  "EMAIL_HELLO": "hello@group.coderplanets.com",
+  "EMAIL_BUSINESS": "business@group.coderplanets.com"
+}

config/config.local.json

@@ -0,0 +1,23 @@
+{
+  "// endpoint configs //": "--------------------------------",
+  "ASSETS_ENDPOINT": "https://cps-oss.oss-cn-shanghai.aliyuncs.com",
+  "GRAPHQL_ENDPOINT": "https://api.coderplanets.com/graphiql",
+  "//GRAPHQL_ENDPOINT": "http://localhost:4001/graphiql",
+
+  "// general configs //": "--------------------------------",
+  "DEFAULT_THEME": "cyan",
+  "SENIOR_AMOUNT_THRESHOLD": 51.2,
+  "SPONSOR_AMOUNT_THRESHOLD": 3999,
+  "PAGE_SIZE": {
+    "S": 10,
+    "D": 20,
+    "M": 30,
+    "L": 40
+  },
+
+  "// contact configs //": "--------------------------------",
+  "EMAIL_CLUB": "club@group.coderplanets.com",
+  "EMAIL_SUPPORT": "support@group.coderplanets.com",
+  "EMAIL_HELLO": "hello@group.coderplanets.com",
+  "EMAIL_BUSINESS": "business@group.coderplanets.com"
+}

config/config.prod.json

@@ -0,0 +1,22 @@
+{
+  "// endpoint configs //": "--------------------------------",
+  "ASSETS_ENDPOINT": "https://cps-oss.oss-cn-shanghai.aliyuncs.com",
+  "GRAPHQL_ENDPOINT": "https://api.coderplanets.com/graphiql",
+
+  "// general configs //": "--------------------------------",
+  "DEFAULT_THEME": "cyan",
+  "SENIOR_AMOUNT_THRESHOLD": 51.2,
+  "SPONSOR_AMOUNT_THRESHOLD": 3999,
+  "PAGE_SIZE": {
+    "S": 10,
+    "D": 20,
+    "M": 30,
+    "L": 40
+  },
+
+  "// contact configs //": "--------------------------------",
+  "EMAIL_CLUB": "club@group.coderplanets.com",
+  "EMAIL_SUPPORT": "support@group.coderplanets.com",
+  "EMAIL_HELLO": "hello@group.coderplanets.com",
+  "EMAIL_BUSINESS": "business@group.coderplanets.com"
+}

config/contacts.js

@@ -1,24 +1,8 @@
 /* config for different envs */
 import { ICON_CMD } from './assets'
+import * as CONFIG from './config.json'
 
-const getGraphQLEndpoint = () => {
-  switch (process.env.NODE_ENV) {
-    case 'production':
-      return 'https://api.coderplanets.com/graphiql'
-
-    case 'dev':
-      return 'https://devapi.coderplanets.com/graphiql'
-
-    case 'ci':
-      return 'http://localhost:4001/graphiql'
-
-    default:
-      return 'https://api.coderplanets.com/graphiql'
-    /* return 'http://localhost:4001/graphiql' */
-  }
-}
-
-export const GRAPHQL_ENDPOINT = getGraphQLEndpoint()
+export const { GRAPHQL_ENDPOINT } = CONFIG // getGraphQLEndpoint()
 
 export const SITE_URL = 'https://coderplanets.com'
 export const GITHUB_WEB_ADDR =

config/endpoint.js

@@ -1,18 +1,8 @@
 /*
    general behavior of the site
+   TODO:  move those to config
  */
 
-export const DEFAULT_THEME = 'cyan'
-export const SENIOR_AMOUNT_THRESHOLD = 51.2
-export const SPONSOR_AMOUNT_THRESHOLD = 5999
-
-export const PAGE_SIZE = {
-  S: 10,
-  D: 20,
-  M: 30,
-  L: 40,
-}
-
 export const WORD_LIMIT = {
   COMMENT: 300,
 }

config/general.js

@@ -1,12 +1,14 @@
-export {
+import * as CONFIG from './config.json'
+
+export const { EMAIL_CLUB, EMAIL_SUPPORT, EMAIL_HELLO, EMAIL_BUSINESS } = CONFIG
+export const {
   DEFAULT_THEME,
   SENIOR_AMOUNT_THRESHOLD,
   SPONSOR_AMOUNT_THRESHOLD,
   PAGE_SIZE,
-  WORD_LIMIT,
-  TAG_COLORS,
-  TAG_COLOR_ORDER,
-} from './general'
+} = CONFIG
+
+export { WORD_LIMIT, TAG_COLORS, TAG_COLOR_ORDER } from './general'
 
 export {
   SITE_URL,
@@ -23,13 +25,5 @@ export {
   DEFAULT_USER_AVATAR,
 } from './endpoint'
 
-export {
-  EMAIL_CLUB,
-  EMAIL_SUPPORT,
-  EMAIL_HELLO,
-  EMAIL_BUSINESS,
-} from './contacts'
-
 export { ASSETS_ENDPOINT, ICON_BASE, ICON_CMD, DEFAULT_ICON } from './assets'
-
 export { default as LABEL_POOL } from './label_pool'

config/index.js

@@ -12,10 +12,11 @@ const LRUCache = require('lru-cache')
 const helmet = require('helmet')
 const mobxReact = require('mobx-react')
 const R = require('ramda')
-
 // inspect graphql model
 const { express: voyagerMiddleware } = require('graphql-voyager/middleware')
 
+const CONFIG = require('./config/config.json')
+
 const app = next({ dev, quiet: false })
 const handle = app.getRequestHandler()
 const SERVE_PORT = process.env.SERVE_PORT || 3000
@@ -34,7 +35,7 @@ const ssrCache = new LRUCache({
 app.prepare().then(() => {
   const server = express()
   /* eslint-disable-next-line */
-  const { Sentry } = require('./services/sentry')({ release: app.buildId })
+  const { Sentry } = require('./src/services/sentry')({ release: app.buildId })
 
   server.use(Sentry.Handlers.requestHandler())
   server.use(cookieParser())
@@ -48,7 +49,7 @@ app.prepare().then(() => {
   server.use(helmet())
   server.use(
     '/model-graphs',
-    voyagerMiddleware({ endpointUrl: 'https://api.coderplanets.com/graphiql' })
+    voyagerMiddleware({ endpointUrl: CONFIG.GRAPHQL_ENDPOINT })
   )
 
   server.get('/_next/:page?', (req, res) => handle(req, res))

server.js

@@ -2,7 +2,7 @@ import React from 'react'
 import T from 'prop-types'
 
 import { ICON_CMD } from '@config'
-import withGuardian from '@components/HOC/withGuardian'
+import { withGuardian } from '@hoc'
 
 import { Option, OptionIcon, OptionTitle } from './styles'
 

components/ArticleActionsPanel/CommunitySetterOption.js renamed to src/components/ArticleActionsPanel/CommunitySetterOption.js

@@ -2,7 +2,7 @@ import React from 'react'
 import T from 'prop-types'
 
 import { ICON_CMD } from '@config'
-import withGuardian from '@components/HOC/withGuardian'
+import { withGuardian } from '@hoc'
 
 import { Option, OptionIcon, OptionTitle } from './styles'
 

components/ArticleActionsPanel/DeleteOption.js renamed to src/components/ArticleActionsPanel/DeleteOption.js

@@ -3,8 +3,8 @@ import T from 'prop-types'
 
 import { ICON_CMD } from '@config'
 import { THREAD } from '@constant'
+import { withGuardian } from '@hoc'
 
-import withGuardian from '@components/HOC/withGuardian'
 import { Option, OptionIcon, OptionTitle } from './styles'
 
 const EditOption = ({ thread, onEdit }) => (

components/ArticleActionsPanel/EditOption.js renamed to src/components/ArticleActionsPanel/EditOption.js

@@ -2,7 +2,7 @@ import React from 'react'
 import T from 'prop-types'
 
 import { ICON_CMD } from '@config'
-import withGuardian from '@components/HOC/withGuardian'
+import { withGuardian } from '@hoc'
 
 import { Option, OptionIcon, OptionTitle } from './styles'
 

components/ArticleActionsPanel/PinOption.js renamed to src/components/ArticleActionsPanel/PinOption.js

@@ -3,7 +3,7 @@ import T from 'prop-types'
 import R from 'ramda'
 
 import { ICON_CMD } from '@config'
-import withGuardian from '@components/HOC/withGuardian'
+import { withGuardian } from '@hoc'
 
 import { Option, OptionIcon, OptionTitle } from './styles'
 

components/ArticleActionsPanel/RefineOption.js renamed to src/components/ArticleActionsPanel/RefineOption.js

@@ -8,10 +8,9 @@ import React from 'react'
 import T from 'prop-types'
 
 import { buildLog } from '@utils'
+import { withGuardian } from '@hoc'
 
 import AvatarAdder from '@containers/AvatarAdder'
-
-import withGuardian from '@components/HOC/withGuardian'
 import Popover from '@components/Popover'
 import GithubUserCard from '@components/GithubUserCard'
 

components/ArticleActionsPanel/index.js renamed to src/components/ArticleActionsPanel/index.js

@@ -1,7 +1,7 @@
 import styled from 'styled-components'
 
 // import Img from '../../../components/Img'
-import { theme, cs } from '../../../utils'
+import { theme, cs } from '@utils'
 
 export const Wrapper = styled.div`
   ${cs.flex('justify-between')};