Merge pull request #19 from WeFoxTech/AtenJin-master

welcom Aten join us👏 💯
WeFoxTech · May 16, 2020 · 9619d2a · 9619d2a · github-actions · May 17, 2020
2 parents 0cffadd + 243364a
commit 9619d2a
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 19 deletions.
diff --git a/packages/website/components/icons/Zhihu.tsx b/packages/website/components/icons/Zhihu.tsx
@@ -0,0 +1,13 @@
+import { SvgIcon } from '@material-ui/core';
+
+export const ZhihuIcon: React.FC = props => {
+  return (
+    <SvgIcon fontSize="large" viewBox="0 100 1124 1124" {...props}>
+      <path
+        d="M940.35 795.875c0 78.652-63.771 142.422-142.421 142.422H228.226c-78.655 0-142.427-63.772-142.427-142.422v-569.7c0-78.658 63.772-142.432 142.427-142.432H797.93c78.658 0 142.432 63.772 142.432 142.431l-0.01 569.701zM415.621 543.356h125.593c0-29.528-13.923-46.824-13.923-46.824H418.295c2.59-53.493 4.91-122.15 5.739-147.65h103.677s-0.561-43.871-12.091-43.871H333.378s10.971-57.374 25.594-82.7c0 0-54.417-2.938-72.98 69.622-18.562 72.56-46.404 116.43-49.356 124.446-2.953 8.013 16.031 3.795 24.044 0 8.015-3.797 44.294-16.876 54.84-67.496h56.35c0.76 32.082 2.99 130.397 2.287 147.649H258.15c-16.45 11.81-21.936 46.824-21.936 46.824h132.592c-5.53 36.615-15.239 83.813-28.817 108.835-21.513 39.655-32.904 75.934-110.525 138.368 0 0-12.657 9.28 26.576 5.906 39.231-3.372 76.356-13.498 102.087-64.963 13.378-26.756 27.213-60.697 38.006-95.121l-0.04 0.12 109.26 125.795s14.343-33.747 3.798-70.87l-80.994-90.698-27.42 20.279-0.031 0.099c7.615-26.7 13.092-53.095 14.795-76.061 0.042-0.553 0.084-1.119 0.121-1.689zM567.366 295.73v435.35h45.77l18.753 52.405 79.328-52.405h99.978V295.73H567.366zM764.09 684.253h-51.968l-64.817 42.817-15.319-42.817H615.81v-339.94h148.28v339.94z m0 0"
+        fill="#429efe"
+        p-id="1530"
+      ></path>
+    </SvgIcon>
+  );
+};
diff --git a/packages/website/components/team/Menber.tsx b/packages/website/components/team/Menber.tsx
@@ -12,6 +12,7 @@ import LinkIcon from '@material-ui/icons/Link';
 import { WeiboIcon } from '../icons/Weibo';
 import { MDXComponent } from '~/src/types/mdx';
 import useTranslation from '~/src/hooks/useTranslation';
