From acf8173d50156d19e4a9d3708de055a7b603afd8 Mon Sep 17 00:00:00 2001 From: zjwmiao <1723168479@qq.com> Date: Tue, 18 Feb 2025 10:39:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0Cookie=E5=90=8C?= =?UTF-8?q?=E6=84=8F=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 + packages/euler/.env.development | 2 +- packages/euler/.env.production | 2 +- packages/euler/components.d.ts | 1 + packages/euler/src/App.vue | 18 + .../euler/src/components/CookieNotice.vue | 394 +++++++++ packages/euler/src/i18n/cookie/cookie-en.ts | 17 + packages/euler/src/i18n/cookie/cookie-zh.ts | 17 + packages/euler/src/i18n/cookie/index.ts | 7 + packages/euler/src/i18n/index.ts | 3 + packages/euler/src/main.ts | 8 +- packages/euler/src/router.ts | 2 +- packages/euler/src/shared/analytics.ts | 21 +- .../src/shared/opendesign-styles/_color.scss | 181 ++++ .../src/shared/opendesign-styles/_font.scss | 26 + .../src/shared/opendesign-styles/_shadow.scss | 9 + .../shared/opendesign-styles/_spacing.scss | 13 + .../shared/opendesign-styles/variable.scss | 4 + packages/euler/vite.config.js | 8 +- packages/gauss/.env.development | 2 +- packages/gauss/.env.production | 3 +- packages/gauss/components.d.ts | 2 + packages/gauss/src/.env.production | 3 - packages/gauss/src/App.vue | 20 + .../gauss/src/components/CookieNotice.vue | 377 ++++++++ packages/gauss/src/i18n/cookie.ts | 41 + packages/gauss/src/i18n/index.ts | 2 + packages/gauss/src/main.ts | 7 +- packages/gauss/src/shared/analytics.ts | 22 +- .../styles/opendesign-style/_color.scss | 169 ++++ .../shared/styles/opendesign-style/_font.scss | 26 + .../styles/opendesign-style/_shadow.scss | 9 + .../styles/opendesign-style/_spacing.scss | 13 + .../styles/opendesign-style/variable.scss | 4 + .../current/SpecialInterestGroupDiagram.vue | 32 +- packages/gauss/vite.config.js | 7 +- packages/mindspore/.env.development | 2 +- packages/mindspore/.env.production | 4 +- packages/mindspore/components.d.ts | 21 +- packages/mindspore/src/App.vue | 18 + .../src/components/ContentWrapper.vue | 14 + .../mindspore/src/components/CookieNotice.vue | 390 ++++++++ .../mindspore/src/i18n/cookie/cookie-en.ts | 17 + .../mindspore/src/i18n/cookie/cookie-zh.ts | 17 + packages/mindspore/src/i18n/cookie/index.ts | 7 + packages/mindspore/src/i18n/index.ts | 3 +- packages/mindspore/src/main.ts | 4 +- packages/mindspore/src/shared/analytics.ts | 22 +- .../src/shared/styles/mixin/font.scss | 243 +++++ .../src/shared/styles/mixin/screen.scss | 73 ++ .../styles/opendesign-styles/_animation.scss | 0 .../styles/opendesign-styles/_color.scss | 181 ++++ .../styles/opendesign-styles/_font.scss | 26 + .../styles/opendesign-styles/_shadow.scss | 9 + .../styles/opendesign-styles/_spacing.scss | 13 + .../styles/opendesign-styles/variable.scss | 4 + packages/mindspore/vite.config.js | 12 + packages/shared/analytics/index.ts | 86 +- packages/shared/components/OAnchor.vue | 4 +- packages/shared/components/ONav.vue | 2 +- .../components/Opendesign/button/index.ts | 8 + .../Opendesign/button/src/button-types.ts | 35 + .../Opendesign/button/src/button.scss | 187 ++++ .../Opendesign/button/src/button.tsx | 46 + .../components/Opendesign/button/src/var.scss | 90 ++ .../shared/components/Opendesign/index.ts | 14 + .../components/Opendesign/style/_color.scss | 181 ++++ .../components/Opendesign/style/_font.scss | 26 + .../components/Opendesign/style/_shadow.scss | 9 + .../components/Opendesign/style/_spacing.scss | 13 + .../components/Opendesign/style/variable.scss | 4 + packages/shared/hooks/useScreen.ts | 159 ++++ packages/shared/stores/cookies.ts | 46 + packages/shared/styles/mixin/screen.scss | 43 + packages/shared/svg-icons/icon-close.svg | 3 + packages/shared/utils/cookies.ts | 33 + pnpm-lock.yaml | 834 +++++++++++++++--- 77 files changed, 4123 insertions(+), 255 deletions(-) create mode 100644 packages/euler/src/components/CookieNotice.vue create mode 100644 packages/euler/src/i18n/cookie/cookie-en.ts create mode 100644 packages/euler/src/i18n/cookie/cookie-zh.ts create mode 100644 packages/euler/src/i18n/cookie/index.ts create mode 100644 packages/euler/src/shared/opendesign-styles/_color.scss create mode 100644 packages/euler/src/shared/opendesign-styles/_font.scss create mode 100644 packages/euler/src/shared/opendesign-styles/_shadow.scss create mode 100644 packages/euler/src/shared/opendesign-styles/_spacing.scss create mode 100644 packages/euler/src/shared/opendesign-styles/variable.scss delete mode 100644 packages/gauss/src/.env.production create mode 100644 packages/gauss/src/components/CookieNotice.vue create mode 100644 packages/gauss/src/i18n/cookie.ts create mode 100644 packages/gauss/src/shared/styles/opendesign-style/_color.scss create mode 100644 packages/gauss/src/shared/styles/opendesign-style/_font.scss create mode 100644 packages/gauss/src/shared/styles/opendesign-style/_shadow.scss create mode 100644 packages/gauss/src/shared/styles/opendesign-style/_spacing.scss create mode 100644 packages/gauss/src/shared/styles/opendesign-style/variable.scss create mode 100644 packages/mindspore/src/components/ContentWrapper.vue create mode 100644 packages/mindspore/src/components/CookieNotice.vue create mode 100644 packages/mindspore/src/i18n/cookie/cookie-en.ts create mode 100644 packages/mindspore/src/i18n/cookie/cookie-zh.ts create mode 100644 packages/mindspore/src/i18n/cookie/index.ts create mode 100644 packages/mindspore/src/shared/styles/mixin/font.scss create mode 100644 packages/mindspore/src/shared/styles/mixin/screen.scss create mode 100644 packages/mindspore/src/shared/styles/opendesign-styles/_animation.scss create mode 100644 packages/mindspore/src/shared/styles/opendesign-styles/_color.scss create mode 100644 packages/mindspore/src/shared/styles/opendesign-styles/_font.scss create mode 100644 packages/mindspore/src/shared/styles/opendesign-styles/_shadow.scss create mode 100644 packages/mindspore/src/shared/styles/opendesign-styles/_spacing.scss create mode 100644 packages/mindspore/src/shared/styles/opendesign-styles/variable.scss create mode 100644 packages/shared/components/Opendesign/button/index.ts create mode 100644 packages/shared/components/Opendesign/button/src/button-types.ts create mode 100644 packages/shared/components/Opendesign/button/src/button.scss create mode 100644 packages/shared/components/Opendesign/button/src/button.tsx create mode 100644 packages/shared/components/Opendesign/button/src/var.scss create mode 100644 packages/shared/components/Opendesign/index.ts create mode 100644 packages/shared/components/Opendesign/style/_color.scss create mode 100644 packages/shared/components/Opendesign/style/_font.scss create mode 100644 packages/shared/components/Opendesign/style/_shadow.scss create mode 100644 packages/shared/components/Opendesign/style/_spacing.scss create mode 100644 packages/shared/components/Opendesign/style/variable.scss create mode 100644 packages/shared/hooks/useScreen.ts create mode 100644 packages/shared/stores/cookies.ts create mode 100644 packages/shared/styles/mixin/screen.scss create mode 100644 packages/shared/svg-icons/icon-close.svg create mode 100644 packages/shared/utils/cookies.ts diff --git a/package.json b/package.json index 9c8fc86..cfb8ea6 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "echarts": "^5.3.2", "element-plus": "^2.1.4", "html2canvas": "^1.4.1", + "js-cookie": "^3.0.5", "lodash-es": "^4.17.21", "normalize.css": "^8.0.1", "pinia": "^2.0.11", @@ -33,11 +34,13 @@ "vue-router": "^4.0.13" }, "devDependencies": { + "@types/js-cookie": "^3.0.6", "@types/lodash-es": "^4.17.6", "@types/node": "^17.0.21", "@typescript-eslint/eslint-plugin": "^5.13.0", "@typescript-eslint/parser": "^5.13.0", "@vitejs/plugin-vue": "^4.6.2", + "@vitejs/plugin-vue-jsx": "^4.1.1", "@vue/eslint-config-prettier": "^7.0.0", "@vue/eslint-config-typescript": "^10.0.0", "eslint": "^8.9.0", diff --git a/packages/euler/.env.development b/packages/euler/.env.development index d5a75c7..a4fe0c3 100644 --- a/packages/euler/.env.development +++ b/packages/euler/.env.development @@ -1,3 +1,3 @@ VITE_COOKIE_DOMAIN = localhost - +VITE_COOKIE_VER = "20240830" VITE_LOGIN_ORIGIN = https://id.openeuler.org diff --git a/packages/euler/.env.production b/packages/euler/.env.production index 79e379e..709ca2d 100644 --- a/packages/euler/.env.production +++ b/packages/euler/.env.production @@ -1,3 +1,3 @@ +VITE_COOKIE_VER = "20240830" VITE_COOKIE_DOMAIN = .openeuler.org - VITE_LOGIN_ORIGIN = https://id.openeuler.org diff --git a/packages/euler/components.d.ts b/packages/euler/components.d.ts index 6ffaf08..9d0d9de 100644 --- a/packages/euler/components.d.ts +++ b/packages/euler/components.d.ts @@ -11,6 +11,7 @@ declare module 'vue' { AppHeader: typeof import('./src/components/AppHeader.vue')['default'] AppHeaderMobile: typeof import('./src/components/AppHeaderMobile.vue')['default'] AppMobileMenu: typeof import('./src/components/AppMobileMenu.vue')['default'] + CookieNotice: typeof import('./src/components/CookieNotice.vue')['default'] ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete'] ElAvatar: typeof import('element-plus/es')['ElAvatar'] ElButton: typeof import('element-plus/es')['ElButton'] diff --git a/packages/euler/src/App.vue b/packages/euler/src/App.vue index df9bcaf..29f4124 100644 --- a/packages/euler/src/App.vue +++ b/packages/euler/src/App.vue @@ -2,6 +2,7 @@ import AppHeader from '@/components/AppHeader.vue'; import { setStoreData, useStoreData } from 'shared/utils/login'; import { openCommunityInfo } from './api'; +import CookieNotice from './components/CookieNotice.vue'; setStoreData(openCommunityInfo.name); const { loginIframeSrc } = useStoreData(); @@ -15,6 +16,7 @@ const { loginIframeSrc } = useStoreData(); +