Skip to content

Commit

Permalink
Merge branch 'master' into v2
Browse files Browse the repository at this point in the history
* master: (26 commits)
  Publish
  [feat] Extract internal plugin for automatically creating pages so we can reuse for other directories (#4490)
  fix(contentful): properly delete deleted entries and assets (#5756)
  Fix typo
  add Linda's post (#5817)
  [gatsby-source-contentful] Fix prepareJSONNode for array normalization (#5107)
  Process Contentful images inlined in markdown (#5542)
  feat(contentful): add traced SVGs to Contentful images (#5659)
  [SQIP] Add documentation (#5287)
  Add site to showcase (#5819)
  [gatsby-remark-copy-linked-files] Support reference-style images (#5818)
  Update docs for gatsby-plugin-catch-links (#5843)
  Added ⋅ representing a space to sub-list examples to reflect actual code (#5829)
  Adding tigerfacilityservices.com to showcase (#5855)
  fix schema type conflict reporter regressions (#5805)
  [gatsby-plugin-feed] Support nested output directory (#5820)
  Make cache available to the plugins (#5840)
  [gatsby-source-contentful] update data and jest snapshots (#5802)
  [gatsby-plugin-manifest] Replace all manifest.json with manifest.webmanifest in comments/docs (#5157)
  Update deploy-gatsby.md (#5800)
  ...

# Conflicts:
#	docs/tutorial/part-one/index.md
#	examples/using-sqip/src/components/polaroid.js
#	packages/gatsby-image/README.md
#	packages/gatsby-image/package.json
#	packages/gatsby-plugin-catch-links/package.json
#	packages/gatsby-plugin-feed/package.json
#	packages/gatsby-plugin-manifest/package.json
#	packages/gatsby-plugin-page-creator/src/gatsby-node.js
#	packages/gatsby-remark-copy-linked-files/package.json
#	packages/gatsby-source-contentful/package.json
#	packages/gatsby-source-contentful/src/__tests__/__snapshots__/normalize.js.snap
#	packages/gatsby-source-contentful/src/extend-node-type.js
#	packages/gatsby-source-contentful/src/gatsby-node.js
#	packages/gatsby-source-contentful/src/normalize.js
#	packages/gatsby-transformer-remark/package.json
#	packages/gatsby-transformer-remark/src/__tests__/__snapshots__/gatsby-node.js.snap
#	packages/gatsby-transformer-sqip/package.json
#	packages/gatsby-transformer-sqip/src/extend-node-type.js
#	packages/gatsby/package.json
#	packages/gatsby/src/bootstrap/load-plugins/__tests__/__snapshots__/load-plugins.js.snap
#	packages/gatsby/src/bootstrap/load-plugins/load.js
#	www/src/data/sites.yml
  • Loading branch information
m-allanson committed Jun 14, 2018
2 parents ffc87cd + 7e42c02 commit b5ff2b6
Show file tree
Hide file tree
Showing 69 changed files with 2,806 additions and 385 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,8 @@ Websites built with Gatsby:
* [Cup of Data](https://cupofdata.com) ([source](https://github.com/cupofdata/cupofdata.com))
* [Natalia Acevedo - Personal Website](https://nataliaacevedo.com) ([source](https://github.com/yeion7/nataliaacevedo.com))
* [Airbnb Cereal](https://airbnb.design/cereal/)
* [mottox2 blog](https://mottox2.com)
* [Tiger Facility Services](https://www.tigerfacilityservices.com/)

## Docs

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
title: Gatsby for Marketers, Managers, Agencies and Teams
date: "2018-06-08"
author: "Linda Watkins"
---

A few years ago, I worked at a small startup on an agile marketing team. This startup built website management tools and they had many customers come to them with stories of hosting headaches. I saw first-hand the hosting hassles that companies face.

One of the biggest challenges was having your best day become your worst nightmare. An up-and-coming e-commerce site put a lot of effort into making a clean, interactive website in preparation for the holiday season. Their site looked amazing and they were ready to go! But they were using traditional hosting which means they were competing for server resources with other websites. Unfortunately, traffic spiked, the server couldn’t scale as quickly as needed, and their site went down. Their best day became their worst nightmare.

In contrast, I’ve become a fan of Gatsby-- a blazing-fast website development tool that eliminates the hosting hassles of managing complex, costly infrastructure. Gatsby is a new paradigm for building websites and there are some key benefits that are explained in this new one-page overview.

# Living on the edge

Gatsby sites scale quickly and easily because they live on the edge. There are no servers! With a Gatsby website, content is compiled ahead of time and stored directly on the CDN (content delivery network). Basically, this means that your website lives closest to your customers—wherever they are—which means it’s immediately available, instantly scalable, and loads with lightning-fast speed. And it’s inherently secure because hackers can’t access your database or CMS. Honestly, it’s like magic. I guess I’ve gotten used to pages that take a second or two to load (which is annoying but happens so often) but when I go to a Gatsby site, it’s almost instantaneous. It’s so much faster than anything I’ve seen before.

Last week, I was on a long plane flight and decided to pay the $30 for in-flight wifi (yes, $30 for wifi. United- seriously?). It was a terrible connection and I couldn’t get any websites to load...except Gatsby. Gatsby loaded effortlessly and quickly while all other sites timed out. It was like a smooth magic carpet ride, flying from one page to the other. Amazing.

So I’ve become a fan girl for Gatsby. It’s blazing-fast, secure, serverless, and lets me use the tools (CMS) that I already love. And this [new one-page overview](/gatsby-one-pager.pdf) is great in positioning Gatsby to the marketer, manager, agency, or team. The overview is perfect for:

- An agency or individual freelancer trying to help a client understand the benefits of this new technology
- An engineering manager trying to help less-technical stakeholders such as marketers or senior leadership understand why choosing Gatsby makes sense
- A developer who’s just launched a Gatsby website and coworkers are asking how you made it so fast and if you can do that for future projects

Get a better understanding of what Gatsby can do for your website. [Check it out](/gatsby-one-pager.pdf)!
4 changes: 4 additions & 0 deletions docs/blog/author.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -133,3 +133,7 @@
bio: Front end developer at Mud, CSS obsessive and blogger at https://css-irl.info
avatar: avatars/michelle-barker.jpg
twitter: "@CSSInRealLife"
- id: Linda Watkins
bio: Marketing execution machine. I think critically, adjust often, and find creative solutions to problems.
avatar: avatars/linda-watkins.jpg
twitter: "@lindawatkins"
Binary file added docs/blog/avatars/linda-watkins.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/docs/adding-images-fonts-files.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ production so you don’t need to worry about long-term caching of assets.

Please be advised that this is also a custom feature of Webpack.

Two alternative ways of handling static assets is described in the next sections.
Two alternative ways of handling static assets are described in the next sections.

## Query for `File` in GraphQL queries using gatsby-source-filesystem

Expand Down
2 changes: 2 additions & 0 deletions docs/docs/deploy-gatsby.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ Now run `npm run deploy`. Preview changes in your GitHub page
`https://username.github.io/project-name/`. You can also find the link to your
site on GitHub under `Settings` > `GitHub Pages`.

If this is not successful, make sure that `gh-pages` is set as the source branch in your repository's `Settings` > `GitHub Pages` and then re-run `npm run deploy`.

### Deploying a user/organization site

Unlike project pages, user/organization sites on GitHub live in a special
Expand Down
14 changes: 14 additions & 0 deletions docs/docs/gatsby-starters.md
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,20 @@ Community:
* One-page layout with sub-pages for case studies
* Easily configurable
* And other good stuff (SEO, Offline Support, WebApp Manifest Support)

* [gatsby-starter-portfolio-cara](https://github.com/LeKoArts/gatsby-starter-portfolio-cara)
[(demo)](https://portfolio-cara.netlify.com/)

The target audience are designers and photographers.

Features:

* Gatsby v2
* React Spring
* TailwindCSS & Emotion
* Playful & Colorful One-Page website with Parallax effect
* Easily configurable
* And other good stuff (SEO, Responsive images, Offline Support, WebApp Manifest Support)

* [gatsby-starter-bootstrap-netlify](https://github.com/konsumer/gatsby-starter-bootstrap-netlify)
[(demo)](https://gatsby-starter-bootstrap-netlify.netlify.com)
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/how-gatsby-works-with-github-pages.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ We are using prefix paths because our website is inside a folder `http://usernam
}
```

When you run `npm run deploy` all contents of `public` folder will be moved to your repositories `gh-pages` branch.
When you run `npm run deploy` all contents of the `public` folder will be moved to your repository's `gh-pages` branch. Make sure that your repository's settings has the `gh-pages` branch set as the source.

## GitHub Organization or User page

Expand Down
9 changes: 7 additions & 2 deletions docs/tutorial/part-one/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,13 @@ following command:
gatsby develop
```

You should shortly see some text, close to the bottom, that says <code>You can now view <strong>gatsby-starter-hello-world</strong> in the browser</code> [http://localhost:8000](http://localhost:8000). Open that address in your
browser and...
You should shortly see some text, close to the bottom, that says:

`You can now view gatsby-starter-hello-world in the browser.`

[http://localhost:8000/](http://localhost:8000).

Open that address in your browser and...

![Gatsby.js hello world](hello-world.png)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ In this example, leading and trailing spaces are shown with with dots: ⋅
```no-highlight
1. First ordered list item
2. Another item
⋅⋅⋅* Unordered sub-list.
⋅⋅⋅* Unordered sub-list.
1. Actual numbers don't matter, just that it's a number
⋅⋅⋅1. Ordered sub-list
⋅⋅⋅1. Ordered sub-list
4. And another item.
⋅⋅⋅You can have properly indented paragraphs within list items. Notice the blank line above, and the leading spaces (at least one, but we'll use three here to also align the raw Markdown).
Expand Down
6 changes: 4 additions & 2 deletions examples/using-sqip/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
"gatsby-plugin-sharp": "^1.6.43",
"gatsby-source-filesystem": "^1.5.34",
"gatsby-transformer-sharp": "^1.6.23",
"gatsby-transformer-sqip": "*"
"gatsby-transformer-sqip": "0.0.6"
},
"keywords": ["gatsby"],
"keywords": [
"gatsby"
],
"license": "MIT",
"scripts": {
"build": "gatsby build",
Expand Down
44 changes: 7 additions & 37 deletions examples/using-sqip/src/components/polaroid.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ const data = {
url: `https://unsplash.com/photos/HhOo98Iygps`,
},
'igor-ovsyannykov-307432-unsplash-2000px': {
style: { right: `27vw`, bottom: `3vw` },
style: { right: `27vw`, bottom: `4vw` },
author: `Igor Ovsyannykov`,
url: `https://unsplash.com/photos/uzd2UEDdQJ8`,
},
'quino-al-101314-unsplash-2000px': {
style: { right: `28vw`, bottom: `27vw` },
style: { right: `26vw`, bottom: `27vw` },
author: `Quino Al`,
url: `https://unsplash.com/photos/vBxlL1xpSdc`,
},
Expand All @@ -48,24 +48,10 @@ const data = {
},
}

function generateStyle(imageData) {
function generateDynamicStyle(imageData) {
const rotation = Math.floor(Math.random() * 26) - 13
return {
boxSizing: `content-box`,

display: `block`,
position: `absolute`,

width: `18vw`,

padding: `0.8vw 0.4vw 0`,
background: `linear-gradient(120deg, #fff, #eee 60%)`,

color: `inherit`,

boxShadow: `2px 2px 7px 0px rgba(0,0,0,0.4), rgba(0, 0, 0, 0.1) 1px 1px 3px 0px inset`,
transform: `rotate(${rotation}deg)`,

...imageData.style,
}
}
Expand All @@ -77,34 +63,18 @@ const Polaroid = ({ image }) => {
<a
href={imageData.url}
title={`by ${imageData.author}`}
style={generateStyle(imageData)}
className="polaroid"
style={generateDynamicStyle(imageData)}
>
<div style={{ position: `relative` }}>
<div className="polaroid-image-wrapper">
<Image
fluid={{
...image.childImageSharp.fluid,
base64: image.childImageSharp.sqip.dataURI,
}}
/>
<div
style={{
position: `absolute`,
top: 0,
left: 0,
background: `linear-gradient(120deg, rgba(255, 255, 255, 0.5), transparent 60%, rgba(0, 0, 0, 0.4) 99%)`,
boxShadow: `inset 4px 5px 10px 0 rgba(0,0,0,0.05)`,
width: `100%`,
height: `100%`,
}}
/>
</div>
<div
style={{
lineHeight: `4vw`,
textAlign: `center`,
fontSize: `1.6vw`,
}}
>{`📷 ${imageData.author}`}</div>
<div className="polaroid-author">{`📷 ${imageData.author}`}</div>
</a>
)
}
Expand Down
Loading

0 comments on commit b5ff2b6

Please sign in to comment.