This is an automated email from the ASF dual-hosted git repository. djwang pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudberry-site.git
commit 3a3034179817f2cc2a6fb20b3fcd93b3bb31d83a Author: Dianjin Wang <[email protected]> AuthorDate: Sun Nov 24 10:40:26 2024 +0800 Pages: delete the contributor wall and one FAQ In this PR, we delete the contributor wall image including PostgreSQL and Greenplum community contributors. Also, remove the not suitable FAQ "Can I use the Apache Cloudberry (Incubating) for commercial purposes?". Moreover, update the Chinese version team page. --- i18n/zh/docusaurus-plugin-content-pages/team.md | 73 ++++++++-------- .../home/MeetTheCommunity/getGithubContributors.ts | 97 --------------------- .../home/MeetTheCommunity/index.module.scss | 28 +----- src/components/home/MeetTheCommunity/index.tsx | 23 ----- src/consts/homeContent.tsx | 8 +- src/pages/team.md | 34 -------- static/img/home/grid-rect.png | Bin 270528 -> 0 bytes 7 files changed, 38 insertions(+), 225 deletions(-) diff --git a/i18n/zh/docusaurus-plugin-content-pages/team.md b/i18n/zh/docusaurus-plugin-content-pages/team.md index d7ba9a63..683fea57 100644 --- a/i18n/zh/docusaurus-plugin-content-pages/team.md +++ b/i18n/zh/docusaurus-plugin-content-pages/team.md @@ -3,46 +3,45 @@ title: 团队 description: 基于开源，为了开源。 --- -Cloudberry Database 团队专注于数据库内核、周边工具开发以及网站、文档等更新。Cloudberry Database 项目起始于 2022 年，基于新版 Postgres 稳定内核和 Greenplum Database 分布式架构构建。如果没有这 2 个项目贡献者的宝贵贡献，Cloudberry Database 则无法快速发展、实现今天的成就。我们对他们致以诚挚的感谢。 - -[](https://git-contributor.com?chart=contributorOverTime&repo=cloudberrydb/cloudberrydb) - -除了[主仓库](https://github.com/cloudberrydb/cloudberrydb)外，我们在 GitHub 上还开源了一些生态项目。如果要查看 Cloudberry Database 社区全部贡献者，敬请访问 [GitHub 主页](https://github.com/cloudberrydb/)查看详情。下面的图片仅展示了部分贡献者（包括活跃贡献者、上游贡献者，不包括匿名贡献者），可点击图片查看更多贡献者信息。 - -- **[cloudberrydb/cloudberrydb](https://github.com/cloudberrydb/cloudberrydb):** - -<a href="https://github.com/cloudberrydb/cloudberrydb/graphs/contributors";> - <img src="https://contrib.rocks/image?repo=cloudberrydb/cloudberrydb&max=800&columns=20&anon=0"; /> -</a> - -- **[cloudberrydb/cloudberrydb-site](https://github.com/cloudberrydb/cloudberrydb-site):** - -<a href="https://github.com/cloudberrydb/cloudberrydb-site/graphs/contributors";> - <img src="https://contrib.rocks/image?repo=cloudberrydb/cloudberrydb-site&max=800&columns=20&anon=0"; /> -</a> - -- **[cloudberrydb/bootcamp](https://github.com/cloudberrydb/bootcamp):** - -<a href="https://github.com/cloudberrydb/bootcamp/graphs/contributors";> - <img src="https://contrib.rocks/image?repo=cloudberrydb/bootcamp&max=800&columns=20&anon=0"; /> -</a> - -- **[cloudberrydb/gpbackup](https://github.com/cloudberrydb/gpbackup):** - -<a href="https://github.com/cloudberrydb/gpbackup/graphs/contributors";> - <img src="https://contrib.rocks/image?repo=cloudberrydb/gpbackup&max=800&columns=20&anon=0"; /> -</a> - -- **[cloudberrydb/gp-common-go-libs](https://github.com/cloudberrydb/gp-common-go-libs):** - -<a href="https://github.com/cloudberrydb/gp-common-go-libs/graphs/contributors";> - <img src="https://contrib.rocks/image?repo=cloudberrydb/gp-common-go-libs&max=800&columns=20&anon=0"; /> -</a> +Apache Cloudberry 团队专注于数据库内核、周边工具开发以及网站、文档等更新。 + +## Podling PMC + +每个孵化项目管理委员会 (PPMC) 都帮助其孵化项目 (Podling) 学习如何自我管理。它类似于 PMC，但不向 ASF 董事会报告，而向孵化器 PMC 报告。最初，它由孵化项目的导师和初始提交者（committers）组成。孵化项目管理委员会直接负责监督孵化项目，并决定将谁新增为 PPMC 成员。 + +|姓名| 邮箱 | GitHub ID | 所在组织| +|--|--|--|--| +| Andrey Borodin | [email protected] | x4m | Yandex Cloud | +| Antonio Petrole | [email protected] | antoniopetrole | Individual | +| Dianjin Wang | [email protected] | tuhaihe | HashData | +| Ed Espino | [email protected] | edespino | Individual | +| Greg Spiegelberg | [email protected] | gspiegelberg | Individual | +| Hao Wu | [email protected] | gfphoenix78 | HashData | +| Hope Gao | [email protected] | gaoxueyu | HighGo | +| Jianghua Yang | [email protected] | yjhjstz | HashData | +| Jiaqi Zhou | [email protected] | jiaqizho | HashData | +| Jinbao Chen | [email protected] | oppenheimer01 | HashData | +| Kirill Reshke | [email protected] | reshke | Yandex Cloud | Yandex Cloud | +| Kent Yao *(Mentor)* | [email protected] | yaooqinn | Apache Member, NetEase | +| Louis Mugnano | [email protected] | lmugnano4537 | Individual | +| Max Yang | [email protected] | my-ship-it | HashData | +| Maxim Smyatkin | [email protected] | Smyatkin-Maxim | Yandex Cloud | +| Roman Shaposhnik *(Mentor)* | [email protected] | rvs | Ainekko | +| Sen Hu | [email protected] | HuSen8891 | HashData | +| Shine Zhang | [email protected] | xinzweb | Individual | +| Tushar Pednekar | [email protected] | 2shar-p | Individual | +| Weinan WANG | [email protected] | weinan003 | HashData | +| Willem Jiang *(Mentor)*|[email protected] | WillemJiang | Apache Member, ByteDance | +| Xiaoran Wang | [email protected] | fanfuxiaoran | HashData | +| Xin (Alwin) Tang | [email protected] | xtangcode | HashData | +| Zhang Mingli | [email protected] | avamingli | HashData | + +Cloudberry 项目起始于 2022 年，基于新版 Postgres 稳定内核和 Greenplum Database 分布式架构构建。如果没有这 2 个项目贡献者的宝贵贡献，Cloudberry 则无法快速发展、实现今天的成就。我们对他们致以诚挚的感谢。 # 成为贡献者 -Cloudberry Database 作为面向分析和 AI 场景打造的下一代统一型开源数据库，致力于构建开放、友好、中立的开源社区，欢迎越来越多的人加入社区，参与到 Cloudberry Database 发展中来。我们欢迎所有人的贡献，无论贡献大小都值得鼓励和赞扬。如果你对贡献有兴趣，可查看我们的[贡献指南](/contribute)了解详情。 +我们欢迎所有人的贡献，无论贡献大小都值得鼓励和赞扬。如果你对贡献有兴趣，可查看我们的[贡献指南](/contribute)了解详情。 -你在学习、使用和贡献 Cloudberry Database 过程中，遇到任何问题，都可以通过[官方支持渠道](/support)获得帮助。 +你在学习、使用和贡献 Cloudberry 过程中，遇到任何问题，都可以通过[官方支持渠道](/support)获得帮助。 加入我们吧！ \ No newline at end of file diff --git a/src/components/home/MeetTheCommunity/getGithubContributors.ts b/src/components/home/MeetTheCommunity/getGithubContributors.ts deleted file mode 100644 index 9e802bc0..00000000 --- a/src/components/home/MeetTheCommunity/getGithubContributors.ts +++ /dev/null @@ -1,97 +0,0 @@ -async function fetchGithubNum(url) { - let allCommits = []; - while (url) { - const response = await fetch(url); - const data = await response.json(); - if (response.status !== 200) { - throw new Error(data.message); - } - allCommits = allCommits.concat(data); - const link = response.headers.get("link"); - url = link ? extractNextUrl(link) : null; - } - return allCommits; -} - -function extractNextUrl(linkHeader) { - const links = linkHeader.split(","); - for (const link of links) { - if (link.includes('rel="next"')) { - const urlMatch = link.match(/<(.*)>/); - if (urlMatch) { - return urlMatch[1]; - } - } - } - return null; -} - -const baseGithubUrl = "https://api.github.com/repos";; -const repoName = "cloudberrydb/cloudberrydb"; - -const business = "contributors"; -const key = "GITHUB_CONTRIBUTORS"; - -export interface ContributorItem { - avatarURL: string; - htmlURL: string; - id: number; -} -interface CacheObj { - time: number; - list: ContributorItem[]; -} - -export default async function getGithubContributors(): Promise< - ContributorItem[] -> { - let cacheObj: CacheObj | null = null; - try { - const cacheStr = localStorage.getItem(key); - cacheObj = cacheStr ? JSON.parse(cacheStr) : null; - } catch (err) { - localStorage.removeItem(key); - console.error(err); - } - - if (!isNeedReqNewApi(cacheObj)) { - if (!cacheObj?.list.length) { - localStorage.removeItem(key); - return []; - } - return cacheObj.list; - } - - try { - const dataList = await fetchGithubNum( - `${baseGithubUrl}/${repoName}/${business}` - ); - const list = dataList.map((item) => { - return { - avatarURL: item.avatar_url, - htmlURL: item.html_url, - id: item.id, - }; - }); - - if (list.length) { - const catchObj: CacheObj = { - time: new Date().getTime(), - list: list, - }; - localStorage.setItem(key, JSON.stringify(catchObj)); - } else { - if (cacheObj.list) { - return cacheObj.list; - } - } - return list; - } catch (err) { - return []; - } -} - -function isNeedReqNewApi(cacheStr: CacheObj | null) { - // one hour cache - return !cacheStr || new Date().getTime() - cacheStr.time > 1000 * 60 * 60; -} diff --git a/src/components/home/MeetTheCommunity/index.module.scss b/src/components/home/MeetTheCommunity/index.module.scss index 68617532..08ef25e2 100644 --- a/src/components/home/MeetTheCommunity/index.module.scss +++ b/src/components/home/MeetTheCommunity/index.module.scss @@ -1,17 +1,9 @@ .meetTheCommunity { position: relative; - height: 910px; + height: 309px; padding-top: 70px; margin-bottom: -62px; background-color: rgb(17, 15, 15); - .bgImg { - width: 810px; - height: 810px; - margin: auto; - background-image: url("/img/home/grid-rect.png"); - background-size: contain; - background-repeat: no-repeat; - } .title { position: absolute; top: 150px; @@ -27,24 +19,6 @@ } } - .contributorList { - display: grid; - width: 1090px; - grid-template-columns: repeat(17, 1fr); - grid-template-rows: auto; - gap: 20px 23px; - position: absolute; - top: 372px; - left: 50%; - transform: translateX(-50%); - .contributorItem { - width: 42px; - height: 42px; - border-radius: 50%; - overflow: hidden; - border: 2px solid rgba(255, 178, 25, 1); - } - } @media screen and (max-width: 1440px) { padding-inline: var(--mobile-padding-width); height: 910px; diff --git a/src/components/home/MeetTheCommunity/index.tsx b/src/components/home/MeetTheCommunity/index.tsx index 3265e655..9806646e 100644 --- a/src/components/home/MeetTheCommunity/index.tsx +++ b/src/components/home/MeetTheCommunity/index.tsx @@ -1,33 +1,10 @@ import { MEET_THE_COMMUNITY } from "@site/src/consts/homeContent"; import { useEffect, useState } from "react"; -import getGithubContributors, { - ContributorItem, -} from "./getGithubContributors"; import styles from "./index.module.scss"; export default function MeetTheCommunity() { - const [contributors, setContributors] = useState<ContributorItem[]>([]); - useEffect(() => { - getGithubContributors().then((c) => { - setContributors(c.slice(0, 119)); - }); - }, []); return ( <div className={styles.meetTheCommunity}> - <div className={styles.bgImg}></div> <div className={styles.title}>{MEET_THE_COMMUNITY.title}</div> - <div className={styles.contributorList}> - {contributors.map((c) => ( - <div className={styles.contributorItem} key={c.id}> - <a - href="https://github.com/cloudberrydb/cloudberrydb/graphs/contributors"; - target="_blank" - rel="noreferrer" - > - <img src={c.avatarURL} alt="" /> - </a> - </div> - ))} - </div> </div> ); } diff --git a/src/consts/homeContent.tsx b/src/consts/homeContent.tsx index baee22eb..68ba9318 100644 --- a/src/consts/homeContent.tsx +++ b/src/consts/homeContent.tsx @@ -149,8 +149,7 @@ let TRY_IT_OUT = { let MEET_THE_COMMUNITY = { title: ( <> - <p>Meet the</p> - <p>community</p> + <p>Meet the community</p> </> ), }; @@ -229,11 +228,6 @@ let FREQUENTLY_ASKED_QUESTIONS = { </> ), list: [ - { - title: "Can I use the Apache Cloudberry (Incubating) for commercial purposes?", - content: - "Apache Cloudberry (Incubating) is open-source under Apache License V2.0, which permits commercial use, as long as following the license agreement.", - }, { title: "What's the product plan for the Apache Cloudberry (Incubating)?", content: ( diff --git a/src/pages/team.md b/src/pages/team.md index 7c871339..9ad283af 100644 --- a/src/pages/team.md +++ b/src/pages/team.md @@ -37,40 +37,6 @@ Each Podling Project Management Committee (PPMC) helps its Podling learn how to Our journey began in 2022, and we have built our foundation on PostgreSQL and Greenplum Database. We would not be where we are today without the invaluable contributions of the two project contributors. We extend our heartfelt thanks to them. -## Contributor wall - -We have several ecosystem projects available on GitHub in addition to our [main repository](https://github.com/cloudberrydb/cloudberrydb). To discover all of the contributors to Apache Cloudberry, please visit our [GitHub homepage](https://github.com/cloudberrydb/). Please note that the images shown below highlight the avatars of our active and upstream contributors while not including anonymous contributors. To view all the contributors, you can click on the images. - -- **[cloudberrydb/cloudberrydb](https://github.com/cloudberrydb/cloudberrydb):** - -<a href="https://github.com/cloudberrydb/cloudberrydb/graphs/contributors";> - <img src="https://contrib.rocks/image?repo=cloudberrydb/cloudberrydb&max=800&columns=25&anon=0"; /> -</a> - -- **[cloudberrydb/cloudberrydb-site](https://github.com/cloudberrydb/cloudberrydb-site):** - -<a href="https://github.com/cloudberrydb/cloudberrydb-site/graphs/contributors";> - <img src="https://contrib.rocks/image?repo=cloudberrydb/cloudberrydb-site&max=800&columns=25&anon=0"; /> -</a> - -- **[cloudberrydb/bootcamp](https://github.com/cloudberrydb/bootcamp):** - -<a href="https://github.com/cloudberrydb/bootcamp/graphs/contributors";> - <img src="https://contrib.rocks/image?repo=cloudberrydb/bootcamp&max=800&columns=25&anon=0"; /> -</a> - -- **[cloudberrydb/gpbackup](https://github.com/cloudberrydb/gpbackup):** - -<a href="https://github.com/cloudberrydb/gpbackup/graphs/contributors";> - <img src="https://contrib.rocks/image?repo=cloudberrydb/gpbackup&max=800&columns=25&anon=0"; /> -</a> - -- **[cloudberrydb/gp-common-go-libs](https://github.com/cloudberrydb/gp-common-go-libs):** - -<a href="https://github.com/cloudberrydb/gp-common-go-libs/graphs/contributors";> - <img src="https://contrib.rocks/image?repo=cloudberrydb/gp-common-go-libs&max=800&columns=25&anon=0"; /> -</a> - # Become a contributor The Apache Cloudberry community welcomes everyone to contribute, regardless of their level of experience. We encourage all types of contributions, no matter how small. Our [contribution guide](/contribute) is available to help you get started with the process. diff --git a/static/img/home/grid-rect.png b/static/img/home/grid-rect.png deleted file mode 100644 index 5b412bcf..00000000 Binary files a/static/img/home/grid-rect.png and /dev/null differ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
