From a9f99ae51a5edb6a45ee81471502a2b16bdddc3b Mon Sep 17 00:00:00 2001
From: tangly1024 <tlyong1992@hotmail.com>
Date: Wed, 29 Sep 2021 13:08:52 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=85=20=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=A7=BB=E5=85=A5config.js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blog.config.js                 |  3 +-
 components/SideBar.js          |  4 +--
 components/ThirdPartyScript.js | 53 ++++++++++++++++------------------
 3 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/blog.config.js b/blog.config.js
index c82e77b9..7f1de703 100644
--- a/blog.config.js
+++ b/blog.config.js
@@ -57,7 +57,8 @@ const BLOG = {
     }
   },
   isProd: process.env.VERCEL_ENV === 'production', // distinguish between development and production environment (ref: https://vercel.com/docs/environment-variables#system-environment-variables)
-  googleAdsense: true
+  googleAdsenseId: 'ca-pub-2708419466378217',
+  DaoVoiceId: 'daf1a94b' // DaoVoice http://dashboard.daovoice.io/get-started
 }
 // export default BLOG
 module.exports = BLOG
diff --git a/components/SideBar.js b/components/SideBar.js
index 4b91d3d8..afdf96cd 100644
--- a/components/SideBar.js
+++ b/components/SideBar.js
@@ -41,7 +41,7 @@ const SideBar = ({ tags, currentTag, toc }) => {
   return <aside className='z-10'>
 
     <div
-      className={(collapse ? '-ml-80 ' : 'shadow-2xl xl:shadow-none') + ' dark:bg-gray-800 bg-white sidebar h-full w-60 duration-500 ease-in-out'}>
+      className={(collapse ? '-ml-80 ' : 'shadow-2xl xl:shadow-none') + ' dark:bg-gray-800 bg-white sidebar h-full w-72 duration-500 ease-in-out'}>
 
       {/* Logo  */}
       <section className='mx-5 pt-6 pb-2'>
@@ -109,7 +109,7 @@ const SideBar = ({ tags, currentTag, toc }) => {
 
     {/* 顶部菜单按钮 */}
     <div
-      className={(collapse ? 'left-0' : 'left-60') + ' fixed flex flex-nowrap md:flex-col  top-0 pl-4 py-1 duration-500 ease-in-out'}>
+      className={(collapse ? 'left-0' : 'left-72') + ' fixed flex flex-nowrap md:flex-col  top-0 pl-4 py-1 duration-500 ease-in-out'}>
       {/* 菜单折叠 */}
       <div className='z-30 p-1 border hover:shadow-xl duration-200 dark:border-gray-500 h-12 bg-white dark:bg-gray-600 dark:bg-opacity-70 bg-opacity-70
       dark:hover:bg-gray-100 text-xl cursor-pointer mr-2 my-2 dark:text-gray-300 dark:hover:text-black'>
diff --git a/components/ThirdPartyScript.js b/components/ThirdPartyScript.js
index 18f87c7b..3b4b08ba 100644
--- a/components/ThirdPartyScript.js
+++ b/components/ThirdPartyScript.js
@@ -1,41 +1,41 @@
 import BLOG from '@/blog.config'
 
 const ThirdPartyScript = () => {
-  return <>
-    {/* DaoVoice http://dashboard.daovoice.io/get-started */}
-
-    <script dangerouslySetInnerHTML={{
-      __html: `
+  return (<>
+    {BLOG.DaoVoiceId && (<>
+      {/* DaoVoice 反馈 */}
+      <script dangerouslySetInnerHTML={{
+        __html: `
                   (function(i,s,o,g,r,a,m){i["DaoVoiceObject"]=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;a.charset="utf-8";m.parentNode.insertBefore(a,m)})(window,document,"script",('https:' == document.location.protocol ? 'https:' : 'http:') + "//widget.daovoice.io/widget/daf1a94b.js","daovoice")
                   `
-    }}
-    />
-    <script async dangerouslySetInnerHTML={{
-      __html: `
+      }}
+      />
+      <script async dangerouslySetInnerHTML={{
+        __html: `
                  daovoice('init', {
-                    app_id: "daf1a94b"
+                    app_id: "${BLOG.DaoVoiceId}"
                   });
                   daovoice('update');
                   `
-    }}
-    />
-
-    {/* GoogleAdsense */}
-    { BLOG.isProd && (
-      <>
-        {BLOG.googleAdsense && (
-          <script data-ad-client='ca-pub-2708419466378217' async
+      }}
+      />
+    </>)}
+    {/* 代码统计 */}
+    {BLOG.isProd && (<>
+        {/* GoogleAdsense */}
+        {BLOG.googleAdsenseId && (
+          <script data-ad-client={BLOG.googleAdsenseId} async
                   src='https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js' />
         )}
 
-        {/* 统计脚本 */}
-        { BLOG.analytics.provider === 'ackee' && (
+        {/* ackee统计脚本 */}
+        {BLOG.analytics.provider === 'ackee' && (
           <script async src={BLOG.analytics.ackeeConfig.tracker}
                   data-ackee-server={BLOG.analytics.ackeeConfig.dataAckeeServer}
                   data-ackee-domain-id={BLOG.analytics.ackeeConfig.domainId}
           />
         )}
-        {/* 百度 */}
+        {/* 百度统计 */}
         {BLOG.analytics.baidyAnalytics && (
           <script async
                   dangerouslySetInnerHTML={{
@@ -70,8 +70,7 @@ const ThirdPartyScript = () => {
         )}
 
         {/* 谷歌统计 */}
-        {BLOG.analytics.provider === 'ga' && (
-          <>
+        {BLOG.analytics.provider === 'ga' && (<>
             <script async
                     src={`https://www.googletagmanager.com/gtag/js?id=${BLOG.analytics.gaConfig.measurementId}`}
             />
@@ -87,11 +86,9 @@ const ThirdPartyScript = () => {
                       `
                     }}
             />
-          </>
-        )}
-      </>
-    )}
-  </>
+          </>)}
+      </>)}
+  </>)
 }
 
 export default ThirdPartyScript