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

upgrade packages and add note about COVID #331

Merged
merged 4 commits into from
May 29, 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: 0 additions & 1 deletion .env.development
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ AUTH0_CALLBACK=http://localhost:8000/callback/
AUTH0_AUDIENCE=https://api.gatsbyjs.com/
GATSBY_API=https://us-central1-gatsby-core.cloudfunctions.net/graphql
SHOPIFY_ACCESS_TOKEN=9aa73c089d34741f36edbe4d7314373a

1 change: 1 addition & 0 deletions gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ module.exports = {
component: require.resolve(`./src/components/Layout/`)
}
},
'gatsby-plugin-sharp',
'gatsby-transformer-sharp',
{
resolve: 'gatsby-source-shopify',
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@
"apollo-boost": "^0.3.1",
"auth0-js": "^9.10.2",
"axios": "^0.18.0",
"gatsby": "^2.5.0",
"gatsby": "^2.22.12",
"gatsby-image": "^2.0.41",
"gatsby-plugin-emotion": "^4.0.6",
"gatsby-plugin-google-analytics": "^2.0.20",
"gatsby-plugin-layout": "^1.0.15",
"gatsby-plugin-manifest": "^2.1.1",
"gatsby-plugin-offline": "^2.1.0",
"gatsby-plugin-react-helmet": "^3.0.12",
"gatsby-plugin-sharp": "^2.0.37",
"gatsby-source-shopify": "^2.0.30",
"gatsby-plugin-sharp": "^2.6.9",
"gatsby-source-shopify": "^3.2.8",
"gatsby-transformer-sharp": "^2.1.19",
"react": "^16.8.6",
"react-apollo": "^2.5.5",
Expand Down
12 changes: 9 additions & 3 deletions src/components/ContributorArea/ContentForContributor.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,7 @@ const ProgressIndicator = `
`;

const ProgressBar = styled(`progress`)`
${ProgressBarContainer}

::-webkit-progress-bar {
${ProgressBarContainer} ::-webkit-progress-bar {
${ProgressBarContainer}
}

Expand Down Expand Up @@ -235,6 +233,14 @@ const ContentForContributor = () => {
} to earn level 2 swag!`}</Text>
</>
)}
<Text style={{ fontStyle: 'italic' }}>
Due to COVID-19 related international mail service disruptions,
your order may be delayed or suspended. Please view{' '}
<a href="https://about.usps.com/newsroom/service-alerts/international/welcome.htm">
the list of affected countries
</a>{' '}
to see if your order is affected.
</Text>
</ContentForContributorRoot>
);
}}
Expand Down
6 changes: 4 additions & 2 deletions src/components/ContributorArea/ContentForNotContributor.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@ class ContentForNotContributor extends Component {
</Text>
<Text>
If you have questions, ask on any issue (you can tag{' '}
<a href="https://github.com/orgs/gatsbyjs/teams/learning">@gatsbyjs/learning</a> if you’d
like) or hit us up{' '}
<a href="https://github.com/orgs/gatsbyjs/teams/learning">
@gatsbyjs/learning
</a>{' '}
if you’d like) or hit us up{' '}
<a href="https://twitter.com/gatsbyjs">on Twitter at @gatsbyjs</a>.
</Text>

Expand Down
11 changes: 9 additions & 2 deletions src/components/ContributorArea/ContentForNotLoggedIn.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import styled from '@emotion/styled';
import { GoMarkGithub } from 'react-icons/go';

import { login } from '../../utils/auth';
import { spacing, animations } from '../../utils/styles';
import { Button as BaseButton } from '../shared/Buttons';
import { Heading, SectionHeading, Text } from './AreaTypography';
import { spacing, animations } from '../../utils/styles';

const ContentForGuestRoot = styled(`div`)`
animation: ${animations.simpleEntry};
Expand Down Expand Up @@ -41,13 +41,20 @@ const ContentForGuest = () => (
had your first pull request merged into Gatsby, you can come back here to
claim free swag.
</Text>

<Button
inverse
href="https://github.com/search?o=desc&q=org%3Agatsbyjs+type%3Aissue+label%3A%22help%20wanted%22+is%3Aopen&s=updated&type=Issues"
>
Explore Open Issues
</Button>
<Text style={{ fontStyle: 'italic' }}>
Due to COVID-19 related international mail service disruptions, your order
may be delayed or suspended. Please view{' '}
<a href="https://about.usps.com/newsroom/service-alerts/international/welcome.htm">
the list of affected countries
</a>{' '}
to see if your order is affected.
</Text>
</ContentForGuestRoot>
);

Expand Down
6 changes: 4 additions & 2 deletions src/components/Dashboard/Contributions.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ export default () => (
</Text>
<Text>
If you have questions, ask on any issue (you can tag{' '}
<a href="https://github.com/orgs/gatsbyjs/teams/learning">@gatsbyjs/learning</a> if you’d
like) or hit us up{' '}
<a href="https://github.com/orgs/gatsbyjs/teams/learning">
@gatsbyjs/learning
</a>{' '}
if you’d like) or hit us up{' '}
<a href="https://twitter.com/gatsbyjs">on Twitter at @gatsbyjs</a>.
</Text>
<Text>
Expand Down
Loading