Skip to content

Commit

Permalink
Merge pull request #1261 from makerdao/1237-Type-code
Browse files Browse the repository at this point in the history
Add types and implement atomic design
  • Loading branch information
twblack88 authored Apr 17, 2021
2 parents f0da25f + a9d42d7 commit 87975a2
Show file tree
Hide file tree
Showing 147 changed files with 8,580 additions and 2,310 deletions.
12 changes: 10 additions & 2 deletions .flowconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
[ignore]
./gatsby-config.js
./gatsby-browser.js

[include]

Expand All @@ -7,11 +9,17 @@
[lints]

[options]
module.name_mapper='^@atoms' ->'<PROJECT_ROOT>/src/atoms'
module.name_mapper='^@molecules' ->'<PROJECT_ROOT>/src/molecules'
module.name_mapper='^@templates' ->'<PROJECT_ROOT>/src/templates'
module.name_mapper='^@layouts' ->'<PROJECT_ROOT>/src/layouts'
module.name_mapper='^@styles' ->'<PROJECT_ROOT>/src/styles'
module.name_mapper='^@modules' ->'<PROJECT_ROOT>/src/modules'
module.name_mapper='^@data' ->'<PROJECT_ROOT>/src/data'
module.name_mapper='^@src' ->'<PROJECT_ROOT>/src'
module.name_mapper='^@utils' ->'<PROJECT_ROOT>/utils.js'
module.name_mapper='^@utils' ->'<PROJECT_ROOT>/src/utils.js'
module.name_mapper='^@pages' ->'<PROJECT_ROOT>/pages'
module.name_mapper='^@images' ->'<PROJECT_ROOT>/images'
module.name_mapper='^@images' ->'<PROJECT_ROOT>/static/images'
module.name_mapper='^@content' ->'<PROJECT_ROOT>/content'
esproposal.export_star_as=enable
esproposal.optional_chaining=enable
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/poolparty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
- uses: actions/checkout@v2
with:
ref: r2d
- name: Use Node.js 10.x
uses: actions/setup-node@v1
- name: Use Node.js 12.x
uses: actions/setup-node@v2
with:
node-version: 10.x
node-version: 12.x

- name: install yarn
run: npm install -g yarn
Expand Down
1 change: 1 addition & 0 deletions .husky/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_
5 changes: 5 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx lint-staged
yarn flow-check
19 changes: 19 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"printWidth": 80,
"tabWidth": 2,
"useTabs": false,
"semi": true,
"singleQuote": true,
"arrowParens": "always",
"trailingComma": "es5",
"bracketSpacing": true,
"jsxBracketSameLine": false,
"overrides": [
{
"files": ["*.css", "*.scss"],
"options": {
"singleQuote": false
}
}
]
}
10 changes: 9 additions & 1 deletion blogPosts/en/blog/community/Engineering-for-communities.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -26,34 +26,42 @@ and begin to figure out the deeper architectural challenges and intricacies of w

<List>


<Link to="/en/blog/community/Engineering-for-communities">


**Engineering For Communities: Part 1**

</Link>


<Link to="/en/blog/community/eng-search">


The Intracacies of Search: Part 2

</Link>


<Link to="/en/blog/community/eng-navigation">


Navigating Through Automagic: Part 3

</Link>


<Link to="/en/blog/community/eng-language">


Translations for Global Communities: Part 4

</Link>


</List>


<Button to="https://docs.makerdao.com" primary>
Lost? You might be looking for Protocol Documentation
</Button>

91 changes: 45 additions & 46 deletions blogPosts/en/blog/governance/Maker-Governance-Review-March-2021.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -23,28 +23,28 @@ The March Governance Cycle, which began on March 1 and ended on March 26, summar

