Squashed commit of the following:

commit 54078a69f8 Author: Ad-closeNN <1709301095@qq.com> Date: Thu Aug 7 23:33:17 2025 +0800 2025/8/7 commit f65632b1e8 Author: Ad-closeNN <1709301095@qq.com> Date: Thu Aug 7 18:45:38 2025 +0800 Finish commit 7986271c89 Author: Ad-closeNN <1709301095@qq.com> Date: Thu Aug 7 17:41:57 2025 +0800 Delete umami.md commit fc0208cf4f Author: Ad-closeNN <1709301095@qq.com> Date: Thu Aug 7 17:38:53 2025 +0800 测试第一篇文章 commit 690d1290e4 Author: Ad-closeNN <1709301095@qq.com> Date: Thu Aug 7 11:56:58 2025 +0800 feat: 博客访问量测试 commit 135830db3c Author: Ad-closeNN <1709301095@qq.com> Date: Thu Aug 7 00:30:57 2025 +0800 25/8/6
2026-05-31 02:20:05 -04:00 · 2025-08-07 23:33:48 +08:00
parent b62aa887e7
commit 5fbc350af2
49 changed files with 1073 additions and 734 deletions
@@ -11,11 +11,15 @@ const currentYear = new Date().getFullYear();
 <!--<div class="transition bg-[oklch(92%_0.01_var(&#45;&#45;hue))] dark:bg-black rounded-2xl py-8 mt-4 mb-8 flex flex-col items-center justify-center px-6">-->
 <div class="transition border-dashed border-[oklch(85%_0.01_var(--hue))] dark:border-white/15 rounded-2xl mb-12 flex flex-col items-center justify-center px-6">
    <div class="transition text-50 text-sm text-center">
-        &copy; <span id="copyright-year">{currentYear}</span> {profileConfig.name}. All Rights Reserved. /
+        <a href="https://icp.gov.moe/?keyword=20256087" target="_blank">萌ICP备20256087号</a>
+        <br>
+        &copy; <span id="copyright-year">{currentYear}</span> {profileConfig.name}. All Rights Reserved.
+        <br>
        <a class="transition link text-[var(--primary)] font-medium" target="_blank" href={url('rss.xml')}>RSS</a> /
        <a class="transition link text-[var(--primary)] font-medium" target="_blank" href={url('sitemap-index.xml')}>Sitemap</a><br>
-        Powered by
-        <a class="transition link text-[var(--primary)] font-medium" target="_blank" href="https://astro.build">Astro</a> &
+        由
+        <a class="transition link text-[var(--primary)] font-medium" target="_blank" href="https://astro.build">Astro</a> 和
        <a class="transition link text-[var(--primary)] font-medium" target="_blank" href="https://github.com/saicaca/fuwari">Fuwari</a>
+        强力驱动
    </div>
 </div>
