diff --git a/.gitignore b/.gitignore index e5434d92311a50c9f1d6ea5aab0816f1eb5e5ccf..83563d75ffebadfd014fb4b553efc181a79453af 100644 --- a/.gitignore +++ b/.gitignore @@ -120,11 +120,14 @@ dist temp-docs +app/zh/docs/**/* +app/en/docs/**/* + app/.vitepress/.temp app/.vitepress/.cache app/.vitepress/dist app/.vitepress/cache -app/.vitepress/public/menu/menu.json -app/.vitepress/public/menu/menu-en.json -app/zh/docs/**/* -app/en/docs/**/* \ No newline at end of file +app/.vitepress/public/menu/**/* +app/.vitepress/public/dsl/**/* + +.env.development \ No newline at end of file diff --git a/app/.env.development b/app/.env.development deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/app/.env.production b/app/.env.production index 5128e49c745870f8a3b9ca5a9eeddce0fe4efcf5..469e7bc108c97a586ade0fe758b0ed6dbe79c6ef 100644 --- a/app/.env.production +++ b/app/.env.production @@ -2,5 +2,20 @@ VITE_LOGIN_URL = https://id.openeuler.org VITE_XSRF_COOKIE_NAME = '_U_T_' VITE_XSRF_HEADER_NAME = 'Token' VITE_COOKIE_DOMAIN = .openeuler.org -VITE_MESSAGE_CENTER_URL = https://message-center.openeuler.org -VITE_MAIN_DOMAIN_URL = https://www.openeuler.org \ No newline at end of file +VITE_MAIN_DOMAIN_URL = https://www.openeuler.org + +VITE_SERVICE_DOCS_URL = https://docs.openeuler.org +VITE_SERVICE_REPO_URL = https://repo.openeuler.openatom.cn +VITE_SERVICE_DATASTAT_URL = https://datastat.openeuler.org +VITE_SERVICE_QUICKISSUE_URL = https://quickissue.openeuler.org +VITE_SERVICE_SOFTWARE_PKG_URL = https://software-pkg.openeuler.org +VITE_SERVICE_ARTLFS_WEBSITE_URL = https://artlfs-website.openeuler.org +VITE_SERVICE_SOFTWARE_URL = https://easysoftware.openeuler.org +VITE_SERVICE_MESSAGE_CENTER_URL = https://message-center.openeuler.org +VITE_SERVICE_OEAS_URL = https://oeas.openeuler.org +VITE_SERVICE_MEETING_MINUTES_URL = https://meeting-minutes.openeuler.org +VITE_SERVICE_CERTIFICATION_URL = https://certification.openeuler.org + +VITE_SERVICE_FORUM_URL = https://forum.openeuler.org +VITE_SERVICE_PKGMANAGE_URL = https://pkgmanage.openeuler.org +VITE_SERVICE_COMPLIANCE_URL = https://compliance.openeuler.org diff --git a/app/.vitepress/src/@types/type-home.ts b/app/.vitepress/src/@types/type-home.ts new file mode 100644 index 0000000000000000000000000000000000000000..d3f762a1755b936dce0be2f71fb36ebc13c4109a --- /dev/null +++ b/app/.vitepress/src/@types/type-home.ts @@ -0,0 +1,38 @@ +export interface HomeBannerItemT { + title: string; + desc: string; + href: string; + bg_light: string; + bg_dark: string; + bg_mb_light: string; + bg_mb_dark: string; + dropdown?: string; +} + +export interface HomeRecommendT { + title: string; + columns: number; + columns_mb: number; + items: HomeBannerItemT[]; +} + +export interface HomeSectionItemT { + title: string; + desc: string; + href: string; + icon?: string; + bg?: string; +} + +export interface HomeSectionT { + title: string; + columns: number; + columns_mb: number; + items: HomeSectionItemT[]; +} + +export interface HomeConfig { + hots: string[]; + recommend: HomeRecommendT; + sections: HomeSectionT[]; +} diff --git a/app/.vitepress/src/assets/category/footer/police.png b/app/.vitepress/src/assets/category/footer/police.png new file mode 100644 index 0000000000000000000000000000000000000000..116368e79ceab8617d988f4aa4b5a722dbff185b Binary files /dev/null and b/app/.vitepress/src/assets/category/footer/police.png differ diff --git a/app/.vitepress/src/components/AppFooter.vue b/app/.vitepress/src/components/AppFooter.vue index 300a859940c297d645cbee355385d83890cae411..68e26dcebd37b590373b1f2971d9e856df152b00 100644 --- a/app/.vitepress/src/components/AppFooter.vue +++ b/app/.vitepress/src/components/AppFooter.vue @@ -1,5 +1,5 @@ -

