Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions src/components/Layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,10 @@ const Layout = (props) => {
if (localStorage.getItem("zen-mode") !== null) {
let isMobile = false
if (typeof window !== undefined) {
isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(
window.navigator.userAgent
)
isMobile =
/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(
window.navigator.userAgent
)
}
setIsZenMode(localStorage.getItem("zen-mode") === "true" && !isMobile)
}
Expand Down
8 changes: 6 additions & 2 deletions src/components/MeetupList.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Libraries
import React, { useState } from "react"
import styled from "styled-components"
import { sortBy } from "lodash"

// Components
import Emoji from "./Emoji"
Expand Down Expand Up @@ -78,18 +79,21 @@ const StyledInput = styled.input`
`

const filterMeetups = (query) => {
if (!query) return meetups
if (!query) return sortedMeetups

const lowercaseQuery = query.toLowerCase()

return meetups.filter((meetup) => {
return sortedMeetups.filter((meetup) => {
return (
meetup.title.toLowerCase().includes(lowercaseQuery) ||
meetup.location.toLowerCase().includes(lowercaseQuery)
)
})
}

// sort meetups by country and then by city
const sortedMeetups = sortBy(meetups, ["emoji", "location"])

// TODO create generalized CardList / TableCard
// TODO prop if ordered list or unordered
const MeetupList = () => {
Expand Down
3 changes: 1 addition & 2 deletions src/content/community/online/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ Hundreds of thousands of Ethereum enthusiasts gather in these online forums to s
<Callout
emoji=":classical_building:"
title="Decentralized Autonomous Organizations (DAOs)"
description="These groups leverage Ethereum technology to facilitate organization and collaboration. For instance, for controlling membership, voting on proposals, or managing pooled assets."
>
description="These groups leverage Ethereum technology to facilitate organization and collaboration. For instance, for controlling membership, voting on proposals, or managing pooled assets.">
<div>
<ButtonLink to="/community/get-involved/#decentralized-autonomous-organizations-daos">
Learn more about DAOs
Expand Down
3 changes: 1 addition & 2 deletions src/pages-conditional/eth.js
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,7 @@ const cardListContent = [
caption: <Translation id="page-eth-last-updated" />,
},
{
link:
"https://support.mycrypto.com/how-to/getting-started/how-to-buy-ether-with-usd",
link: "https://support.mycrypto.com/how-to/getting-started/how-to-buy-ether-with-usd",
title: <Translation id="page-eth-how-to-buy" />,
description: "MyCrypto",
caption: <Translation id="page-eth-how-to-buy-caption" />,
Expand Down
9 changes: 3 additions & 6 deletions src/pages-conditional/wallets/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -202,20 +202,17 @@ const articles = [
{
title: <Translation id="page-wallets-protecting-yourself" />,
description: "MyCrypto",
link:
"https://support.mycrypto.com/staying-safe/protecting-yourself-and-your-funds",
link: "https://support.mycrypto.com/staying-safe/protecting-yourself-and-your-funds",
},
{
title: <Translation id="page-wallets-keys-to-safety" />,
description: <Translation id="page-wallets-blog" />,
link:
"https://blog.coinbase.com/the-keys-to-keeping-your-crypto-safe-96d497cce6cf",
link: "https://blog.coinbase.com/the-keys-to-keeping-your-crypto-safe-96d497cce6cf",
},
{
title: <Translation id="page-wallets-how-to-store" />,
description: "ConsenSys",
link:
"https://media.consensys.net/how-to-store-digital-assets-on-ethereum-a2bfdcf66bd0",
link: "https://media.consensys.net/how-to-store-digital-assets-on-ethereum-a2bfdcf66bd0",
},
]

Expand Down
9 changes: 4 additions & 5 deletions src/pages/eth2/deposit-contract.js
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,7 @@ const DepositContractPage = ({ data, location }) => {
const addressSources = [
{
title: "ConsenSys",
link:
"https://consensys.net/blog/news/eth2-phase-0-deposit-contract-address/",
link: "https://consensys.net/blog/news/eth2-phase-0-deposit-contract-address/",
image: getImage(data.consensys),
},
{
Expand All @@ -279,8 +278,7 @@ const DepositContractPage = ({ data, location }) => {
},
{
title: "EthHub",
link:
"https://docs.ethhub.io/ethereum-roadmap/ethereum-2.0/deposit-contract/",
link: "https://docs.ethhub.io/ethereum-roadmap/ethereum-2.0/deposit-contract/",
image: getImage(data.ethhub),
},
]
Expand Down Expand Up @@ -379,7 +377,8 @@ const DepositContractPage = ({ data, location }) => {
callback={() =>
setState({
...state,
userWillCheckOtherSources: !state.userWillCheckOtherSources,
userWillCheckOtherSources:
!state.userWillCheckOtherSources,
})
}
>
Expand Down
12 changes: 4 additions & 8 deletions src/pages/eth2/get-involved/bug-bounty.js
Original file line number Diff line number Diff line change
Expand Up @@ -243,23 +243,19 @@ const BugBountiesPage = ({ data, location }) => {
const specs = [
{
title: <Translation id="page-eth2-bug-bounty-title-1" />,
link:
"https://github.com/ethereum/eth2.0-specs/blob/dev/specs/phase0/beacon-chain.md",
link: "https://github.com/ethereum/eth2.0-specs/blob/dev/specs/phase0/beacon-chain.md",
},
{
title: <Translation id="page-eth2-bug-bounty-title-2" />,
link:
"https://github.com/ethereum/eth2.0-specs/blob/dev/specs/phase0/fork-choice.md",
link: "https://github.com/ethereum/eth2.0-specs/blob/dev/specs/phase0/fork-choice.md",
},
{
title: <Translation id="page-eth2-bug-bounty-title-3" />,
link:
"https://github.com/ethereum/eth2.0-specs/blob/dev/specs/phase0/deposit-contract.md",
link: "https://github.com/ethereum/eth2.0-specs/blob/dev/specs/phase0/deposit-contract.md",
},
{
title: <Translation id="page-eth2-bug-bounty-title-4" />,
link:
"https://github.com/ethereum/eth2.0-specs/blob/dev/specs/phase0/p2p-interface.md",
link: "https://github.com/ethereum/eth2.0-specs/blob/dev/specs/phase0/p2p-interface.md",
},
]
return (
Expand Down
9 changes: 3 additions & 6 deletions src/pages/get-eth.js
Original file line number Diff line number Diff line change
Expand Up @@ -223,20 +223,17 @@ const GetETHPage = ({ data }) => {
const safetyArticles = [
{
title: "Protecting yourself and your funds",
link:
"https://support.mycrypto.com/staying-safe/protecting-yourself-and-your-funds",
link: "https://support.mycrypto.com/staying-safe/protecting-yourself-and-your-funds",
description: "MyCrypto",
},
{
title: "The keys to keeping your crypto safe",
link:
"https://blog.coinbase.com/the-keys-to-keeping-your-crypto-safe-96d497cce6cf",
link: "https://blog.coinbase.com/the-keys-to-keeping-your-crypto-safe-96d497cce6cf",
description: "Coinbase blog",
},
{
title: "How to store digital assets on Ethereum",
link:
"https://media.consensys.net/how-to-store-digital-assets-on-ethereum-a2bfdcf66bd0",
link: "https://media.consensys.net/how-to-store-digital-assets-on-ethereum-a2bfdcf66bd0",
description: "ConsenSys",
},
]
Expand Down