The [March 2021 MIPs Executive Vote](https://vote.makerdao.com/executive/approve-march-2021-governance-cycle-bundle?network=mainnet#proposal-detail) was posted on Monday, March 22, passed on March 25, and was executed on March 27. As a result of the Bundled Vote the following MIPs were ratified :

* The Core Unit MIP set.
* Core Unit MIP set related amendments.
* The Keg module MIP set.
* MIP43: Term Lending Module.
* MIP45: Liquidations 2.0.
* MIP46: Parameter Proposal Groups.
* MIP47: MakerDAO Multisignature Wallet Management.
- The Core Unit MIP set.
- Core Unit MIP set related amendments.
- The Keg module MIP set.
- MIP43: Term Lending Module.
- MIP45: Liquidations 2.0.
- MIP46: Parameter Proposal Groups.
- MIP47: MakerDAO Multisignature Wallet Management.

This Month’s MIPs Bundle also ratified the following Core Units, including their mandate, budget, and facilitator onboarding proposals:

* RWF-001, Real World Finance Core Unit
* [Mandate](https://github.com/makerdao/mips/blob/master/MIP39/MIP39c2-Subproposals/MIP39c2-SP1.md)
* [Budget](https://github.com/makerdao/mips/blob/master/MIP40/MIP40c2-Subproposals/MIP40c2-SP1.md) of 40k DAI per month for an unspecified number of months
* [Facilitator Onboarding](https://github.com/makerdao/mips/blob/master/MIP41/MIP41c4-Subproposals/MIP41c4-SP1.md) of Sébastien Derivaux
* GOV-001, Governance Core Unit
* [Mandate](https://github.com/makerdao/mips/blob/master/MIP39/MIP39c2-Subproposals/MIP39c2-SP3.md)
* [Budget](https://github.com/makerdao/mips/blob/master/MIP40/MIP40c2-Subproposals/MIP40c2-SP3.md) of 80k DAI per month for 3 months, April-June
* [Facilitator Onboarding](https://github.com/makerdao/mips/blob/master/MIP41/MIP41c4-Subproposals/MIP41c4-SP3.md) of LongForWisdom
* RISK-001, Risk Core Unit Proposals
* [Mandate](https://github.com/makerdao/mips/blob/master/MIP41/MIP41c4-Subproposals/MIP41c4-SP1.md)
* [Budget](https://github.com/makerdao/mips/blob/master/MIP40/MIP40c2-Subproposals/MIP40c2-SP2.md) of 100,500 DAI per month for 3 months, April-June
* [Facilitator Onboarding](https://github.com/makerdao/mips/blob/master/MIP41/MIP41c4-Subproposals/MIP41c4-SP2.md) of Primož Kordež
- RWF-001, Real World Finance Core Unit
- [Mandate](https://github.com/makerdao/mips/blob/master/MIP39/MIP39c2-Subproposals/MIP39c2-SP1.md)
- [Budget](https://github.com/makerdao/mips/blob/master/MIP40/MIP40c2-Subproposals/MIP40c2-SP1.md) of 40k DAI per month for an unspecified number of months
- [Facilitator Onboarding](https://github.com/makerdao/mips/blob/master/MIP41/MIP41c4-Subproposals/MIP41c4-SP1.md) of Sébastien Derivaux
- GOV-001, Governance Core Unit
- [Mandate](https://github.com/makerdao/mips/blob/master/MIP39/MIP39c2-Subproposals/MIP39c2-SP3.md)
- [Budget](https://github.com/makerdao/mips/blob/master/MIP40/MIP40c2-Subproposals/MIP40c2-SP3.md) of 80k DAI per month for 3 months, April-June
- [Facilitator Onboarding](https://github.com/makerdao/mips/blob/master/MIP41/MIP41c4-Subproposals/MIP41c4-SP3.md) of LongForWisdom
- RISK-001, Risk Core Unit Proposals
- [Mandate](https://github.com/makerdao/mips/blob/master/MIP41/MIP41c4-Subproposals/MIP41c4-SP1.md)
- [Budget](https://github.com/makerdao/mips/blob/master/MIP40/MIP40c2-Subproposals/MIP40c2-SP2.md) of 100,500 DAI per month for 3 months, April-June
- [Facilitator Onboarding](https://github.com/makerdao/mips/blob/master/MIP41/MIP41c4-Subproposals/MIP41c4-SP2.md) of Primož Kordež

Visit the [MIPs Tracker ](https://www.notion.so/b6e7223840874da6937748228b73b213?v=9a2b165297be474788377dccef08b407)to learn more about MIPs and core unites in progress and view MIP statuses.

Expand All @@ -54,34 +54,34 @@ The March Cycle also included a number of Executive Votes that changed parameter

**Stability Fees**

* Many changes, [listed here](https://forum.makerdao.com/t/rates-changes-proposal-2-mar-2021/6812/1).
- Many changes, [listed here](https://forum.makerdao.com/t/rates-changes-proposal-2-mar-2021/6812/1).

**Debt Ceiling Management & Optimizations**

* The ETH-A Maximum Debt Ceiling increased from 2.5 billion DAI to 15 billion DAI.
* The WBTC-A Maximum Debt Ceiling increased from 350 million DAI to 750 million DAI.
* Debt Ceiling Increases to three UNIV2-LP vaults following successful LP-Oracle audit.
* Instant Access Modules enabled on three UNIV2-LP vaults.
* The ETH-A Target Available Debt (gap) increased from 30 million DAI to 80 million DAI, making Debt Ceiling increases on ETH-A less frequent.
- The ETH-A Maximum Debt Ceiling increased from 2.5 billion DAI to 15 billion DAI.
- The WBTC-A Maximum Debt Ceiling increased from 350 million DAI to 750 million DAI.
- Debt Ceiling Increases to three UNIV2-LP vaults following successful LP-Oracle audit.
- Instant Access Modules enabled on three UNIV2-LP vaults.
- The ETH-A Target Available Debt (gap) increased from 30 million DAI to 80 million DAI, making Debt Ceiling increases on ETH-A less frequent.

**Auction Optimizations**

* The Bid Duration (ttl) parameter decreased from 6 hours to 4 hours for all vault types with liquidations enabled.
* The Max Auction Duration (tau) parameter decreased from 6 hours to 4 hours for all vault types with liquidations enabled.
* The Maximum DAI amount that can be out for auction at any given time(box) parameter increased from 15 million DAI to 20 million DAI.
* The Minimum Bid Increment (beg) parameter increased from 3% to 5% for the ETH-B & UniswapV2 Liquidity Pool vault types.
* The Surplus Lot Size (bump) parameter increased from 10,000 DAI to 30,000 DAI, giving surplus auctions larger instances.
- The Bid Duration (ttl) parameter decreased from 6 hours to 4 hours for all vault types with liquidations enabled.
- The Max Auction Duration (tau) parameter decreased from 6 hours to 4 hours for all vault types with liquidations enabled.
- The Maximum DAI amount that can be out for auction at any given time(box) parameter increased from 15 million DAI to 20 million DAI.
- The Minimum Bid Increment (beg) parameter increased from 3% to 5% for the ETH-B & UniswapV2 Liquidity Pool vault types.
- The Surplus Lot Size (bump) parameter increased from 10,000 DAI to 30,000 DAI, giving surplus auctions larger instances.

**Debt Floor Requirements**

* These increasing minimum position sizes are due to the growing gas costs involved with liquidating positions.
* The Debt Floor (dust) parameter increased from 2,000 DAI to 5,000 DAI for all vault types with the exception of ETH-B, PSM-USDC-A, and RWA001-A.
* The Debt Floor (dust) parameter increased from 2,000 DAI to 15,000 DAI for the ETH-B vault type.
- These increasing minimum position sizes are due to the growing gas costs involved with liquidating positions.
- The Debt Floor (dust) parameter increased from 2,000 DAI to 5,000 DAI for all vault types with the exception of ETH-B, PSM-USDC-A, and RWA001-A.
- The Debt Floor (dust) parameter increased from 2,000 DAI to 15,000 DAI for the ETH-B vault type.

**Vault Additions**

* ETH-C vault type was added to offer borrowers a facility with a better rate in exchange for a higher collateralization requirement.
* The RWA001-A vault type was added using RWA001 (6s Capital) as collateral with preliminary, non-final parameters for testing purposes with a Debt Ceiling of 1000 Dai.
- ETH-C vault type was added to offer borrowers a facility with a better rate in exchange for a higher collateralization requirement.
- The RWA001-A vault type was added using RWA001 (6s Capital) as collateral with preliminary, non-final parameters for testing purposes with a Debt Ceiling of 1000 Dai.

## Community Greenlight Polls

Expand All @@ -91,15 +91,15 @@ These polls gauge community sentiment for collateral onboarding. Greenlight Poll

Nine collateral types were considered, all of them were greenlit by the community.

* [aAAVE (Aave AAVE)](https://vote.makerdao.com/polling/QmTrbBEV)
* [SNX (Synthetix)](https://vote.makerdao.com/polling/QmbageWV)
* [SolarX (Uprets/SolarX REIT) ](https://vote.makerdao.com/polling/QmeAHrDb)
* [aWETH (Aave wETH)](https://vote.makerdao.com/polling/QmVBGusc)
* [SB-BFDC (SolidBlock BeachFront Digital Coin)](https://vote.makerdao.com/polling/QmXsUuLA)
* [CurveLP-cDAI-cUSDC (Curve cDAI-cUSDC Liquidity Token)](https://vote.makerdao.com/polling/QmfX8Kmu)
* [sUSD (Synthetix USD)](https://vote.makerdao.com/polling/QmfA2gaW)
* [xSUSHI (Sushibar)](https://vote.makerdao.com/polling/Qmdkrgon)
* [CurveLP-renBTC-WBTC (Curve renBTC-WBTC Liquidity Token)](https://vote.makerdao.com/polling/QmbcueDJ)
- [aAAVE (Aave AAVE)](https://vote.makerdao.com/polling/QmTrbBEV)
- [SNX (Synthetix)](https://vote.makerdao.com/polling/QmbageWV)
- [SolarX (Uprets/SolarX REIT) ](https://vote.makerdao.com/polling/QmeAHrDb)
- [aWETH (Aave wETH)](https://vote.makerdao.com/polling/QmVBGusc)
- [SB-BFDC (SolidBlock BeachFront Digital Coin)](https://vote.makerdao.com/polling/QmXsUuLA)
- [CurveLP-cDAI-cUSDC (Curve cDAI-cUSDC Liquidity Token)](https://vote.makerdao.com/polling/QmfX8Kmu)
- [sUSD (Synthetix USD)](https://vote.makerdao.com/polling/QmfA2gaW)
- [xSUSHI (Sushibar)](https://vote.makerdao.com/polling/Qmdkrgon)
- [CurveLP-renBTC-WBTC (Curve renBTC-WBTC Liquidity Token)](https://vote.makerdao.com/polling/QmbcueDJ)

Check the progress of all proposed collateral types in the [Collateral Status Index.](https://forum.makerdao.com/t/collateral-status-index/2231)

Expand All @@ -113,8 +113,8 @@ Implementation of Liquidations 2.0 will begin, with support for the LINK-A vault

With the approval of the [Parameter Proposal Groups MIP](https://github.com/makerdao/mips/blob/master/MIP46/MIP46.md#mip46-parameter-proposal-groups), we can now expect parameter proposals to come consistently on the first Monday of the month, for inclusion into the weekly cycle in the second week of the month.


![](https://i.imgur.com/LT39XoR.png)

## Resources

[Public Google Calendar
Expand All @@ -138,4 +138,3 @@ With the approval of the [Parameter Proposal Groups MIP](https://github.com/make
## About Maker Improvement Proposals

[MIPs support the organic growth that further expands MakerDAO’s self-sustainability ](https://blog.makerdao.com/the-first-13-maker-improvement-proposals-to-further-decentralization-of-makerdao/)by providing the Maker community and all stakeholders with a standard approach to proposing improvements, specifications, and process and state changes to the Maker Protocol and MakerDAO.

40 changes: 31 additions & 9 deletions content/en/contribute/contest/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -10,44 +10,54 @@ description: "Community-contributed content helps ensure up-to-date resources fo

It is with great pleasure that we announce the MakerDAO Community Art Contest! The present is about the future and the future is here in the form of Decentralized Finance.

What began as a handful of ideas has grown into a $237 billion dollar industry in just a decade. This growth has expanded into the creative sector as well, allowing many creative professionals to earn a living on their own terms.
What began as a handful of ideas has grown into a \$237 billion dollar industry in just a decade. This growth has expanded into the creative sector as well, allowing many creative professionals to earn a living on their own terms.

The purpose of this contest is to introduce visual artists and designers to the world of Decentralized Finance and to provide information about opportunities with the potential to secure a better future for everyone!

## Contest Theme

Choose one of the [Core Principles of Maker Governance](https://community-development.makerdao.com/en/learn/MakerDAO/core-principles/) and create a visual artwork to represent your chosen principle.
Choose one of the [Core Principles of Maker Governance](https://community-development.makerdao.com/en/learn/MakerDAO/core-principles/) and create a visual artwork to represent your chosen principle.

We encourage you to make creative use of the MakerDAO or Dai logo in your artwork. You can use one [here](https://www.notion.so/Maker-Brand-ac517c82ff9a43089d0db5bb2ee045a4) or make your own.
We encourage you to make creative use of the MakerDAO or Dai logo in your artwork. You can use one [here](https://www.notion.so/Maker-Brand-ac517c82ff9a43089d0db5bb2ee045a4) or make your own.

<Column>


<Box>

### Prizes

### Prizes

**💥 1st** 1000 Dai

**💥 2nd** 500 Dai

**💥 3rd** 250 Dai

and 50 Dai *each* for 5 runner-ups! 🚀
and 50 Dai _each_ for 5 runner-ups! 🚀

</Box>


<Box>

### Submissions

### Submissions

**📆 Open between February 15th and April 15th, 2021**

</Box>


</Column>


<Column>


<Box>


## Rules

Open to visual artists of all types and skill levels!
Expand All @@ -62,22 +72,28 @@ Open to visual artists of all types and skill levels!

</Box>


</Column>


## How to Submit

<Process>
<Process>


<Box>


### Create a Wallet

To submit artwork to this contest and receive prizes, participants will need an [Ethereum wallet](https://ethereum.org/en/wallets/find-wallet/) and an address to which prizes will be paid out. [Metamask](https://metamask.io/) is recommended for its ease of use.
To submit artwork to this contest and receive prizes, participants will need an [Ethereum wallet](https://ethereum.org/en/wallets/find-wallet/) and an address to which prizes will be paid out. [Metamask](https://metamask.io/) is recommended for its ease of use.

</Box>


<Box>


### Submit Your Art

Once you have an Ethereum Wallet and Address, you may submit your artwork here- https://forms.gle/DfVJ1akGNXfPJUqf8
Expand All @@ -86,8 +102,10 @@ Double check that the address you’ve submitted is correct. Prizes sent to an i

</Box>


<Box>


### Promote Your Work

After you have submitted your artwork, post your work on Twitter with the hashtag: **#DaiForArt**
Expand All @@ -98,10 +116,14 @@ Creators will receive bonus points for tagging others to participate, however, t

</Box>


</Process>


<CTA>


Questions or concerns? Please contact makerdaoart@gmail.com

</CTA>
</CTA>

4 changes: 3 additions & 1 deletion content/en/funding/meetup-funding.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ keywords: "meetup, meetups, event, events, grant, microgrant, program, help, loc
description: "How MakerDAO supports meetups and events"
---

import data from "@modules/transparency_dash/data/publicData.json";
import data from "@data/publicData.json";

<StatusBanner>

Expand All @@ -26,12 +26,14 @@ The MakerDAO Core Community Development Initiative supports both virtual and phy
<TDStat data={data.meetups.totalMoneyDispersed}>
Dai Awarded


</TDStat>


<TDStat data={data.meetups.totalNumberMeetups}>
Meetups Funded


</TDStat>


Expand Down
Loading

0 comments on commit 87975a2

Please sign in to comment.