v3.1.1.0

2021-04-05 13:09:28 +08:00
parent 086cf27744
commit c0cdcc0de0
163 changed files with 631 additions and 293 deletions
--- a/.vuepress/comp/KuboardDemo.vue
+++ b/.vuepress/comp/KuboardDemo.vue
@ -0,0 +1,57 @@
+<i18n locale="en" lang="yaml">
+  hi: kuboard
+</i18n>
+
+<i18n locale="cn" lang="yaml">
+  hi: kuboard
+</i18n>
+
+<template>
+  <div style="display: inline-block;">
+    <div style="cursor: pointer;" :id="`demo-popover-target-${suffix}`">
+      <slot>
+        <span :style="`font-weight: bold; color: ${color};`">{{label}}</span>
+      </slot>
+    </div>
+    <b-popover :target="`demo-popover-target-${suffix}`" triggers="hover" placement="bottom" variant="primary">
+      <template #title>在线演示</template>
+      <div style="font-size: 13px; color: #666;">
+        在线演示环境中，您具备 <span style="color: red; font-weight: bold">只读</span> 权限，只能体验 Kuboard 的一部分功能。<br/>
+      </div>
+      <div style="padding: 10px; border: 1px solid #eee; border-radius: 10px; margin: 10px 0px; background-color: #fafafa;">
+        <a href="http://demo.kuboard.cn:10080" target="_blank">http://demo.kuboard.cn:10080</a> <br/>
+        <div style="width: 60px; display: inline-block;margin-top: 5px;">用&nbsp;户</div>
+        demo <br/>
+        <div style="width: 60px; display: inline-block">密&nbsp;码</div>
+        demo123
+      </div>
+    </b-popover>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    suffix: { type: String, required: false, default: '' },
+    label: { type: String, required: false, default: 'Demo' },
+    color: { type: String, required: false, default: 'auto' },
+  },
+  data() {
+    return {
+
+    }
+  },
+  computed: {
+  },
+  components: { },
+  mounted () {
+  },
+  methods: {
+
+  }
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>
--- a/.vuepress/comp/index.js
+++ b/.vuepress/comp/index.js
@ -3,6 +3,7 @@ let components = [
  { name: 'Course', component: () => import(`./Course.vue`) },
  { name: 'CurrentVersion', component: () => import(`./CurrentVersion.vue`) },
  { name: 'CurrentVersionV3', component: () => import(`./CurrentVersionV3.vue`) },
+  { name: 'KuboardDemo', component: () => import(`./KuboardDemo.vue`) },
 ]

 export default function (Vue) {
--- a/.vuepress/config-sidebar.js
+++ b/.vuepress/config-sidebar.js
@ -370,6 +370,38 @@ let sidebar = {
      title: 'Kubernetes 高级',
      collapsable: true,
      children: [
+        {
+          title: '认证及授权',
+          collapsable: true,
+          children: [
+            {
+              title: '用户认证',
+              collapsable: true,
+              children: [
+                'k8s-advanced/sec/authenticate/',
+                'k8s-advanced/sec/sa-admin',
+                // 'k8s-advanced/sec/authenticate/install',
+                // 'k8s-advanced/sec/authenticate/ldap',
+              ]
+            }, {
+              title: '用户授权',
+              collapsable: true,
+              children: [
+                'k8s-advanced/sec/kuboard',
+                'k8s-advanced/sec/rbac/user-namespace.html',
+                'k8s-advanced/sec/rbac/list-namespace.html',
+                'k8s-advanced/sec/rbac/logs.html',
+                'k8s-advanced/sec/rbac/api',
+                'k8s-advanced/sec/rbac/default',
+                'k8s-advanced/sec/rbac/escalation',
+                'k8s-advanced/sec/rbac/cmd',
+                'k8s-advanced/sec/rbac/sa',
+                'k8s-advanced/sec/rbac/permissive',
+                'k8s-advanced/sec/rbac/example',
+              ]
+            },
+          ]
+        },
        {
          title: '问题诊断',
          collapsable: true,
@ -444,38 +476,6 @@ let sidebar = {
            'k8s-advanced/hpa/walkthrough',
          ]
        },
-        {
-          title: '安全',
-          collapsable: true,
-          children: [
-            {
-              title: '用户认证',
-              collapsable: true,
-              children: [
-                'k8s-advanced/sec/authenticate/',
-                'k8s-advanced/sec/sa-admin',
-                'k8s-advanced/sec/authenticate/install',
-                'k8s-advanced/sec/authenticate/ldap',
-              ]
-            }, {
-              title: '用户授权',
-              collapsable: true,
-              children: [
-                'k8s-advanced/sec/kuboard',
-                'k8s-advanced/sec/rbac/user-namespace.html',
-                'k8s-advanced/sec/rbac/list-namespace.html',
-                'k8s-advanced/sec/rbac/logs.html',
-                'k8s-advanced/sec/rbac/api',
-                'k8s-advanced/sec/rbac/default',
-                'k8s-advanced/sec/rbac/escalation',
-                'k8s-advanced/sec/rbac/cmd',
-                'k8s-advanced/sec/rbac/sa',
-                'k8s-advanced/sec/rbac/permissive',
-                'k8s-advanced/sec/rbac/example',
-              ]
-            },
-          ]
-        },
        {
          title: '监控',
          collapsable: true,
--- a/.vuepress/config.js
+++ b/.vuepress/config.js
@ -56,20 +56,6 @@ module.exports = {
      // selector: 'div[class*="language-"] pre'
      selector: 'div[class*="language-"] pre'
    },
-    // '@vuepress/pwa': {
-    //   serviceWorker: true,
-    //   // popupComponent: 'KbSWUpdatePopup',
-    //   updatePopup: {
-    //     '/': {
-    //       message: "Kuboard已更新",
-    //       buttonText: "点击刷新"
-    //     }
-    //   }
-    // },
-    // '@vuepress/pwa': {
-    //   serviceWorker: true,
-    //   updatePopup: true
-    // },
    '@vssue/vuepress-plugin-vssue': {
      // set `platform` rather than `api`
      platform: 'github-v4',
@ -132,7 +118,7 @@ module.exports = {
      // { text: '简介', link: '/overview/' },
      { text: '安装', link: '/install/v3/install.html' },
      { text: '教程', link: '/learning/' },
-      { text: '使用', link: '/guide/' },
+      // { text: '使用', link: '/guide/' },
      { text: '支持', link: '/support/' },
      { text: '论坛', link: 'https://forum.kuboard.cn/'},
      // { text: '培训', link: 'https://kubetrain.cn/?from=kuboard', target: '_blank' },
@ -147,13 +133,13 @@ module.exports = {
    },
    lastUpdated: '更新时间',
    // 假定是 GitHub. 同时也可以是一个完整的 GitLab URL
-    repo: 'eip-work/kuboard-press',
+    // repo: 'eip-work/kuboard-press',
    // 自定义仓库链接文字。默认从 `themeConfig.repo` 中自动推断为
    // "GitHub"/"GitLab"/"Bitbucket" 其中之一，或是 "Source"。
-    repoLabel: '文档仓库',
+    // repoLabel: '文档仓库',

    // 假如你的文档仓库和项目本身不在一个仓库：
-    docsRepo: 'eip-work/kuboard-press',
+    // docsRepo: 'eip-work/kuboard-press',
    // 假如文档不是放在仓库的根目录下：
    docsDir: '',
    // 假如文档放在一个特定的分支下：
--- a/.vuepress/public/landing.html
+++ b/.vuepress/public/landing.html
@ -200,16 +200,32 @@
                        <h1 class="text-primary">快速在 Kubernetes 上落地微服务</h1>
                        <p class="text-primary mt-3"><span style="font-weight: 500;">Kubernetes：</span> 安装、教程、管理面板、微服务实战</p>
                        <ul class="pair-btns-list">
-                            <li> <a class="cbtn btn-grad-s btn-shadow btn-width"
+                            <!-- <li> <a class="cbtn btn-grad-s btn-shadow btn-width"
                             target="_blank"
                             href="http://demo.kuboard.cn/dashboard?k8sToken=eyJhbGciOiJSUzI1NiIsImtpZCI6InZ6SzVqZFNJOXZFMmxQSkhXamNBcFY4RU9FR0RvSUR5bzJIY0NwVG1zODQifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJrdWJlLXN5c3RlbSIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VjcmV0Lm5hbWUiOiJrdWJvYXJkLXZpZXdlci10b2tlbi0yOW40cyIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50Lm5hbWUiOiJrdWJvYXJkLXZpZXdlciIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50LnVpZCI6IjQzMWMwNmYyLTNiNTAtNGEyMy1hYjM1LTkyNDQwNTQ2NzFkZCIsInN1YiI6InN5c3RlbTpzZXJ2aWNlYWNjb3VudDprdWJlLXN5c3RlbTprdWJvYXJkLXZpZXdlciJ9.kgwTa6t00gNC0vgr6HOvCqkDghPcW-jVDg-_K6WLy97ppb9jvaqVz-AxXzF7mJqXnNetbJw-8-x_L3ogSsDlTKmRucao96VA2tPKxel8pM04J8MU0ZmYgWhTJelibbxmQK3jwGM4x32bckOOvmtumcXdsBRN0z1SZ1iu4H0VoaswhfoFS4ZJKoe61xyqoDhQx4RLCVJh_-Uctd5RCcPLWFEk-BHqC8vUTy8QcRst6RIIozQdTqsv7Xs6bH6dHrHFS--eVVTH2orQdm8znuUFhlqFOOjmCIMzIlaUQC_SO9URIGYOs0jrk27N9KC0HvQ5dLgFmwyNJ0Gu7cYi23NP1A">
-                             在线演示</a></li>
+                             在线演示</a></li> -->
+                             <li> <a class="cbtn btn-grad-s btn-shadow btn-width"
+                                target="_blank"
+                                href="http://demo.kuboard.cn:10080/">
+                                在线演示</a></li>
                            <li><a href="/learning/" class="cbtn btn-grad btn-shadow btn-width">查看教程</a></li>
                        </ul>
                        <p style="margin-top: 20px;">
                            <a aria-label="github" href="https://starchart.cc/eip-work/kuboard-press" target="_blank" alt="Github Stars"><img src="https://badgen.net/github/stars/eip-work/kuboard-press?label=github&nbsp;stars"/></a>
                            <a aria-label="github" href="https://hub.docker.com/r/eipwork/kuboard" target="_blank" alt="Docker Pulls"><img src="https://badgen.net/docker/pulls/eipwork/kuboard"/></a>
                        </p>
+                        <p>
+                            <div style="font-size: 13px; color: #666;">
+                                在线演示环境中，您具备 <span style="color: red; font-weight: bold">只读</span> 权限，只能体验 Kuboard 的一部分功能。<br/>
+                              </div>
+                              <div style="padding: 10px; border: 1px solid #eee; border-radius: 10px; margin: 10px 0px; background-color: #fafafa;">
+                                <a href="http://demo.kuboard.cn:10080" target="_blank">http://demo.kuboard.cn:10080</a> <br/>
+                                <div style="width: 60px; display: inline-block;margin-top: 5px;">用&nbsp;户：</div>
+                                demo <br/>
+                                <div style="width: 60px; display: inline-block">密&nbsp;码：</div>
+                                demo123
+                              </div>
+                        </p>
                    </div>
                </div>
                <div class="col-sm-6 col-md-5">
--- a/.vuepress/theme/components/Navbar.vue
+++ b/.vuepress/theme/components/Navbar.vue
@ -54,6 +54,7 @@
      />
      <SearchBox v-else-if="$site.themeConfig.search !== false && $page.frontmatter.search !== false"/>
      <NavLinks class="can-hide"/>
+      <KuboardDemo class="can-hide" style="margin-left: 20px;" suffix="navbar"></KuboardDemo>
    </div>
  </header>
 </template>
--- a/.vuepress/theme/components/Sidebar.vue
+++ b/.vuepress/theme/components/Sidebar.vue
@ -14,42 +14,30 @@
      <div class="side-nav-item" :style="activeLinkStyle('/learning/')">
        <a :href="`/learning/${urlSurfix}`" class="nav-link router-link-exact-active router-link-active">教程</a>
      </div>
-      <div class="side-nav-item" :style="activeLinkStyle('/guide/')">
+      <!-- <div class="side-nav-item" :style="activeLinkStyle('/guide/')">
        <a :href="`/guide/${urlSurfix}`" class="nav-link">使用</a>
-      </div>
+      </div> -->
      <div class="side-nav-item" :style="activeLinkStyle('/support/')">
        <a :href="`/support/${urlSurfix}`" class="nav-link">支持</a>
      </div>
      <div class="side-nav-item" :style="activeLinkStyle('/forum/')">
        <a :href="`https://forum.kuboard.cn`" target="_blank" class="nav-link">论坛</a>
      </div>
-      <!-- <div class="side-nav-item" :style="activeLinkStyle('/training/')">
-        <a :href="`https://kubetrain.cn/?from=kuboard`" class="nav-link" target="_blank">培训</a>
-      </div> -->
-      <!-- <div class="side-nav-item">
-        <a href="http://k8s.kubetrain.cn" class="nav-link" target="_blank">博客</a>
-      </div> -->
-      <!-- <div class="side-nav-item">
-        <a href="http://bbs.kuboard.cn" class="nav-link" target="_blank">论坛</a>
-      </div> -->
+      <KuboardDemo class="side-nav-item" suffix="sidebar"></KuboardDemo>
    </div>
    <slot name="top"/>
    <SidebarLinks :depth="0" :items="items"/>
    <slot name="bottom"/>
    <div style="text-align: center; margin-top: 5vh;">
-      <!-- <a target="_blank" :href="`http://demo.kuboard.cn/dashboard?k8sToken=${$site.themeConfig.kuboardToken}`">
-        <img style="width: 242px; border: 1px solid #d7dae2;" src="/images/logo-main.png" alt="Kuboard_快速在Kubernetes上落地微服务"/>
-      </a> -->
-
      <p>
-        <strong>
-          <a target="_blank" :href="`http://demo.kuboard.cn/dashboard?k8sToken=${$site.themeConfig.kuboardToken}`">在线体验</a>
-        </strong>
+        <KuboardDemo suffix="sidebar2" label="在线演示" color="#007af5"></KuboardDemo>
      </p>
      <div>
-        <a target="_blank" :href="`http://demo.kuboard.cn/dashboard?k8sToken=${$site.themeConfig.kuboardToken}`">
-          <FancyImage style="width: 242px;" src="/images/preview.png" alt="Kubernetes教程_Kuboard在线体验" title="Kuboard" description="快速在 Kubernetes 上落地微服务"></FancyImage>
-        </a>
+        <KuboardDemo suffix="sidebar3">
+          <a target="_blank" href="http://demo.kuboard.cn:10080">
+            <FancyImage style="width: 242px;" src="/images/preview.png" alt="Kubernetes教程_Kuboard在线体验" title="Kuboard" description="http://demo.kuboard.cn:10080"></FancyImage>
+          </a>
+        </KuboardDemo>
      </div>
      <p>
      </p>
@ -145,7 +133,7 @@ export default {
 }
 .side-nav-item {
  margin-bottom: -2px;
-  margin-left: 3px;
+  margin-left: 10px;
  display: inline-block;
  line-height: 1.4rem;
  white-space: nowrap;