diff --git a/README.md b/README.md index f2ef8ef..469d92b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - + ## 小破站 diff --git a/public/images/favicon.ico b/assets/images/favicon.ico similarity index 100% rename from public/images/favicon.ico rename to assets/images/favicon.ico diff --git a/public/images/favicon.webp b/assets/images/favicon.webp similarity index 100% rename from public/images/favicon.webp rename to assets/images/favicon.webp diff --git a/public/images/img/64.ai b/assets/images/img/64.ai similarity index 100% rename from public/images/img/64.ai rename to assets/images/img/64.ai diff --git a/public/images/img/64.png b/assets/images/img/64.png similarity index 100% rename from public/images/img/64.png rename to assets/images/img/64.png diff --git a/public/images/img/64.svg b/assets/images/img/64.svg similarity index 100% rename from public/images/img/64.svg rename to assets/images/img/64.svg diff --git a/public/images/img/Sensei_dark.webp b/assets/images/img/Sensei_dark.webp similarity index 100% rename from public/images/img/Sensei_dark.webp rename to assets/images/img/Sensei_dark.webp diff --git a/public/images/img/Sensei_sakura.webp b/assets/images/img/Sensei_sakura.webp similarity index 100% rename from public/images/img/Sensei_sakura.webp rename to assets/images/img/Sensei_sakura.webp diff --git a/public/images/img/about.webp b/assets/images/img/about.webp similarity index 100% rename from public/images/img/about.webp rename to assets/images/img/about.webp diff --git a/public/images/img/apple-touch-icon.webp b/assets/images/img/apple-touch-icon.webp similarity index 100% rename from public/images/img/apple-touch-icon.webp rename to assets/images/img/apple-touch-icon.webp diff --git a/public/images/img/avatar.ai b/assets/images/img/avatar.ai similarity index 100% rename from public/images/img/avatar.ai rename to assets/images/img/avatar.ai diff --git a/public/images/img/avatar.svg b/assets/images/img/avatar.svg similarity index 100% rename from public/images/img/avatar.svg rename to assets/images/img/avatar.svg diff --git a/public/images/img/avatar_b.webp b/assets/images/img/avatar_b.webp similarity index 100% rename from public/images/img/avatar_b.webp rename to assets/images/img/avatar_b.webp diff --git a/public/images/img/avatar_b2.webp b/assets/images/img/avatar_b2.webp similarity index 100% rename from public/images/img/avatar_b2.webp rename to assets/images/img/avatar_b2.webp diff --git a/public/images/img/backup.webp b/assets/images/img/backup.webp similarity index 100% rename from public/images/img/backup.webp rename to assets/images/img/backup.webp diff --git a/public/images/img/category.webp b/assets/images/img/category.webp similarity index 100% rename from public/images/img/category.webp rename to assets/images/img/category.webp diff --git a/public/images/img/comment-line-dark.svg b/assets/images/img/comment-line-dark.svg similarity index 100% rename from public/images/img/comment-line-dark.svg rename to assets/images/img/comment-line-dark.svg diff --git a/public/images/img/comment-line.svg b/assets/images/img/comment-line.svg similarity index 100% rename from public/images/img/comment-line.svg rename to assets/images/img/comment-line.svg diff --git a/public/images/img/default.webp b/assets/images/img/default.webp similarity index 100% rename from public/images/img/default.webp rename to assets/images/img/default.webp diff --git a/public/images/img/favicon.webp b/assets/images/img/favicon.webp similarity index 100% rename from public/images/img/favicon.webp rename to assets/images/img/favicon.webp diff --git a/public/images/img/friend.webp b/assets/images/img/friend.webp similarity index 100% rename from public/images/img/friend.webp rename to assets/images/img/friend.webp diff --git a/public/images/img/index.webp b/assets/images/img/index.webp similarity index 100% rename from public/images/img/index.webp rename to assets/images/img/index.webp diff --git a/public/images/img/loading.gif b/assets/images/img/loading.gif similarity index 100% rename from public/images/img/loading.gif rename to assets/images/img/loading.gif diff --git a/public/images/img/mona-loading-default.gif b/assets/images/img/mona-loading-default.gif similarity index 100% rename from public/images/img/mona-loading-default.gif rename to assets/images/img/mona-loading-default.gif diff --git a/public/images/img/mona-loading-dimmed.gif b/assets/images/img/mona-loading-dimmed.gif similarity index 100% rename from public/images/img/mona-loading-dimmed.gif rename to assets/images/img/mona-loading-dimmed.gif diff --git a/public/images/img/mona.webp b/assets/images/img/mona.webp similarity index 100% rename from public/images/img/mona.webp rename to assets/images/img/mona.webp diff --git a/public/images/img/placeholder-1200x1000.webp b/assets/images/img/placeholder-1200x1000.webp similarity index 100% rename from public/images/img/placeholder-1200x1000.webp rename to assets/images/img/placeholder-1200x1000.webp diff --git a/public/images/img/placeholder-600x500.webp b/assets/images/img/placeholder-600x500.webp similarity index 100% rename from public/images/img/placeholder-600x500.webp rename to assets/images/img/placeholder-600x500.webp diff --git a/public/images/img/police_beian.webp b/assets/images/img/police_beian.webp similarity index 100% rename from public/images/img/police_beian.webp rename to assets/images/img/police_beian.webp diff --git a/public/images/img/post.webp b/assets/images/img/post.webp similarity index 100% rename from public/images/img/post.webp rename to assets/images/img/post.webp diff --git a/public/images/img/qrcode.webp b/assets/images/img/qrcode.webp similarity index 100% rename from public/images/img/qrcode.webp rename to assets/images/img/qrcode.webp diff --git a/public/images/img/sparkling-heart.ai b/assets/images/img/sparkling-heart.ai similarity index 100% rename from public/images/img/sparkling-heart.ai rename to assets/images/img/sparkling-heart.ai diff --git a/public/images/img/sparkling-heart.png b/assets/images/img/sparkling-heart.png similarity index 100% rename from public/images/img/sparkling-heart.png rename to assets/images/img/sparkling-heart.png diff --git a/public/images/img/sparkling-heart.svg b/assets/images/img/sparkling-heart.svg similarity index 100% rename from public/images/img/sparkling-heart.svg rename to assets/images/img/sparkling-heart.svg diff --git a/public/images/img/tags.webp b/assets/images/img/tags.webp similarity index 100% rename from public/images/img/tags.webp rename to assets/images/img/tags.webp diff --git a/public/images/p/create-a-mini-router-for-react/Web架构.drawio b/assets/images/p/create-a-mini-router-for-react/Web架构.drawio similarity index 100% rename from public/images/p/create-a-mini-router-for-react/Web架构.drawio rename to assets/images/p/create-a-mini-router-for-react/Web架构.drawio diff --git a/public/images/p/create-a-mini-router-for-react/Web架构.svg b/assets/images/p/create-a-mini-router-for-react/Web架构.svg similarity index 100% rename from public/images/p/create-a-mini-router-for-react/Web架构.svg rename to assets/images/p/create-a-mini-router-for-react/Web架构.svg diff --git a/public/images/p/create-a-mini-router-for-react/image-20210823154009498.webp b/assets/images/p/create-a-mini-router-for-react/image-20210823154009498.webp similarity index 100% rename from public/images/p/create-a-mini-router-for-react/image-20210823154009498.webp rename to assets/images/p/create-a-mini-router-for-react/image-20210823154009498.webp diff --git a/public/images/p/create-a-mini-router-for-react/router.png b/assets/images/p/create-a-mini-router-for-react/router.png similarity index 100% rename from public/images/p/create-a-mini-router-for-react/router.png rename to assets/images/p/create-a-mini-router-for-react/router.png diff --git a/public/images/p/create-a-mini-router-for-react/router.psd b/assets/images/p/create-a-mini-router-for-react/router.psd similarity index 100% rename from public/images/p/create-a-mini-router-for-react/router.psd rename to assets/images/p/create-a-mini-router-for-react/router.psd diff --git a/public/images/p/create-a-mini-router-for-react/router.webp b/assets/images/p/create-a-mini-router-for-react/router.webp similarity index 100% rename from public/images/p/create-a-mini-router-for-react/router.webp rename to assets/images/p/create-a-mini-router-for-react/router.webp diff --git a/public/images/p/create-a-mini-router-for-react/迷你路由器.drawio b/assets/images/p/create-a-mini-router-for-react/迷你路由器.drawio similarity index 100% rename from public/images/p/create-a-mini-router-for-react/迷你路由器.drawio rename to assets/images/p/create-a-mini-router-for-react/迷你路由器.drawio diff --git a/public/images/p/create-a-mini-router-for-react/迷你路由器.svg b/assets/images/p/create-a-mini-router-for-react/迷你路由器.svg similarity index 100% rename from public/images/p/create-a-mini-router-for-react/迷你路由器.svg rename to assets/images/p/create-a-mini-router-for-react/迷你路由器.svg diff --git a/public/images/p/how-to-load-a-background-with-threejs/Skybox_example.png b/assets/images/p/how-to-load-a-background-with-threejs/Skybox_example.png similarity index 100% rename from public/images/p/how-to-load-a-background-with-threejs/Skybox_example.png rename to assets/images/p/how-to-load-a-background-with-threejs/Skybox_example.png diff --git a/public/images/p/my-develop-environmental/logo.svg b/assets/images/p/my-develop-environmental/logo.svg similarity index 100% rename from public/images/p/my-develop-environmental/logo.svg rename to assets/images/p/my-develop-environmental/logo.svg diff --git a/public/images/p/my-develop-environmental/windows-environmentail.png b/assets/images/p/my-develop-environmental/windows-environmentail.png similarity index 100% rename from public/images/p/my-develop-environmental/windows-environmentail.png rename to assets/images/p/my-develop-environmental/windows-environmentail.png diff --git a/public/images/p/setting-up-docsearch-for-nextjs/cannot-login-to-algolia-crawler.png b/assets/images/p/setting-up-docsearch-for-nextjs/cannot-login-to-algolia-crawler.png similarity index 100% rename from public/images/p/setting-up-docsearch-for-nextjs/cannot-login-to-algolia-crawler.png rename to assets/images/p/setting-up-docsearch-for-nextjs/cannot-login-to-algolia-crawler.png diff --git a/public/images/p/setting-up-docsearch-for-nextjs/index-format.png b/assets/images/p/setting-up-docsearch-for-nextjs/index-format.png similarity index 100% rename from public/images/p/setting-up-docsearch-for-nextjs/index-format.png rename to assets/images/p/setting-up-docsearch-for-nextjs/index-format.png diff --git a/components/RUA/loading/RUALoading.tsx b/components/RUA/loading/RUALoading.tsx index 6c7495c..6f80a28 100644 --- a/components/RUA/loading/RUALoading.tsx +++ b/components/RUA/loading/RUALoading.tsx @@ -1,7 +1,7 @@ import React from 'react'; import cn from 'classnames'; -import loadingImage from 'public/images/img/mona-loading-default.gif'; -import loadingImageDimmed from 'public/images/img/mona-loading-dimmed.gif'; +import loadingImage from 'assets/images/img/mona-loading-default.gif'; +import loadingImageDimmed from 'assets/images/img/mona-loading-dimmed.gif'; import Image from 'next/image'; import { useTheme } from 'next-themes'; diff --git a/components/gists/UserInfo.tsx b/components/gists/UserInfo.tsx index 8abc1d8..3438466 100644 --- a/components/gists/UserInfo.tsx +++ b/components/gists/UserInfo.tsx @@ -1,7 +1,7 @@ import classNames from 'classnames'; import { GetUser } from 'lib/fetcher'; import Image from 'next/image'; -import avatar from 'public/images/img/avatar.svg'; +import avatar from 'assets/images/img/avatar.svg'; import { FiLink, FiMail, FiTwitter } from 'react-icons/fi'; type Props = { diff --git a/layouts/MDXLayout.tsx b/layouts/MDXLayout.tsx index 80c4c86..676cfbe 100644 --- a/layouts/MDXLayout.tsx +++ b/layouts/MDXLayout.tsx @@ -10,11 +10,11 @@ const PostComment = dynamic(() => import('components/post/PostComment')); interface Props extends MyMatters { showTOC?: boolean; - children: React.ReactNode; + children: React.ReactElement; } const MDXLayout = ({ title, date, showTOC = true, children }: Props) => { - const contentString = renderToString(children as any); + const contentString = renderToString(children); const headings = getHeadings(contentString); return ( diff --git a/pages/g/[id].tsx b/pages/g/[id].tsx index f4e0fcd..bfa0356 100644 --- a/pages/g/[id].tsx +++ b/pages/g/[id].tsx @@ -6,7 +6,7 @@ import { GetStaticPaths, GetStaticProps, InferGetStaticPropsType } from 'next'; import dynamic from 'next/dynamic'; import Image from 'next/image'; import Link from 'next/link'; -import avatar from 'public/images/img/avatar.svg'; +import avatar from 'assets/images/img/avatar.svg'; import { ReactElement } from 'react'; const MainLayout = dynamic(() => import('layouts/MainLayout')); diff --git a/pages/p/create-a-mini-router-for-react.mdx b/pages/p/create-a-mini-router-for-react.mdx index 2bbdb9e..f4ff4bd 100644 --- a/pages/p/create-a-mini-router-for-react.mdx +++ b/pages/p/create-a-mini-router-for-react.mdx @@ -6,10 +6,10 @@ tags: [JavaScript, React] import Layout from 'layouts/MDXLayout'; import Image from 'components/mdx/Image'; -import image1 from 'public/images/p/create-a-mini-router-for-react/router.webp'; -import image2 from 'public/images/p/create-a-mini-router-for-react/Web架构.svg'; -import image3 from 'public/images/p/create-a-mini-router-for-react/迷你路由器.svg'; -import image4 from 'public/images/p/create-a-mini-router-for-react/image-20210823154009498.webp'; +import image1 from 'assets/images/p/create-a-mini-router-for-react/router.webp'; +import image2 from 'assets/images/p/create-a-mini-router-for-react/Web架构.svg'; +import image3 from 'assets/images/p/create-a-mini-router-for-react/迷你路由器.svg'; +import image4 from 'assets/images/p/create-a-mini-router-for-react/image-20210823154009498.webp'; export const meta = { title: '现代前端的Web应用路由-为React打造一个迷你路由器', diff --git a/pages/p/how-to-load-a-background-with-threejs.mdx b/pages/p/how-to-load-a-background-with-threejs.mdx index 8d765d7..43df8f3 100644 --- a/pages/p/how-to-load-a-background-with-threejs.mdx +++ b/pages/p/how-to-load-a-background-with-threejs.mdx @@ -7,7 +7,7 @@ tags: ['three.js', 'JavaScript'] import Layout from 'layouts/MDXLayout'; import dynamic from 'next/dynamic'; import Image from 'components/mdx/Image'; -import image1 from 'public/images/p/how-to-load-a-background-with-threejs/Skybox_example.png'; +import image1 from 'assets/images/p/how-to-load-a-background-with-threejs/Skybox_example.png'; export const RUASandpack = dynamic(() => import('components/RUA/RUASandpack')); diff --git a/pages/p/my-develop-environmental.mdx b/pages/p/my-develop-environmental.mdx index 4812851..82ea5ac 100644 --- a/pages/p/my-develop-environmental.mdx +++ b/pages/p/my-develop-environmental.mdx @@ -6,8 +6,8 @@ tags: [Linux, Server] import Layout from 'layouts/MDXLayout'; import Image from 'components/mdx/Image'; -import image1 from 'public/images/p/my-develop-environmental/logo.svg'; -import image2 from 'public/images/p/my-develop-environmental/windows-environmentail.png'; +import image1 from 'assets/images/p/my-develop-environmental/logo.svg'; +import image2 from 'assets/images/p/my-develop-environmental/windows-environmentail.png'; export const meta = { title: '我的开发环境', diff --git a/pages/p/setting-up-docsearch-for-nextjs.mdx b/pages/p/setting-up-docsearch-for-nextjs.mdx index 5ba804c..af0b359 100644 --- a/pages/p/setting-up-docsearch-for-nextjs.mdx +++ b/pages/p/setting-up-docsearch-for-nextjs.mdx @@ -7,8 +7,8 @@ tags: ['Next.js', 'JavaScript'] import Layout from 'layouts/MDXLayout'; import dynamic from 'next/dynamic'; import Image from 'components/mdx/Image'; -import image1 from 'public/images/p/setting-up-docsearch-for-nextjs/cannot-login-to-algolia-crawler.png'; -import image2 from 'public/images/p/setting-up-docsearch-for-nextjs/index-format.png'; +import image1 from 'assets/images/p/setting-up-docsearch-for-nextjs/cannot-login-to-algolia-crawler.png'; +import image2 from 'assets/images/p/setting-up-docsearch-for-nextjs/index-format.png'; export const RUASandpack = dynamic(() => import('components/RUA/RUASandpack')); export const Tab = dynamic(() => import('components/RUA/tab')); diff --git a/public/vercel.svg b/public/vercel.svg index a9b447f..918acb7 100644 --- a/public/vercel.svg +++ b/public/vercel.svg @@ -1,5 +1,5 @@ + d="M141.04 16c-11.04 0-19 7.2-19 18s8.96 18 20 18c6.67 0 12.55-2.64 16.19-7.09l-7.65-4.42c-2.02 2.21-5.09 3.5-8.54 3.5-4.79 0-8.86-2.5-10.37-6.5h28.02c.22-1.12.35-2.28.35-3.5 0-10.79-7.96-17.99-19-17.99zm-9.46 14.5c1.25-3.99 4.67-6.5 9.45-6.5 4.79 0 8.21 2.51 9.45 6.5h-18.9zM248.72 16c-11.04 0-19 7.2-19 18s8.96 18 20 18c6.67 0 12.55-2.64 16.19-7.09l-7.65-4.42c-2.02 2.21-5.09 3.5-8.54 3.5-4.79 0-8.86-2.5-10.37-6.5h28.02c.22-1.12.35-2.28.35-3.5 0-10.79-7.96-17.99-19-17.99zm-9.45 14.5c1.25-3.99 4.67-6.5 9.45-6.5 4.79 0 8.21 2.51 9.45 6.5h-18.9zM200.24 34c0 6 3.92 10 10 10 4.12 0 7.21-1.87 8.8-4.92l7.68 4.43c-3.18 5.3-9.14 8.49-16.48 8.49-11.05 0-19-7.2-19-18s7.96-18 19-18c7.34 0 13.29 3.19 16.48 8.49l-7.68 4.43c-1.59-3.05-4.68-4.92-8.8-4.92-6.07 0-10 4-10 10zm82.48-29v46h-9V5h9zM36.95 0L73.9 64H0L36.95 0zm92.38 5l-27.71 48L73.91 5H84.3l17.32 30 17.32-30h10.39zm58.91 12v9.69c-1-.29-2.06-.49-3.2-.49-5.81 0-10 4-10 10V51h-9V17h9v9.2c0-5.08 5.91-9.2 13.2-9.2z" + fill="#000" /> \ No newline at end of file