From 98cee0efa02dba6cfda76d3bea7f2d64cc7f2afb Mon Sep 17 00:00:00 2001
From: tangly1024 <tlyong1992@hotmail.com>
Date: Wed, 29 Sep 2021 15:52:42 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=BB=20=E5=8F=96=E6=B6=88defer=E2=9D=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/RightAside.js       |  2 +-
 components/SideBar.js          | 33 ++++++++++++++++-----------------
 components/ThirdPartyScript.js | 20 ++++++++++----------
 layouts/ArticleLayout.js       |  2 +-
 4 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/components/RightAside.js b/components/RightAside.js
index 509a7954..cd4be0d3 100644
--- a/components/RightAside.js
+++ b/components/RightAside.js
@@ -38,7 +38,7 @@ const RightAside = ({ toc, post }) => {
 
     {/* 下方菜单组 */}
     <div
-      className={(hideAside ? 'right-0' : 'right-48') + ' space-x-2 fixed flex bottom-20 px-4 py-1 duration-500'}>
+      className={(hideAside ? 'right-0' : 'right-48') + ' space-x-2 fixed flex bottom-24 px-4 py-1 duration-500'}>
       <div className='flex-wrap'>
         {/* 分享按钮 */}
         <ShareButton post={post} />
diff --git a/components/SideBar.js b/components/SideBar.js
index 1b6abaca..9cd67992 100644
--- a/components/SideBar.js
+++ b/components/SideBar.js
@@ -37,26 +37,12 @@ const SideBar = ({ tags, currentTag, toc }) => {
       changeCollapse(true)
     }
   }, 500)
-  const [collapse, changeCollapse] = useState(false)
+  const [collapse, changeCollapse] = useState(true)
 
   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-72 duration-500 ease-in-out'}>
 
-      {/* Logo  */}
-      <section className='mx-5 pt-6 pb-2'>
-        <Link href='/'>
-          <a
-            className='text-3xl hover:shadow-2xl text-black dark:bg-gray-900 dark:text-gray-300 font-semibold dark:hover:bg-gray-600 hover:bg-gray-800 hover:text-white p-2 duration-200'>{BLOG.title}</a>
-        </Link>
-      </section>
-
-      {/* 地理标志 */}
-      <section className='text-gray-500 text-sm px-7 pt-3 pb-5 dark:text-gray-300'>
-        <i className='fa fa-map-marker mr-1' />
-        Fuzhou, China
-      </section>
-
       {/* 搜索框 */}
       <section className='sticky top-0 flex justify-center items-center py-5 pr-5 pl-2 bg-gray-100 dark:bg-black'>
         <input
@@ -72,11 +58,24 @@ const SideBar = ({ tags, currentTag, toc }) => {
         <i className='fa fa-search text-gray-400 -ml-8' />
       </section>
 
+      {/* Logo  */}
+      <section className='mx-5 pt-6 pb-2'>
+        <Link href='/'>
+          <a className='text-3xl hover:shadow-2xl text-black dark:bg-gray-900 dark:text-gray-300 font-semibold dark:hover:bg-gray-600 hover:bg-gray-800 hover:text-white p-2 duration-200'>{BLOG.title}</a>
+        </Link>
+      </section>
+
+      {/* 地理标志 */}
+      <section className='text-gray-500 text-sm px-7 pt-3 pb-5 dark:text-gray-300'>
+        <i className='fa fa-map-marker mr-1' />
+        Fuzhou, China
+      </section>
+
       {/* wrapper */}
       <div className='p-6'>
 
         {/* 菜单 */}
-        <nav className='py-4'>
+        <nav>
           <div>
             <strong className='text-xl text-gray-600 dark:text-gray-400'>菜单</strong>
           </div>
@@ -109,7 +108,7 @@ const SideBar = ({ tags, currentTag, toc }) => {
         </section>
 
       </div>
-      <div className='sticky top-0'>
+      <div className='sticky top-20'>
         <TocBar toc={toc} />
       </div>
     </div>
diff --git a/components/ThirdPartyScript.js b/components/ThirdPartyScript.js
index 7947dfcc..ccf823c7 100644
--- a/components/ThirdPartyScript.js
+++ b/components/ThirdPartyScript.js
@@ -4,13 +4,13 @@ const ThirdPartyScript = () => {
   return (<>
     {BLOG.DaoVoiceId && (<>
       {/* DaoVoice 反馈 */}
-      <script defer dangerouslySetInnerHTML={{
+      <script async 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 defer dangerouslySetInnerHTML={{
+      <script async dangerouslySetInnerHTML={{
         __html: `
                  daovoice('init', {
                     app_id: "${BLOG.DaoVoiceId}"
@@ -21,23 +21,23 @@ const ThirdPartyScript = () => {
       />
     </>)}
     {/* 代码统计 */}
-    {true && (<>
+    {BLOG.isProd && (<>
         {/* GoogleAdsense */}
         {BLOG.googleAdsenseId && (
-          <script data-ad-client={BLOG.googleAdsenseId} defer
+          <script data-ad-client={BLOG.googleAdsenseId} async
                   src='https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js' />
         )}
 
         {/* ackee统计脚本 */}
         {BLOG.analytics.provider === 'ackee' && (
-          <script defer src={BLOG.analytics.ackeeConfig.tracker}
+          <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 defer
+          <script async
                   dangerouslySetInnerHTML={{
                     __html: `
                   var _hmt = _hmt || [];
@@ -53,14 +53,14 @@ const ThirdPartyScript = () => {
         )}
         {/* 不蒜子 */}
         {BLOG.analytics.busuanzi && (
-          <script defer
+          <script async
                   src={'//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js'}
           />
         )}
 
         {/* 站长统计 */}
         {BLOG.isProd && (
-          <script defer
+          <script async
                   dangerouslySetInnerHTML={{
                     __html: `
                   document.write(unescape("%3Cspan style='display:none' id='cnzz_stat_icon_1279970751'%3E%3C/span%3E%3Cscript src='https://s9.cnzz.com/z_stat.php%3Fid%3D1279970751' type='text/javascript'%3E%3C/script%3E"));
@@ -71,10 +71,10 @@ const ThirdPartyScript = () => {
 
         {/* 谷歌统计 */}
         {BLOG.analytics.provider === 'ga' && (<>
-            <script defer
+            <script async
                     src={`https://www.googletagmanager.com/gtag/js?id=${BLOG.analytics.gaConfig.measurementId}`}
             />
-            <script defer
+            <script async
                     dangerouslySetInnerHTML={{
                       __html: `
                         window.dataLayer = window.dataLayer || [];
diff --git a/layouts/ArticleLayout.js b/layouts/ArticleLayout.js
index 996a6bce..206949e3 100644
--- a/layouts/ArticleLayout.js
+++ b/layouts/ArticleLayout.js
@@ -161,7 +161,7 @@ const ArticleLayout = ({
 
         {/* 下方菜单组 */}
         <div
-          className='right-0 space-x-2 fixed flex bottom-20 px-5 py-1 duration-500'>
+          className='right-0 space-x-2 fixed flex bottom-24 px-5 py-1 duration-500'>
           <div className='flex-wrap'>
             {/* 分享按钮 */}
             <ShareButton post={frontMatter} />