From 0c9f9659ba6394816e41d0ffe9faab830b92abaa Mon Sep 17 00:00:00 2001
From: tangly1024 <tlyong1992@hotmail.com>
Date: Fri, 14 Jan 2022 13:01:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E7=BB=84=E4=BB=B6=E3=80=81?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=8F=B3=E4=BE=A7adsense?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/Card.js          |  2 +-
 components/Collapse.js      |  2 +-
 components/Footer.js        | 22 ++++++++++++----------
 components/SideAreaRight.js | 22 +++++++++++-----------
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/components/Card.js b/components/Card.js
index bd7683b8..d24c046e 100644
--- a/components/Card.js
+++ b/components/Card.js
@@ -1,7 +1,7 @@
 const Card = ({ children, headerSlot, className }) => {
   return <div className={className}>
     <>{headerSlot}</>
-    <section className="shadow mb-5 px-2 py-4 bg-white dark:bg-gray-800 hover:shadow-xl duration-200">
+    <section className="shadow px-2 py-4 bg-white dark:bg-gray-800 hover:shadow-xl duration-200">
         {children}
     </section>
   </div>
diff --git a/components/Collapse.js b/components/Collapse.js
index 2b68ad73..7607b732 100644
--- a/components/Collapse.js
+++ b/components/Collapse.js
@@ -28,7 +28,7 @@ const Collapse = props => {
     }
   }, [props.isOpen])
   return (
-    <div ref={collapseRef} className='overflow-hidden duration-200'>
+    <div ref={collapseRef} style={{ height: '0px' }} className='overflow-hidden duration-200'>
       {props.children}
     </div>
   )
diff --git a/components/Footer.js b/components/Footer.js
index c35eb512..60e64af8 100644
--- a/components/Footer.js
+++ b/components/Footer.js
@@ -1,25 +1,27 @@
-import { faCopyright, faEye, faShieldAlt, faUsers } from '@fortawesome/free-solid-svg-icons'
+import { faCopyright, faEye, faShieldAlt, faUsers, faHeart } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import React from 'react'
 import BLOG from '@/blog.config'
 
 const Footer = ({ title }) => {
   const d = new Date()
-  const y = d.getFullYear()
+  const currentYear = d.getFullYear()
+  const startYear = BLOG.since && BLOG.since !== currentYear && BLOG.since + '-'
   return (
     <footer
-      className='dark:bg-gray-900 flex-shrink-0 justify-center text-center m-auto w-full text-gray-400 text-sm p-6'
+      className='dark:bg-gray-900 flex-shrink-0 justify-center text-center m-auto w-full leading-6 text-gray-400 text-sm p-6'
     >
-      <FontAwesomeIcon icon={faCopyright} /> {` ${y}`} <span> <a href={BLOG.link} className='underline font-bold text-gray-500 dark:text-gray-300 '>{BLOG.author}</a>. Powered by <a href='https://notion.so' className='underline font-bold text-gray-500 dark:text-gray-300'>Notion</a> & <a href='https://github.com/tangly1024/NotionNext' className='underline font-bold text-gray-500 dark:text-gray-300'>NotionNext</a>.</span>
-      <br />
-      <FontAwesomeIcon icon={faShieldAlt} /> <a href='https://beian.miit.gov.cn/' className='ml-1 font-bold'>闽ICP备20010331号</a>
-      {/* <span > <Link href='/article/privacy-policy' ><a className='ml-1 mr-1 font-bold underline'>隐私政策</a></Link></span> */}
+      <FontAwesomeIcon icon={faCopyright} /> {`${startYear}${currentYear}`} <span><FontAwesomeIcon icon={faHeart} className='mx-1 animate-pulse'/> <a href={BLOG.link} className='underline font-bold text-gray-500 dark:text-gray-300 '>{BLOG.author}</a>.
+      <br/>
 
+      <span>Powered by <a href='https://notion.so' className='underline font-bold text-gray-500 dark:text-gray-300'>Notion</a> & <a href='https://github.com/tangly1024/NotionNext' className='underline font-bold text-gray-500 dark:text-gray-300'>NotionNext</a>.</span></span>
+      <br />
+
+      <FontAwesomeIcon icon={faShieldAlt} /> <a href='https://beian.miit.gov.cn/' className='mr-2 font-bold'>闽ICP备20010331号</a>
       <span className='hidden busuanzi_container_site_pv'>
-            <FontAwesomeIcon icon={faEye}/><span className='px-1 busuanzi_value_site_pv'> </span>pv
-      </span>
+            <FontAwesomeIcon icon={faEye}/><span className='px-1 busuanzi_value_site_pv'> </span>  </span>
       <span className='pl-2 hidden busuanzi_container_site_uv'>
-        <FontAwesomeIcon icon={faUsers}/> <span className='px-1 busuanzi_value_site_uv'> </span>uv   </span>
+        <FontAwesomeIcon icon={faUsers}/> <span className='px-1 busuanzi_value_site_uv'> </span> </span>
         <br/>
         <h1>{title}</h1>
     </footer>
diff --git a/components/SideAreaRight.js b/components/SideAreaRight.js
index fb76fb09..8585a7be 100644
--- a/components/SideAreaRight.js
+++ b/components/SideAreaRight.js
@@ -39,17 +39,17 @@ const SideAreaRight = ({
 
   return (<aside id='right' className='hidden 2xl:block flex-col w-60 ml-4'>
 
-      <Card>
-              {/* 展示广告  */}
-              <ins
-                className="adsbygoogle"
-                style={{ display: 'block' }}
-                data-adtest="on"
-                data-ad-client="ca-pub-2708419466378217"
-                data-ad-slot="8807314373"
-                data-ad-format="auto"
-                data-full-width-responsive="true"
-              ></ins>
+      <Card className='mb-2'>
+          {/* 展示广告  */}
+          <ins
+            className="adsbygoogle"
+            style={{ display: 'block' }}
+            data-adtest="on"
+            data-ad-client="ca-pub-2708419466378217"
+            data-ad-slot="8807314373"
+            data-ad-format="auto"
+            data-full-width-responsive="true"
+          ></ins>
       </Card>
 
       <div className="sticky top-4">