Skip to content

Commit

Permalink
Merge pull request tangly1024#271 from tangly1024/feat_comment_valine
Browse files Browse the repository at this point in the history
Waline评论插件
  • Loading branch information
tangly1024 authored May 27, 2022
2 parents b3d262e + 25c1ee3 commit 1415eca
Show file tree
Hide file tree
Showing 6 changed files with 57 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .env.local
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# 环境变量 @see https://www.nextjs.cn/docs/basic-features/environment-variables
NEXT_PUBLIC_VERSION=3.3.7
NEXT_PUBLIC_VERSION=3.3.8
5 changes: 3 additions & 2 deletions blog.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ const BLOG = {
BIO: '一个普通的干饭人🍚', // 作者简介
LINK: 'https://tangly1024.com', // 网站地址
KEYWORDS: 'Notion, 博客', // 网站关键词 英文逗号隔开
NOTION_PAGE_ID:
process.env.NOTION_PAGE_ID || '02ab3b8678004aa69e9e415905ef32a5', // Important page_id!!!Duplicate Template from https://www.notion.so/tanghh/02ab3b8678004aa69e9e415905ef32a5
NOTION_PAGE_ID: '29d5a78b858e4a3bbc13e51b5400fb82', // Important page_id!!!Duplicate Template from https://www.notion.so/tanghh/02ab3b8678004aa69e9e415905ef32a5
NOTION_ACCESS_TOKEN: process.env.NOTION_ACCESS_TOKEN || '', // Useful if you prefer not to make your database public
DEBUG: process.env.NEXT_PUBLIC_DEBUG || false, // 是否显示调试按钮

Expand Down Expand Up @@ -107,6 +106,8 @@ const BLOG = {
COMMENT_VALINE_SERVER_URLS: process.env.NEXT_PUBLIC_VALINE_SERVER_URLS || '', // 该配置适用于国内自定义域名用户, 海外版本会自动检测(无需手动填写) @see https://valine.js.org/configuration.html#serverURLs
COMMENT_VALINE_PLACEHOLDER: process.env.NEXT_PUBLIC_VALINE_PLACEHOLDER || '抢个沙发吧~', // 可以搭配后台管理评论 https://github.com/DesertsP/Valine-Admin 便于查看评论,以及邮件通知,垃圾评论过滤等功能

COMMENT_WALINE_SERVER_URL: process.env.NEXT_PUBLIC_WALINE_SERVER_URL || '', // Waline 评论 @see https://waline.js.org/guide/get-started.html

// 站点统计
ANALYTICS_BUSUANZI_ENABLE: true, // 展示网站阅读量、访问数 see http://busuanzi.ibruce.info/
ANALYTICS_BAIDU_ID: process.env.NEXT_PUBLIC_ANALYTICS_BAIDU_ID || '', // e.g 只需要填写百度统计的id,[baidu_id] -> https://hm.baidu.com/hm.js?[baidu_id]
Expand Down
5 changes: 5 additions & 0 deletions components/Comment.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { useRouter } from 'next/router'
import Tabs from '@/components/Tabs'
import { ReactCusdis } from 'react-cusdis'
import { useGlobal } from '@/lib/global'
import { WalineComponent } from './WalineComponent'

const GitalkComponent = dynamic(
() => {
Expand Down Expand Up @@ -40,6 +41,10 @@ const Comment = ({ frontMatter }) => {
<div id='comment' className='comment mt-5 text-gray-800 dark:text-gray-300'>
<Tabs>

{ BLOG.COMMENT_WALINE_SERVER_URL && (<div key='Waline'>
<WalineComponent/>
</div>) }

{BLOG.COMMENT_VALINE_APP_ID && (<div key='Valine' name='reply'>
<ValineComponent path={frontMatter.id}/>
</div>)}
Expand Down
43 changes: 43 additions & 0 deletions components/WalineComponent.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import React from 'react'
import { init } from '@waline/client'
import BLOG from '@/blog.config'
import { useRouter } from 'next/router'

/**
* @see https://waline.js.org/guide/get-started.html
* @param {*} props
* @returns
*/
export const WalineComponent = (props) => {
const walineInstanceRef = React.useRef(null)
const containerRef = React.createRef()
const router = useRouter()

React.useEffect(() => {
walineInstanceRef.current = init({
...props,
el: containerRef.current,
serverURL: BLOG.COMMENT_WALINE_SERVER_URL
})

return () => walineInstanceRef.current?.destroy()
}, [])

const updateWaline = url => {
walineInstanceRef.current?.update(props)
}

React.useEffect(() => {
walineInstanceRef.current?.update(props)
router.events.on('routeChangeComplete', updateWaline)
return () => {
router.events.off('routeChangeComplete', updateWaline)
}
}, [])

React.useEffect(() => {

}, [])

return <div ref={containerRef} />
}
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "notion-next",
"version": "3.3.7",
"version": "3.3.8",
"homepage": "https://github.com/tangly1024/NotionNext.git",
"license": "MIT",
"repository": {
Expand Down Expand Up @@ -51,6 +51,7 @@
"valine": "^1.4.18"
},
"devDependencies": {
"@waline/client": "^2.5.1",
"autoprefixer": "^10.2.5",
"eslint": "^7.26.0",
"eslint-config-next": "^11.0.0",
Expand Down
3 changes: 3 additions & 0 deletions pages/_app.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ import '@/styles/notion.css' // 重写部分样式
import 'prismjs/themes/prism-tomorrow.min.css'
import 'react-notion-x/build/third-party/equation.css'

// waline 评论插件
import '@waline/client/dist/waline.css'

import dynamic from 'next/dynamic'
import { GlobalContextProvider } from '@/lib/global'
import { DebugPanel } from '@/components/DebugPanel'
Expand Down

0 comments on commit 1415eca

Please sign in to comment.