Skip to content

Commit

Permalink
Merge branch 'main' into 557-auto-increment-version
Browse files Browse the repository at this point in the history
  • Loading branch information
JamieSlome authored Jul 1, 2024
2 parents 7fbc690 + f6d54c9 commit e4b400d
Show file tree
Hide file tree
Showing 4 changed files with 109 additions and 5 deletions.
4 changes: 4 additions & 0 deletions website/docusaurus.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ module.exports = {
platform: 'linkedin',
url: 'https://www.linkedin.com/embed/feed/update/urn:li:share:7092203565380722688',
},
{
platform: 'linkedin',
url: 'https://www.linkedin.com/embed/feed/update/urn:li:activity:7211986423942385664',
},
{
platform: 'linkedin',
url: 'https://www.linkedin.com/embed/feed/update/urn:li:activity:7181933362339549184',
Expand Down
1 change: 1 addition & 0 deletions website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"dependencies": {
"@docusaurus/core": "^3.0.0",
"@docusaurus/preset-classic": "^3.0.0",
"axios": "^1.7.2",
"classnames": "^2.2.6",
"clsx": "^2.0.0",
"eslint": "^8.0.0",
Expand Down
65 changes: 62 additions & 3 deletions website/src/pages/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import React from 'react';
import React, { useEffect } from 'react';
import Layout from '@theme/Layout';
import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
import Avatar from '../components/avatar';
import Testimonials from './testimonials';
import ReactPlayer from 'react-player';
import axios from 'axios';

/**
* Home page component
Expand All @@ -14,6 +15,13 @@ function Home() {
const { siteConfig = {} } = context;

const [showDemo, setShowDemo] = React.useState(false);
const [contributors, setContributors] = React.useState([]);

useEffect(() => {
axios.get('https://api.github.com/repos/finos/git-proxy/contributors').then((res) => {
setContributors(res.data);
});
}, []);

return (
<Layout title={`${siteConfig.title}`} description={`${siteConfig.tagline}`}>
Expand Down Expand Up @@ -132,8 +140,25 @@ function Home() {
)}
</div>
</div>
<Testimonials />
<div className='container text--center margin-top--xl'>
<h1 className='margin-top--md'>Meet the Team 👋</h1>
<h1 className='margin-top--md'>
Our{' '}
<span
style={{
color: 'purple',
border: '2px solid purple',
paddingTop: '5px',
paddingBottom: '5px',
paddingLeft: '10px',
paddingRight: '10px',
borderRadius: '30px',
backgroundColor: 'rgba(90, 34, 139, 0.1)',
}}
>
Maintainers
</span>
</h1>
<div className='row margin-top--xl margin-bottom--xl'>
<div className='col col--4'>
<div className='col-demo'>
Expand Down Expand Up @@ -178,7 +203,41 @@ function Home() {
</div>
</div>
</div>
<Testimonials />
<div className='container text--center'>
<h1 className='margin-top--md'>
Our{' '}
<span
style={{
color: '#30d5c8',
border: '2px solid #30d5c8',
paddingTop: '5px',
paddingBottom: '5px',
paddingLeft: '10px',
paddingRight: '10px',
borderRadius: '30px',
backgroundColor: 'rgba(48, 213, 200, 0.1)',
}}
>
Contributors
</span>
</h1>
<div className='row margin-top--xl margin-bottom--xl'>
{contributors.map((contributor) => {
if (![29139614, 49699333].includes(contributor.id))
return (
<div key={contributor.id} className='col col--4'>
<div className='col-demo'>
<Avatar
name={contributor.login}
description={`${contributor.contributions} ${contributor.contributions > 1 ? 'contributions' : 'contribution'}`}
username={contributor.login}
/>
</div>
</div>
);
})}
</div>
</div>
</Layout>
);
}
Expand Down
44 changes: 42 additions & 2 deletions website/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2773,6 +2773,11 @@ astring@^1.8.0:
resolved "https://registry.yarnpkg.com/astring/-/astring-1.8.6.tgz#2c9c157cf1739d67561c56ba896e6948f6b93731"
integrity sha512-ISvCdHdlTDlH5IpxQJIex7BWBywFWgjJSVdwst+/iQCoEYnyOaQ95+X1JGshuBjGp6nxKUy1jMgE3zPqN7fQdg==

asynckit@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==

at-least-node@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
Expand All @@ -2797,6 +2802,15 @@ available-typed-arrays@^1.0.7:
dependencies:
possible-typed-array-names "^1.0.0"

axios@^1.7.2:
version "1.7.2"
resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621"
integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==
dependencies:
follow-redirects "^1.15.6"
form-data "^4.0.0"
proxy-from-env "^1.1.0"

babel-loader@^9.1.3:
version "9.1.3"
resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-9.1.3.tgz#3d0e01b4e69760cc694ee306fe16d358aa1c6f9a"
Expand Down Expand Up @@ -3218,6 +3232,13 @@ combine-promises@^1.1.0:
resolved "https://registry.yarnpkg.com/combine-promises/-/combine-promises-1.2.0.tgz#5f2e68451862acf85761ded4d9e2af7769c2ca6a"
integrity sha512-VcQB1ziGD0NXrhKxiwyNbCDmRzs/OShMs2GqW2DlU2A/Sd0nQxE1oWDAE5O0ygSx5mgQOn9eIFh7yKPgFRVkPQ==

combined-stream@^1.0.8:
version "1.0.8"
resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
dependencies:
delayed-stream "~1.0.0"

comma-separated-tokens@^2.0.0:
version "2.0.3"
resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz#4e89c9458acb61bc8fef19f4529973b2392839ee"
Expand Down Expand Up @@ -3692,6 +3713,11 @@ del@^6.1.1:
rimraf "^3.0.2"
slash "^3.0.0"

delayed-stream@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==

depd@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
Expand Down Expand Up @@ -4505,7 +4531,7 @@ flatted@^3.2.9:
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==

follow-redirects@^1.0.0:
follow-redirects@^1.0.0, follow-redirects@^1.15.6:
version "1.15.6"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
Expand Down Expand Up @@ -4541,6 +4567,15 @@ form-data-encoder@^2.1.2:
resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-2.1.4.tgz#261ea35d2a70d48d30ec7a9603130fa5515e9cd5"
integrity sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==

form-data@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
dependencies:
asynckit "^0.4.0"
combined-stream "^1.0.8"
mime-types "^2.1.12"

format@^0.2.0:
version "0.2.2"
resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b"
Expand Down Expand Up @@ -6636,7 +6671,7 @@ mime-types@2.1.18:
dependencies:
mime-db "~1.33.0"

mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34:
mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34:
version "2.1.35"
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
Expand Down Expand Up @@ -7521,6 +7556,11 @@ proxy-addr@~2.0.7:
forwarded "0.2.0"
ipaddr.js "1.9.1"

proxy-from-env@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==

punycode@^1.3.2:
version "1.4.1"
resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
Expand Down

0 comments on commit e4b400d

Please sign in to comment.