- {{ t('footer.copyRight', [getYearByOffset()]) }} -

{{ t('footer.license_1') }} {{ t('footer.license_2') }}

+
+

+ {{ t('footer.copyRight', [getYearByOffset()]) }} +

+
+ + {{ t('footer.filingText1') }} + + +

{{ t('footer.filingText2') }}

+
+
@@ -252,7 +261,6 @@ $color: #fff; position: relative; @include respond-to('<=pad_v') { margin: 0 auto; - max-width: 240px; padding: 12px 0 24px; flex-direction: column; justify-content: space-between; @@ -290,8 +298,33 @@ $color: #fff; .copyright { margin-top: 6px; color: rgba(255, 255, 255, 0.6); + display: flex; + gap: var(--o-gap-2); + + @include respond-to('<=pad') { + flex-direction: column; + gap: 6px; + } @include respond-to('<=pad_v') { margin-top: 4px; + gap: 4px; + } + + .filing { + display: flex; + gap: var(--o-gap-2); + + .filing-link { + color: rgba(255, 255, 255, 0.6); + @include hover { + color: rgba(255, 255, 255, 1); + } + } + .filing-img { + height: 16px; + width: 16px; + align-self: center; + } } } .license { @@ -313,7 +346,6 @@ $color: #fff; display: inline-block; } .footer-option-item { - display: flex; align-items: center; } @include respond-to('<=pad_v') { diff --git a/app/.vitepress/src/components/CookieNotice.vue b/app/.vitepress/src/components/CookieNotice.vue index 5d937cc8ba51f1dccba836b7d440318405f3667d..1e00e2ba8f97371f671d1e7680a509e5e441e3d8 100644 --- a/app/.vitepress/src/components/CookieNotice.vue +++ b/app/.vitepress/src/components/CookieNotice.vue @@ -44,6 +44,7 @@ const cookieStore = useCookieStore(); const loginStore = useLoginStore(); const COOKIE_DOMAIN = import.meta.env.VITE_COOKIE_DOMAIN; +const VITE_MAIN_DOMAIN_URL = import.meta.env.VITE_MAIN_DOMAIN_URL; // 是否允许分析cookie const analysisAllowed = ref(false); @@ -230,7 +231,7 @@ watch(

