Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
0ae0cf9
Prototype community home
minimalsm Oct 27, 2021
03b85e8
Add meetup list inputs
minimalsm Nov 10, 2021
29bf885
Save
minimalsm Nov 22, 2021
2b5d62f
Update community hub
minimalsm Nov 23, 2021
0bcf3cc
Update get involved and online
minimalsm Nov 24, 2021
4395b54
Add support content
minimalsm Nov 24, 2021
6aec9f1
Update community nav dropdown
samajammin Nov 25, 2021
4f88e29
"Merge Sam's changes"
minimalsm Nov 29, 2021
e0175e5
Remove subnav from community
minimalsm Nov 29, 2021
897ed73
Update copy
minimalsm Nov 29, 2021
da716f4
Tweaks to online communities
minimalsm Nov 29, 2021
1ceb4a3
Update events
minimalsm Dec 7, 2021
dd9423b
Create EventCard and refactor UpcomingEventList to use EventCard
minimalsm Dec 7, 2021
ea7a1c7
Add regex to remove emojis from table of contents
minimalsm Dec 7, 2021
a7c94f3
Fix typo in UpcomingEventsList
minimalsm Dec 7, 2021
545a638
Replace emoji with Twemoji
minimalsm Dec 7, 2021
0a6a02c
Add breadcrumbs for online, support and events
minimalsm Dec 7, 2021
4d77177
Remove meetups
minimalsm Dec 7, 2021
c564ab2
Add styled callouts
minimalsm Dec 7, 2021
b0d947a
Add common questions
minimalsm Dec 7, 2021
eb7a5d1
Fix broken heading
minimalsm Dec 7, 2021
47ac70d
Add links and header ids to online communities page
minimalsm Dec 7, 2021
3bd4d09
Add search by location
minimalsm Dec 8, 2021
c7ec156
Add search to meetups
minimalsm Dec 8, 2021
f6ecd0c
Add fallback banner if no upcoming events
samajammin Dec 8, 2021
9f9658d
Add additional links to support page
samajammin Dec 8, 2021
214d979
Remove Ethereum Gitter home link
samajammin Dec 8, 2021
be67dd7
feat: add new card for grants, edited copy and button order for OpenS…
corwintines Dec 8, 2021
73fffe6
fix: sentance casing for community-hub translation
corwintines Dec 8, 2021
a745eee
feat: add InfoBanner for empty search result in MeetupList
corwintines Dec 8, 2021
135d71a
feat: create and implement SocialListItem, update react-icons package
corwintines Dec 9, 2021
84f2365
move meetups into their own data file, add location to community-even…
corwintines Dec 9, 2021
34f8a34
fix: UpcomingEventsList and EventCard styling for some more breathing…
corwintines Dec 9, 2021
d220892
Merge branch 'dev' into communityHubUpdates
corwintines Dec 9, 2021
2902817
fix: convert over to gatasby v4 implementation
corwintines Dec 9, 2021
c56cd0e
Update FAQ questions
minimalsm Dec 9, 2021
d4b5d8b
feat: transltion support
corwintines Dec 9, 2021
5ee972e
Merge branch 'communityHubUpdates' of https://github.com/ethereum/eth…
corwintines Dec 9, 2021
5b6bc8c
fix: remove DAO from online page, will add this back in future
corwintines Dec 9, 2021
ade0bf1
Minor copy tweaks
samajammin Dec 10, 2021
75d4a7c
icon hover patch
wackerow Dec 10, 2021
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"react-dom": "17.0.2",
"react-emoji-render": "^1.2.4",
"react-helmet": "^6.1.0",
"react-icons": "^4.1.0",
"react-icons": "^4.3.1",
"react-instantsearch-dom": "^6.6.0",
"react-select": "^4.3.0",
"recharts": "1.8.5",
Expand Down
59 changes: 59 additions & 0 deletions src/components/EventCard.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import React from "react"
import styled from "styled-components"
import Emoji from "./Emoji"
import ButtonLink from "./ButtonLink"

const StyledCard = styled.div`
display: flex;
flex: 1 1 30%;
max-width: 620px;
min-width: 240px;
margin: 2rem 0;
flex-direction: column;
justify-content: space-between;
background: ${(props) => props.theme.colors.ednBackground};
border-radius: 2px;
border: 1px solid ${(props) => props.theme.colors.lightBorder};
padding: 1.5rem;
`

