feature:最新文章排序调整,适配夜间模式

This commit is contained in:
tangly1024
2021-11-03 16:24:58 +08:00
parent 3fcbb8a420
commit ab375a3cdc
3 changed files with 9 additions and 6 deletions

View File

@@ -9,8 +9,8 @@ const SideBar = ({ tags, currentTag, post, posts }) => {
// 按时间排序
if (posts) {
posts = posts.sort((a, b) => {
const dateA = new Date(a?.date?.start_date || a.createdTime)
const dateB = new Date(b?.date?.start_date || b.createdTime)
const dateA = new Date(a?.lastEditedTime || a.createdTime)
const dateB = new Date(b?.lastEditedTime || b.createdTime)
return dateB - dateA
}).slice(0, 5)
}
@@ -31,17 +31,17 @@ const SideBar = ({ tags, currentTag, post, posts }) => {
<hr className='dark:border-gray-700' />
<section
className='text-sm font-bold py-3 px-5 text-gray-600 dark:text-gray-400 dark:hover:bg-black duration-100 flex flex-nowrap align-middle'>
<div className='w-32'>最新文章</div>
<div className='w-32'>近更</div>
</section>
<div>
{posts.map(post => {
return (
<Link key={post.id} title={post.title} href={`${BLOG.path}/article/${post.slug}`} >
<div className='text-sm py-1.5 px-5 cursor-pointer hover:underline hover:bg-gray-100 flex'>
<div className='text-sm py-1.5 px-5 cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-600 flex'>
<div className='w-12 overflow-hidden'>
<img className='w-12 w-12 object-cover cursor-pointer transform hover:scale-110 duration-500' src={post.page_cover} alt={post.title} />
</div>
<div className='w-60 ml-2 overflow-hidden whitespace-nowrap'>{post.title}</div>
<div className='w-60 ml-2 overflow-hidden whitespace-nowrap dark:text-gray-300'>{post.title}</div>
</div>
</Link>
)

View File

@@ -48,10 +48,12 @@ async function getPostsFromNotionAPI ({ from }) {
for (let i = 0; i < pageIds.length; i++) {
const id = pageIds[i]
const properties = (await getPageProperties(id, block, schema)) || null
// Add fullwidth, createdtime to properties
properties.createdTime = new Date(
block[id].value?.created_time
).toString()
properties.lastEditedTime = new Date(
block[id].value?.last_edited_time
).toString()
properties.fullWidth = block[id].value?.format?.page_full_width ?? false
properties.page_cover = getPostCover(id, block, pageRecordMap) ?? getContentFirstImage(id, block, pageRecordMap)
properties.content = block[id].value?.content ?? []

View File

@@ -1,6 +1,7 @@
import BLOG from '@/blog.config'
import { NotionAPI } from 'notion-client'
import { getDataFromCache, setDataToCache } from '@/lib/cache/cache_manager'
import { useRouter } from 'next/router'
export async function getPostBlocks (id, from) {
let pageBlock = await getDataFromCache('page_block_' + id)