You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2023/03/02 04:24:02 UTC
[iotdb] branch master updated: [fix(people): fix Community display] (#9198)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new eea1ec9f93 [fix(people): fix Community display] (#9198)
eea1ec9f93 is described below
commit eea1ec9f93f5d01b7b91ba658f81ffb48d0c9f36
Author: CritasWang <cr...@outlook.com>
AuthorDate: Thu Mar 2 12:23:55 2023 +0800
[fix(people): fix Community display] (#9198)
---
...unity-Powered By.md => Community-Powered-By.md} | 0
.../Community-Project-Committers.md} | 3 +
docs/Development/VoteRelease.md | 4 +-
...unity-Powered By.md => Community-Powered-By.md} | 0
.../Community/Community-Project-Committers.md} | 3 +
site/src/main/.vuepress/client.ts | 4 +-
site/src/main/.vuepress/components/Contributor.vue | 411 +++++++++++++++++++++
site/src/main/.vuepress/components/PageFooter.vue | 51 ++-
site/src/main/.vuepress/navbar/en.ts | 4 +-
site/src/main/.vuepress/navbar/zh.ts | 4 +-
10 files changed, 461 insertions(+), 23 deletions(-)
diff --git a/docs/Community/Community-Powered By.md b/docs/Community/Community-Powered-By.md
similarity index 100%
rename from docs/Community/Community-Powered By.md
rename to docs/Community/Community-Powered-By.md
diff --git a/docs/zh/Community/Community-Project Committers.md b/docs/Community/Community-Project-Committers.md
similarity index 97%
rename from docs/zh/Community/Community-Project Committers.md
rename to docs/Community/Community-Project-Committers.md
index d138f23fa0..46627d85bc 100644
--- a/docs/zh/Community/Community-Project Committers.md
+++ b/docs/Community/Community-Project-Committers.md
@@ -1,3 +1,6 @@
+---
+home: true
+---
<!--
Licensed to the Apache Software Foundation (ASF) under one
diff --git a/docs/Development/VoteRelease.md b/docs/Development/VoteRelease.md
index 139fb5cf42..8eb9b5bc01 100644
--- a/docs/Development/VoteRelease.md
+++ b/docs/Development/VoteRelease.md
@@ -21,7 +21,9 @@
# How to vote for a release
-For non-Chinese users, please read https://cwiki.apache.org/confluence/display/IOTDB/Validating+a+staged+Release
+For non-Chinese users, please read
+
+https://cwiki.apache.org/confluence/display/IOTDB/Validating+a+staged+Release
## Download everything under voting version / rc
diff --git a/docs/zh/Community/Community-Powered By.md b/docs/zh/Community/Community-Powered-By.md
similarity index 100%
rename from docs/zh/Community/Community-Powered By.md
rename to docs/zh/Community/Community-Powered-By.md
diff --git a/docs/Community/Community-Project Committers.md b/docs/zh/Community/Community-Project-Committers.md
similarity index 97%
rename from docs/Community/Community-Project Committers.md
rename to docs/zh/Community/Community-Project-Committers.md
index d138f23fa0..46627d85bc 100644
--- a/docs/Community/Community-Project Committers.md
+++ b/docs/zh/Community/Community-Project-Committers.md
@@ -1,3 +1,6 @@
+---
+home: true
+---
<!--
Licensed to the Apache Software Foundation (ASF) under one
diff --git a/site/src/main/.vuepress/client.ts b/site/src/main/.vuepress/client.ts
index ac7dd8fa3a..f09d81b334 100644
--- a/site/src/main/.vuepress/client.ts
+++ b/site/src/main/.vuepress/client.ts
@@ -20,6 +20,7 @@ import { defineClientConfig } from '@vuepress/client';
import ElementPlus from 'element-plus';
import IoTDB from './components/IoTDB.vue';
import IoTDBZH from './components/IoTDBZH.vue';
+import Contributor from './components/Contributor.vue';
import 'element-plus/dist/index.css';
export default defineClientConfig({
@@ -27,6 +28,7 @@ export default defineClientConfig({
enhance: ({ app }) => {
app.use(ElementPlus);
app.component('IoTDB', IoTDB);
+ app.component('Contributor', Contributor);
app.component('IoTDBZH', IoTDBZH);
},
-});
+});
\ No newline at end of file
diff --git a/site/src/main/.vuepress/components/Contributor.vue b/site/src/main/.vuepress/components/Contributor.vue
new file mode 100644
index 0000000000..ec0b07dab0
--- /dev/null
+++ b/site/src/main/.vuepress/components/Contributor.vue
@@ -0,0 +1,411 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+<template>
+ <div>
+
+ <h1 style="text-align: center;">Project Mentors</h1>
+ <div v-for="(item,i) in mentors" class="box">
+ <img :src="item.avatar">
+ <div class="right">
+ <p class="con-name">{{item.name}}</p>
+ <div class="con-detailed-info">
+ <p>{{item.role}}</p>
+ </div>
+ <div class="con-apache-info">
+ <p class="con-id">Apache ID: {{item.id}}</p>
+ <p class="con-date">Starting date: {{item.date}}</p>
+ </div>
+ </div>
+ </div>
+
+ <h1 style="text-align: center;">Project Committers</h1>
+ <div v-for="(item,i) in conList" class="box">
+ <img :src="item.avatar">
+ <div class="right">
+ <p class="con-name">{{item.name}}</p>
+ <div class="con-detailed-info">
+ <p>{{item.role}}</p>
+ </div>
+ <div class="con-apache-info">
+ <p class="con-id">Apache ID: {{item.id}}</p>
+ <p class="con-date">Starting date: {{item.date}}</p>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</template>
+
+<script lang="ts">
+
+ export default {
+ name: "Community",
+ data() {
+ return {
+ msg: 'Welcome to Community Page',
+ md: "",
+ toc: "",
+ mentors:[
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Justin Mclean',
+ role: 'Mentor',
+ id: 'jmclean',
+ date: '2018/11/18'
+ },
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Christofer Dutz',
+ role: 'Mentor',
+ id: 'cdutz',
+ date: '2018/11/18'
+ },
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Willem Ning Jiang',
+ role: 'Mentor',
+ id: 'ningjiang',
+ date: '2018/11/18'
+ },
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Kevin A. McGrail',
+ role: 'Champion',
+ id: 'kmcgrail',
+ date: '2018/11/18'
+ },
+ ],
+ conList: [
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Gaofei Cao',
+ role: 'PMC, Committer',
+ id: 'caogaofei',
+ date: '2018/11/18'
+ },
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Yi Xu',
+ role: 'PMC, Committer',
+ id: 'dope',
+ date: '2018/11/18'
+ },
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Dongfang Mao',
+ role: 'PMC, Committer',
+ id: 'east',
+ date: '2018/11/18'
+ },
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Wangminhao Gou',
+ role: 'Committer',
+ id: 'ejttianyu',
+ date: '2020/03/03'
+ },
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Boris Zhu',
+ role: 'Committer',
+ id: 'geniuspig',
+ date: '2019/12/19'
+ },
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Haonan Hou',
+ role: 'PMC, Committer',
+ id: 'haonan',
+ date: '2020/01/30'
+ },
+ {
+ avatar: '/img/contributor-avatar/xdh.jpg',
+ name: 'Xiangdong Huang',
+ role: 'PMC, Committer',
+ id: 'hxd',
+ date: '2018/11/18'
+ },
+ {
+ avatar: '/img/contributor-avatar/yt.jpg',
+ name: 'Yuan Tian',
+ role: 'Committer',
+ id: 'jackietien',
+ date: '2019/12/18'
+ },
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Julian Feinauer',
+ role: 'PMC, Committer',
+ id: 'jfeinauer',
+ date: '2019/07/15'
+ },
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Tian Jiang',
+ role: 'PMC, Committer',
+ id: 'jiangtian',
+ date: '2018/11/18'
+ },
+ {
+ avatar: 'http://ise.thss.tsinghua.edu.cn/~wangjianmin/jimwang.jpg',
+ name: 'Jianmin Wang',
+ role: 'PMC, Committer',
+ id: 'jimwang',
+ date: '2018/11/18'
+ },
+ {
+ avatar: 'https://avatars1.githubusercontent.com/u/22488084?s=400&u=2ef5ad52a7c4241bf88fb5e45682948b307a7d90&v=4',
+ name: 'Jincheng Sun',
+ role: 'PMC, Committer',
+ id: 'jincheng',
+ date: '2020/01/21'
+ },
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Rong Kang',
+ role: 'PMC, Committer',
+ id: 'kangrong',
+ date: '2018/11/18'
+ },
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Lei Rui',
+ role: 'PMC, Committer',
+ id: 'leirui',
+ date: '2019/06/20'
+ },
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Dawei Liu',
+ role: 'PMC, Committer',
+ id: 'liudw',
+ date: '2020/03/01'
+ },
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Kun Liu',
+ role: 'PMC, Committer',
+ id: 'liukun',
+ date: '2018/11/18'
+ },
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Rui Liu',
+ role: 'PMC, Committer',
+ id: 'liurui',
+ date: '2018/11/18'
+ },
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Tianan Li',
+ role: 'PMC, Committer',
+ id: 'lta',
+ date: '2018/11/18'
+ },
+ {
+ avatar: '/img/contributor-avatar/jlq.png',
+ name: 'Jialin Qiao',
+ role: 'PMC, Committer',
+ id: 'qiaojialin',
+ date: '2018/11/18'
+ },
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Shuo Zhang',
+ role: 'PMC, Committer',
+ id: 'shuozhang',
+ date: '2018/11/18'
+ },
+ {
+ avatar: '/img/contributor-avatar/zss.jpg',
+ name: 'Zesong Sun',
+ role: 'Committer',
+ id: 'sunzesong',
+ date: '2019/12/23'
+ },
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Yue Su',
+ role: 'PMC, Committer',
+ id: 'suyue',
+ date: '2018/11/18'
+ },
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Zonghan Cai',
+ role: 'Committer',
+ id: 'tsaitsunghan',
+ date: '2019/11/05'
+ },
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Chen Wang',
+ role: 'PMC, Committer',
+ id: 'wangchen',
+ date: '2018/11/18'
+ },
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Jinrui Zhang',
+ role: 'PMC, Committer',
+ id: 'xingtanzjr',
+ date: '2018/11/18'
+ },
+ {
+ avatar: 'https://avatars0.githubusercontent.com/u/6711230?s=460&u=b8f03cad5891dbe4eab23ca75df3d97358b23b0c&v=4',
+ name: 'Xin Wang',
+ role: 'Committer',
+ id: 'xinwang',
+ date: '2020/05/18'
+ },
+ {
+ avatar: '/img/contributor-avatar/kfx.jpeg',
+ name: 'Kaifeng Xue',
+ role: 'Committer',
+ id: 'xuekaifeng',
+ date: '2018/12/19'
+ },
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Jun Yuan',
+ role: 'PMC, Committer',
+ id: 'yuanjun',
+ date: '2018/11/18'
+ },
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Stefanie Zhao',
+ role: 'PMC, Committer',
+ id: 'zhaoxinyi',
+ date: '2018/11/18'
+ },
+ {
+ avatar:'/img/contributor-avatar/cw.jpg',
+ name: 'Chao Wang',
+ role: 'PMC, Committer',
+ id: 'chaow',
+ date: '2020/09/04'
+ },
+ {
+ avatar:'/img/contributor-avatar/qhl.jpg',
+ name: 'Houliang Qi',
+ role: 'PMC, Committer',
+ id: 'neuyilan',
+ date: '2020/12/18'
+ },
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Xinyu Tan',
+ role: 'Committer',
+ id: 'LebronAl',
+ date: '2020/12/21'
+ },
+ {
+ avatar:'/img/contributor-avatar/xww.jpg',
+ name: 'Xiangwei Wei',
+ role: 'Committer',
+ id: 'Alima777',
+ date: '2021/02/20'
+ },
+ {
+ avatar:'/img/contributor-avatar/yrzh.jpg',
+ name: 'Jesse Zhou',
+ role: 'Committer',
+ id: 'JesseZhou-1',
+ date: '2021/02/20'
+ },
+ {
+ avatar:'https://avatars.githubusercontent.com/u/30497621',
+ name: 'Steve Yurong Su',
+ role: 'Committer',
+ id: 'rong',
+ date: '2021/05/12'
+ },
+ {
+ avatar:'/img/contributor-avatar/user.svg',
+ name: 'Chao Wang',
+ role: 'Committer',
+ id: 'wangchao316',
+ date: '2021/06/30'
+ },
+ {
+ avatar:'/img/contributor-avatar/ericpai.jpg',
+ name: 'Jian Bai',
+ role: 'Committer',
+ id: 'ericpai',
+ date: '2021/12/24'
+ },
+ ]
+ }
+ },
+ created() {
+ },
+ methods: {
+ parse(html) {
+ return Global.isReadyForPrerender(html)
+ }
+ }
+ }
+</script>
+<style scoped>
+
+ .box{
+ width:50%;
+ height:200px;
+ display: inline-block;
+ vertical-align: top;
+ text-align: center;
+ }
+
+ img{
+ vertical-align: top;
+ margin-right: 20px;
+ display: inline-block;
+ width: 100px;
+ height: 120px;
+ }
+
+ .right{
+ display: inline-block;
+ font-size: 14px;
+ height: 120px;
+ width: 180px;
+ padding: 0;
+ }
+
+ .con-detailed-info p {
+ margin: 0;
+ line-height: 10px;
+ }
+
+ .con-detailed-info {
+ margin-bottom: 10px;
+ }
+
+ .con-apache-info p {
+ margin: 0;
+ color: #888;
+ }
+
+ .con-name {
+ font-size: 16px;
+ font-weight: 500;
+ }
+
+</style>
\ No newline at end of file
diff --git a/site/src/main/.vuepress/components/PageFooter.vue b/site/src/main/.vuepress/components/PageFooter.vue
index feec19cec2..2ba10375e7 100644
--- a/site/src/main/.vuepress/components/PageFooter.vue
+++ b/site/src/main/.vuepress/components/PageFooter.vue
@@ -1,24 +1,24 @@
/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- */
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
<template>
<footer style="padding-bottom: 2rem;">
+ <span id="doc-version" style="display: none;">{{ docVersion }}</span>
<p style="text-align: center; color: #909399; font-size: 12px; margin: 0 30px;">Copyright © {{year}} The Apache Software Foundation.<br>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation</p>
<p style="text-align: center; margin-top: 10px; color: #909399; font-size: 12px; margin: 0 30px;">
@@ -30,6 +30,23 @@
</template>
<script setup lang="ts">
import { computed } from 'vue';
+import { usePageData } from '@vuepress/client';
+
+const pageData = usePageData();
const year = computed(() => new Date().getFullYear());
+
+const getDocVersion = (branch = 'master', path = '') => {
+ if (path.indexOf('UserGuide/Master') > -1 || path.indexOf('UserGuide') === -1) {
+ return branch;
+ }
+ const branchRex = /UserGuide\/V(\d+\.\d+\.x)/;
+ if (branchRex.test(path)) {
+ const tag = branchRex.exec(path)![1];
+ return `rel/${tag.replace('.x', '')}`;
+ }
+ return branch;
+};
+
+const docVersion = computed(() => getDocVersion('master', pageData.value.path));
</script>
diff --git a/site/src/main/.vuepress/navbar/en.ts b/site/src/main/.vuepress/navbar/en.ts
index e552b1b9f5..d326c75275 100644
--- a/site/src/main/.vuepress/navbar/en.ts
+++ b/site/src/main/.vuepress/navbar/en.ts
@@ -42,8 +42,8 @@ export const enNavbar = navbar([
children: [
{ text: 'About', link: '/Community/About' },
{ text: 'Wiki', link: 'https://cwiki.apache.org/confluence/display/iotdb' },
- { text: 'People', link: '/Community/Community-Project Committers' },
- { text: 'Powered By', link: '/Community/Community-Powered By' },
+ { text: 'People', link: '/Community/Community-Project-Committers' },
+ { text: 'Powered By', link: '/Community/Community-Powered-By' },
{ text: 'Resources', link: '/Community/Materials' },
{ text: 'Feedback', link: '/Community/Feedback' },
],
diff --git a/site/src/main/.vuepress/navbar/zh.ts b/site/src/main/.vuepress/navbar/zh.ts
index d21e73d73f..51719abd11 100644
--- a/site/src/main/.vuepress/navbar/zh.ts
+++ b/site/src/main/.vuepress/navbar/zh.ts
@@ -42,8 +42,8 @@ export const zhNavbar = navbar([
children: [
{ text: '关于社区', link: '/zh/Community/About' },
{ text: 'Wiki', link: 'https://cwiki.apache.org/confluence/display/iotdb' },
- { text: '开发人员', link: '/zh/Community/Community-Project Committers' },
- { text: '技术支持', link: '/zh/Community/Community-Powered By' },
+ { text: '开发人员', link: '/zh/Community/Community-Project-Committers' },
+ { text: '技术支持', link: '/zh/Community/Community-Powered-By' },
{ text: '活动与报告', link: '/Community/Materials' },
{ text: '交流与反馈', link: '/zh/Community/Feedback' },
],