Oct 18, 2021 · Oct 11, 2021 · Oct 11, 2021 · Oct 11, 2021 · Oct 11, 2021 · Oct 12, 2021
diff --git a/.eslintignore b/.eslintignore
 *.png
 *.jpeg
 *.txt
 *.md
 *.md
 *.ico
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
  },
  "dependencies": {
    "@babel/core": "^7.13.14",
    "@groupher/react-editor": "^1.1.26",
    "@groupher/react-editor": "^1.1.28",
    "@next/bundle-analyzer": "^9.4.4",
    "@sentry/browser": "5.17.0",
    "@sentry/node": "5.17.0",
    "resize-observer-polyfill": "^1.5.1",
    "response-time": "^2.3.2",
    "rxjs": "6.2.2",
    "sanitize-html": "^2.5.2",
    "scroll-into-view-if-needed": "1.5.0",
    "sentry-testkit": "^2.1.0",
    "store": "^2.0.12",
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/server/helper.js b/server/helper.js
  // do not cache in dev mode
  if (dev) {
    const pagePath = path || req.path
    console.log('# pagePath: ', pagePath)
    return app.render(req, res, pagePath, {
      ...req.query,
      ...req.params,
diff --git a/server/routes.js b/server/routes.js
 /* eslint-disable @typescript-eslint/no-var-requires */

 const router = require('express').Router()
 const R = require('ramda')

 const app = require('./app')
 const { renderAndCache } = require('./helper')
 // 将首页重定向到 HOME_PAGE
 router
  .route('/')
  .get((req, res) => renderAndCache({ req, res, path: '/community' }))
  .get((req, res) => renderAndCache({ req, res, path: '/index' }))

 // 来一杯
 router.route('/have-a-drink/:slug?').get((req, res) => {

 // 帖子页
 router.route('/post/:id').get((req, res) => {
  return renderAndCache({ req, res, path: '/post' })
  const { id } = req.params
  return renderAndCache({ req, res, path: `/post/${id}` })
 })

 // job 帖子页
 })

 // repo 帖子页
 router.route('/:community/repo/:id').get((req, res) => {
  return renderAndCache({ req, res, path: '/repo' })
 })
 //router.route('/:community/repo/:id').get((req, res) => {
 //  return renderAndCache({ req, res, path: '/repo' })
 //})

 // 创建新社区
 router.route('/create/community').get((req, res) => {
  return renderAndCache({ req, res, page: '/create/community' })
 router.route('/publish/community').get((req, res) => {
  return renderAndCache({ req, res, page: '/publish/community' })
 })

 // 创建新帖子
 router.route('/publish/post').get((req, res) => {
  return renderAndCache({ req, res, page: '/publish/post' })
 })

 // 创建新内容
 router.route('/create/article').get((req, res) => {
  return renderAndCache({ req, res, page: '/create/article' })
 // 编辑新帖子
 router.route('/update/post/:id').get((req, res) => {
  const { id } = req.params
  return renderAndCache({ req, res, path: `/update/post/${id}` })
 })

 // 创建新博客
 router.route('/create/blog').get((req, res) => {
  return renderAndCache({ req, res, page: '/create/blog' })
 router.route('/publish/blog').get((req, res) => {
  return renderAndCache({ req, res, page: '/publish/blog' })
 })

 // 创建新作品
 router.route('/create/works').get((req, res) => {
  return renderAndCache({ req, res, page: '/create/works' })
 router.route('/publish/works').get((req, res) => {
  return renderAndCache({ req, res, page: '/publish/works' })
 })

 // 所有社区

 // 社区主页
 router.route('/:community/:thread').get((req, res) => {
  if (
    R.has('preview', req.query) &&
    R.has('id', req.query) &&
    R.has('community', req.query)
  ) {
    const { community, preview, id } = req.query
    return res.redirect(`/${community}/${preview}/${id}`)
  }

  return renderAndCache({ req, res, path: '/community' })
  return renderAndCache({ req, res, path: '/index' })
 })

 router.route('*').get((req, res) => handle(req, res))
diff --git a/src/components/ArticleCard/Header.tsx b/src/components/ArticleCard/Header.tsx
 import { ICON } from '@/config'
 import { THREAD } from '@/constant'
 import { cutRest } from '@/utils/helper'
 importInlineTags from '@/components/InlineTags'
 importTagsList from '@/components/TagsList'
 import { Br } from '@/components/Common'

 import type { TProps as TIndex } from './index'
          <Br top={4} />
          <Title>{cutRest(title, 100)}</Title>
          <Br top={6} />
          <InlineTags items={articleTags} mLeft={0} size="medium" />
          <TagsList items={articleTags} mLeft={0} size="medium" />
        </Wrapper>
      )
    }

      return (
        <Wrapper>
          <InlineTags items={articleTags} mLeft={0} size="medium" />
          <TagsList items={articleTags} mLeft={0} size="medium" />
          <Br top={10} />
          <Title>
            <ExtraInfo>
diff --git a/src/components/ArticleEditToolbar/CopyrightSelector.js b/src/components/ArticleEditToolbar/CopyrightSelector.js
diff --git a/src/components/ArticleEditToolbar/index.js b/src/components/ArticleEditToolbar/index.js
diff --git a/src/components/ArticleEditToolbar/styles/copyright_selector.ts b/src/components/ArticleEditToolbar/styles/copyright_selector.ts
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,4 +8,5 @@ next-env.d.ts
		*.png
		*.jpeg
		*.txt
		*.md
		*.md
		*.ico
Original file line number	Diff line number	Diff line change
Expand Up		@@ -41,7 +41,7 @@
		},
		"dependencies": {
		"@babel/core": "^7.13.14",
		"@groupher/react-editor": "^1.1.26",
		"@groupher/react-editor": "^1.1.28",
		"@next/bundle-analyzer": "^9.4.4",
		"@sentry/browser": "5.17.0",
		"@sentry/node": "5.17.0",
Expand DownExpand Up		@@ -112,6 +112,7 @@
		"resize-observer-polyfill": "^1.5.1",
		"response-time": "^2.3.2",
		"rxjs": "6.2.2",
		"sanitize-html": "^2.5.2",
		"scroll-into-view-if-needed": "1.5.0",
		"sentry-testkit": "^2.1.0",
		"store": "^2.0.12",
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,6 +9,7 @@ const renderAndCache = ({ req, res, path }) => {
		// do not cache in dev mode
		if (dev) {
		const pagePath = path \|\| req.path
		console.log('# pagePath: ', pagePath)
		return app.render(req, res, pagePath, {
		...req.query,
		...req.params,
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,7 +1,6 @@
		/* eslint-disable @typescript-eslint/no-var-requires */

		const router = require('express').Router()
		const R = require('ramda')

		const app = require('./app')
		const { renderAndCache } = require('./helper')
Expand All		@@ -22,7 +21,7 @@ router.route('/oauth/').get((req, res) => renderAndCache({ req, res }))
		// 将首页重定向到 HOME_PAGE
		router
		.route('/')
		.get((req, res) => renderAndCache({ req, res, path: '/community' }))
		.get((req, res) => renderAndCache({ req, res, path: '/index' }))

		// 来一杯
		router.route('/have-a-drink/:slug?').get((req, res) => {
Expand DownExpand Up		@@ -85,7 +84,8 @@ router.route('/user/:userId').get((req, res) => {

		// 帖子页
		router.route('/post/:id').get((req, res) => {
		return renderAndCache({ req, res, path: '/post' })
		const { id } = req.params
		return renderAndCache({ req, res, path: `/post/${id}` })
		})

		// job 帖子页
Expand All		@@ -99,28 +99,34 @@ router.route('/:community/video/:id').get((req, res) => {
		})

		// repo 帖子页
		router.route('/:community/repo/:id').get((req, res) => {
		return renderAndCache({ req, res, path: '/repo' })
		})
		//router.route('/:community/repo/:id').get((req, res) => {
		// return renderAndCache({ req, res, path: '/repo' })
		//})

		// 创建新社区
		router.route('/create/community').get((req, res) => {
		return renderAndCache({ req, res, page: '/create/community' })
		router.route('/publish/community').get((req, res) => {
		return renderAndCache({ req, res, page: '/publish/community' })
		})

		// 创建新帖子
		router.route('/publish/post').get((req, res) => {
		return renderAndCache({ req, res, page: '/publish/post' })
		})

		// 创建新内容
		router.route('/create/article').get((req, res) => {
		return renderAndCache({ req, res, page: '/create/article' })
		// 编辑新帖子
		router.route('/update/post/:id').get((req, res) => {
		const { id } = req.params
		return renderAndCache({ req, res, path: `/update/post/${id}` })
		})

		// 创建新博客
		router.route('/create/blog').get((req, res) => {
		return renderAndCache({ req, res, page: '/create/blog' })
		router.route('/publish/blog').get((req, res) => {
		return renderAndCache({ req, res, page: '/publish/blog' })
		})

		// 创建新作品
		router.route('/create/works').get((req, res) => {
		return renderAndCache({ req, res, page: '/create/works' })
		router.route('/publish/works').get((req, res) => {
		return renderAndCache({ req, res, page: '/publish/works' })
		})

		// 所有社区
Expand All		@@ -137,16 +143,7 @@ router.route('/:community/help-center').get((req, res) => {

		// 社区主页
		router.route('/:community/:thread').get((req, res) => {
		if (
		R.has('preview', req.query) &&
		R.has('id', req.query) &&
		R.has('community', req.query)
		) {
		const { community, preview, id } = req.query
		return res.redirect(`/${community}/${preview}/${id}`)
		}

		return renderAndCache({ req, res, path: '/community' })
		return renderAndCache({ req, res, path: '/index' })
		})

		router.route('*').get((req, res) => handle(req, res))
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,7 +4,7 @@ import type { TJob, TRadar } from '@/spec'
		import { ICON } from '@/config'
		import { THREAD } from '@/constant'
		import { cutRest } from '@/utils/helper'
		importInlineTags from '@/components/InlineTags'
		importTagsList from '@/components/TagsList'
		import { Br } from '@/components/Common'

		import type { TProps as TIndex } from './index'
Expand DownExpand Up		@@ -33,7 +33,7 @@ const Header: FC<TIndex> = ({ data, thread }) => {
		<Br top={4} />
		<Title>{cutRest(title, 100)}</Title>
		<Br top={6} />
		<InlineTags items={articleTags} mLeft={0} size="medium" />
		<TagsList items={articleTags} mLeft={0} size="medium" />
		</Wrapper>
		)
		}
Expand All		@@ -43,7 +43,7 @@ const Header: FC<TIndex> = ({ data, thread }) => {

		return (
		<Wrapper>
		<InlineTags items={articleTags} mLeft={0} size="medium" />
		<TagsList items={articleTags} mLeft={0} size="medium" />
		<Br top={10} />
		<Title>
		<ExtraInfo>
Expand Down