This is an automated email from the ASF dual-hosted git repository.
leezng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong-website.git
The following commit(s) were added to refs/heads/master by this push:
new 7500ef3ec0 [INLONG-602] Optimize the team page to better display the
team (#603)
7500ef3ec0 is described below
commit 7500ef3ec004ed4ecc7721bac272f90f4de27314
Author: Lizhen <88174078+bluew...@users.noreply.github.com>
AuthorDate: Thu Nov 17 14:07:22 2022 +0800
[INLONG-602] Optimize the team page to better display the team (#603)
---
config/team.json | 140 +++++++++++++++++++++++++++-------------
src/pages/team/index.js | 119 ++++++++++++++--------------------
src/pages/team/index.less | 38 -----------
src/pages/team/team.module.less | 94 +++++++++++++++++++++++++++
static/img/default.png | Bin 0 -> 1540 bytes
5 files changed, 238 insertions(+), 153 deletions(-)
diff --git a/config/team.json b/config/team.json
index 4257f1e8aa..d09f39b654 100644
--- a/config/team.json
+++ b/config/team.json
@@ -3,184 +3,232 @@
{
"apacheID": "aloyszhang",
"githubName": "aloyszhang",
- "publicName": "Aloys Zhang"
+ "publicName": "Aloys Zhang",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/48062889?v=4";
},
{
"apacheID": "dockerzhang",
"githubName": "dockerzhang",
- "publicName": "Charles Zhang"
+ "publicName": "Charles Zhang",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/18047329?v=4";
},
{
"apacheID": "leezng",
"githubName": "leezng",
- "publicName": "Daniel Li"
+ "publicName": "Daniel Li",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/13777294?v=4";
},
{
"apacheID": "gxcheng",
"githubName": "guangxuCheng",
- "publicName": "Guangxu Cheng"
+ "publicName": "Guangxu Cheng",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/16833559?v=4";
},
{
"apacheID": "technoboy",
"githubName": "technoboy-",
- "publicName": "Guo Jiwei"
+ "publicName": "Guo Jiwei",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/6297296?v=4";
},
{
"apacheID": "gosonzhang",
"githubName": "gosonzhang",
- "publicName": "Guocheng Zhang"
+ "publicName": "Guocheng Zhang",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/14038849?v=4";
},
{
"apacheID": "charleli",
"githubName": "charlely",
- "publicName": "Haiji Li"
+ "publicName": "Haiji Li",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/41224243?v=4";
},
{
"apacheID": "healchow",
"githubName": "healchow",
- "publicName": "Heal Chow"
+ "publicName": "Heal Chow",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/31994335?v=4";
},
{
"apacheID": "jbonofre",
"githubName": "jbonofre",
- "publicName": "Jean-Baptiste Onofré"
+ "publicName": "Jean-Baptiste Onofré",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/158903?v=4";
},
{
"apacheID": "jshao",
"githubName": "jerryshao",
- "publicName": "Jerry Shao"
+ "publicName": "Jerry Shao",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/850797?v=4";
},
{
"apacheID": "junjie",
"githubName": "chenjunjiedada",
- "publicName": "Junjie Chen"
+ "publicName": "Junjie Chen",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/3960228?v=4";
},
{
"apacheID": "junping_du",
- "githubName": "",
- "publicName": "Junping Du"
+ "githubName": "junpingdu",
+ "publicName": "Junping Du",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/888093?v=4";
},
{
"apacheID": "jmclean",
- "githubName": "justinmclean, jmclean",
- "publicName": "Justin Mclean"
+ "githubName": "justinmclean",
+ "publicName": "Justin Mclean",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/144504?v=4";
},
{
"apacheID": "lamberliu",
"githubName": "lamberliu",
- "publicName": "Lamber Liu"
+ "publicName": "Lamber Liu",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/55134155?v=4";
},
{
"apacheID": "lzwang",
"githubName": "bluewang",
- "publicName": "Lizhen"
+ "publicName": "Lizhen",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/88174078?v=4";
},
{
"apacheID": "osgooli",
"githubName": "lizhiboo",
- "publicName": "Osgoo Li"
+ "publicName": "Osgoo Li",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/16134780?v=4";
},
{
"apacheID": "pengchen",
"githubName": "chinpeng",
- "publicName": "Peng Chen"
+ "publicName": "Peng Chen",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/454694?v=4";
},
{
"apacheID": "seraph",
- "githubName": "j-j-cheng",
- "publicName": "Seraph"
+ "githubName": "j-ching",
+ "publicName": "Seraph",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/3312291?v=4";
},
{
"apacheID": "yuanbo",
"githubName": "yuanboliu",
- "publicName": "Yuanbo Liu"
+ "publicName": "Yuanbo Liu",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/5643344?v=4";
},
{
"apacheID": "jiyuanhao",
"githubName": "shink",
- "publicName": "Yuanhao Ji"
+ "publicName": "Yuanhao Ji",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/49934421?v=4";
},
{
"apacheID": "zakwu",
"githubName": "wf123537200",
- "publicName": "Zak Wu"
+ "publicName": "Zak Wu",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/5130528?v=4";
},
{
"apacheID": "kaynewu",
"githubName": "kaynewu",
- "publicName": "ZhongBo Wu"
+ "publicName": "ZhongBo Wu",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/5574794?v=4";
},
{
"apacheID": "alfredlu",
"githubName": "TszKitLo40",
- "publicName": "Zijie Lu"
+ "publicName": "Zijie Lu",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/18443139?v=4";
},
{
"apacheID": "tison",
"githubName": "tisonkun",
- "publicName": "Zili Chen"
+ "publicName": "Zili Chen",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/18818196?v=4";
},
{
"apacheID": "zirui",
"githubName": "EMsnap",
- "publicName": "Zirui Peng"
+ "publicName": "Zirui Peng",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/26538404?v=4";
}
],
"committers": [
+ {
+ "apacheID": "ciscozhou",
+ "githubName": "ciscozhou",
+ "publicName": "Cisco Zhou",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/45899072?v=4";
+ },
{
"apacheID": "ke4qqq",
- "githubName": "",
- "publicName": "David Nalley"
+ "githubName": "ke4qqq",
+ "publicName": "David Nalley",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/222407?v=4";
},
{
"apacheID": "zeus",
"githubName": "",
- "publicName": "Jie Jiang"
+ "publicName": "Jie Jiang",
+ "avatarUrl": ""
},
{
"apacheID": "luchunliang",
"githubName": "luchunliang",
- "publicName": "Lu Chunliang"
+ "publicName": "Lu Chunliang",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/8925507?v=4";
},
{
"apacheID": "baomingyu",
- "githubName": "",
- "publicName": "Mingyu Bao"
+ "githubName": "baomingyu",
+ "publicName": "Mingyu Bao",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/8108604?v=4";
},
{
"apacheID": "sijie",
"githubName": "sijie",
- "publicName": "Sijie Guo"
+ "publicName": "Sijie Guo",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/1217863?v=4";
},
{
"apacheID": "xiangli",
"githubName": "waterlx",
- "publicName": "Xiang Li"
+ "publicName": "Xiang Li",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/13976495?v=4";
+ },
+ {
+ "apacheID": "pacinogong",
+ "githubName": "gong",
+ "publicName": "Xin Gong",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/9883232?v=4";
},
{
"apacheID": "yihengw",
"githubName": "yiheng",
- "publicName": "Yiheng Wang"
+ "publicName": "Yiheng Wang",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/1297418?v=4";
},
{
"apacheID": "ehomeliu",
"githubName": "",
- "publicName": "Yuhong Liu"
+ "publicName": "Yuhong Liu",
+ "avatarUrl": ""
+ },
+ {
+ "apacheID": "yunqing",
+ "githubName": "yunqingmoswu",
+ "publicName": "Yunqing Mo",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/44659300?v=4";
},
{
"apacheID": "kipshi",
- "githubName": "",
- "publicName": "Yupeng Shi"
+ "githubName": "kipshi",
+ "publicName": "Yupeng Shi",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/48468934?v=4";
},
{
"apacheID": "zjshen",
"githubName": "zjshen14",
- "publicName": "Zhijie Shen"
- },
- {
- "apacheID": "yunqing",
- "githubName": "yunqingmoswu",
- "publicName": "Yunqing Mo"
+ "publicName": "Zhijie Shen",
+ "avatarUrl": "https://avatars.githubusercontent.com/u/35021395?v=4";
}
]
}
\ No newline at end of file
diff --git a/src/pages/team/index.js b/src/pages/team/index.js
index 6f217fe1dc..620dc1901e 100644
--- a/src/pages/team/index.js
+++ b/src/pages/team/index.js
@@ -4,7 +4,7 @@ import useBaseUrl from '@docusaurus/useBaseUrl';
import config from "../team/config.json";
import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
import Layout from '@theme/Layout';
-import './index.less';
+import styles from './team.module.less';
export default function() {
const isBrowser = useIsBrowser();
@@ -17,12 +17,10 @@ export default function() {
const { siteConfig } = useDocusaurusContext();
const team = siteConfig.customFields.team;
- const contributors = siteConfig.customFields.contributors;
- const docContributors = siteConfig.customFields.docContributors;
return (
<Layout>
- <div className="team-div"><br/>
+ <div className={styles.teamDiv}><br/>
<h1>InLong Team</h1>
<div>
<p>{dataSource.synopsis[0]}</p>
@@ -31,75 +29,58 @@ export default function() {
</div>
<h2>Members</h2>
<p>{dataSource.members}</p>
- <table>
- <thead>
- <tr>
- <td><b>Apache ID</b></td>
- <td><b>GitHub User Name</b></td>
- <td><b>Public Name</b></td>
- </tr>
- </thead>
- <tbody>
- {
- team.members.map((member, i) => (
- <tr key={i} index={i}>
- <td>{member.apacheID}</td>
- <td>{member.githubName}</td>
- <td>{member.publicName}</td>
- </tr>
- ))
- }
- </tbody>
- </table>
+ <div className={styles.card}>
+ {
+ team.members.map((member, i) => (
+ <div>
+ <a className={styles.memberLink}
target="_blank" href={`https://github.com/${member.githubName}`}>
+ <img src={member.avatarUrl}
className={styles.memberAvatarImg}/>
+ <div
className={styles.memberNameDiv}>{member.apacheID}</div>
+ <div
className={styles.usernameDiv}>{member.githubName}</div>
+ </a>
+ </div>
+ ))
+ }
+ </div>
<h2>Committer</h2>
- <table>
- <thead>
- <tr>
- <td><b>Apache ID</b></td>
- <td><b>GitHub User Name</b></td>
- <td><b>Public Name</b></td>
- </tr>
- </thead>
- <tbody>
- {
- team.committers.map((committer, i) => (
- <tr key={i} index={i}>
- <td>{committer.apacheID}</td>
- <td>{committer.githubName}</td>
- <td>{committer.publicName}</td>
- </tr>
- ))
- }
- </tbody>
- </table>
+ <div className={styles.card}>
+ {
+ team.committers.map((committer, i) => (
+ <div>
+ <a className={styles.memberLink}
target="_blank" href={committer.githubName === "" ? `` :
`https://github.com/${committer.githubName}`}>
+ <img className={styles.memberAvatarImg}
src={committer.avatarUrl !== "" ? committer.avatarUrl :
useBaseUrl('/img/default.png')}/>
+ <div
className={styles.memberNameDiv}>{committer.apacheID}</div>
+ <div
className={styles.usernameDiv}>{committer.githubName}</div>
+ </a>
+ </div>
+ ))
+ }
+ </div>
<h2>Contributors</h2>
<p>{dataSource.code_contributors}</p>
- <div className="contributors-div">
- <ul id="conID" className="ul-flex">
- {
- contributors.map((contributor, i) => (
- <li className="mb-2" key={i} index={i}>
- <a href={contributor.html_url}
target="_blank">
- <img src={contributor.avatar_url}
/><span>{contributor.login}</span>
- </a>
- </li>
- ))
- }
- </ul>
+ <div className={styles.committerDiv}>
+ <a
href="https://github.com/apache/inlong/graphs/contributors";
className={styles.committerLink} target="_blank">
+ <svg t="1668397861887" className="icon" viewBox="0 0
1024 1024" version="1.1"
+ xmlns="http://www.w3.org/2000/svg"; p-id="2713"
width="32" height="32">
+ <path
+ d="M960 512c0 97.76-28.704 185.216-85.664
263.264-56.96 78.016-130.496 131.84-220.64 161.856-10.304 1.824-18.368
0.448-22.848-4.032a22.4 22.4 0 0
1-7.2-17.504v-122.88c0-37.632-10.304-65.44-30.464-82.912a409.856 409.856 0 0 0
59.616-10.368 222.752 222.752 0 0 0 54.72-22.816c18.848-10.784 34.528-23.36
47.104-38.592 12.544-15.232 22.848-35.904 30.912-61.44 8.096-25.568
12.128-54.688 12.128-87.904 0-47.072-15.232-86.976-46.208-120.16 14.368-35.456
13.024-74.91 [...]
+ fill="#000000" p-id="2714"></path>
+ </svg>
+ apache/inlong
+ </a>
+ <a
href="https://github.com/apache/inlong-website/graphs/contributors";
className={styles.committerLink} target="_blank">
+ <svg t="1668397861887" className="icon" viewBox="0 0
1024 1024" version="1.1"
+ xmlns="http://www.w3.org/2000/svg"; p-id="2713"
width="32" height="32">
+ <path
+ d="M960 512c0 97.76-28.704 185.216-85.664
263.264-56.96 78.016-130.496 131.84-220.64 161.856-10.304 1.824-18.368
0.448-22.848-4.032a22.4 22.4 0 0
1-7.2-17.504v-122.88c0-37.632-10.304-65.44-30.464-82.912a409.856 409.856 0 0 0
59.616-10.368 222.752 222.752 0 0 0 54.72-22.816c18.848-10.784 34.528-23.36
47.104-38.592 12.544-15.232 22.848-35.904 30.912-61.44 8.096-25.568
12.128-54.688 12.128-87.904 0-47.072-15.232-86.976-46.208-120.16 14.368-35.456
13.024-74.91 [...]
+ fill="#000000" p-id="2714"></path>
+ </svg>
+ apache/inlong-website
+ </a>
</div>
- <p>{dataSource.doc_contributors}</p>
- <div className="contributors-div">
- <ul id="docID" className="ul-flex">
- {
- docContributors.map((docContributor, i) => (
- <li className="mb-2" key={i} index={i}>
- <a href={docContributor.html_url}
target="_blank">
- <img src={docContributor.avatar_url}
/><span>{docContributor.login}</span>
- </a>
- </li>
- ))
- }
- </ul>
+ <h2>Contributor Over Time</h2>
+ <div className={styles.divImg}>
+ <img
src="https://contributor-graph-api.apiseven.com/contributors-svg?repo=apache/inlong&merge=true";
alt="apache inlong"/>
</div>
</div>
</Layout>
diff --git a/src/pages/team/index.less b/src/pages/team/index.less
deleted file mode 100644
index 317b2cc1d5..0000000000
--- a/src/pages/team/index.less
+++ /dev/null
@@ -1,38 +0,0 @@
-.team-div {
- width: 50%;
- //height: 960px;
- margin: 0 auto;
-}
-.contributors-div {
- text-align: left;
-}
-.ul-flex {
- margin-left: -30px;
-
- .mb-2 {
- border: 1px solid lightgray;
- display: inline-block;
- list-style-type: none;
- margin: 0px 8px 8px 0px;
- padding: 4px 7px;
- border-radius: 3px;
- height: 40px;
-
- a {
- display: inline-block;
- margin: 0px 8px 8px 0px;
- }
-
- img {
- width: 1em;
- height: 1em;
- border-radius: 50%;
- }
-
- span {
- padding-left: 5px;
- }
- }
-
-}
-
diff --git a/src/pages/team/team.module.less b/src/pages/team/team.module.less
new file mode 100644
index 0000000000..a850a2dd5b
--- /dev/null
+++ b/src/pages/team/team.module.less
@@ -0,0 +1,94 @@
+.teamDiv {
+ width: 50%;
+ margin: 0 auto;
+}
+
+.card {
+ display: grid;
+ grid-template-columns: repeat(6, 1fr);
+ box-shadow: none;
+ gap: 18px;
+ margin: 20px 0px 20px 0px;
+ @media (max-width: 812px) {
+ grid-template-columns: repeat(2, 1fr);
+ }
+}
+
+html[data-theme='dark'] .memberLink {
+ color: white;
+}
+
+.memberLink {
+ border-radius: 0.75rem;
+ border: 1px solid #eee;
+ box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.03);
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ text-align: center;
+ padding: 1rem;
+ min-width: calc(108px + 2rem);
+ cursor: pointer;
+ height: 100%;
+ color: black;
+ &:hover {
+ color: inherit;
+ text-decoration: none;
+ }
+}
+
+.memberAvatarImg {
+ height: 108px;
+ width: 108px;
+ border-radius: 50%;
+
+}
+
+.memberNameDiv {
+ font-size: 1rem;
+ font-weight: 600;
+ margin-top: 12px;
+ margin-bottom: -4px;
+ line-height: 1rem;
+}
+
+.usernameDiv {
+ font-size: 0.8rem;
+ font-weight: 500;
+ margin-top: 8px;
+}
+
+.committerDiv {
+ display: flex;
+ flex-wrap: wrap;
+ margin: 20px 0px 20px 0px;
+
+ .committerLink {
+ border-radius: 0.75rem;
+ border: 1px solid #eee;
+ box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.03);
+ display: flex;
+ align-items: center;
+ font-weight: 500;
+ padding: 1rem;
+ margin: 8px;
+ cursor: pointer;
+ transition: all 0.3s;
+
+ &:hover {
+ opacity: 0.98;
+ text-decoration: none;
+ }
+
+ svg {
+ margin-right: 8px;
+ transition: all 0.3s;
+ }
+ }
+
+}
+
+.divImg {
+ margin: 20px 0px 20px 0px;
+}
diff --git a/static/img/default.png b/static/img/default.png
new file mode 100644
index 0000000000..f2f5085eb4
Binary files /dev/null and b/static/img/default.png differ
