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

feat: Add tweets to footer of state page #1542

Merged
merged 4 commits into from
Oct 27, 2020
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
1 change: 1 addition & 0 deletions gatsby-node.js
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ exports.createPages = async ({ graphql, actions }) => {
component: path.resolve(`./src/templates/state/index.js`),
context: {
...node,
nameRegex: `/${node.name}/g`,
slug,
},
})
Expand Down
6 changes: 6 additions & 0 deletions plugins/gatsby-source-covid-tracking-tweets/gatsby-node.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const fs = require('fs-extra')
const { DateTime } = require('luxon')
const crypto = require('crypto')

exports.sourceNodes = async ({ actions, createNodeId }, configOptions) => {
Expand All @@ -15,6 +16,11 @@ exports.sourceNodes = async ({ actions, createNodeId }, configOptions) => {
pinnedTweet => pinnedTweet.id && pinnedTweet.id === tweet.id_str,
).length > 0

tweet.date = DateTime.fromFormat(
tweet.created_at,
'EEE MMM d HH:mm:ss ZZZ yyyy',
).toJSDate()

const digest = crypto
.createHash('md5')
.update(JSON.stringify(tweet))
Expand Down
8 changes: 6 additions & 2 deletions src/__tests__/components/common/__snapshots__/tweet.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ exports[`Components : Common: Tweet renders correctly 1`] = `
<a
className="tweet"
href="https://twitter.com/1318691388242956291"
rel="noreferrer"
target="_blank"
>
<div
className="row"
Expand Down Expand Up @@ -36,7 +38,7 @@ exports[`Components : Common: Tweet renders correctly 1`] = `
<p
className="date"
>
October 20 2020
Tue Oct 20 23:11:41 +0000 2020
</p>
</div>
<div
Expand All @@ -60,6 +62,8 @@ exports[`Components : Common: Tweet renders correctly 2`] = `
<a
className="tweet"
href="https://twitter.com/1318691388242956291"
rel="noreferrer"
target="_blank"
>
<div
className="row"
Expand Down Expand Up @@ -92,7 +96,7 @@ exports[`Components : Common: Tweet renders correctly 2`] = `
<p
className="date"
>
October 20 2020
Tue Oct 20 23:11:41 +0000 2020
</p>
</div>
</div>
Expand Down
41 changes: 20 additions & 21 deletions src/components/common/tweet.js
Original file line number Diff line number Diff line change
@@ -1,34 +1,33 @@
import React from 'react'
import { DateTime } from 'luxon'
import classnames from 'classnames'
import { Row, Col } from '~components/common/grid'
import tweetStyles from './tweet.module.scss'
import twitterIcon from '~images/twitter_icon.png'
import twitterLogo from '~images/icons/twitter.svg'

const Tweet = ({ text, media, link, date }) => (
<a href={link} className={tweetStyles.tweet}>
const Tweet = ({ text, media, link, date, hideHandle = false }) => (
<a href={link} target="_blank" rel="noreferrer" className={tweetStyles.tweet}>
<Row>
<Col width={[4, 4, media ? 6 : 12]}>
<img
src={twitterLogo}
alt="Twitter"
className={classnames(
tweetStyles.twitterLogo,
media && tweetStyles.twitterLogoMobileOnly,
)}
/>
<h4>
<span className="a11y-only">Latest tweet from </span>
<img src={twitterIcon} alt="" />
@COVID19Tracking
</h4>
{!hideHandle && (
<>
<img
src={twitterLogo}
alt="Twitter"
className={classnames(
tweetStyles.twitterLogo,
media && tweetStyles.twitterLogoMobileOnly,
)}
/>
<h4>
<span className="a11y-only">Latest tweet from </span>
<img src={twitterIcon} alt="" />
@COVID19Tracking
</h4>
</>
)}
<blockquote>{text.replace(/https:\/\/t.co\/(.*)/, '')}</blockquote>
<p className={tweetStyles.date}>
{DateTime.fromFormat(date, 'EEE MMM d HH:mm:ss ZZZ yyyy').toFormat(
'LLLL d yyyy',
)}
</p>
<p className={tweetStyles.date}>{date}</p>
</Col>
{media && (
<Col width={[4, 4, 6]}>
Expand Down
8 changes: 4 additions & 4 deletions src/components/pages/data/daily-tweet.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ const DailyTweet = () => {
{
allTweets(
filter: { is_pinned: { eq: true } }
sort: { fields: id_str, order: DESC }
sort: { fields: date, order: DESC }
limit: 1
) {
nodes {
created_at
id_str
date(formatString: "MMMM D yyyy")
entities {
urls {
display_url
Expand All @@ -32,14 +32,14 @@ const DailyTweet = () => {
return null
}

const { id_str, full_text, entities, created_at } = data.allTweets.nodes[0]
const { id_str, full_text, entities, date } = data.allTweets.nodes[0]

return (
<Tweet
text={full_text}
media={entities.media[0] && entities.media[0].media_url}
link={`https://twitter.com/COVID19Tracking/status/${id_str}`}
date={created_at}
date={date}
/>
)
}
Expand Down
49 changes: 49 additions & 0 deletions src/components/pages/state/state-tweets.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import React from 'react'
import { CtaAnchorLink } from '~components/common/landing-page/call-to-action'
import Tweet from '~components/common/tweet'
import twitterIcon from '~images/twitter_icon.png'
import stateTweetsStyle from './state-tweets.module.scss'

const StateTweets = ({ name, tweets }) => {
if (typeof tweets.nodes === 'undefined' || !tweets.nodes.length) {
return null
}
return (
<>
<h2 id="state-tweets">Our latest tweets about {name}</h2>
<h4 className={stateTweetsStyle.twitterHandle}>
<span className="a11y-only">Our twitter handle is </span>

<a
href="https://twitter.com/COVID19Tracking"
target="_blank"
rel="noreferrer"
>
<img src={twitterIcon} alt="" />
</a>
<a
href="https://twitter.com/COVID19Tracking"
target="_blank"
rel="noreferrer"
>
@COVID19Tracking
</a>
</h4>
{tweets.nodes.map(tweet => (
<Tweet
hideHandle
date={tweet.date}
text={tweet.full_text}
link={`https://twitter.com/COVID19Tracking/status/${tweet.id_str}`}
/>
))}
<CtaAnchorLink
href={`https://twitter.com/search?q=from%3A%40COVID19Tracking%20${name}&src=typed_query`}
>
More tweets about {name}
</CtaAnchorLink>
</>
)
}

export default StateTweets
19 changes: 19 additions & 0 deletions src/components/pages/state/state-tweets.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.twitter-handle {
display: flex;
align-items: center;
vertical-align: middle;
margin-top: 0;
@include margin(32, bottom);
@include type-size(300);
a {
text-decoration: none;
&:hover {
text-decoration: underline;
}
}
img {
display: inline-block;
width: 35px;
@include margin(16, right);
}
}
16 changes: 15 additions & 1 deletion src/templates/state/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import StatePreamble from '~components/pages/state/preamble'
import SummaryCharts from '~components/pages/data/summary-charts'
import StateSummary from '~components/pages/data/summary'
import StateNotes from '~components/pages/state/state-notes'
import StateTweets from '~components/pages/state/state-tweets'

const StateTemplate = ({ pageContext, data, path }) => {
const state = pageContext
Expand All @@ -18,6 +19,7 @@ const StateTemplate = ({ pageContext, data, path }) => {
allContentfulChartAnnotation,
sevenDaysAgo,
contentfulStateOrTerritory,
allTweets,
} = data
return (
<Layout title={state.name} returnLinks={[{ link: '/data' }]} path={path}>
Expand Down Expand Up @@ -45,6 +47,7 @@ const StateTemplate = ({ pageContext, data, path }) => {
metadata={contentfulStateOrTerritory}
lastUpdated={covidState.lastUpdateEt}
/>
<StateTweets tweets={allTweets} name={state.name} />
</StateNavWrapper>
</Layout>
)
Expand All @@ -53,7 +56,7 @@ const StateTemplate = ({ pageContext, data, path }) => {
export default StateTemplate

export const query = graphql`
query($state: String!, $sevenDaysAgo: Date) {
query($state: String!, $sevenDaysAgo: Date, $nameRegex: String!) {
sevenDaysAgo: covidStateDaily(
date: { eq: $sevenDaysAgo }
state: { eq: $state }
Expand Down Expand Up @@ -206,5 +209,16 @@ export const query = graphql`
}
}
}
allTweets(
filter: { full_text: { regex: $nameRegex } }
sort: { fields: date, order: DESC }
limit: 5
) {
nodes {
full_text
id_str
date(formatString: "MMMM D yyyy")
}
}
}
`