+import { ZhihuIcon } from '../icons/Zhihu';
 
 const useStyles = makeStyles((theme: Theme) =>
   createStyles({
@@ -39,7 +40,7 @@ const useStyles = makeStyles((theme: Theme) =>
   })
 );
 
-export type  MenberBio = string | MDXComponent | JSX.Element;
+export type MenberBio = string | MDXComponent | JSX.Element;
 export interface MenberData {
   name: string;
   id: string;
@@ -54,6 +55,7 @@ export interface MenberData {
   hidden?: boolean;
   email?: string;
   tel?: string;
+  zhuanlan?: string;
 }
 
 export const GitHub: React.FC<{ id?: string }> = ({ id }) => {
@@ -182,6 +184,31 @@ const Email: React.FC<{ address?: string }> = ({ address }) => {
   }
 };
 
+const Zhuanlan: React.FC<{ zhuanlan?: string }> = ({ zhuanlan }) => {
+  if (zhuanlan) {
+    return (
+      <Grid item>
+        <Tooltip
+          title={
+            <>
+              <LinkIcon />
+              <Typography component="span" className="text-with-icon">
+                {`zhuanlan.zhihu.com/${zhuanlan}`}
+              </Typography>
+            </>
+          }
+        >
+          <Link target="_blank" href={`https://zhuanlan.zhihu.com/${zhuanlan}`}>
+            <ZhihuIcon />
+          </Link>
+        </Tooltip>
+      </Grid>
+    );
+  } else {
+    return null;
+  }
+};
+
 const Tel: React.FC<{ tel?: string }> = ({ tel }) => {
   if (tel) {
     return (
@@ -216,7 +243,7 @@ export const Bio: React.FC<{ menber: MenberData }> = ({ menber }) => {
     bio = menber.bio;
   }
   if (typeof bio === 'string') {
-    return  <Typography>{bio}</Typography> ;
+    return <Typography>{bio}</Typography>;
   } else if (React.isValidElement(bio)) {
     return <>{bio}</>;
   } else {
@@ -275,14 +302,15 @@ export const Menber: React.FC<MenberProps> = ({ data }) => {
         ></Avatar>
         <Name menber={data} />
         <Box pt={2}>
-        <Grid container spacing={2} justify="center">
-          <GitHub id={data.github}> </GitHub>
-          <Twitter id={data.twitter}> </Twitter>
-          <Weibo id={data.weibo}> </Weibo>
-          <Site url={data.site}></Site>
-          <Email address={data.email} />
-          <Tel tel={data.tel} />
-        </Grid>
+          <Grid container spacing={2} justify="center">
+            <GitHub id={data.github}> </GitHub>
+            <Twitter id={data.twitter}> </Twitter>
+            <Weibo id={data.weibo}> </Weibo>
+            <Site url={data.site}></Site>
+            <Zhuanlan zhuanlan={data.zhuanlan} />
+            <Email address={data.email} />
+            <Tel tel={data.tel} />
+          </Grid>
         </Box>
 
         <Bio menber={data}></Bio>

diff --git a/packages/website/components/team/bio/AtenBioCn.mdx b/packages/website/components/team/bio/AtenBioCn.mdx
@@ -0,0 +1 @@
+3 年以上区块链底层开发工程师，[Substrate](https://github.com/paritytech/substrate/)区块链框架早期开发者，熟悉 Bitcoin，Ethereum，Polkadot，Filecoin 等主流区块链。曾在微众银行任职区块链开发，现为 ChainX 核心开发工程师以及 Filecoin 的 Rust 版本 Plum 及挖矿程序的核心工程师。
diff --git a/packages/website/src/data/teamData.tsx b/packages/website/src/data/teamData.tsx
@@ -5,6 +5,7 @@ import BaboonBioCn from '~/components/team/bio/BaboonBioCn.mdx';
 import BaboonBio from '~/components/team/bio/BaboonBio.mdx';
 import SamBio from '~/components/team/bio/SamBio.mdx';
 import SamBioCn from '~/components/team/bio/SamBioCn.mdx';
+import AtenBioCn from '~/components/team/bio/AtenBioCn.mdx';
 
 const avatarBaseUrl = '//img.wefox.tech/team/avatar';
 
@@ -35,6 +36,18 @@ export const teamData: MenberData[] = [
     bio: <BaboonBio />,
     bioCn: <BaboonBioCn />,
   },
+  {
+    id: 'aten',
+    name: 'Aten',
+    cnName: 'Aten',
+    avatar: `${avatarBaseUrl}/aten.png`,
+    github: 'AtenJin',
+    zhuanlan: 'c_74315572',
+
+    bio:
+      'A blockchain infrastructure developer which have focused on blockchain more then 3 years. Early developer for Substrate blockchain framewrok and is very familiar with Bitcoin, Ethereum, Polkadot Filecoin, etc. The former Webank developer for blockchain FISCO-BCOS, now working for ChainX and developing a rust version filecoin and miner.',
+    bioCn: <AtenBioCn />,
+  },
   {
     id: 'lee',
     name: 'Lee',
@@ -145,15 +158,6 @@ export const teamData: MenberData[] = [
     bio: 'Mobile development engineer, involving iOS, h5, WeChat applets, etc.',
     bioCn: '移动开发工程师，涉及 iOS、h5、微信小程序等。',
   },
-  {
-    id: 'aten',
-    name: 'Aten',
-    cnName: 'Aten',
-    avatar: `${avatarBaseUrl}/aten.jpg`,
-    site: 'https://github.com/AtenJin',
-    bio: 'A blockchain infrastructure developer which have focused on blockchain more then 3 years. Early developer for Substrate blockchain framewrok and is very familiar with Bitcoin, Ethereum, Polkadot Filecoin, etc. The   former Webank developer for blockchain FISCO-BCOS, now working for ChainX and developing a rust version filecoin and miner.',
-    bioCn: '3年以上区块链底层开发工程师，[Substrate](https://meiqia.com)区块链框架早期开发者，熟悉Bitcoin，Ethereum，Polkadot，Filecoin等主流区块链。曾在微众银行任职区块链开发，现为ChainX核心开发工程师以及Filecoin的Rust版本Plum及挖矿程序的核心工程师。',
-  },
   {
     id: 'hellsam',
     name: 'hellsam',
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		3 年以上区块链底层开发工程师，[Substrate](https://github.com/paritytech/substrate/)区块链框架早期开发者，熟悉 Bitcoin，Ethereum，Polkadot，Filecoin 等主流区块链。曾在微众银行任职区块链开发，现为 ChainX 核心开发工程师以及 Filecoin 的 Rust 版本 Plum 及挖矿程序的核心工程师。