From cf46520adab959c8142bd2aec43549a2afda3782 Mon Sep 17 00:00:00 2001 From: Zhigang Wang Date: Tue, 25 Jun 2024 08:51:50 -0700 Subject: [PATCH] merging --- frontend/src/App.vue | 4 +- frontend/src/assets/styles/main.scss | 6 +- frontend/src/components/FreeleapsEditor.vue | 2 +- frontend/src/components/LaguageSwitch.vue | 109 ++++++------- frontend/src/headers/HeaderUser.vue | 2 +- frontend/src/lang/en.js | 138 ++++++++--------- frontend/src/lang/zh.js | 4 +- frontend/src/pages/guest/FrontDoor.vue | 8 +- frontend/src/pages/guest/NewUserSetFlid.vue | 4 +- .../src/pages/guest/NewUserSetPassword.vue | 6 +- .../pages/guest/SigninWithEmailAndCode.vue | 4 +- .../guest/SigninWithEmailAndPassword.vue | 6 +- frontend/src/pages/public/About.vue | 2 +- frontend/src/pages/public/Blogs.vue | 5 +- frontend/src/pages/public/Career.vue | 8 +- frontend/src/pages/public/Contact.vue | 6 +- .../src/pages/user/account/UserHistory.vue | 75 ++++++--- frontend/src/pages/user/workspace/Home.vue | 126 ++++++++------- .../user/workspace/requestIssue/Issue.vue | 2 +- frontend/src/plugins/store/basic.js | 143 +++++++++--------- 20 files changed, 360 insertions(+), 300 deletions(-) diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 8c19f19..9e1b5ac 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -1,7 +1,7 @@