You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by wa...@apache.org on 2022/12/15 02:33:28 UTC
[dolphinscheduler-website] branch master updated: [Fix] Fix links and connent UI. (#858)
This is an automated email from the ASF dual-hosted git repository.
wanggenhua pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler-website.git
The following commit(s) were added to refs/heads/master by this push:
new ad7490895f [Fix] Fix links and connent UI. (#858)
ad7490895f is described below
commit ad7490895fbb1b067bbe5bc155de2b9352f5c5ef
Author: Amy0104 <wa...@apache.org>
AuthorDate: Thu Dec 15 10:33:23 2022 +0800
[Fix] Fix links and connent UI. (#858)
---
scripts/generate_docs.js | 4 +-
scripts/parse_md.js | 10 ++-
scripts/replace_links.js | 166 ++++++++++++++++++++++++++++++++++++
src/components/Connect/index.scss | 16 ++--
src/views/Documentation/detail.scss | 3 +
5 files changed, 190 insertions(+), 9 deletions(-)
diff --git a/scripts/generate_docs.js b/scripts/generate_docs.js
index b9c1b63c1d..1e4525f543 100644
--- a/scripts/generate_docs.js
+++ b/scripts/generate_docs.js
@@ -120,7 +120,7 @@ const getMenu = (list, data, version, lang, isDeployment, location) => {
".md"
)}`;
- const mdInfo = parseMd(mdPath);
+ const mdInfo = parseMd(mdPath, lang, version);
const onlyText = mdInfo["__html"].replace(/<.*?>/g, "");
const structure = [];
@@ -224,7 +224,7 @@ const wirteVersion = () => {
};
const wirteSearchDocData = () => {
- ["en-us", "zh-cn"].forEach((lang) => {
+ [("en-us", "zh-cn")].forEach((lang) => {
const targetSearchPath = `${BASE}/public/data/doc/${lang}.json`;
fs.ensureFileSync(targetSearchPath);
fs.writeFileSync(
diff --git a/scripts/parse_md.js b/scripts/parse_md.js
index b9167a7aa7..c58258dac1 100644
--- a/scripts/parse_md.js
+++ b/scripts/parse_md.js
@@ -4,6 +4,7 @@ const path = require("path");
const fs = require("fs-extra");
const MarkdownIt = require("markdown-it");
const hljs = require("highlight.js");
+const replaceDeadLinks = require("./replace_links.js");
const MD = new MarkdownIt({
html: true,
@@ -39,7 +40,7 @@ function splitMetaAndContent(str) {
return result;
}
-const parseMd = (filePath) => {
+const parseMd = (filePath, lang, version) => {
const result = {
meta: {},
__html: "",
@@ -64,7 +65,12 @@ const parseMd = (filePath) => {
result.meta[key] = value;
});
- result.__html = MD.render(splitContent.content);
+
+ let content = splitContent.content;
+ if (lang && version) {
+ content = replaceDeadLinks(content, lang, version);
+ }
+ result.__html = MD.render(content);
} catch (err) {}
return result;
diff --git a/scripts/replace_links.js b/scripts/replace_links.js
new file mode 100644
index 0000000000..bc5e36ec4b
--- /dev/null
+++ b/scripts/replace_links.js
@@ -0,0 +1,166 @@
+const replaceDeadLinks = (content, lang, version) => {
+ return content
+ .replaceAll(
+ `https://dolphinscheduler.apache.org/${lang}/download/download.html`,
+ `/#/${lang}/download`
+ )
+ .replaceAll(
+ `pseudo-cluster.md`,
+ `/#/${lang}/docs/${version}/guide/installation/pseudo-cluster`
+ )
+ .replaceAll(
+ `standalone.md`,
+ `/#/${lang}/docs/${version}/guide/installation/standalone`
+ )
+ .replaceAll(
+ `kubernetes.md`,
+ `/#/${lang}/docs/${version}/guide/installation/kubernetes`
+ )
+ .replaceAll(
+ `cluster.md`,
+ `/#/${lang}/docs/${version}/guide/installation/cluster`
+ )
+ .replaceAll(
+ `../howto/datasource-setting.md`,
+ `https://github.com/apache/dolphinscheduler/blob/${version}-release/docs/docs/${
+ lang === "en-us" ? "en" : "zh"
+ }/guide/howto/datasource-setting.md`
+ )
+ .replaceAll(
+ `general-setting.md`,
+ `https://github.com/apache/dolphinscheduler/blob/${version}-release/docs/docs/${
+ lang === "en-us" ? "en" : "zh"
+ }/guide/howto/general-setting.md`
+ )
+ .replaceAll(
+ `../en/guide/alert/email.md`,
+ `/#/en-us/docs/${version}/guide/alert/email`
+ )
+ .replaceAll(
+ `../guide/homepage.md`,
+ `/#/${lang}/docs/${version}/guide/homepage`
+ )
+ .replaceAll(
+ `./development-environment-setup.md`,
+ `https://github.com/apache/dolphinscheduler/blob/${version}-release/docs/docs/${
+ lang === "en-us" ? "en" : "zh"
+ }/contribute/development-environment-setup.md`
+ )
+ .replaceAll(
+ `./frontend-development.md`,
+ `https://github.com/apache/dolphinscheduler/blob/${version}-release/docs/docs/${
+ lang === "en-us" ? "en" : "zh"
+ }/contribute/frontend-development.md`
+ )
+ .replaceAll(
+ `../guide/homepage.md`,
+ `/#/${lang}/docs/${version}/guide/homepage`
+ )
+ .replaceAll(`./security.md`, `/#/${lang}/docs/${version}/guide/security`)
+ .replaceAll(
+ `../start/quick-start.md`,
+ `/#/${lang}/docs/${version}/guide/start/quick-start`
+ )
+ .replaceAll(
+ `priority.md`,
+ `/#/${lang}/docs/${version}/guide/parameter/priority`
+ )
+ .replaceAll(
+ `global.md`,
+ `/#/${lang}/docs/${version}/guide/parameter/global`
+ )
+ .replaceAll(`local.md`, `/#/${lang}/docs/${version}/guide/parameter/local`)
+ .replaceAll(
+ `../task/shell.md`,
+ `/#/${lang}/docs/${version}/guide/task/shell`
+ )
+ .replaceAll(`../task/sql.md`, `/#/${lang}/docs/${version}/guide/task/sql`)
+ .replaceAll(
+ `../task/stored-procedure.md`,
+ `/#/${lang}/docs/${version}/guide/task/stored-procedure`
+ )
+ .replaceAll(
+ `../task/python.md`,
+ `/#/${lang}/docs/${version}/guide/task/python`
+ )
+ .replaceAll(
+ `../resource/configuration.md`,
+ `/#/${lang}/docs/${version}/guide/resource/configuration`
+ )
+ .replaceAll(`../open-api.md`, `/#/${lang}/docs/${version}/guide/open-api`)
+ .replaceAll(
+ `context.md`,
+ `/#/${lang}/docs/${version}/guide/parameter/context`
+ )
+ .replaceAll(
+ `workflow-definition.md`,
+ `/#/${lang}/docs/${version}/guide/project/workflow-definition`
+ )
+ .replaceAll(
+ `../parameter/global.md`,
+ `/#/${lang}/docs/${version}/guide/parameter/global`
+ )
+ .replaceAll(
+ `./task-instance.md`,
+ `/#/${lang}/docs/${version}/guide/project/task-instance`
+ )
+ .replaceAll(
+ `../installation/standalone.md`,
+ `/#/${lang}/docs/${version}/guide/installation/standalone`
+ )
+ .replaceAll(
+ `../../architecture/configuration.md`,
+ `/#/${lang}/docs/${version}/architecture/configuration`
+ )
+ .replaceAll(`appendix.md`, `/#/${lang}/docs/${version}/guide/task/appendix`)
+ .replaceAll(`switch.md`, `/#/${lang}/docs/${version}/guide/task/switch`)
+ .replaceAll(`shell.md`, `/#/${lang}/docs/${version}/guide/task/shell`)
+ .replaceAll(`./python.md`, `/#/${lang}/docs/${version}/guide/task/python`)
+ .replaceAll(`../security.md`, `/#/${lang}/docs/${version}/guide/security`)
+ .replaceAll(
+ `../resource/file-manage.md`,
+ `/#/${lang}/docs/${version}/guide/resource/file-manage`
+ )
+ .replaceAll(
+ `./hive-cli.md`,
+ `/#/${lang}/docs/${version}/guide/task/hive-cli`
+ )
+ .replaceAll(
+ `./incompatible.md`,
+ `/#/${lang}/docs/${version}/guide/upgrade/incompatible`
+ )
+ .replaceAll(
+ `../installation/cluster.md`,
+ `/#/${lang}/docs/${version}/guide/installation/cluster`
+ )
+ .replaceAll(
+ `../installation/pseudo-cluster.md`,
+ `/#/${lang}/docs/${version}/guide/installation/pseudo-cluster`
+ )
+ .replaceAll(
+ `../zh/guide/alert/email.md`,
+ `/#/zh-cn/docs/${version}/guide/alert/email`
+ )
+ .replaceAll(
+ `installation/cluster.md`,
+ `/#/${lang}/docs/${version}/guide/installation/cluster`
+ )
+ .replaceAll(
+ `howto/datasource-setting.md`,
+ `https://github.com/apache/dolphinscheduler/blob/${version}-release/docs/docs/${
+ lang === "en-us" ? "en" : "zh"
+ }/guide/howto/datasource-setting.md`
+ )
+ .replaceAll(
+ `start/quick-start.md`,
+ `/#/${lang}/docs/${version}/guide/start/quick-start`
+ )
+ .replaceAll(
+ `datasource-setting.md`,
+ `https://github.com/apache/dolphinscheduler/blob/${version}-release/docs/docs/${
+ lang === "en-us" ? "en" : "zh"
+ }/guide/howto/datasource-setting.md`
+ );
+};
+
+module.exports = replaceDeadLinks;
diff --git a/src/components/Connect/index.scss b/src/components/Connect/index.scss
index 7335758503..33305f56c6 100644
--- a/src/components/Connect/index.scss
+++ b/src/components/Connect/index.scss
@@ -1,14 +1,19 @@
.connect {
- height: 420px;
+ height: 380px;
background-color: #0097e0;
text-align: center;
width: 100%;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
&-title {
font-weight: 700;
color: #ffffff;
- font-size: 60px;
- padding: 40px;
+ font-size: 50px;
+ line-height: 50px;
+ padding: 0px 40px 40px;
@media screen and (max-width: 640px) {
font-size: 7vw;
@@ -17,7 +22,8 @@
&-desc {
color: #ffffff;
font-size: 18px;
- line-height: 48px;
+ line-height: 18px;
+ padding-top: 20px;
@media screen and (max-width: 640px) {
font-size: 14px;
@@ -34,7 +40,7 @@
font-weight: 700;
color: #0097e0;
font-size: 18px;
- margin-top: 80px;
+ margin-top: 60px;
vertical-align: middle;
@media screen and (max-width: 640px) {
diff --git a/src/views/Documentation/detail.scss b/src/views/Documentation/detail.scss
index 1b0b4bc425..53f4a6f6ed 100644
--- a/src/views/Documentation/detail.scss
+++ b/src/views/Documentation/detail.scss
@@ -31,6 +31,9 @@
border: 1px solid gray;
}
}
+ code {
+ white-space: break-spaces;
+ }
}
&-title {
font-weight: 700;