Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds glossary term content [contributes to #1718] #1725

Merged
merged 6 commits into from Nov 11, 2020
Merged

Adds glossary term content [contributes to #1718] #1725

merged 6 commits into from Nov 11, 2020

Conversation

wackerow
Copy link
Member

@wackerow wackerow commented Nov 2, 2020

Description

Added definitions for defi, stablecoin, staking.

Note: submitted this as an independent PR from #1717 changes so terms could be reviewed separately, however, I did link to #token-standard in this which is dependent on the new definition slipped into #1717. Also utilized new emoji pattern suggested in #1717.

Related Issue

#1718

+ defi, stablecoin, staking
@github-actions github-actions bot added needs review 👀 Review is needed for this issue or pull request content 🖋️ This involves copy additions or edits labels Nov 2, 2020
Copy link
Contributor

@ryancreatescopy ryancreatescopy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for adding these. Some small content edits suggested.

src/content/glossary/index.md Outdated Show resolved Hide resolved
@@ -424,6 +430,18 @@ A procedural (imperative) programming language with syntax that is similar to Ja

A [hard fork](#hard-fork) of the Ethereum blockchain, which occurred at block 2,675,000 to address more denial-of-service attack vectors and clear state (see [Tangerine Whistle](#tangerine-whistle)). Also, a replay attack protection mechanism.

### stablecoin {#stablecoin}

An [ERC-20 token](#token-standard), backed by a reserve asset, with price pegged to real-world asset value. Examples of uses include pegging an ERC-20 tokens value to the value of fiat currency, precious metals, or other cryptocurrencies.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested edit:

"An ERC-20 token with a value pegged to another asset's value. There are stablecoins backed by fiat currency like dollars, precious metals like gold, and other cryptocurrencies like Bitcoin."

src/content/glossary/index.md Outdated Show resolved Hide resolved
@ryancreatescopy Updated with everything mentioend, withholding 'Ether' change until discussed.
Realised we refer to intermediaries elsewhere on the site
ryancreatescopy
ryancreatescopy previously approved these changes Nov 4, 2020
Copy link
Contributor

@samajammin samajammin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this! See comments - let's just update the links to markdown syntax.


Short for "decentralized finance," a broad category of [Dapps](#dapp) aiming to provide financial services backed by the blockchain, without any intermediaries, so anyone with an internet connection can participate.

<a href="/en/dapps/#how-to-use-an-application-built-on-ethereum">More about Dapp uses<Emoji text=":point_right:" size={1} marginLeft={0.75} /></a>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<a href="/en/dapps/#how-to-use-an-application-built-on-ethereum">More about Dapp uses<Emoji text=":point_right:" size={1} marginLeft={0.75} /></a>
[More about Dapp uses <Emoji text=":point_right:" size={1} marginLeft={0.75} />](/dapps/#how-to-use-an-application-built-on-ethereum)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can & should continue to use markdown syntax where possible.

Note: we can & should also drop the language path (/en/ in this case). When we use markdown links, Gatsby uses our Link component under the hood, which automatically adds the language path. This makes it easier when translating pages - we don't have to update the links everywhere.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@samajammin 👍 Will definitely remove the /en/ language path. (Note though that all static.js pages will interpret the anchor tags into the custom Link component as well, not just when using markdown... custom component in the works will do the same):
image

I'll fix these now to get this pulled in first.

src/content/glossary/index.md Outdated Show resolved Hide resolved
src/content/glossary/index.md Outdated Show resolved Hide resolved
@wackerow
Copy link
Member Author

wackerow commented Nov 4, 2020

@samajammin Only reason I didn't use markdown for those links was because doing that left an underlined space before the Emoji (the 'marginLeft' prop doesn't seem to be passing this way), and I didn't want to remove the emoji from the link.
image
...But I get your point about taking advantage of the MD parsing... Happy to refactor this back to markdown, but working on a new component suggested by @ryancreatescopy that will change this entirely (#1737). If this is causing linking issues with /en/ baked in I can fix this first if preferred (same applies to the links added in #1724)

@samajammin
Copy link
Contributor

samajammin commented Nov 4, 2020

Hmm good point. Notice we did refactor the Emoji component. You should now pass a string for margin left, e.g. ml={'1 rem'}.

We refactored it to use styled-system under the hood.

updated emoji margin prop
samajammin
samajammin previously approved these changes Nov 11, 2020
Copy link
Contributor

@samajammin samajammin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🙌

src/content/glossary/index.md Outdated Show resolved Hide resolved
@samajammin samajammin merged commit a4c9989 into ethereum:dev Nov 11, 2020
@wackerow wackerow deleted the w/glossary2 branch November 11, 2020 23:58
@samajammin samajammin mentioned this pull request Nov 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
content 🖋️ This involves copy additions or edits needs review 👀 Review is needed for this issue or pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants