Merge branch 'tangly1024:main' into main

2026-05-14 07:26:52 +00:00 · 2023-01-03 20:20:50 +08:00
parent 57f343b06c c88d4969cc
commit ed5636ef20
18 changed files with 119 additions and 17 deletions
--- a/.env.local
+++ b/.env.local
@@ -1,2 +1,2 @@
 # 环境变量 @see https://www.nextjs.cn/docs/basic-features/environment-variables
-NEXT_PUBLIC_VERSION=3.7.2
+NEXT_PUBLIC_VERSION=3.7.3
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@ yarn-error.log*
 # dev
 /data.json
 /yarn.lock
+/pnpm-lock.yaml
 .idea
 .vscode

--- a/README.md
+++ b/README.md
@@ -71,6 +71,10 @@

  <td align="center"><a href="https://github.com/Vixcity"><img src="https://avatars.githubusercontent.com/u/57704177" width="64px;"  alt="Vixcity"/><br/><sub><b>Vixcity</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=Vixcity" title="Vixcity" >🔧 🐛</a></td>

+  <td align="center"><a href="https://github.com/ipatpat"><img src="https://avatars.githubusercontent.com/u/39089551" width="64px;"  alt="ipatpat"/><br/><sub><b>ipatpat</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=ipatpat" title="ipatpat" >🔧 🐛</a></td>
+
+  <td align="center"><a href="https://github.com/xloong"><img src="https://avatars.githubusercontent.com/u/8479955" width="64px;"  alt="xloong"/><br/><sub><b>xloong</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=xloong" title="xloong" >🔧 🐛</a></td>
+
 </tr>
 </table>

--- a/blog.config.js
+++ b/blog.config.js
@@ -30,6 +30,9 @@ const BLOG = {
  CUSTOM_FONT_SANS: ['LXGW WenKai'], // 自定义无衬线字体
  CUSTOM_FONT_SERIF: ['LXGW WenKai'], // 自定义衬线字体

+  // 侧栏布局 是否反转(左变右,右变左) 已支持主题: hexo next medium fukasawa example
+  LAYOUT_SIDEBAR_REVERSE: false,
+
  // 一个小插件展示你的facebook fan page~ @see https://tw.andys.pro/article/add-facebook-fanpage-notionnext
  FACEBOOK_PAGE_TITLE: process.env.NEXT_PUBLIC_FACEBOOK_PAGE_TITLE || null, // 邊欄 Facebook Page widget 的標題欄，填''則無標題欄 e.g FACEBOOK 粉絲團'
  FACEBOOK_PAGE: process.env.NEXT_PUBLIC_FACEBOOK_PAGE || null, // Facebook Page 的連結 e.g https://www.facebook.com/tw.andys.pro
@@ -76,6 +79,30 @@ const BLOG = {
  // https://cdn.jsdelivr.net/npm/live2d-widget-model-haruto@1.0.5/assets/haruto.model.json
  WIDGET_PET_SWITCH_THEME: false, // 点击宠物挂件切换博客主题

+  // 音乐播放插件
+  MUSIC_PLAYER: process.env.NEXT_PUBLIC_MUSIC_PLAYER || false, // 是否使用音乐播放插件
+  MUSIC_PLAYER_VISIBLE: process.env.NEXT_PUBLIC_MUSIC_PLAYER_VISIBLE || true, // 是否在左下角显示播放和切换，如果使用播放器，打开自动播放再隐藏，就会以类似背景音乐的方式播放，无法取消和暂停
+  MUSIC_PLAYER_AUTO_PLAY: process.env.NEXT_PUBLIC_MUSIC_PLAYER_AUTO_PLAY || true, // 是否自动播放，不过自动播放时常不生效（移动设备不支持自动播放）
+  MUSIC_PLAYER_SHOW_LRC: process.env.NEXT_PUBLIC_MUSIC_PLAYER_SHOW_LRC || false, // 是否展示歌词（前提是有配置歌词路径，对 meting 无效）
+  MUSIC_PLAYER_ORDER: 'list', // 默认播放方式，顺序 list，随机 random
+  MUSIC_PLAYER_AUDIO_LIST: [ // 示例音乐列表。除了以下配置外，还可配置歌词，具体配置项看此文档 https://aplayer.js.org/#/zh-Hans/
+    {
+      name: '风を共に舞う気持ち',
+      artist: 'Falcom Sound Team jdk',
+      url: 'https://music.163.com/song/media/outer/url?id=731419.mp3',
+      cover: 'https://p2.music.126.net/kn6ugISTonvqJh3LHLaPtQ==/599233837187278.jpg'
+    },
+    {
+      name: '王都グランセル',
+      artist: 'Falcom Sound Team jdk',
+      url: 'https://music.163.com/song/media/outer/url?id=731355.mp3',
+      cover: 'https://p1.music.126.net/kn6ugISTonvqJh3LHLaPtQ==/599233837187278.jpg'
+    }
+  ],
+  MUSIC_PLAYER_METING: process.env.NEXT_PUBLIC_MUSIC_PLAYER_METING || false, // 是否要开启 MetingJS，从平台获取歌单。会覆盖自定义的 MUSIC_PLAYER_AUDIO_LIST，更多配置信息：https://github.com/metowolf/MetingJS
+  MUSIC_PLAYER_METING_SERVER: process.env.NEXT_PUBLIC_MUSIC_PLAYER_METING_SERVER || 'netease', // 音乐平台，[netease, tencent, kugou, xiami, baidu]
+  MUSIC_PLAYER_METING_ID: process.env.NEXT_PUBLIC_MUSIC_PLAYER_METING_ID || '60198', // 对应歌单的 id
+
  // ----> 评论互动 可同时开启多个支持 WALINE VALINE GISCUS CUSDIS UTTERRANCES GITALK

  // twikoo
--- a/components/CommonScript.js
+++ b/components/CommonScript.js
@@ -101,6 +101,10 @@ const CommonScript = () => {
              }}
      />
    </>)}
