Merge branch 'main' of https://github.com/tangly1024/NotionNext

themes/game/components/Footer.js

@@ -9,7 +9,7 @@ export const Footer = props => {
 
   return (
     <footer
-      className={`z-10 dark:bg-black bg-white p-2 rounded-lg relative mt-6 flex-shrink-0 m-auto w-full dark:text-gray-200 `}>
+      className={`z-10 dark:bg-black bg-white p-2 rounded-lg relative mt-6 flex-shrink-0 mb-4 w-full shadow dark:text-gray-200 `}>
       {/* <hr className='my-2 border-black dark:border-gray-100' /> */}
       {/* 页面底部 */}
       <div className='w-full flex justify-between p-4 '>

themes/game/components/GameListIndexCombine.js

@@ -1,5 +1,6 @@
 /* eslint-disable @next/next/no-img-element */
 import { AdSlot } from '@/components/GoogleAdsense'
+import LazyImage from '@/components/LazyImage'
 import { siteConfig } from '@/lib/config'
 import { checkContainHttp, deepClone, sliceUrlFromHttp } from '@/lib/utils'
 import Link from 'next/link'
@@ -88,8 +89,8 @@ export const GameListIndexCombine = ({ posts }) => {
   }
 
   return (
-    <div className='game-list-wrapper flex justify-center w-full px-2'>
-      <div className='game-grid mx-auto w-full h-full grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-2'>
+    <div className='game-list-wrapper flex justify-center w-full'>
+      <div className='game-grid mx-auto w-full h-full grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-3 px-2 md:p-0'>
         {components?.map((ItemComponent, index) => {
           return ItemComponent
         })}
@@ -104,20 +105,24 @@ export const GameListIndexCombine = ({ posts }) => {
  */
 const GameAd = () => {
   return (
-    <div className='card-group rounded game-ad h-[20rem] w-full overflow-hidden'>
+    <div className='card-group relative rounded-lg game-ad h-80 w-full overflow-hidden'>
       <AdSlot type='flow' />
+      <div className='absolute left-0 right-0 w-full h-full flex flex-col justify-center items-center bg-white'>
+        <p className='text-2xl'>{siteConfig('TITLE')}</p>
+        <p>{siteConfig('DESCRIPTION')}</p>
+      </div>
     </div>
   )
 }
 
 /**
- * 4卡组成一个大卡
+ * 大卡由2行2列小卡构成
  * @param {*} param0
  * @returns
  */
 const GameItemGroup = ({ items }) => {
   return (
-    <div className='card-group h-[20rem] w-full grid grid-cols-2 grid-rows-2 gap-2'>
+    <div className='card-group h-80 w-full grid grid-cols-2 grid-rows-2 gap-3'>
       {items.map((item, index) => (
         <GameItem key={index} item={item} />
       ))}
@@ -140,38 +145,39 @@ const GameItem = ({ item, isLargeCard }) => {
   const video = item?.ext?.video
   return (
     <Link
+      title={title}
       href={`${url}`}
+      className={`card-single ${isLargeCard ? 'h-80 ' : 'h-full text-xs'} w-full transition-all duration-200 hover:scale-105 shadow-md hover:shadow-lg relative rounded-lg overflow-hidden flex justify-center items-center
+      group hover:border-purple-400`}
       onMouseOver={() => {
         setShowType('video')
       }}
       onMouseOut={() => {
         setShowType('img')
-      }}
-      title={title}
-      className={`card-single ${
-        isLargeCard ? 'h-[20rem]' : 'h-full'
-      } w-full relative shadow rounded-md overflow-hidden flex justify-center items-center
-                group   hover:border-purple-400`}>
+      }}>
       <div className='text-center absolute bottom-0 invisible group-hover:bottom-2 group-hover:visible transition-all duration-200 text-white z-30'>
         {title}
       </div>
-      <div className='h-1/2 w-full absolute left-0 bottom-0 z-20 opacity-0 group-hover:opacity-75 transition-all duration-200'>
+
+      <div className='h-2/3 w-full absolute left-0 bottom-0 z-20 opacity-0 group-hover:opacity-75 transition-all duration-200'>
         <div className='h-full w-full absolute bg-gradient-to-b from-transparent to-black'></div>
       </div>
 
       {showType === 'video' && (
         <video
-          className={`z-10 object-cover w-full ${isLargeCard ? 'h-[20rem]' : 'h-full'} absolute overflow-hidden`}
+          className={`z-10 object-cover w-full ${isLargeCard ? 'h-80' : 'h-full'} absolute overflow-hidden`}
           loop='true'
           autoPlay
           preload='none'>
           <source src={video} type='video/mp4' />
         </video>
       )}
-      <img
+      <LazyImage
         className='w-full h-full absolute object-cover group-hover:scale-105 duration-100 transition-all'
         src={img}
+        priority
         alt={title}
+        fill='full'
       />
     </Link>
   )

themes/game/components/GameListRealate.js

@@ -43,7 +43,9 @@ export const GameListRelate = ({ posts }) => {
 const GameItem = ({ item }) => {
   const { title } = item
   const [showType, setShowType] = useState('img') // img or video
-  const url = checkContainHttp(item.slug) ? sliceUrlFromHttp(item.slug) : `${siteConfig('SUB_PATH', '')}/${item.slug}`
+  const url = checkContainHttp(item.slug)
+    ? sliceUrlFromHttp(item.slug)
+    : `${siteConfig('SUB_PATH', '')}/${item.slug}`
 
   const img = item?.pageCoverThumbnail
   const video = item?.ext?.video
@@ -60,15 +62,19 @@ const GameItem = ({ item }) => {
       title={title}
       className={`card-single w-24 h-24 relative shadow rounded-md overflow-hidden flex justify-center items-center 
                 group   hover:border-purple-400`}>
-      <div className='text-sm text-center absolute bottom-0 invisible group-hover:bottom-2 group-hover:visible transition-all duration-200 text-white z-30'>
+      <div className='text-xs text-center absolute bottom-0 invisible group-hover:bottom-2 group-hover:visible transition-all duration-200 text-white z-30'>
         {title}
       </div>
-      <div className='h-1/2 w-full absolute left-0 bottom-0 z-20 opacity-0 group-hover:opacity-75 transition-all duration-200'>
+      <div className='h-2/3 w-full absolute left-0 bottom-0 z-20 opacity-0 group-hover:opacity-75 transition-all duration-200'>
         <div className='h-full w-full absolute bg-gradient-to-b from-transparent to-black'></div>
       </div>
 
       {showType === 'video' && (
-        <video className={`z-10 object-cover w-full h-24 absolute overflow-hidden`} loop='true' autoPlay preload='none'>
+        <video
+          className={`z-10 object-cover w-full h-24 absolute overflow-hidden`}
+          loop='true'
+          autoPlay
+          preload='none'>
           <source src={video} type='video/mp4' />
         </video>
       )}

themes/game/components/GameListRecent.js

@@ -1,7 +1,7 @@
 /* eslint-disable @next/next/no-img-element */
 import { siteConfig } from '@/lib/config'
 import { checkContainHttp, deepClone, sliceUrlFromHttp } from '@/lib/utils'
-import Link from 'next/link'
+import { useRouter } from 'next/router'
 import { useState } from 'react'
 import { useGameGlobal } from '..'
 
@@ -32,7 +32,7 @@ export const GameListRecent = ({ maxCount = 14 }) => {
 
   return (
     <>
-      <div className='game-list-recent-wrapper w-full max-w-full overflow-x-auto pt-4 px-2'>
+      <div className='game-list-recent-wrapper w-full max-w-full overflow-x-auto pt-4 px-2 md:px-0'>
         <div className='game-grid md:flex grid grid-flow-col gap-2'>
           {components?.map((ItemComponent, index) => {
             return ItemComponent
@@ -49,29 +49,67 @@ export const GameListRecent = ({ maxCount = 14 }) => {
  * @returns
  */
 const GameItem = ({ item }) => {
+  const router = useRouter()
+  const { recentGames, setRecentGames } = useGameGlobal()
   const { title } = item || {}
   const [showType, setShowType] = useState('img') // img or video
   const url = checkContainHttp(item.slug)
     ? sliceUrlFromHttp(item.slug)
     : `${siteConfig('SUB_PATH', '')}/${item.slug}`
 
+  const [isClockVisible, setClockVisible] = useState(true)
+  const toggleIcons = () => {
+    setClockVisible(!isClockVisible)
+  }
+  /**
+   * 移除最近
+   */
+  const removeRecent = () => {
+    const updatedRecentGames = deepClone(recentGames) // 创建一个 recentGames 的副本
+    const indexToRemove = updatedRecentGames.findIndex(
+      game => game?.title === item.title
+    ) // 找到要移除的项的索引
+    if (indexToRemove !== -1) {
+      updatedRecentGames.splice(indexToRemove, 1) // 使用 splice 方法删除项
+      setRecentGames(updatedRecentGames) // 更新 recentGames 状态
+      localStorage.setItem('recent_games', JSON.stringify(updatedRecentGames))
+    }
+  }
+
+  const handleButtonClick = () => {
+    router.push(url) // 如果是 Next.js
+  }
+
   const img = item?.pageCoverThumbnail
   const video = item?.ext?.video
+
   return (
-    <Link
-      href={`${url}`}
+    <div
+      onClick={handleButtonClick}
       onMouseOver={() => {
         setShowType('video')
       }}
       onMouseOut={() => {
         setShowType('img')
       }}
       title={title}
-      className={`card-single h-28 w-28 relative shadow rounded-md overflow-hidden flex justify-center items-center 
-                group   hover:border-purple-400`}>
-      <div className='absolute right-0.5 top-1 z-20'>
-        <i className='fas fa-clock-rotate-left w-6 h-6 flex items-center justify-center shadow rounded-full bg-white text-blue-500 text-sm' />
-      </div>
+      className={`cursor-pointer card-single h-28 w-28 relative shadow rounded-md overflow-hidden flex justify-center items-center 
+                group hover:border-purple-400`}>
+      <button
+        className='absolute right-0.5 top-1 z-20'
+        onClick={e => {
+          e.stopPropagation() // 阻止事件冒泡，防止触发父级元素的点击事件
+          removeRecent()
+        }}
+        onMouseEnter={toggleIcons}
+        onMouseLeave={toggleIcons}>
+        {isClockVisible ? (
+          <i className='fas fa-clock-rotate-left w-6 h-6 flex items-center justify-center shadow rounded-full bg-white text-blue-500 text-sm'></i>
+        ) : (
+          <i className='fas fa-trash-can w-6 h-6 flex items-center justify-center shadow rounded-full bg-white text-red-500 text-sm'></i>
+        )}
+      </button>
+
       <div className='absolute text-sm bottom-2 transition-all duration-200 text-white z-30'>
         {title}
       </div>
@@ -93,6 +131,6 @@ const GameItem = ({ item }) => {
         src={img}
         alt={title}
       />
-    </Link>
+    </div>
   )
 }

themes/game/index.js

@@ -62,11 +62,6 @@ const LayoutBase = props => {
   const [sideBarVisible, setSideBarVisible] = useState(false)
 
   useEffect(() => {
-    setRecentGames(
-      localStorage.getItem('recent_games')
-        ? JSON.parse(localStorage.getItem('recent_games'))
-        : []
-    )
     loadWowJS()
   }, [])
 
@@ -110,9 +105,8 @@ const LayoutBase = props => {
           </div>
 
           {/* 右侧 */}
-          <main className='flex-grow w-full h-full flex flex-col min-h-screen overflow-x-auto'>
+          <main className='flex-grow w-full h-full flex flex-col min-h-screen overflow-x-auto md:p-2'>
             <div className='flex-grow h-full'>{children}</div>
-
             <Footer />
           </main>
         </div>
@@ -274,6 +268,7 @@ const LayoutArchive = props => {
  * @returns
  */
 const LayoutSlug = props => {
+  const { setRecentGames } = useGameGlobal()
   const { post, siteInfo, allNavPages, recommendPosts, lock, validPassword } =
     props
 
@@ -298,29 +293,31 @@ const LayoutSlug = props => {
       recentGames.unshift(existingGame)
     }
     localStorage.setItem('recent_games', JSON.stringify(recentGames))
+
+    setRecentGames(recentGames)
   }, [post])
 
   return (
     <>
       {lock && <ArticleLock validPassword={validPassword} />}
 
       {!lock && (
-        <div id='article-wrapper' className='md:px-2'>
-          <div className='game-detail-wrapper w-full grow flex md:px-2'>
-            <div className={`w-full py-1 md:py-4 `}>
+        <div id='article-wrapper'>
+          <div className='game-detail-wrapper w-full grow flex'>
+            <div className={`w-full md:py-2`}>
               {/* 游戏窗口 */}
               <GameEmbed post={post} siteInfo={siteInfo} />
 
               {/* 资讯 */}
-              <div className='game-info dark:text-white py-4 px-2 md:px-0 mt-14 md:mt-0'>
+              <div className='game-info  dark:text-white py-2 px-2 md:px-0 mt-14 md:mt-0'>
                 {/* 关联游戏 */}
                 <div className='w-full'>
                   <GameListRelate posts={relateGames} />
                 </div>
 
                 {/* 详情描述 */}
                 {post && (
-                  <div className='bg-white shadow-md my-2 p-2 rounded-md dark:bg-black'>
+                  <div className='bg-white shadow-md my-2 p-4 rounded-md dark:bg-black'>
                     <PostInfo post={post} />
                     <NotionPage post={post} />
                     {/* 广告嵌入 */}