const Description = styled.p`
opacity: 0.8;
`

const Date = styled.p`
color: ${(props) => props.theme.colors.primary};
margin-bottom: 0;
text-align: right;
`

const Location = styled.p`
margin-bottom: 0;
text-align: right;
`

const LocationText = styled.span`
opacity: 0.6;
`

const Title = styled.h3`
margin-top: 0;
`

const EventCard = ({ title, to, date, description, className, location }) => (
<StyledCard className={className}>
<Date>
{date}
<Emoji text=":spiral_calendar:" size={1} ml={`0.5em`} />
</Date>
<Location>
<LocationText>{location}</LocationText>
<Emoji text=":round_pushpin:" size={1} ml={`0.5em`} />
</Location>
<Title>{title}</Title>
<Description>{description}</Description>
<ButtonLink to={to}>View Event</ButtonLink>
</StyledCard>
)

export default EventCard
2 changes: 1 addition & 1 deletion src/components/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ const Footer = () => {
links: [
{
to: `/community/`,
text: "ethereum-community",
text: "community-hub",
},
{
to: "/foundation/",
Expand Down
45 changes: 38 additions & 7 deletions src/components/Icon.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,15 @@ import React from "react"
import PropTypes from "prop-types"
import styled from "styled-components"
import { IconContext } from "react-icons"
import { FaGithub, FaTwitter, FaYoutube, FaDiscord } from "react-icons/fa"
import {
FaGithub,
FaTwitter,
FaYoutube,
FaDiscord,
FaRedditAlien,
FaStackExchange,
FaGlobe,
} from "react-icons/fa"
import {
MdAdd,
MdBrightness2,
Expand All @@ -20,7 +28,15 @@ import {
import { BsQuestionSquareFill, BsToggleOff, BsToggleOn } from "react-icons/bs"
import { IoCodeOutline, IoCodeDownload } from "react-icons/io5"

const Icon = ({ name, size, className }) => (
const socialColors = {
reddit: "#FF4301",
twitter: "#1DA1F2",
youtube: "#FF0000",
discord: "#7289da",
stackExchange: "#48a2da",
}

const Icon = ({ name, color = false, size, className }) => (
<IconContext.Provider value={{ size: size, className: className }}>
{name === "add" && <MdAdd />}
{name === "chevronDown" && <MdExpandMore />}
Expand All @@ -34,15 +50,28 @@ const Icon = ({ name, size, className }) => (
{name === "zenModeOff" && <BsToggleOff />}
{name === "zenModeOn" && <BsToggleOn />}
{name === "menu" && <MdMenu />}
{name === "twitter" && <FaTwitter />}
{name === "twitter" && (
<FaTwitter color={color ? socialColors.twitter : undefined} />
)}
{name === "search" && <MdSearch />}
{name === "youtube" && <FaYoutube />}
{name === "discord" && <FaDiscord />}
{name === "youtube" && (
<FaYoutube color={color ? socialColors.youtube : undefined} />
)}
{name === "discord" && (
<FaDiscord color={color ? socialColors.discord : undefined} />
)}
{name === "glossary" && <BsQuestionSquareFill />}
{name === "codeDownload" && <IoCodeDownload />}
{name === "code" && <IoCodeOutline />}
{name === "flip" && <MdFlip />}
{name === "help" && <MdLiveHelp />}
{name === "reddit" && (
<FaRedditAlien color={color ? socialColors.reddit : undefined} />
)}
{name === "stackExchange" && (
<FaStackExchange color={color ? socialColors.stackExchange : undefined} />
)}
{name === "webpage" && <FaGlobe />}
</IconContext.Provider>
)

Expand All @@ -58,8 +87,10 @@ Icon.propTypes = {
}

const StyledIcon = styled(Icon)`
fill: ${(props) => props.theme.colors.secondary};
&:hover path:last-of-type {
fill: ${(props) =>
props.color ? props.color : props.theme.colors.secondary};

&:hover svg {
fill: ${(props) => props.theme.colors.primary};
}
`
Expand Down
7 changes: 3 additions & 4 deletions src/components/Layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,9 @@ 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
Loading