+
+    {/* 引入音乐播放 */}
+    {JSON.parse(BLOG.MUSIC_PLAYER) && <script async src="https://cdnjs.cloudflare.com/ajax/libs/aplayer/1.10.1/APlayer.min.js" />}
+    {JSON.parse(BLOG.MUSIC_PLAYER) && JSON.parse(BLOG.MUSIC_PLAYER_METING) && <script async src="https://cdnjs.cloudflare.com/ajax/libs/meting/2.0.1/Meting.min.js" />}
  </>)
 }

--- a/components/MusicPlayer.js
+++ b/components/MusicPlayer.js
@@ -0,0 +1,7 @@
+import dynamic from 'next/dynamic'
+
+const MusicPlayer = dynamic(
+  () => import('@/components/Player'),
+  { ssr: false }
+)
+export default MusicPlayer
--- a/components/Player.js
+++ b/components/Player.js
@@ -0,0 +1,52 @@
+import React from 'react'
+import BLOG from '@/blog.config'
+
+const Player = () => {
+  const [player, setPlayer] = React.useState()
+  const ref = React.useRef(null)
+
+  const showLrc = JSON.parse(BLOG.MUSIC_PLAYER_SHOW_LRC)
+  const playerVisible = JSON.parse(BLOG.MUSIC_PLAYER_VISIBLE)
+  const autoPlay = JSON.parse(BLOG.MUSIC_PLAYER_AUTO_PLAY)
+
+  const meting = JSON.parse(BLOG.MUSIC_PLAYER_METING)
+
+  React.useEffect(() => {
+    if (!meting && window.APlayer) {
+      setPlayer(new window.APlayer({
+        container: ref.current,
+        fixed: true,
+        showlrc: showLrc,
+        autoplay: autoPlay,
+        order: BLOG.MUSIC_PLAYER_ORDER,
+        audio: BLOG.MUSIC_PLAYER_AUDIO_LIST
+      }))
+    }
+    return () => {
+      setPlayer(undefined)
+    }
+  }, [])
+
+  return (
+    <div className={playerVisible ? 'visible' : 'invisible'}>
+      <link
+        rel="stylesheet"
+        type="text/css"
+        href="https://cdnjs.cloudflare.com/ajax/libs/aplayer/1.10.1/APlayer.min.css"
+      />
+      {meting
+        ? <meting-js
+            fixed
+            type="playlist"
+            autoplay={autoPlay}
+            order={BLOG.MUSIC_PLAYER_ORDER}
+            server={BLOG.MUSIC_PLAYER_METING_SERVER}
+            id={BLOG.MUSIC_PLAYER_METING_ID}
+          />
+        : <div ref={ref} data-player={player} />
+      }
+    </div>
+  )
+}
+
+export default Player
--- a/components/ThemeSwitch.js
+++ b/components/ThemeSwitch.js
@@ -15,7 +15,7 @@ export function ThemeSwitch() {

  return (<>
        <Draggable>
-            <div id="draggableBox" style={{ left: '10px', top: '90vh' }} className="fixed text-white bg-black z-50 rounded-lg shadow-card">
+            <div id="draggableBox" className="fixed left-1 bottom-20 text-white bg-black z-50 rounded-lg shadow-card">
                <div className="p-2 flex items-center">
                    <i className='fas fa-arrows cursor-move px-2' />
                    {/* <div className='uppercase font-sans whitespace-nowrap cursor-pointer ' onClick={switchTheme}> {theme}</div> */}
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "notion-next",
-  "version": "3.7.2",
+  "version": "3.7.3",
  "homepage": "https://github.com/tangly1024/NotionNext.git",
  "license": "MIT",
  "repository": {
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -25,6 +25,7 @@ import { GlobalContextProvider } from '@/lib/global'
 import { DebugPanel } from '@/components/DebugPanel'
 import { ThemeSwitch } from '@/components/ThemeSwitch'
 import { Fireworks } from '@/components/Fireworks'
+import MusicPlayer from '@/components/MusicPlayer'

 const Ackee = dynamic(() => import('@/components/Ackee'), { ssr: false })
 const Gtag = dynamic(() => import('@/components/Gtag'), { ssr: false })
@@ -47,6 +48,7 @@ const MyApp = ({ Component, pageProps }) => {
        {BLOG.ADSENSE_GOOGLE_ID && <GoogleAdsense />}
        {BLOG.FACEBOOK_APP_ID && BLOG.FACEBOOK_PAGE_ID && <Messenger />}
        {JSON.parse(BLOG.FIREWORKS) && <Fireworks />}
+        {JSON.parse(BLOG.MUSIC_PLAYER) && <MusicPlayer />}
    </>

  // 默认Webfont:  请在font.js文件中检查font-family 新版改从npm本地导入；
--- a/pages/sitemap.xml.js
+++ b/pages/sitemap.xml.js
@@ -8,32 +8,32 @@ export const getServerSideProps = async (ctx) => {
  const defaultFields = [
    {
      loc: `${BLOG.LINK}`,
-      lastmod: new Date(),
+      lastmod: new Date().toISOString().split('T')[0],
      changefreq: 'daily',
      priority: '0.7'
    }, {
      loc: `${BLOG.LINK}/archive`,
-      lastmod: new Date(),
+      lastmod: new Date().toISOString().split('T')[0],
      changefreq: 'daily',
      priority: '0.7'
    }, {
      loc: `${BLOG.LINK}/category`,
-      lastmod: new Date(),
+      lastmod: new Date().toISOString().split('T')[0],
      changefreq: 'daily',
      priority: '0.7'
    }, {
      loc: `${BLOG.LINK}/feed`,
-      lastmod: new Date(),
+      lastmod: new Date().toISOString().split('T')[0],
      changefreq: 'daily',
      priority: '0.7'
    }, {
      loc: `${BLOG.LINK}/search`,
-      lastmod: new Date(),
+      lastmod: new Date().toISOString().split('T')[0],
      changefreq: 'daily',
      priority: '0.7'
    }, {
      loc: `${BLOG.LINK}/tag`,
-      lastmod: new Date(),
+      lastmod: new Date().toISOString().split('T')[0],
      changefreq: 'daily',
      priority: '0.7'
    }
@@ -41,7 +41,7 @@ export const getServerSideProps = async (ctx) => {
  const postFields = allPages?.map(post => {
    return {
      loc: `${BLOG.LINK}/${post.slug}`,
-      lastmod: new Date(post?.date?.start_date || post?.createdTime),
+      lastmod: new Date(post?.date?.start_date || post?.createdTime).toISOString().split('T')[0],
      changefreq: 'daily',
      priority: '0.7'
    }
--- a/themes/example/LayoutBase.js
+++ b/themes/example/LayoutBase.js
@@ -6,6 +6,7 @@ import { Footer } from './components/Footer'
 import { Title } from './components/Title'
 import { SideBar } from './components/SideBar'
 import JumpToTopButton from './components/JumpToTopButton'
+import BLOG from '@/blog.config'
 /**
 * 基础布局 采用左右两侧布局，移动端使用顶部导航栏

@@ -28,7 +29,7 @@ const LayoutBase = props => {

                <Title {...props} />

-                <div className="container mx-auto justify-center md:flex items-start py-8 px-2">
+                <div className={(BLOG.LAYOUT_SIDEBAR_REVERSE ? 'flex-row-reverse' : '') + ' container mx-auto justify-center md:flex items-start py-8 px-2'}>

                    <div className='w-full max-w-3xl xl:px-14 lg:px-4 '>{children}</div>

--- a/themes/fukasawa/LayoutBase.js
+++ b/themes/fukasawa/LayoutBase.js
@@ -2,6 +2,7 @@ import CommonHead from '@/components/CommonHead'
 import TopNav from './components/TopNav'
 import AsideLeft from './components/AsideLeft'
 import Live2D from '@/components/Live2D'
+import BLOG from '@/blog.config'

 /**
 * 基础布局 采用左右两侧布局，移动端使用顶部导航栏
@@ -27,7 +28,7 @@ const LayoutBase = (props) => {
  return (<>
    <CommonHead meta={meta} />
    <TopNav {...props}/>
-    <div className='flex'>
+    <div className={(BLOG.LAYOUT_SIDEBAR_REVERSE ? 'flex-row-reverse' : '') + ' flex'}>
      <AsideLeft {...props} slot={leftAreaSlot}/>
      <main id='wrapper' className='flex w-full py-8 justify-center'>
        <div id='container-inner' className='2xl:max-w-6xl md:max-w-4xl w-full'>
--- a/themes/hexo/LayoutBase.js
+++ b/themes/hexo/LayoutBase.js
@@ -69,7 +69,7 @@ const LayoutBase = props => {
      <main id="wrapper" className="w-full py-8 md:px-8 lg:px-24 min-h-screen">
        <div
          id="container-inner"
-          className="pt-14 w-full mx-auto lg:flex lg:space-x-4 justify-center"
+          className={(BLOG.LAYOUT_SIDEBAR_REVERSE ? 'flex-row-reverse' : '') + ' pt-14 w-full mx-auto lg:flex lg:space-x-4 justify-center'}
        >
          <div className="w-full max-w-4xl overflow-x-hidden scroll-hidden">
            {onLoading ? <LoadingCover /> : children}
--- a/themes/medium/LayoutBase.js
+++ b/themes/medium/LayoutBase.js
@@ -11,6 +11,7 @@ import BottomMenuBar from './components/BottomMenuBar'
 import { useGlobal } from '@/lib/global'
 import { useRouter } from 'next/router'
 import Live2D from '@/components/Live2D'
+import BLOG from '@/blog.config'

 /**
 * 基础布局 采用左右两侧布局，移动端使用顶部导航栏
@@ -26,7 +27,7 @@ const LayoutBase = props => {
  return (
    <div className='bg-white dark:bg-hexo-black-gray w-full h-full min-h-screen justify-center dark:text-gray-300'>
      <CommonHead meta={meta} />
-      <main id='wrapper' className='flex justify-between w-full h-full mx-auto'>
+      <main id='wrapper' className={(BLOG.LAYOUT_SIDEBAR_REVERSE ? 'flex-row-reverse' : '') + ' flex justify-between w-full h-full mx-auto'}>
        {/* 桌面端左侧菜单 */}
        {/* <LeftMenuBar/> */}

--- a/themes/next/LayoutBase.js
+++ b/themes/next/LayoutBase.js
@@ -13,6 +13,7 @@ import React from 'react'
 import smoothscroll from 'smoothscroll-polyfill'
 import CONFIG_NEXT from './config_next'
 import Live2D from '@/components/Live2D'
+import BLOG from '@/blog.config'
 import AOS from 'aos'
 import 'aos/dist/aos.css' // You can also use <link> for styles
 import { isBrowser } from '@/lib/utils'
@@ -75,7 +76,7 @@ const LayoutBase = (props) => {

      <div className='h-0.5 w-full bg-gray-700 dark:bg-gray-600 hidden lg:block'/>

-      <main id='wrapper' className='flex justify-center flex-1 pb-12'>
+      <main id='wrapper' className={(BLOG.LAYOUT_SIDEBAR_REVERSE ? 'flex-row-reverse' : '') + ' flex justify-center flex-1 pb-12'}>
          {/* 左侧栏样式 */}
          <SideAreaLeft slot={leftAreaSlot} targetRef={targetRef} {...props}/>
          <section id='container-inner' className={`${CONFIG_NEXT.NAV_TYPE !== 'normal' ? 'mt-40' : ''} lg:max-w-3xl xl:max-w-4xl flex-grow md:mt-0 min-h-screen w-full`} ref={targetRef}>
--- a/themes/next/components/SideAreaLeft.js
+++ b/themes/next/components/SideAreaLeft.js
@@ -8,6 +8,7 @@ import Tabs from '@/components/Tabs'
 import Logo from './Logo'
 import Card from './Card'
 import CONFIG_NEXT from '../config_next'
+import BLOG from '@/blog.config'

 /**
 * 侧边平铺
@@ -22,7 +23,7 @@ const SideAreaLeft = props => {
  const { post, slot, postCount } = props
  const { locale } = useGlobal()
  const showToc = post && post.toc && post.toc.length > 1
-  return <aside id='left' className='hidden lg:block flex-col w-60 mr-4'>
+  return <aside id='left' className={(BLOG.LAYOUT_SIDEBAR_REVERSE ? 'ml-4' : 'mr-4') + ' hidden lg:block flex-col w-60'}>

        <section
            data-aos="fade-down"
--- a/themes/next/components/SideAreaRight.js
+++ b/themes/next/components/SideAreaRight.js
@@ -24,7 +24,7 @@ const SideAreaRight = (props) => {
  const { tags, currentTag, slot, categories, currentCategory } = props
  const { locale } = useGlobal()
  const router = useRouter()
-  return (<aside id='right' className='hidden 2xl:block flex-col w-60 ml-4'>
+  return (<aside id='right' className={(BLOG.LAYOUT_SIDEBAR_REVERSE ? 'mr-4' : 'ml-4') + ' hidden 2xl:block flex-col w-60'}>

      {CONFIG_NEXT.RIGHT_AD && <Card className='mb-2'>
        {/* 展示广告  */}