部分配置支持环境变量

2026-05-17 23:16:50 +00:00 · 2022-01-19 15:06:33 +08:00
parent f1590f52e8
commit f4f85ff1ed
10 changed files with 93 additions and 120 deletions
--- a/components/Ackee.js
+++ b/components/Ackee.js
@@ -3,14 +3,12 @@ import useAckee from 'use-ackee'
 import BLOG from '@/blog.config'

 const Ackee = () => {
-  const ackeeServerUrl = BLOG.ANALYTICS_ACKEE_DATA_SERVER
-  const ackeeDomainId = BLOG.ANALYTICS_ACKEE_DOMAIN_ID
  const router = useRouter()
  useAckee(
    router.asPath,
    {
-      server: ackeeServerUrl,
-      domainId: ackeeDomainId
+      server: BLOG.ANALYTICS_ACKEE_DATA_SERVER,
+      domainId: BLOG.ANALYTICS_ACKEE_DOMAIN_ID
    },
    {
      detailed: false,
--- a/components/Comment.js
+++ b/components/Comment.js
@@ -27,11 +27,23 @@ const CusdisComponent = dynamic(
 const Comment = ({ frontMatter }) => {
  const router = useRouter()
  const { theme } = useGlobal()
-
  return (
-    <div className='comment mt-5 text-gray-800 dark:text-gray-300'>
+    <div className='comment mt-5 px-10 text-gray-800 dark:text-gray-300'>
      <Tabs>
-        {BLOG.COMMENT_GITALK_CLIENT_ID && (<div className='m-10' key='gitalk'>
+        {BLOG.COMMENT_CUSDIS_APP_ID && (<div key='Cusdis'>
+          <CusdisComponent
+            attrs={{
+              host: BLOG.COMMENT_CUSDIS_HOST,
+              appId: BLOG.COMMENT_CUSDIS_APP_ID,
+              pageId: frontMatter.id,
+              pageTitle: frontMatter.title,
+              pageUrl: BLOG.LINK + router.asPath,
+              theme: theme
+            }}
+            lang={BLOG.LANG.toLowerCase()}
+          />
+        </div>)}
+        {BLOG.COMMENT_GITALK_CLIENT_ID && (<div key='GitTalk'>
          <GitalkComponent
            options={{
              id: frontMatter.id,
@@ -41,30 +53,14 @@ const Comment = ({ frontMatter }) => {
              repo: BLOG.COMMENT_GITALK_REPO,
              owner: BLOG.COMMENT_GITALK_OWNER,
              admin: BLOG.COMMENT_GITALK_ADMIN.split(','),
-              distractionFreeMode: BLOG.COMMENT_GITALK_DISTRACTION_FREE_MODE
+              distractionFreeMode: JSON.parse(BLOG.COMMENT_GITALK_DISTRACTION_FREE_MODE)
            }}
          />
        </div>)}
-        {BLOG.COMMENT_UTTERRANCES_REPO && (<div className='m-10' key='utterance'>
+        {BLOG.COMMENT_UTTERRANCES_REPO && (<div key='Utterance'>
            <UtterancesComponent issueTerm={frontMatter.id} className='px-2' />
          </div>
        )}
-        {BLOG.COMMENT_CUSDIS_APP_ID && (<>
-          <script defer src='https://cusdis.com/js/widget/lang/zh-cn.js' />
-          <div className='m-10' key='cusdis'>
-            <CusdisComponent
-              attrs={{
-                host: BLOG.COMMENT_CUSDIS_HOST,
-                appId: BLOG.COMMENT_CUSDIS_APP_ID,
-                pageId: frontMatter.id,
-                pageTitle: frontMatter.title,
-                pageUrl: BLOG.LINK + router.asPath,
-                theme: theme
-              }}
-              lang={BLOG.LANG.toLowerCase()}
-            />
-          </div>
-        </>)}
      </Tabs>
    </div>
  )
--- a/components/CommonHead.js
+++ b/components/CommonHead.js
@@ -18,10 +18,7 @@ const CommonHead = ({ meta }) => {
    <meta name='robots' content='follow, index' />
    <meta charSet='UTF-8' />
    {BLOG.SEO_GOOGLE_SITE_VERIFICATION && (
-      <meta
-        name='google-site-verification'
-        content={BLOG.SEO_GOOGLE_SITE_VERIFICATION}
-      />
+      <meta name='google-site-verification' content={BLOG.SEO_GOOGLE_SITE_VERIFICATION} />
    )}
    <meta name='keywords' content={keywords} />
    <meta name='description' content={description} />
--- a/components/CommonScript.js
+++ b/components/CommonScript.js
@@ -7,7 +7,7 @@ import BLOG from '@/blog.config'
 */
 const CommonScript = () => {
  return (<>
-    {BLOG.COMMENT_DAO_VOICE_ENABLE && (<>
+    {BLOG.COMMENT_DAO_VOICE_ID && (<>
      {/* DaoVoice 反馈 */}
      <script async dangerouslySetInnerHTML={{
        __html: `
@@ -27,18 +27,15 @@ const CommonScript = () => {
    </>)}

    {/* GoogleAdsense */}
-    {BLOG.GOOGLE_ADSENSE_ENABLE && (<script data-ad-client={BLOG.googleAdsenseId} async
+    {BLOG.ADSENSE_GOOGLE_ID && (<script data-ad-client={BLOG.ADSENSE_GOOGLE_ID} async
              src='https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js'/>)}

-    {BLOG.COMMENT_TIDIO_ENABLE && (<>
-      {/* Tidio在线反馈 */}
-      <script async
-              src={`//code.tidio.co/${BLOG.COMMENT_TIDIO_ID}.js`}
-      />
-    </>)}
+    {BLOG.COMMENT_CUSDIS_APP_ID && <script defer src='https://cusdis.com/js/widget/lang/zh-cn.js' />}
+
+    {BLOG.COMMENT_TIDIO_ID && <script async src={`//code.tidio.co/${BLOG.COMMENT_TIDIO_ID}.js`} />}

    {/* gitter聊天室 */}
-    {BLOG.COMMENT_GITTER_ENABLE && (<>
+    {BLOG.COMMENT_GITTER_ROOM && (<>
      <script src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer/>
      <script async dangerouslySetInnerHTML={{
        __html: `
@@ -51,7 +48,7 @@ const CommonScript = () => {

    {/* 代码统计 */}
    {/* ackee统计脚本 */}
-    {BLOG.ANALYTICS_ACKEE_ENABLE && (
+    {BLOG.ANALYTICS_ACKEE_TRACKER && (
      <script async src={BLOG.ANALYTICS_ACKEE_TRACKER}
              data-ackee-server={BLOG.ANALYTICS_ACKEE_DATA_SERVER}
              data-ackee-domain-id={BLOG.ANALYTICS_ACKEE_DOMAIN_ID}
@@ -59,7 +56,7 @@ const CommonScript = () => {
    )}

    {/* 百度统计 */}
-    {BLOG.ANALYTICS_BAIDU_ENABLE && (
+    {BLOG.ANALYTICS_BAIDU_ID && (
      <script async
              dangerouslySetInnerHTML={{
                __html: `
@@ -76,7 +73,7 @@ const CommonScript = () => {
    )}

    {/* 站长统计 */}
-    {BLOG.ANALYTICS_CNZZ_ENABLE && (
+    {BLOG.ANALYTICS_CNZZ_ID && (
      <script async
              dangerouslySetInnerHTML={{
                __html: `
@@ -87,7 +84,7 @@ const CommonScript = () => {
    )}

    {/* 谷歌统计 */}
-    {BLOG.ANALYTICS_GOOGLE_ENABLE && (<>
+    {BLOG.ANALYTICS_GOOGLE_ID && (<>
        <script async
                src={`https://www.googletagmanager.com/gtag/js?id=${BLOG.ANALYTICS_GOOGLE_ID}`}
        />
--- a/components/Tabs.js
+++ b/components/Tabs.js
@@ -24,28 +24,30 @@ const Tabs = ({ children }) => {
  }

  const [currentTab, setCurrentTab] = useState(0)
+
  function tabClickHandle (i) {
    setCurrentTab(i)
  }

-  return (
-    < >
-      {<div className='hidden lg:block mb-5 bg-white dark:bg-gray-800 duration-200'>
-        <ul className='flex justify-center space-x-5 pb-4 dark:text-gray-400 text-gray-600'>
-          {children.map((item, index) => {
-            return <li key={index} className={(currentTab === index ? 'font-black border-b-2 border-red-400 text-red-400 animate__animated animate__jello ' : 'font-extralight cursor-pointer') + ' text-sm font-sans '} onClick={() => { tabClickHandle(index) }}>
-              {item?.key}
-            </li>
-          })}
-        </ul>
-        {children.map((item, index) => {
-          return <section key={index} className={`${currentTab === index ? 'block animate__animated animate__fadeIn animate__faster' : 'hidden'}`}>
-              {item}
-            </section>
-        })}
-      </div>}
-
-    </>)
+  return <div className='mb-5 bg-white dark:bg-gray-800 duration-200'>
+    <ul className='flex justify-center space-x-5 pb-4 dark:text-gray-400 text-gray-600'>
+      {children.map((item, index) => {
+        return <li key={index}
+                   className={(currentTab === index ? 'font-black border-b-2 border-red-400 text-red-400 animate__animated animate__jello ' : 'font-extralight cursor-pointer') + ' text-sm font-sans '}
+                   onClick={() => {
+                     tabClickHandle(index)
+                   }}>
+          {item?.key}
+        </li>
+      })}
+    </ul>
+    {children.map((item, index) => {
+      return <section key={index}
+                      className={`${currentTab === index ? 'block animate__animated animate__fadeIn animate__faster' : 'hidden'}`}>
+        {item}
+      </section>
+    })}
+  </div>
 }

 export default Tabs