You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2019/09/26 02:09:40 UTC

[incubator-iotdb-website] branch master updated: Add "In progress" documents in User Guide

This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb-website.git


The following commit(s) were added to refs/heads/master by this push:
     new 81a8ca1  Add "In progress" documents in User Guide
     new e4de269  Merge pull request #35 from samperson1997/progress
81a8ca1 is described below

commit 81a8ca1109eda5f1746ea2b408ad1b9fe9003908
Author: samperson1997 <sz...@mails.tsinghua.edu.cn>
AuthorDate: Thu Sep 26 10:06:37 2019 +0800

    Add "In progress" documents in User Guide
---
 src/components/Global.vue |  8 ++++----
 src/components/NavBar.vue |  2 +-
 src/views/Development.vue | 16 ++++++++--------
 src/views/Documents.vue   | 17 -----------------
 4 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/src/components/Global.vue b/src/components/Global.vue
index 83facd2..d99db4d 100644
--- a/src/components/Global.vue
+++ b/src/components/Global.vue
@@ -11,7 +11,7 @@
   const DOC_ENG_PREFIX = "/docs/Documentation";
   const DOC_CHN_PREFIX = "/docs/Documentation-CHN";
   const DEFAULT_VERSION = "0.8.0";
-  const LATEST_STR = "latest";
+  const PROGRESS_STR = "progress";
   const SUPPORT_VERSION = {
     "0.8.0": {
       "branch": "rel/0.8",
@@ -19,10 +19,10 @@
       'text': "V0.8.0",
       'content': '0-Content.md'
     },
-    "latest": {
+    "progress": {
       "branch": "master",
       "doc-prefix": DOC_URL_PREFIX,
-      'text': "Latest",
+      'text': "In progress",
       'content': '0-Content.md'
     }
   };
@@ -43,7 +43,7 @@
     downloadSparkConnector,
     DEFAULT_VERSION,
     SUPPORT_VERSION,
-    LATEST_STR,
+    PROGRESS_STR,
     DOC_ENG_PREFIX,
     DOC_CHN_PREFIX,
     isReadyForPrerender
diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index b3954b1..d4204bf 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -130,7 +130,7 @@
         "Development": [
           {"url": "/Development/Contributing", "content": "Questions and Contributing"},
           {"url": "/Development/IDE", "content": "Developing in IDE"},
-          {"url": "/Development/Tsfile", "content": "Changelist of Tsfile"},
+          {"url": "/Development/Tsfile", "content": "Changelist of TsFile"},
           {"url": "/Development/RPC", "content": "Changelist of RPC"}
         ]
       }
diff --git a/src/views/Development.vue b/src/views/Development.vue
index 34dfbcc..6cbe6ee 100644
--- a/src/views/Development.vue
+++ b/src/views/Development.vue
@@ -54,14 +54,14 @@
       },
       fetchData() {
         const dict = {
-          "Contributing": Global.SUPPORT_VERSION[Global.LATEST_STR]['doc-prefix'] +
-          Global.SUPPORT_VERSION[Global.LATEST_STR]['branch'] + "/docs/Development-Contributing.md",
-          "IDE": Global.SUPPORT_VERSION[Global.LATEST_STR]['doc-prefix'] +
-          Global.SUPPORT_VERSION[Global.LATEST_STR]['branch'] + "/docs/Development-IDE.md",
-          "Tsfile": Global.SUPPORT_VERSION[Global.LATEST_STR]['doc-prefix'] +
-          Global.SUPPORT_VERSION[Global.LATEST_STR]['branch'] + "/tsfile/format-changelist.md",
-          "RPC": Global.SUPPORT_VERSION[Global.LATEST_STR]['doc-prefix'] +
-          Global.SUPPORT_VERSION[Global.LATEST_STR]['branch'] + "/service-rpc/rpc-changelist.md",
+          "Contributing": Global.SUPPORT_VERSION[Global.PROGRESS_STR]['doc-prefix'] +
+          Global.SUPPORT_VERSION[Global.PROGRESS_STR]['branch'] + "/docs/Development-Contributing.md",
+          "IDE": Global.SUPPORT_VERSION[Global.PROGRESS_STR]['doc-prefix'] +
+          Global.SUPPORT_VERSION[Global.PROGRESS_STR]['branch'] + "/docs/Development-IDE.md",
+          "Tsfile": Global.SUPPORT_VERSION[Global.PROGRESS_STR]['doc-prefix'] +
+          Global.SUPPORT_VERSION[Global.PROGRESS_STR]['branch'] + "/tsfile/format-changelist.md",
+          "RPC": Global.SUPPORT_VERSION[Global.PROGRESS_STR]['doc-prefix'] +
+          Global.SUPPORT_VERSION[Global.PROGRESS_STR]['branch'] + "/service-rpc/rpc-changelist.md",
         };
         const content = this.content();
         let url = null;
diff --git a/src/views/Documents.vue b/src/views/Documents.vue
index 6d74c5f..4b9cbb7 100644
--- a/src/views/Documents.vue
+++ b/src/views/Documents.vue
@@ -87,23 +87,6 @@
       '$route.params.section': 'updateDocument',
     },
     methods: {
-      init(){
-        for(let key in Global.SUPPORT_VERSION){
-          this.versions.push({
-            text: Global.SUPPORT_VERSION[key]['text'],
-            url: '/Documents/'+ key + '/chap1/sec1'
-          })
-        }
-        let version = this.getVersion();
-        if(version in Global.SUPPORT_VERSION){
-          if(version === Global.LATEST_STR){
-            this.version = Global.DEFAULT_VERSION;
-          } else {
-            this.version = version;
-          }
-        }
-        this.text = this.getVersionString();
-      },
       getVersionString() {
         let version = this.$route.params.version;
         if (version in Global.SUPPORT_VERSION){