{{ t('cookie.desc') }} diff --git a/app/.vitepress/src/components/FloatingButtonDocs.vue b/app/.vitepress/src/components/FloatingButtonDocs.vue index 8bc53b235780729845494b8839c75deb62090bf5..4f6bc1d45b3a98adadb70bb0d12ec4565d0d1e04 100644 --- a/app/.vitepress/src/components/FloatingButtonDocs.vue +++ b/app/.vitepress/src/components/FloatingButtonDocs.vue @@ -141,7 +141,7 @@ const floatData = reactive([ text: computed(() => t('feedback.forum')), textMb: computed(() => t('feedback.forumHelp')), tip: computed(() => t('feedback.forumTip')), - link: 'https://forum.openeuler.org/', + link: import.meta.env.VITE_SERVICE_FORUM_URL, }, { img: computed(() => { @@ -152,7 +152,7 @@ const floatData = reactive([ text2: 'Issue', textMb: 'QuickIssue', tip: computed(() => t('feedback.quickIssueTip')), - link: 'https://quickissue.openeuler.org/zh/issues/', + link: `${import.meta.env.VITE_SERVICE_QUICKISSUE_URL}/zh/issues/`, }, { img: computed(() => { diff --git a/app/.vitepress/src/components/doc/DocBugDialog.vue b/app/.vitepress/src/components/doc/DocBugDialog.vue index dd112543f5aa69fe8317f85565af9bf8f57529de..61afdebff8c2c86efad35e0d35d30806d6444385 100644 --- a/app/.vitepress/src/components/doc/DocBugDialog.vue +++ b/app/.vitepress/src/components/doc/DocBugDialog.vue @@ -27,6 +27,7 @@ import { submitDocsBug } from '@/api/api-feedback'; import { useLocale } from '@/composables/useLocale'; +const VITE_MAIN_DOMAIN_URL = import.meta.env.VITE_MAIN_DOMAIN_URL; const message = useMessage(); const { t, locale } = useLocale(); const { page } = useData(); @@ -272,7 +273,7 @@ const change = (visible: boolean) => {

{{ t('feedback.bugPostPrivacyPolicy') }} - {{ t('feedback.privacyPolicy') }} + {{ t('feedback.privacyPolicy') }}
diff --git a/app/.vitepress/src/components/doc/DocFooter.vue b/app/.vitepress/src/components/doc/DocFooter.vue index dfda3af8e6f738fda9bac869a9328c785998b5eb..ca3776c41278757a4a791deb856215b2862e0512 100644 --- a/app/.vitepress/src/components/doc/DocFooter.vue +++ b/app/.vitepress/src/components/doc/DocFooter.vue @@ -3,7 +3,7 @@ import type { PropType } from 'vue'; import { ODivider } from '@opensig/opendesign'; import { useLocale } from '@/composables/useLocale'; -import { linksData2 } from '@/config/footer'; +import { linksData2, filingData } from '@/config/footer'; import { getYearByOffset } from '@/utils/common'; defineProps({ @@ -17,20 +17,23 @@ defineProps({ }, }); -const baseUrl = 'https://www.openeuler.org'; +const baseUrl = import.meta.env.VITE_MAIN_DOMAIN_URL; const { t } = useLocale();
+ +
+
+ +
+ +
{{ t('footer.license_1') }}{{ t('footer.license_2') }}
+
{{ t('footer.copyRight', [getYearByOffset()]) }}
+
+ {{ t('footer.filingText1') }} + + {{ t('footer.filingText2') }} +
+
diff --git a/app/.vitepress/src/views/home/components/HomeBannerCard.vue b/app/.vitepress/src/views/home/components/HomeBannerCard.vue new file mode 100644 index 0000000000000000000000000000000000000000..d611e369e3b2aabc42f2b02affed524bc5d79373 --- /dev/null +++ b/app/.vitepress/src/views/home/components/HomeBannerCard.vue @@ -0,0 +1,96 @@ + + + + + diff --git a/app/.vitepress/src/views/home/components/HomeSectionCard.vue b/app/.vitepress/src/views/home/components/HomeSectionCard.vue new file mode 100644 index 0000000000000000000000000000000000000000..ca09a78c116a5c230d570b5be83d2eb3d32b0712 --- /dev/null +++ b/app/.vitepress/src/views/home/components/HomeSectionCard.vue @@ -0,0 +1,106 @@ + + + + + diff --git a/scripts/merge.js b/scripts/merge.js index f3f04a3a1112fd33ea7abf5dc5de349160444135..eef569015f585c6624071ae8cfe418e1b341bbfd 100644 --- a/scripts/merge.js +++ b/scripts/merge.js @@ -202,7 +202,20 @@ const normalizeContent = async (branch) => { await copyContentToDir(`${REPO_DOCS_DIR}/docs/en/`, `${BUILD_DIR}/app/en/docs/${branchName}/`); } - // handleOpenStackDocs(branchName); + // 复制配置 + if (branchName !== 'common') { + await checkoutBranch(REPO_DOCS_DIR, 'common'); + await pullRemoteBranch(REPO_DOCS_DIR, 'common'); + } + + if (fs.existsSync(`${REPO_DOCS_DIR}/dsl/`)) { + fs.mkdirSync(`${BUILD_DIR}/app/.vitepress/public/dsl/`, { + recursive: true, + }); + + await copyContentToDir(`${REPO_DOCS_DIR}/dsl/`, `${BUILD_DIR}/app/.vitepress/public/dsl/`); + console.log(`已将 dsl 复制到 public 目录下`); + } }; const normalizeContentWithHugo = async (branch) => {