@@ -11,8 +11,8 @@ import {
 import { onMount } from "svelte";
 import type { LIGHT_DARK_MODE } from "@/types/config.ts";

-const seq: LIGHT_DARK_MODE[] = [LIGHT_MODE, DARK_MODE, AUTO_MODE];
-let mode: LIGHT_DARK_MODE = $state(AUTO_MODE);
+const seq: LIGHT_DARK_MODE[] = [LIGHT_MODE, DARK_MODE];
+let mode: LIGHT_DARK_MODE = LIGHT_MODE;

 onMount(() => {
 	mode = getStoredTheme();
@@ -66,9 +66,6 @@ function hidePanel() {
        <div class="absolute" class:opacity-0={mode !== DARK_MODE}>
            <Icon icon="material-symbols:dark-mode-outline-rounded" class="text-[1.25rem]"></Icon>
        </div>
-        <div class="absolute" class:opacity-0={mode !== AUTO_MODE}>
-            <Icon icon="material-symbols:radio-button-partial-outline" class="text-[1.25rem]"></Icon>
-        </div>
    </button>

    <div id="light-dark-panel" class="hidden lg:block absolute transition float-panel-closed top-11 -right-2 pt-5" >
@@ -87,13 +84,6 @@ function hidePanel() {
                <Icon icon="material-symbols:dark-mode-outline-rounded" class="text-[1.25rem] mr-3"></Icon>
                {i18n(I18nKey.darkMode)}
            </button>
-            <button class="flex transition whitespace-nowrap items-center !justify-start w-full btn-plain scale-animation rounded-lg h-9 px-3 font-medium active:scale-95"
-                    class:current-theme-btn={mode === AUTO_MODE}
-                    onclick={() => switchScheme(AUTO_MODE)}
-            >
-                <Icon icon="material-symbols:radio-button-partial-outline" class="text-[1.25rem] mr-3"></Icon>
-                {i18n(I18nKey.systemMode)}
-            </button>
        </div>
    </div>
 </div>
@@ -7,6 +7,7 @@ import { i18n } from "../i18n/translation";
 import { getDir } from "../utils/url-utils";
 import ImageWrapper from "./misc/ImageWrapper.astro";
 import PostMetadata from "./PostMeta.astro";
+import { umamiConfig } from "../config";

 interface Props {
 	class?: string;
@@ -64,14 +65,15 @@ const { remarkPluginFrontmatter } = await entry.render();
            { description || remarkPluginFrontmatter.excerpt }
        </div>

-        <!-- word count and read time  -->
+            
+        <!-- word count, read time and page views https://github.com/afoim/fuwari/blob/81f22decb17ff7ee1dd480c10773f7ba8f4df296/src/components/PostCard.astro -->
        <div class="text-sm text-black/30 dark:text-white/30 flex gap-4 transition">
-            <div>
-                {remarkPluginFrontmatter.words} {" " + i18n(remarkPluginFrontmatter.words === 1 ? I18nKey.wordCount : I18nKey.wordsCount)}
-            </div>
+            <div>{remarkPluginFrontmatter.words} {" " + i18n(I18nKey.wordsCount)}</div>
+            <div>|</div>
+            <div>{remarkPluginFrontmatter.minutes} {" " + i18n(I18nKey.minutesCount)}</div>
            <div>|</div>
            <div>
-                {remarkPluginFrontmatter.minutes} {" " + i18n(remarkPluginFrontmatter.minutes === 1 ? I18nKey.minuteCount : I18nKey.minutesCount)}
+                <span class="text-50 text-sm font-medium" id={`page-views-${entry.slug}`}>加载中...</span>
            </div>
        </div>

@@ -106,5 +108,72 @@ const { remarkPluginFrontmatter } = await entry.render();
 </div>
 <div class="transition border-t-[1px] border-dashed mx-6 border-black/10 dark:border-white/[0.15] last:border-t-0 md:hidden"></div>

+
+<!-- https://github.com/afoim/fuwari/blob/81f22decb17ff7ee1dd480c10773f7ba8f4df296/src/components/PostCard.astro -->
+
+<script define:vars={{ entry, umamiConfig }}>
+    // 获取文章浏览量统计
+    async function fetchPostCardViews(slug) {
+        if (!umamiConfig.enable) {
+            return;
+        }
+        
+        try {
+            // 第一步：获取网站ID和token
+            const shareResponse = await fetch(`${umamiConfig.baseUrl}/api/share/${umamiConfig.shareId}`);
+            if (!shareResponse.ok) {
+                throw new Error('获取分享信息失败');
+            }
+            const shareData = await shareResponse.json();
+            const { websiteId, token } = shareData;
+            
+            // 第二步：获取统计数据
+            const currentTimestamp = Date.now();
+            const statsUrl = `${umamiConfig.baseUrl}/api/websites/${websiteId}/stats?startAt=0&endAt=${currentTimestamp}&unit=hour&timezone=${encodeURIComponent(umamiConfig.timezone)}&url=%2Fposts%2F${slug}%2F&compare=false`;
+            
+            const statsResponse = await fetch(statsUrl, {
+                headers: {
+                    'x-umami-share-token': token
+                }
+            });
+            
+            if (!statsResponse.ok) {
+                throw new Error('获取统计数据失败');
+            }
+            
+            const statsData = await statsResponse.json();
+            const pageViews = statsData.pageviews?.value || 0;
+            // const visits = statsData.visits?.value || 0;
+            
+            const displayElement = document.getElementById(`page-views-${slug}`);
+             if (displayElement) {
+                 displayElement.textContent = `浏览量 ${pageViews}`;
+             }
+        } catch (error) {
+            console.error('Error fetching page views for', slug, ':', error);
+            const displayElement = document.getElementById(`page-views-${slug}`);
+            if (displayElement) {
+                displayElement.textContent = '统计不可用';
+            }
+        }
+    }
+
+    // 页面加载完成后获取统计数据
+    function initPostCardStats() {
+        const slug = entry.slug;
+        if (slug) {
+            fetchPostCardViews(slug);
+        }
+    }
+
+    if (document.readyState === 'loading') {
+        document.addEventListener('DOMContentLoaded', initPostCardStats);
+    } else {
+        initPostCardStats();
+    }
+</script>
+
+
+
 <style define:vars={{coverWidth}}>
 </style>
@@ -1,9 +1,11 @@
 ---
+import path from "node:path";
 import { Icon } from "astro-icon/components";
 import I18nKey from "../i18n/i18nKey";
 import { i18n } from "../i18n/translation";
 import { formatDateToYYYYMMDD } from "../utils/date-utils";
-import { getCategoryUrl, getTagUrl } from "../utils/url-utils";
+import { getCategoryUrl, getTagUrl, getDir, url } from "../utils/url-utils";
+import { umamiConfig } from "../config";

 interface Props {
 	class: string;
@@ -13,6 +15,7 @@ interface Props {
 	category: string | null;
 	hideTagsForMobile?: boolean;
 	hideUpdateDate?: boolean;
+    slug?: string;
 }
 const {
 	published,
@@ -21,6 +24,7 @@ const {
 	category,
 	hideTagsForMobile = false,
 	hideUpdateDate = false,
+    slug,
 } = Astro.props;
 const className = Astro.props.class;
 ---
@@ -35,7 +39,7 @@ const className = Astro.props.class;
        <span class="text-50 text-sm font-medium">{formatDateToYYYYMMDD(published)}</span>
    </div>

-    <!-- update date -->
+    <!-- update date
    {!hideUpdateDate && updated && updated.getTime() !== published.getTime() && (
        <div class="flex items-center">
            <div class="meta-icon"
@@ -45,6 +49,7 @@ const className = Astro.props.class;
            <span class="text-50 text-sm font-medium">{formatDateToYYYYMMDD(updated)}</span>
        </div>
    )}
+    -->

    <!-- categories -->
    <div class="flex items-center">
@@ -79,4 +84,72 @@ const className = Astro.props.class;
            {!(tags && tags.length > 0) && <div class="transition text-50 text-sm font-medium">{i18n(I18nKey.noTags)}</div>}
        </div>
    </div>
-</div>
+
+    {slug && (
+        <div class="flex items-center">
+            <div class="meta-icon">
+                <Icon name="material-symbols:visibility-outline-rounded" class="text-xl"></Icon>
+            </div>
+            <span class="text-50 text-sm font-medium" id="page-views-display">加载中...</span>
+        </div>
+    )}
+</div>
+
+<!-- https://github.com/afoim/fuwari/blob/81f22decb17ff7ee1dd480c10773f7ba8f4df296/src/components/PostMeta.astro -->
+
+{slug && (
+    <script define:vars={{ slug, umamiConfig }}>
+        // 获取访问量统计
+        async function fetchPageViews() {
+            if (!umamiConfig.enable) {
+                return;
+            }
+            
+            try {
+                // 第一步：获取网站ID和token
+                const shareResponse = await fetch(`${umamiConfig.baseUrl}/api/share/${umamiConfig.shareId}`);
+                if (!shareResponse.ok) {
+                    throw new Error('获取分享信息失败');
+                }
+                const shareData = await shareResponse.json();
+                const { websiteId, token } = shareData;
+                
+                // 第二步：获取统计数据
+                const currentTimestamp = Date.now();
+                const statsUrl = `${umamiConfig.baseUrl}/api/websites/${websiteId}/stats?startAt=0&endAt=${currentTimestamp}&unit=hour&timezone=${encodeURIComponent(umamiConfig.timezone)}&url=%2Fposts%2F${slug}%2F&compare=false`;
+                
+                const statsResponse = await fetch(statsUrl, {
+                    headers: {
+                        'x-umami-share-token': token
+                    }
+                });
+                
+                if (!statsResponse.ok) {
+                    throw new Error('获取统计数据失败');
+                }
+                
+                const statsData = await statsResponse.json();
+                const pageViews = statsData.pageviews?.value || 0;
+                const visits = statsData.visits?.value || 0;
+                
+                const displayElement = document.getElementById('page-views-display');
+                if (displayElement) {
+                    displayElement.textContent = `浏览量 ${pageViews} · 访问数 ${visits}`;
+                }
+            } catch (error) {
+                console.error('Error fetching page views:', error);
+                const displayElement = document.getElementById('page-views-display');
+                if (displayElement) {
+                    displayElement.textContent = '统计不可用';
+                }
+            }
+        }
+
+        // 页面加载完成后获取统计数据
+        if (document.readyState === 'loading') {
+            document.addEventListener('DOMContentLoaded', fetchPageViews);
+        } else {
+            fetchPageViews();
+        }
+    </script>
+)}
@@ -1,6 +1,6 @@
 ---
 import { Icon } from "astro-icon/components";
-import { profileConfig } from "../../config";
+import { profileConfig, umamiConfig } from "../../config";
 import { url } from "../../utils/url-utils";
 import ImageWrapper from "../misc/ImageWrapper.astro";

@@ -34,6 +34,65 @@ const config = profileConfig;
                {config.links[0].name}
            </a>}
        </div>
+
+        <!-- 全站访问量统计 https://github.com/afoim/fuwari/blob/81f22decb17ff7ee1dd480c10773f7ba8f4df296/src/components/widget/Profile.astro -->
+        <div class="text-center text-sm text-neutral-500 dark:text-neutral-400 mt-3 pt-3 border-t border-neutral-200 dark:border-neutral-700">
+            <div class="flex items-center justify-center gap-1">
+                <Icon name="material-symbols:visibility-outline" class="text-base"></Icon>
+                <span id="site-stats">加载中...</span>
+            </div>
+        </div>
+
    </div>
 </div>

+<script define:vars={{ umamiConfig }}>
+    // 获取全站访问量统计
+    async function loadSiteStats() {
+        if (!umamiConfig.enable) {
+            return;
+        }
+        
+        try {
+            // 第一步：获取网站ID和token
+            const shareResponse = await fetch(`${umamiConfig.baseUrl}/api/share/${umamiConfig.shareId}`);
+            if (!shareResponse.ok) {
+                throw new Error('获取分享信息失败');
+            }
+            const shareData = await shareResponse.json();
+            const { websiteId, token } = shareData;
+            
+            // 第二步：获取全站统计数据（不指定url参数获取全站数据）
+            const currentTimestamp = Date.now();
+            const statsUrl = `${umamiConfig.baseUrl}/api/websites/${websiteId}/stats?startAt=0&endAt=${currentTimestamp}&unit=hour&timezone=${encodeURIComponent(umamiConfig.timezone)}&compare=false`;
+            
+            const statsResponse = await fetch(statsUrl, {
+                 headers: {
+                     'x-umami-share-token': token
+                 }
+             });
+            
+            if (!statsResponse.ok) {
+                throw new Error('获取统计数据失败');
+            }
+            
+            const statsData = await statsResponse.json();
+            const pageviews = statsData.pageviews?.value || 0;
+            // const visitors = statsData.visits?.value || 0;
+            
+            const statsElement = document.getElementById('site-stats');
+            if (statsElement) {
+                statsElement.textContent = `浏览量 ${pageviews}`;
+            }
+        } catch (error) {
+            console.error('获取全站统计失败:', error);
+            const statsElement = document.getElementById('site-stats');
+            if (statsElement) {
+                statsElement.textContent = '统计不可用';
+            }
+        }
+    }
+
+    // 页面加载完成后获取统计数据
+    document.addEventListener('DOMContentLoaded', loadSiteStats);
+</script>