diff --git a/src/components/Layout.js b/src/components/Layout.js index 52b767c44ae..a4199955750 100644 --- a/src/components/Layout.js +++ b/src/components/Layout.js @@ -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) } diff --git a/src/components/MeetupList.js b/src/components/MeetupList.js index 3c4b83f08c3..f89be3f7c14 100644 --- a/src/components/MeetupList.js +++ b/src/components/MeetupList.js @@ -1,6 +1,7 @@ // Libraries import React, { useState } from "react" import styled from "styled-components" +import { sortBy } from "lodash" // Components import Emoji from "./Emoji" @@ -78,11 +79,11 @@ 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) @@ -90,6 +91,9 @@ const filterMeetups = (query) => { }) } +// 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 = () => { diff --git a/src/content/community/online/index.md b/src/content/community/online/index.md index b7f6a68c47b..925e917016f 100644 --- a/src/content/community/online/index.md +++ b/src/content/community/online/index.md @@ -42,8 +42,7 @@ Hundreds of thousands of Ethereum enthusiasts gather in these online forums to s + description="These groups leverage Ethereum technology to facilitate organization and collaboration. For instance, for controlling membership, voting on proposals, or managing pooled assets.">
Learn more about DAOs diff --git a/src/pages-conditional/eth.js b/src/pages-conditional/eth.js index e3d9aebfed2..9b11b5e6a99 100644 --- a/src/pages-conditional/eth.js +++ b/src/pages-conditional/eth.js @@ -260,8 +260,7 @@ const cardListContent = [ caption: , }, { - 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: , description: "MyCrypto", caption: , diff --git a/src/pages-conditional/wallets/index.js b/src/pages-conditional/wallets/index.js index b74c1c4facf..ea866d9b8ff 100644 --- a/src/pages-conditional/wallets/index.js +++ b/src/pages-conditional/wallets/index.js @@ -202,20 +202,17 @@ const articles = [ { title: , 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: , description: , - 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: , 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", }, ] diff --git a/src/pages/eth2/deposit-contract.js b/src/pages/eth2/deposit-contract.js index 51552a5cb06..9e1a66a66eb 100644 --- a/src/pages/eth2/deposit-contract.js +++ b/src/pages/eth2/deposit-contract.js @@ -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), }, { @@ -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), }, ] @@ -379,7 +377,8 @@ const DepositContractPage = ({ data, location }) => { callback={() => setState({ ...state, - userWillCheckOtherSources: !state.userWillCheckOtherSources, + userWillCheckOtherSources: + !state.userWillCheckOtherSources, }) } > diff --git a/src/pages/eth2/get-involved/bug-bounty.js b/src/pages/eth2/get-involved/bug-bounty.js index 3cb7d1fd2ce..d6d3829e891 100644 --- a/src/pages/eth2/get-involved/bug-bounty.js +++ b/src/pages/eth2/get-involved/bug-bounty.js @@ -243,23 +243,19 @@ const BugBountiesPage = ({ data, location }) => { const specs = [ { title: , - 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: , - 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: , - 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: , - 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 ( diff --git a/src/pages/get-eth.js b/src/pages/get-eth.js index 445dc578126..2c6c855d61a 100644 --- a/src/pages/get-eth.js +++ b/src/pages/get-eth.js @@ -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", }, ]