diff --git a/components/blurPageBeforeLogin.vue b/components/blurPageBeforeLogin.vue
index c6e092b..eee4f8c 100644
--- a/components/blurPageBeforeLogin.vue
+++ b/components/blurPageBeforeLogin.vue
@@ -7,6 +7,16 @@ const error = ref(false);
const errorMsg = ref("");
const emit = defineEmits(["windowopener", "error", "loadValue"]);
+/**
+ * return {
+ userAccount: fetchViaSQL[0].username,
+ firstName: fetchViaSQL[0].firstName,
+ requested_action: "CONTINUE",
+ current_spot: "KEEP_LOGIN",
+ email: fetchViaSQL[0].email,
+ avatarURL: fetchViaSQL[0].avatarurl,
+ };
+ */
try {
// 喔 我沒有加 await :( 難怪有問題
const { data, error: sendError } = await useFetch(
@@ -15,8 +25,11 @@ try {
if (sendError.value) {
error.value = true;
}
- if (data.value.requested_action === "CONTINUE") {
- if (data.value.userAccount && data.value.userAccount.length !== 0) {
+ if (data.requested_action === "LOGOUT_USER") {
+ logoutUser();
+ }
+ if (data.requested_action === "CONTINUE") {
+ if (data.userAccount && data.userAccount.length !== 0) {
allowed.value = true;
} else {
allowed.value = false;
diff --git a/components/checkAppVersion.ts b/components/checkAppVersion.ts
index 40d7e7f..a2ba763 100644
--- a/components/checkAppVersion.ts
+++ b/components/checkAppVersion.ts
@@ -1,12 +1,14 @@
import currentVersion from "~/versionTag";
+export default async function newestVersion() {
export default async function newestVersion() {
const current = currentVersion();
const req = await fetch("/api/version");
if (!req.ok) {
console.error("Version check failed:", req.statusText);
- return true; // fail-closed → pretend we are up-to-date
+ return true; // fail-closed → pretend we are up-to-date
}
const { version: latest } = await req.json();
- return current === latest; // `true` ➜ up-to-date
+ return current === latest; // `true` ➜ up-to-date
+}
}
diff --git a/i18n/locales/en.json b/i18n/locales/en.json
index a007ac0..c38c38e 100644
--- a/i18n/locales/en.json
+++ b/i18n/locales/en.json
@@ -148,8 +148,5 @@
"nosimilararticles": "There aren't any similar articles.",
"articleopenpart1": "This will open a open a new window about this new org",
"articleopenpart2": ""
- },
- "fav": {
- "haventaddedyet": "You haven't added any favorites yet."
}
}
diff --git a/i18n/locales/zh-tw.json b/i18n/locales/zh-tw.json
index 963ab15..db2c7f1 100644
--- a/i18n/locales/zh-tw.json
+++ b/i18n/locales/zh-tw.json
@@ -71,7 +71,7 @@
"license": "授權",
"search": "搜尋",
"chatbot": "聊天機器人",
- "starred": "我的最愛",
+ "starred": "收藏",
"terminal": "終端機",
"aboutNewsOrg": "關於這個新聞來源",
"newsview": "新聞",
@@ -146,8 +146,5 @@
"nosimilararticles": "找不到類似文章",
"articleopenpart1": "會打開關於媒體",
"articleopenpart2": "的視窗"
- },
- "fav": {
- "haventaddedyet": "你尚未把新聞加入我的最愛"
}
}
diff --git a/package.json b/package.json
index acb3a01..9591082 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"crypto-js": "^4.2.0",
- "groq-sdk": "^0.23.0",
+ "groq-sdk": "^0.22.0",
"gsap": "^3.13.0",
"html-to-json-parser": "^2.0.1",
"js-confetti": "^0.12.0",
@@ -45,7 +45,7 @@
"prettier": "^3.5.3",
"reka-ui": "^2.3.1",
"rss-parser": "^3.13.0",
- "shadcn-nuxt": "2.2.0",
+ "shadcn-nuxt": "2.1.0",
"tailwind-merge": "^3.3.1",
"tailwind-scrollbar": "^4.0.2",
"tailwindcss": "^3.4.17",
diff --git a/server/api/user/logout.ts b/server/api/user/logout.ts
index d43cf28..6e28a81 100644
--- a/server/api/user/logout.ts
+++ b/server/api/user/logout.ts
@@ -1,18 +1,16 @@
import getUserTokenMinusSQLInjection from "~/server/components/getUserToken";
export default defineEventHandler(async (event) => {
- const userToken = await getUserTokenMinusSQLInjection(event);
- if (userToken.error.length !== 0) {
- return {
- error: userToken.error,
- };
- }
+ const loginCookie = await getUserTokenMinusSQLInjection(event);
try {
- deleteCookie(event, "token");
- return {
- success: true,
- error: null,
- };
+ if (false) {
+ deleteCookie(event, "token");
+ return {
+ success: true,
+ error: null,
+ };
+ }
+ return "testing";
} catch (e) {
return {
success: false,