diff --git a/.gitignore b/.gitignore index 8fdf790c75178755e19167f2e9fc254fbc07e437..78f7cf2be7ac6eacf72477e836e8a31f5978dc8c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ *.vscode /content /web-ui/node_modules -/web-ui/package-lock.json \ No newline at end of file +/web-ui/package-lock.json +public \ No newline at end of file diff --git a/.hugo_build.lock b/.hugo_build.lock new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/.pnpm-debug.log b/.pnpm-debug.log new file mode 100644 index 0000000000000000000000000000000000000000..88aa4a44d1b8abb526a4ec225a974166db6c9935 --- /dev/null +++ b/.pnpm-debug.log @@ -0,0 +1,14 @@ +{ + "0 debug pnpm:scope": { + "selected": 1 + }, + "1 error pnpm": { + "code": "ERR_PNPM_NO_IMPORTER_MANIFEST_FOUND", + "err": { + "name": "pnpm", + "message": "No package.json (or package.yaml, or package.json5) was found in \"C:\\Users\\panxiangqu\\Desktop\\测试\\docs\".", + "code": "ERR_PNPM_NO_IMPORTER_MANIFEST_FOUND", + "stack": "pnpm: No package.json (or package.yaml, or package.json5) was found in \"C:\\Users\\panxiangqu\\Desktop\\测试\\docs\".\n at readProjectManifest (C:\\Users\\panxiangqu\\AppData\\Roaming\\npm\\node_modules\\pnpm\\dist\\pnpm.cjs:20808:13)\n at async Object.readProjectManifestOnly (C:\\Users\\panxiangqu\\AppData\\Roaming\\npm\\node_modules\\pnpm\\dist\\pnpm.cjs:20812:28)\n at async readProjectManifestOnly (C:\\Users\\panxiangqu\\AppData\\Roaming\\npm\\node_modules\\pnpm\\dist\\pnpm.cjs:43834:24)\n at async Object.handler (C:\\Users\\panxiangqu\\AppData\\Roaming\\npm\\node_modules\\pnpm\\dist\\pnpm.cjs:178132:24)\n at async C:\\Users\\panxiangqu\\AppData\\Roaming\\npm\\node_modules\\pnpm\\dist\\pnpm.cjs:182701:21\n at async run (C:\\Users\\panxiangqu\\AppData\\Roaming\\npm\\node_modules\\pnpm\\dist\\pnpm.cjs:182675:34)\n at async runPnpm (C:\\Users\\panxiangqu\\AppData\\Roaming\\npm\\node_modules\\pnpm\\dist\\pnpm.cjs:182893:5)\n at async C:\\Users\\panxiangqu\\AppData\\Roaming\\npm\\node_modules\\pnpm\\dist\\pnpm.cjs:182885:7" + } + } +} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 1bdb00c3c7240f0b415d7bd7637c3a90f04cd025..6845d9bb58a061621c5330a5678bce67041cc0f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,9 +9,11 @@ RUN mkdir -p /usr/local/src && \ cd /usr/local/src && \ curl -L https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz | tar -xz && \ mv hugo /usr/local/bin/ - +RUN cd / +RUN ls RUN mkdir -p /src/ COPY . /src/website +RUN ls /src/website/content/zh/docs/ RUN cd /src/ && \ cd /src/website && /usr/local/bin/hugo -b / && /usr/local/bin/hugo --gc --minify && \ diff --git a/deploy/docs-builder.sh b/deploy/docs-builder.sh index 707e42d5fb458b0b45cda66c2d6c7c96fd04ec0a..641670e1e821a1d7c4128176d8007793607b093c 100644 --- a/deploy/docs-builder.sh +++ b/deploy/docs-builder.sh @@ -19,17 +19,19 @@ do git checkout -b $b $r mkdir -p ../website/content/zh/docs/$b - cp -r ./docs/zh/* ../website/content/zh/docs/$b/ + cp -r ./docs/zh/* ../website/content/zh/docs/$b/ mkdir -p ../website/content/en/docs/$b - cp -r ./docs/en/* ../website/content/en/docs/$b/ + cp -r ./docs/en/* ../website/content/en/docs/$b/ if [ -d "./docs/ru" ]; then mkdir -p ../website/content/ru/docs/$b - cp -r ./docs/ru/* ../website/content/ru/docs/$b/ + cp -r ./docs/ru/* ../website/content/ru/docs/$b/ fi cd .. cd ./docs done cd .. +pwd + diff --git a/deploy/nginx.conf b/deploy/nginx.conf index d30ecb2802a61841b3aba5f2ced7ace88c1c61ce..66151e97fb3c542bd53adf405ced62341534488e 100644 --- a/deploy/nginx.conf +++ b/deploy/nginx.conf @@ -89,6 +89,9 @@ http { location /ip-api/ { proxy_pass http://ip-api.com/json/; } + location /docs-search/ { + proxy_pass https://docs.openeuler.org/docs-search/; + } location ~ /\. { deny all; diff --git a/deploy/nginx.ru.conf b/deploy/nginx.ru.conf index 52ba65ce1b0c984baade4aab04c02e1bba516838..7b39cfe867e3ae22b8355e52e42b9b633dbfb82a 100644 --- a/deploy/nginx.ru.conf +++ b/deploy/nginx.ru.conf @@ -89,6 +89,10 @@ http { location /ip-api/ { proxy_pass http://ip-api.com/json/; } + + location /docs-search/ { + proxy_pass https://docs.openeuler.org/; + } location ~ /\. { deny all; diff --git a/i18n/en/en.toml b/i18n/en/en.toml index 44c7a9b3ba9bf74a3bd51e7caea1d87f502db495..2d89137d706ebe434379d773d0fdb26fd9aca846 100644 --- a/i18n/en/en.toml +++ b/i18n/en/en.toml @@ -90,7 +90,22 @@ other = "/en/docs/20.03_LTS_SP1/docs/Releasenotes/terms-of-use.html" other = "/en/docs/20.09/docs/Releasenotes/terms-of-use.html" [know_98_1] other = "/en/docs/20.03_LTS/docs/Releasenotes/terms-of-use.html" - +[version_91] +other = "22.03 LTS" +[version_92] +other = "20.03 LTS SP3" +[version_93] +other = "21.09" +[version_94] +other= "20.03 LTS SP2" +[version_95] +other = "21.03" +[version_96] +other = "20.03 LTS SP1" +[version_97] +other= "20.09" +[version_98] +other = "20.03 LTS" [atom] other = "openEuler is an open source project incubated and operated by the OpenAtom Foundation." @@ -196,4 +211,22 @@ other = " search results about " other = " are found" [hot_docs_version] -other = "20.03 LTS" \ No newline at end of file +other = "20.03 LTS" + +[cancel] +other = "cancel" + +[atom-text] +other = "openEuler is an open source project incubated and operated by the OpenAtom Foundation." +[brand] +other = "Trademark" +[privacy] +other = "Privacy Policy" +[legal] +other = "Legal Notice" +[service] +other = "Service Status" +[lang] +other = "en" +[openEuler] +other = "https://www.openeuler.org/en/" \ No newline at end of file diff --git a/i18n/ru/ru.toml b/i18n/ru/ru.toml index 82d1b38229eb0b4c2e2ca1ef5f17badd6413350a..da066299f862b9d3bc74f5d4ab48672985e63eb5 100644 --- a/i18n/ru/ru.toml +++ b/i18n/ru/ru.toml @@ -50,7 +50,20 @@ other = "/ru/docs/20.03_LTS/docs/Releasenotes/terms-of-use.html" [know_97_1] other = "/ru/docs/20.09/docs/Releasenotes/terms-of-use.html" - +[version_91] +other = "22.03 LTS" +[version_93] +other = "21.09" +[version_94] +other= "20.03 LTS SP2" +[version_95] +other = "21.03" +[version_96] +other = "20.03 LTS SP1" +[version_97] +other= "20.09" +[version_98] +other = "20.03 LTS" [atom] other = "openEuler - это проект с открытым исходным кодом, созданный и управляемый фондом OpenAtom." @@ -195,4 +208,22 @@ other = "В этом руководство описывается, как ус other = "Руководство по установке" [container_link] -other = "/ru/docs/20.03_LTS/docs/Installation/Installation.html" \ No newline at end of file +other = "/ru/docs/20.03_LTS/docs/Installation/Installation.html" + +[cancel] +other = "cancel" + +[atom-text] +other = "openEuler - это проект с открытым исходным кодом, созданный и управляемый фондом OpenAtom." +[brand] +other = "Товарный знак" +[privacy] +other = "Политика конфиденциальности" +[legal] +other = "Правовое уведомление" +[service] +other = "Статус сервиса" +[lang] +other = "ru" +[openEuler] +other = "https://www.openeuler.org/ru/" \ No newline at end of file diff --git a/i18n/zh/zh.toml b/i18n/zh/zh.toml index 9c65965ce97900bbf769cf345ee0dc9fb1abd2e0..cf324419d5e0a1481498f1bc7ab22028cfc111fa 100644 --- a/i18n/zh/zh.toml +++ b/i18n/zh/zh.toml @@ -9,7 +9,7 @@ other = "中文" other = "搜索" [search_placeholder] -other = "输入内容" +other = "请输入搜索内容" [document_link] other = "Documentation" @@ -41,6 +41,22 @@ other = "/zh/docs/20.03_LTS_SP1/docs/Releasenotes/法律声明.html" other = "/zh/docs/20.09/docs/Releasenotes/法律声明.html" [know_98_1] other = "/zh/docs/20.03_LTS/docs/Releasenotes/法律声明.html" +[version_91] +other = "22.03 LTS" +[version_92] +other = "20.03 LTS SP3" +[version_93] +other = "21.09" +[version_94] +other= "20.03 LTS SP2" +[version_95] +other = "21.03" +[version_96] +other = "20.03 LTS SP1" +[version_97] +other= "20.09" +[version_98] +other = "20.03 LTS" [hot_document] @@ -140,7 +156,7 @@ other = "有奖捉虫" other = "“有虫”文档片段" [issue_reason] -other = "存在的问题" +other = "问题描述" [satisfaction] other = "您对文档的总体满意度" @@ -200,3 +216,28 @@ other = "的结果" [hot_docs_version] other = "20.03 LTS" + +[relative] +other = "关于openEuler" + +[website] +other = "openEuler官网" + +[other_link] +other = "友情链接" + +[cancel] +other = "取消" + +[atom-text] +other = "openEuler 是由开放原子开源基金会（OpenAtom Foundation）孵化及运营的开源项目" +[brand] +other = "品牌" +[privacy] +other = "隐私政策" +[legal] +other = "法律声明" +[service] +other = "服务状态" +[lang] +other = "zh" \ No newline at end of file diff --git a/layouts/docs/baseof.html b/layouts/docs/baseof.html index 2a5cf1d3c5c7f6d9cdb471a3f7ccbd3763e7fc70..bef7275833ef1bd0caf96e9837fdfb1d458f2959 100644 --- a/layouts/docs/baseof.html +++ b/layouts/docs/baseof.html @@ -11,110 +11,179 @@
-
- {{ partial "nav.html" . }} -
-
+
+ +
+
{{ $versionArr := split $.File.Path "docs\\" }} {{ $version := index $versionArr 1}} {{ $version := split $version "\\" }} {{ $version := index $version 0}} {{ $lang := .Site.LanguageCode}}
+ {{ partial "nav.html" . }}
- -
- + +
- - {{ template "main" . }} +
+ {{ partial "turn.html"}} +
+
+ {{ template "main" . }} + {{ partial "insideNav.html"}} +
+
- {{ partial "insideNav.html"}} + {{ partial "pcfooter.html" . }}
-
+
-
-
- -
{{ i18n "search" }}
-
-
-

{{ i18n "result_1" }}{{ i18n "result_2" }}{{ i18n "result_3" }}

+
+
+ + +
{{ i18n "cancel" }}
+
+
+
- - {{ partial "h5_footer.html"}} -
diff --git a/layouts/index.html b/layouts/index.html index b6aea2ec8f11056b5e6b10e389b4eb9f0ca596ac..4c093cbb7793a55589d31dd23de24426cc84bef4 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -9,7 +9,7 @@
- +
-