From 5bc16903c5a9a6740789e2ad573e57705efb1d0b Mon Sep 17 00:00:00 2001
From: tangly1024 <tlyong1992@hotmail.com>
Date: Wed, 15 Dec 2021 17:51:24 +0800
Subject: [PATCH] =?UTF-8?q?google=E7=BB=9F=E8=AE=A1=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blog.config.js                 |  2 +-
 components/BlogPostCard.js     |  2 +-
 components/ThirdPartyScript.js | 39 +++++++++++++++++++++++++++++-----
 pages/_app.js                  |  7 +++---
 pages/article/[slug].js        | 10 +++++++--
 5 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/blog.config.js b/blog.config.js
index 45f9a626..7e9f8d3e 100644
--- a/blog.config.js
+++ b/blog.config.js
@@ -32,7 +32,7 @@ const BLOG = {
       domainId: '' // e.g '0e2257a8-54d4-4847-91a1-0311ea48cc7b'
     },
     gaConfig: {
-      measurementId: 'G-5EV4HZD0XX' // e.g: G-XXXXXXXXXX
+      measurementId: 'G-68EK0W049N' // e.g: G-XXXXXXXXXX
     },
     baiduAnalytics: 'f683ef76f06bb187cbed5546f6f28f28', // e.g only need xxxxx -> https://hm.baidu.com/hm.js?[xxxxx]
     busuanzi: true, // see http://busuanzi.ibruce.info/
diff --git a/components/BlogPostCard.js b/components/BlogPostCard.js
index 9f72d1bd..ccce55fa 100644
--- a/components/BlogPostCard.js
+++ b/components/BlogPostCard.js
@@ -11,7 +11,7 @@ const BlogPostCard = ({ post, tags }) => {
     <div key={post.id} className='hover:shadow-2xl shadow-md mb-14 duration-300 md:grid md:grid-cols-5 rounded-xl dark:border-gray-600 animate__animated animate__fadeIn animate__faster
      w-full bg-white dark:bg-gray-800 dark:hover:bg-gray-700'>
       <Link href={`${BLOG.path}/article/${post.slug}`} passHref>
-        <div className='w-full h-60 rounded-t-xl md:rounded-t-none md:rounded-l-xl md:h-full duration-200 cursor-pointer transform col-span-2 overflow-hidden'>
+        <div className='w-full h-60 relative rounded-t-xl md:rounded-t-none md:rounded-l-xl md:h-full duration-200 cursor-pointer transform col-span-2 overflow-hidden'>
           <Image className='hover:scale-105 transform duration-500 rounded-t-xl md:rounded-t-none md:rounded-l-xl' src={(post.page_cover && post.page_cover.length > 1) ? post.page_cover : BLOG.defaultImgCover} alt={post.title} layout='fill' objectFit='cover' loading='lazy' />
         </div>
       </Link>
diff --git a/components/ThirdPartyScript.js b/components/ThirdPartyScript.js
index 34d369a6..2e994a5c 100644
--- a/components/ThirdPartyScript.js
+++ b/components/ThirdPartyScript.js
@@ -35,11 +35,6 @@ const ThirdPartyScript = () => {
 
     {/* 代码统计 */}
     {BLOG.isProd && (<>
-        {/* GoogleAdsense */}
-        {BLOG.googleAdsenseId && (
-          <script data-ad-client={BLOG.googleAdsenseId} async
-                  src='https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js' />
-        )}
 
         {/* ackee统计脚本 */}
         {BLOG.analytics.provider === 'ackee' && (
@@ -100,6 +95,40 @@ const ThirdPartyScript = () => {
                     }}
             />
           </>)}
+
+        {/* GoogleAdsense 广告植入 */}
+        {BLOG.googleAdsenseId && (
+        <>
+          {/* <script data-ad-client={BLOG.googleAdsenseId} async
+                  src='https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js' /> */}
+          <script async src={`https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=${BLOG.googleAdsenseId}`}
+          crossOrigin="anonymous"></script>
+          {/* 信息流 */}
+          <ins className="adsbygoogle"
+              style={{ display: 'block' }}
+              data-ad-format="fluid"
+              data-ad-layout-key="-5j+cz+30-f7+bf"
+              data-ad-client="ca-pub-2708419466378217"
+              data-ad-slot="1510444138"></ins>
+            {/* 展示广告  */}
+          <ins className="adsbygoogle"
+              style={{ display: 'block' }}
+              data-ad-client="ca-pub-2708419466378217"
+              data-ad-slot="8807314373"
+              data-ad-format="auto"
+              data-full-width-responsive="true"></ins>
+          {/* 文章内嵌广告 */}
+          <ins className="adsbygoogle"
+              style={{ display: 'block', textAlign: 'center' }}
+              data-ad-layout="in-article"
+              data-ad-format="fluid"
+              data-ad-client="ca-pub-2708419466378217"
+              data-ad-slot="3806269138"></ins>
+          <script>
+              (adsbygoogle = window.adsbygoogle || []).push({});
+          </script>
+        </>
+        )}
       </>)}
   </>)
 }
diff --git a/pages/_app.js b/pages/_app.js
index dec496ff..25dd8726 100644
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -1,8 +1,9 @@
-import 'rc-dropdown/assets/index.css'
-import 'katex/dist/katex.min.css'
 import 'animate.css'
-import '@/styles/notion.css'
 import '@/styles/globals.css'
+import '@/styles/notion.css'
+import 'rc-dropdown/assets/index.css'
+import 'prismjs/themes/prism-okaidia.css'
+import 'katex/dist/katex.min.css'
 import BLOG from 'blog.config'
 import dynamic from 'next/dynamic'
 import { GlobalContextProvider } from '@/lib/global'
diff --git a/pages/article/[slug].js b/pages/article/[slug].js
index 8356a5d0..622990a4 100644
--- a/pages/article/[slug].js
+++ b/pages/article/[slug].js
@@ -14,7 +14,6 @@ import Custom404 from '@/pages/404'
 import Link from 'next/link'
 import Image from 'next/image'
 
-import 'prismjs/themes/prism-okaidia.css'
 import 'prismjs'
 import 'prismjs/components/prism-bash'
 import 'prismjs/components/prism-markup'
@@ -30,6 +29,10 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faEye, faFolderOpen } from '@fortawesome/free-solid-svg-icons'
 import BlogAround from '@/components/BlogAround'
 
+import '@/styles/notion.css'
+import 'rc-dropdown/assets/index.css'
+import 'prismjs/themes/prism-okaidia.css'
+
 const mapPageUrl = id => {
   return 'https://www.notion.so/' + id.replace(/-/g, '')
 }
@@ -152,7 +155,10 @@ const ArticleDetail = ({ post, blockMap, tags, prev, next, allPosts, categories
 }
 
 export async function getStaticPaths () {
-  const posts = await getAllPosts({ from: 'slug - paths', includePage: true })
+  const posts = []
+  // if (BLOG.isProd) {
+  //   posts = await getAllPosts({ from: 'slug - paths', includePage: true })
+  // }
   return {
     paths: posts.map(row => `${BLOG.path}/article/${row.slug}`),
     fallback: true