Fix login state check and deprecated event subscribers(eventemitter)

Author: wsxiaolin

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Deploy to gh-pages
+name: Run ts and eslint checks
 
 on:
   push:
@@ -27,7 +27,7 @@ jobs:
       - name: Install Git
         run: sudo apt-get install git -y
 
-      - name: Switch to gh-pages branch
+      - name: Configure git user
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
@@ -38,6 +38,6 @@ jobs:
       - name: Eslint checks
         run: npm run eslint
 
-      - name: Build project
+      - name: Building test
         run: npm run build
 

README-zh.md

@@ -41,6 +41,8 @@
 ## 待办事项
 
 如果你想开始贡献，方向如下：
+- [ ] 完成设置界面（包括i18n的切换，和导出错误日志等功能），组件在./views/settings user.config.ts system.config.ts 都已经有雏形了 
+- [ ] 重新设计错误日志，现在的这支格式太烂了
 - [ ] 运行时的一些错误可能无法被检测
 - [ ] 修复窗口过大时的样式问题
 - [ ] 完善响应式设计，目前字体等大小都有问题

README.md

@@ -41,6 +41,8 @@ And most importantly, we sincerely thanks to the previous contributors: Arenfell
 ## TO do list
 
 If you want to start a contribution, here is some directions:
+- [ ] Complete the settings page(including i18n switch, export error log etc), the components in ./views/settings user.config.ts system.config.ts already have a prototype
+- [ ] Redesign the error log, the format now is terrible
 - [ ] Some errors in runtime may not be detected
 - [ ] Fix the style when the window is too large
 - [ ] Improve the responsive design, there are problems with font size and others now

src/components/messages/NotificationList.vue

@@ -156,7 +156,7 @@ function fillInTemplate(data: string, message: PMessage) {
 // 处理加载事件
 // eslint-disable-next-line max-lines-per-function
 const handleLoad = async (noTemplates = true) => {
-  if (!storageManager.getObj("userInfo").value?.ID) return;
+  if (storageManager.getObj("userInfo").value?.Nickname == null) return;
   if (loading.value) return; // Lock
   if (noMore.value) return;
   loading.value = true;

src/config/user.config.ts

@@ -1,6 +1,7 @@
 import i18n from "../services/i18n/i18n";
 import Emitter from "../services/eventEmitter";
 import storageManager from "../services/storage";
+import { showDialog } from "@popup/naiveui";
 
 export const settingsConfig = [
   {
@@ -17,7 +18,7 @@ export const settingsConfig = [
         ],
         callBack: (newValue: string) => {
           i18n.global.locale.value = newValue as "English" | "Chinese";
-          Emitter.emit("nWarning", {
+          showDialog("warning", {
             title: i18n.global.t("login.reLogin"),
             content: i18n.global.t("login.reLoginContent"),
             positiveText: i18n.global.t("login.confirm"),
@@ -52,12 +53,18 @@ export const settingsConfig = [
           if (newValue === "off") {
             localStorage.removeItem("error_logs");
           }
-          Emitter.emit("nWarning", {
+          showDialog("warning", {
             title: i18n.global.t("login.reLogin"),
             content: i18n.global.t("login.reLoginContent"),
             positiveText: i18n.global.t("login.confirm"),
             onPositiveClick: async () => {
-              Emitter.emit("loginRequired");
+              storageManager.remove("userInfo");
+              window.$Logger.logEvent({
+                category: "Account",
+                action: "Toggle-Error-Logger",
+                label: newValue,
+                timestamp: Date.now(),
+              });
             },
           });
         },

src/i18n/getTagName.ts

@@ -1,5 +1,6 @@
 import Emitter from "../services/eventEmitter";
 import i18n from ".";
+import { showMessage } from "@popup/naiveui";
 
 let tagConfig = [
   {
@@ -740,7 +741,9 @@ export default function (tag: string): string {
   if (tag.startsWith("C-")) return tag;
   const tagObj = tagConfig.find((t) => t.Identifier === tag);
   if (!tagObj) {
-    Emitter.emit("error", `Tag not found: ${tag}`, 3);
+    showMessage("error", i18n.global.t("errors.tagNotFound", { tag }), {
+      duration: 5000,
+    });
     return tag;
   }
   return (tagObj?.Subject as any)[i18n.global.locale.value] || "";

src/services/api/login.ts

@@ -1,6 +1,6 @@
-import Emitter from "./eventEmitter";
 import { ref } from "vue";
 import storageManager from "./storage";
+import { showNotification } from "@popup/naiveui";
 
 interface ErrorLog {
   timestamp: number;
@@ -71,7 +71,11 @@ class ErrorLogger {
       ...context,
     });
 
-    Emitter.emit("error", error.message, 0, error);
+    showNotification({
+      title: "Unkown Error Occurred",
+      content: error.message,
+      description: error.stack ? error.stack.slice(0, 100) : "",
+    });
   }
 
   exportToTxt(): void {

src/services/errorLogger.ts

@@ -1,5 +1,6 @@
 import Emitter from "../eventEmitter";
 import i18n from "./i18n";
+import { showMessage } from "@popup/naiveui";
 
 let tagConfig = [
   {
@@ -740,7 +741,9 @@ export default function (tag: string): string {
   if (tag.startsWith("C-")) return tag;
   const tagObj = tagConfig.find((t) => t.Identifier === tag);
   if (!tagObj) {
-    Emitter.emit("error", `Tag not found: ${tag}`, 3);
+    showMessage("error", i18n.global.t("errors.tagNotFound", { tag }), {
+      duration: 1000,
+    });
     return tag;
   }
   return (tagObj?.Subject as any)[i18n.global.locale.value] || "";

src/services/i18n/getTagName.ts

@@ -8,7 +8,7 @@ import {
 import i18n from "./i18n/i18n";
 import Emitter from "./eventEmitter";
 import storageManager from "./storage";
-import router from "../router";
+import { showDialog } from "@popup/naiveui";
 
 type PUser = {
   ID: string;
@@ -254,13 +254,13 @@ export function removeToken(obj: any) {
 }
 
 export function checkLogin() {
-  if (storageManager.getObj("userInfo").value?.loginStatus !== true) {
-    Emitter.emit("nWarning", {
+  if (storageManager.getObj("userInfo").value?.Nickname == null) {
+    showDialog("warning", {
       title: i18n.global.t("login.loginRequired"),
       content: i18n.global.t("login.loginContent"),
       positiveText: i18n.global.t("login.confirm"),
       onPositiveClick: async () => {
-        router.push({ name: "Home" });
+        Emitter.emit("loginRequired");
       },
     });
   }