From 046f5ae44687fba34b0f695e63b5018a7bb68efd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B3=E5=85=83=E7=9A=93?= <hw@yuanhau.com>
Date: Sun, 1 Jun 2025 08:15:53 +0800
Subject: [PATCH] News window & make the hot news that uses google news rss
 legacy.

---
 components/app/windows/aboutNewsOrg.vue | 2 +-
 components/app/windows/news.vue         | 3 ---
 components/app/windows/newsView.vue     | 7 ++++++-
 i18n/locales/en.json                    | 2 +-
 i18n/locales/zh-tw.json                 | 4 ++--
 nginx.conf                              | 3 ++-
 nuxt.config.ts                          | 1 -
 pages/desktop.vue                       | 4 ++--
 8 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/components/app/windows/aboutNewsOrg.vue b/components/app/windows/aboutNewsOrg.vue
index 76232ba..6366f83 100644
--- a/components/app/windows/aboutNewsOrg.vue
+++ b/components/app/windows/aboutNewsOrg.vue
@@ -20,7 +20,7 @@ const {
   data: fetchNewsOrgInfo,
   pending,
   error,
-} = useFetch("/api/cached/getData/fetchNewsOrgInfo/2293", {
+} = useFetch(`/api/cached/getData/fetchNewsOrgInfo/${props.values}`, {
   method: "POST",
   headers: {
     "Content-Type": "application/json",
diff --git a/components/app/windows/news.vue b/components/app/windows/news.vue
index 641f2b6..b14f7e0 100644
--- a/components/app/windows/news.vue
+++ b/components/app/windows/news.vue
@@ -305,9 +305,6 @@ const openPublisher = (text: string) => {
                   找不到類似文章
                 </div>
               </div>
-              <!--<div v-for="item in findRel(item.title)">
-                  {{ item }}
-                </div>-->
             </div>
             <!--<p :class="getCheckResult(item.title) ? 'hidden' : ''">
                 {{ item.shortDescription }}
diff --git a/components/app/windows/newsView.vue b/components/app/windows/newsView.vue
index 8074fa0..515f568 100644
--- a/components/app/windows/newsView.vue
+++ b/components/app/windows/newsView.vue
@@ -68,7 +68,12 @@ const aiSummary = async () => {
             class="w-4 h-4 align-middle justify-center text-center"
           />Activate
         </button>
-        <div v-else>{{ summaryText }}</div>
+        <div v-else>
+          <div v-if="!summaryText">
+            Loading...
+          </div>
+          <div v-else>{{ summaryText }}</div>
+        </div>
       </div>
       <div class="flex flex-col bg-gray-500">
         <div class="flex flex-row" v-for="item in likeart">
diff --git a/i18n/locales/en.json b/i18n/locales/en.json
index 36f3fb1..60dd8a0 100644
--- a/i18n/locales/en.json
+++ b/i18n/locales/en.json
@@ -61,7 +61,7 @@
   "app": {
     "changelangmessage": "Switching the language...",
     "launchtext": "Cooking up the desktop...",
-    "hotnews": "Hot News",
+    "hotnews": "Hot News (legacy)",
     "news": "News",
     "sources": "Sources",
     "about": "About this website",
diff --git a/i18n/locales/zh-tw.json b/i18n/locales/zh-tw.json
index db2706c..30b4eb8 100644
--- a/i18n/locales/zh-tw.json
+++ b/i18n/locales/zh-tw.json
@@ -61,8 +61,8 @@
   "app": {
     "changelangmessage": "正在切換語言中...",
     "launchtext": "系統開機中...",
-    "hotnews": "熱門新聞",
-    "news": "新聞",
+    "hotnews": "熱門新聞 (舊版)",
+    "news": "熱門新聞",
     "sources": "資料來源",
     "about": "關於這個網站",
     "settings": "設定",
diff --git a/nginx.conf b/nginx.conf
index fd5a573..dd6160b 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,6 +1,7 @@
 # Run :%s/news.yuanhau.com/your.domain.here/ in vim to replace news.yuanhau.com to your domain.
 # Caddy is currently not supported.
 # Before getting the SSL cert for your website comment the the few with the lines of #commentbeforessl
+# Use "certbot certonly" to get a certificate.
 #
 #
 #
@@ -18,7 +19,7 @@ server {
         ssl_certificate_key /etc/letsencrypt/live/news.yuanhau.com/privkey.pem; #commentbeforessl
         server_name news.yuanhau.com;
         access_log /var/log/nginx/news_analyze.access.log;
-        error_log /var/log/nginx/news_analyze.error.log;
+        error_log /vㄇar/log/nginx/news_analyze.error.log;
 
         location / {
                 proxy_pass http://127.0.0.1:36694; # Traefik port.
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 2a95fee..644122b 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -41,7 +41,6 @@ export default defineNuxtConfig({
     "@nuxtjs/i18n",
     "@nuxtjs/tailwindcss",
     "shadcn-nuxt",
-    "motion-v/nuxt",
     "@sentry/nuxt/module",
   ],
 
diff --git a/pages/desktop.vue b/pages/desktop.vue
index aa6dd70..1798c37 100644
--- a/pages/desktop.vue
+++ b/pages/desktop.vue
@@ -461,10 +461,10 @@ const openArticles = async (slug: string, titleName?: string) => {
   }, 1000);
 };
 
-const openNewsSourcePage = async (slug: string, titleName: string) => {
+const openNewsSourcePage = async (slug: string) => {
   openingAppViaAnApp.value = true;
   passedValues.value = slug;
-  const titleNameFinal = titleName + "&nbsp;" + t("app.aboutNewsOrg");
+  const titleNameFinal = slug ?  "關於" + slug : t("app.aboutNewsOrg");
   findAndOpenWindow("aboutNewsOrg", titleNameFinal);
 
   setTimeout(() => {