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

Deploy v7.12.2 #10263

Merged
merged 91 commits into from
May 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
8c44e7d
refactor (pages-conditional): migrate dapps page to Chakra
amit-ksh Apr 28, 2023
a9159ca
Start convertion to Chakra of the tutorial page
vdusart Apr 29, 2023
bce3a6d
part 2 of the convertion
vdusart Apr 30, 2023
c15e272
tutorial page end of convertion to Chakra
vdusart May 1, 2023
22f853f
refactor: templates/tutorials.tsx Chakra migration
rishisundar May 10, 2023
73f7a44
chore: update enkrypt logo
gamalielhere May 11, 2023
badc49d
chore: add ethvm to block explorrer link
gamalielhere May 11, 2023
0c83cc1
refactor(Layer2Onboard): migrate to Chakra UI
TylerAPfledderer May 12, 2023
394ed25
fix(Layer2Onboard): flip select exchange option type to intersection
TylerAPfledderer May 12, 2023
2723e3b
fix grammatical mistakes
bskrksyp9 May 12, 2023
ae0edaa
refactor(StakingConsiderations): migrate to Chakra
TylerAPfledderer May 13, 2023
5cfb155
Add link to Mirror Design System
dinadeljanin May 14, 2023
3d07c44
refactor(StakingLaunchpadWidget): migrate component to Chakra
TylerAPfledderer May 15, 2023
ab7e137
cleanup
pettinarip May 15, 2023
7eff90a
refactor(EthExchanges): migrate component to Chakra
TylerAPfledderer May 16, 2023
11b66f6
Merge branch 'dev' into pr/vdusart/10104
pettinarip May 16, 2023
d229a98
simplify buttonlink
pettinarip May 16, 2023
4f2669d
use Text component for p tags
pettinarip May 16, 2023
d92c43d
fix min width of the container
pettinarip May 16, 2023
7cbfe36
Merge branch 'dev' into pr/vdusart/10104
pettinarip May 17, 2023
c87d364
Merge pull request #10089 from amit-ksh/refactor/dapps-page-to-chakra
pettinarip May 17, 2023
2efc358
Merge pull request #10173 from rishisundar/dev
pettinarip May 17, 2023
ec6f2bd
Merge pull request #10104 from vdusart/dev
pettinarip May 17, 2023
f4f855a
import order
pettinarip May 17, 2023
0c0c236
fixes whitepaper typo
SaratAngajalaoffl May 17, 2023
2f1e6c8
Update src/components/EthExchanges/index.tsx
pettinarip May 17, 2023
d94d2f3
Merge pull request #10196 from TylerAPfledderer/refactor/layer-2-onbo…
pettinarip May 17, 2023
e93a499
Merge pull request #10203 from TylerAPfledderer/refactor/staking-cons…
pettinarip May 17, 2023
f7f7132
Merge pull request #10213 from TylerAPfledderer/refactor/staking-laun…
pettinarip May 17, 2023
24cead0
fixes typo in whitepaper
SaratAngajalaoffl May 17, 2023
7f83403
Merge pull request #10222 from TylerAPfledderer/feat/eth-exchanges-to…
pettinarip May 17, 2023
b8d526a
import ar - May update
wackerow May 17, 2023
6c3cae3
import de - May update
wackerow May 17, 2023
b87d51e
import es - May update
wackerow May 17, 2023
b4cf235
import fr - May update
wackerow May 17, 2023
a15b3e9
import id - May update
wackerow May 17, 2023
e56a7a1
import hi - May update
wackerow May 17, 2023
0751e12
import ja - May update
wackerow May 17, 2023
067dc78
import ko - May update
wackerow May 17, 2023
8797cad
import pl - May update
wackerow May 17, 2023
0cc3659
import pt-br - May update
wackerow May 17, 2023
8c11041
import ru - May update
wackerow May 17, 2023
bf4ba9a
import tr - May update
wackerow May 17, 2023
ddfa2d3
import uk - May update
wackerow May 17, 2023
0b0ba9e
import zh-tw - May update
wackerow May 17, 2023
ddb964d
Update markdownChecker.ts
wackerow May 18, 2023
642ac84
initialize pcm language (Nigerian Pidgin)
wackerow May 18, 2023
e332c23
import pcm - May update
wackerow May 18, 2023
4a6cc80
add comment, remove optional
wackerow May 18, 2023
130ac0b
rename ur-in to ur
pettinarip May 18, 2023
436a46a
update reports data
pettinarip May 18, 2023
eb0ae1b
Merge pull request #10240 from ethereum/may-ar
corwintines May 18, 2023
de50ea5
Merge pull request #10241 from ethereum/may-de
corwintines May 18, 2023
5c348dc
Update src/content/translations/es/dao/index.md
corwintines May 18, 2023
3ecdc24
Merge pull request #10242 from ethereum/may-es
corwintines May 18, 2023
0c49c5b
Update src/intl/fr/page-layer-2.json
corwintines May 18, 2023
c0e26b3
Merge pull request #10243 from ethereum/may-fr
corwintines May 18, 2023
2d478c2
Merge pull request #10244 from ethereum/may-hi
corwintines May 18, 2023
fb4e372
Merge pull request #10245 from ethereum/may-id
corwintines May 18, 2023
ba3bddc
Merge pull request #10246 from ethereum/may-ja
corwintines May 18, 2023
3e0796c
Merge pull request #10247 from ethereum/may-ko
corwintines May 18, 2023
3f03d00
Merge pull request #10248 from ethereum/may-pl
corwintines May 18, 2023
c06f432
Update src/content/translations/pt-br/dao/index.md
corwintines May 18, 2023
31481b7
Update src/content/translations/pt-br/decentralized-identity/index.md
corwintines May 18, 2023
20c5fdf
Update src/content/translations/pt-br/defi/index.md
corwintines May 18, 2023
ec1fa78
Update src/content/translations/pt-br/social-networks/index.md
corwintines May 18, 2023
984f2e8
Merge pull request #10249 from ethereum/may-pt-br
corwintines May 18, 2023
dbf9ad2
Merge pull request #10250 from ethereum/may-ru
corwintines May 18, 2023
e0a6359
Merge pull request #10251 from ethereum/may-tr
corwintines May 18, 2023
48c2f74
Merge pull request #10252 from ethereum/may-uk
corwintines May 18, 2023
ff89fbb
Update src/content/translations/zh-tw/nft/index.md
corwintines May 18, 2023
e83cc6d
Merge pull request #10253 from ethereum/may-zh-tw
corwintines May 18, 2023
ab9b2fd
Merge pull request #10254 from ethereum/init-pcm
corwintines May 18, 2023
7376534
Merge pull request #10212 from dinadeljanin/dinadeljanin-patch-1
corwintines May 18, 2023
8708b42
Merge pull request #10194 from gamalielhere/chore/update-enkrypt
corwintines May 18, 2023
92ae48e
Merge pull request #10198 from bskrksyp9/patch-37
corwintines May 18, 2023
8203cff
Merge pull request #10193 from gamalielhere/chore/add-ethvm
corwintines May 18, 2023
f58e377
Merge pull request #10256 from ethereum/rename-urdu-lang
corwintines May 18, 2023
6aee978
use lang config instead of hardcode for lang direction
corwintines May 18, 2023
6d376ff
Merge pull request #10239 from SaratAngajalaoffl/typo-issue
corwintines May 19, 2023
89adf40
Merge pull request #10238 from SaratAngajalaoffl/issue-10237
corwintines May 19, 2023
cfd1015
add Bedrock (RockX) to pooled staking products
wackerow May 19, 2023
e7afd5e
Update src/utils/translations.ts
corwintines May 19, 2023
b6e07d9
add error
corwintines May 19, 2023
815bec9
add commonIconDefaultProps to RockXGlyphIcon
corwintines May 19, 2023
aec3cbc
Merge pull request #10260 from ethereum/bedrock-rockx
corwintines May 19, 2023
113b444
Merge pull request #10259 from ethereum/isLangRightToLeftFix
wackerow May 19, 2023
aff2a09
add docsearch:description meta tag
wackerow May 19, 2023
5bd70ae
Merge pull request #10261 from ethereum/docsearch-description
corwintines May 19, 2023
6c57ae1
v7.12.2
corwintines May 19, 2023
5a622c2
Merge pull request #10262 from ethereum/v7-12-2
corwintines May 19, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions i18n/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,14 @@
"langDir": "ltr",
"dateFormat": "MM/DD/YYYY"
},
{
"code": "pcm",
"hrefLang": "pcm",
"name": "Nigerian Pidgin",
"localName": "Nigerian Pidgin",
"langDir": "ltr",
"dateFormat": "DD/MM/YYYY"
},
{
"code": "ph",
"hrefLang": "fil",
Expand Down Expand Up @@ -392,9 +400,9 @@
"dateFormat": "MM/DD/YYYY"
},
{
"code": "ur-in",
"hrefLang": "ur-in",
"name": "Urdu (India)",
"code": "ur",
"hrefLang": "ur",
"name": "Urdu",
"localName": "اردو",
"langDir": "rtl",
"dateFormat": "MM/DD/YYYY"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ethereum-org-website",
"version": "7.12.1",
"version": "7.12.2",
"description": "Website of ethereum.org",
"main": "index.js",
"repository": "git@github.com:ethereum/ethereum-org-website.git",
Expand Down
Binary file modified src/assets/wallets/enkrypt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
187 changes: 187 additions & 0 deletions src/components/EthExchanges/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,187 @@
import React from "react"
import { Box, Center, chakra, Flex, Heading, Text } from "@chakra-ui/react"

import CardList from "../CardList"
import Link from "../Link"
import Emoji from "../Emoji"
import Translation from "../Translation"
import { StyledSelect as Select } from "../SharedStyledComponents"

import { ChildOnlyProp } from "../../types"
import { useEthExchanges } from "./use-eth-exchanges"

const ListContainer = (props: ChildOnlyProp) => (
<Box mt={16} flex={{ base: "1 1 100%", md: "1 1 50%" }} {...props} />
)

const ResultsContainer = (props: ChildOnlyProp) => (
<Flex
justify="center"
w="full"
maxWidth="876px"
flexWrap={{ base: "wrap", md: "initial" }}
sx={{
"& > *": {
_first: {
mr: { base: 0, md: 6 },
},
},
}}
{...props}
/>
)

const EmptyStateContainer = (props: ChildOnlyProp) => (
<Center flexDir="column" mt={16} {...props} />
)

const SuccessContainer = (props: ChildOnlyProp) => (
<Flex flexDir="column" mt={4} {...props} />
)

const EmptyStateText = (props: ChildOnlyProp) => (
<Text m={8} fontSize="xl" maxW="450px" textAlign="center" {...props} />
)

const StyledSelect = chakra(Select, {
baseStyle: {
maxW: "container.sm",
},
})

const NoResults = ({ children }) => (
<EmptyStateContainer>
<Emoji text=":crying_face:" fontSize="80px" />
<EmptyStateText>
{children}{" "}
<Link to="mailto:website@ethereum.org">website@ethereum.org</Link>.
</EmptyStateText>
</EmptyStateContainer>
)

const NoResultsSingle = ({ children }) => (
<Center flexDir="column" mt={6}>
<Text maxW="450px" mb={16}>
{children}{" "}
<Link to="mailto:website@ethereum.org">website@ethereum.org</Link>.
</Text>
<Emoji text=":crying_face:" fontSize="80px" />
</Center>
)

// TODO move component into get-eth.js page?
const EthExchanges = () => {
const {
exchangesByCountry,
handleSelectChange,
hasSelectedCountry,
placeholderString,
t,
hasExchangeResults,
hasWalletResults,
filteredExchanges,
filteredWallets,
lastUpdated,
} = useEthExchanges()

return (
<Flex flexDir="column" align="center" w="full">
<Heading fontSize={{ base: "2xl", md: "2rem" }} fontWeight={600} lineHeight={1.4}>
<Translation id="page-get-eth-exchanges-header" />
</Heading>
<Text maxW="container.sm" mb={8} lineHeight={1.4} textAlign="center">
<Translation id="page-get-eth-exchanges-intro" />
</Text>
<StyledSelect
aria-label={t("page-get-eth-exchanges-header")}
className="react-select-container"
classNamePrefix="react-select"
options={exchangesByCountry}
onChange={handleSelectChange}
placeholder={placeholderString}
/>
{!hasSelectedCountry && (
<EmptyStateContainer>
<Emoji text=":world_map:" fontSize="80px" />
<EmptyStateText>
<Translation id="page-get-eth-exchanges-empty-state-text" />
</EmptyStateText>
</EmptyStateContainer>
)}
{/* No results */}
{hasSelectedCountry && !hasExchangeResults && !hasWalletResults && (
<ResultsContainer>
<NoResults>
<Translation id="page-get-eth-exchanges-no-exchanges-or-wallets" />
</NoResults>
</ResultsContainer>
)}
{/* Has results */}
{(hasExchangeResults || hasWalletResults) && (
<>
<ResultsContainer>
<ListContainer>
<Heading
as="h3"
fontSize={{ base: "xl", md: "2xl" }}
fontWeight={600}
lineHeight={1.4}
>
<Translation id="page-get-eth-exchanges-header-exchanges" />
</Heading>
{hasExchangeResults && (
<SuccessContainer>
<Text>
<Translation id="page-get-eth-exchanges-success-exchange" />
</Text>
<CardList content={filteredExchanges} />
</SuccessContainer>
)}
{!hasExchangeResults && (
<NoResultsSingle>
<Translation id="page-get-eth-exchanges-no-exchanges" />
</NoResultsSingle>
)}
</ListContainer>
<ListContainer>
<Heading
as="h3"
fontSize={{ base: "xl", md: "2xl" }}
fontWeight={600}
lineHeight={1.4}
>
<Translation id="page-get-eth-exchanges-header-wallets" />
</Heading>

{hasWalletResults && (
<SuccessContainer>
<Text>
<Translation id="page-get-eth-exchanges-success-wallet-paragraph" />{" "}
<Link to="/wallets/">
<Translation id="page-get-eth-exchanges-success-wallet-link" />
</Link>
.
</Text>
<CardList content={filteredWallets} />
</SuccessContainer>
)}
{!hasWalletResults && (
<NoResultsSingle>
<Translation id="page-get-eth-exchanges-no-wallets" />
</NoResultsSingle>
)}
</ListContainer>
</ResultsContainer>
<Text w="full" maxW="876px" mt={16} mb={0}>
<Translation id="page-get-eth-exchanges-disclaimer" />{" "}
<Link to="mailto:website@ethereum.org">website@ethereum.org</Link>.{" "}
<Translation id="page-find-wallet-last-updated" />{" "}
<strong>{lastUpdated}</strong>
</Text>
</>
)}
</Flex>
)
}

export default EthExchanges
Loading