Skip to content

Commit

Permalink
Merge e7f9665 into f510684
Browse files Browse the repository at this point in the history
  • Loading branch information
ibgreen committed May 28, 2019
2 parents f510684 + e7f9665 commit 72f04bc
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 13 deletions.
2 changes: 1 addition & 1 deletion arrowjs/website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"devDependencies": {
"gatsby": "2.3.0",
"gatsby-plugin-styletron": "^3.0.5",
"ocular-gatsby": "1.0.0-alpha.25",
"ocular-gatsby": "1.0.0-alpha.33",
"sharp": "0.22.1"
}
}
14 changes: 10 additions & 4 deletions arrowjs/website/src/components/site-query.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@

// because this is a StaticQuery it needs to be in the local tree so that its graphQl can be
// run by gatsby. Rather, a file of the same name must have the same query in the local tree.
// During the init process, ocular copies this file over to the local tree.

// During the init process, ocular copies this file over to the local tree.

import React from 'react';
import { StaticQuery, graphql } from 'gatsby';
import {StaticQuery, graphql} from 'gatsby';

// All common metadata, table-of-contents etc are queried here and put in React context
const QUERY = graphql`
Expand All @@ -18,6 +17,8 @@ const QUERY = graphql`
PROJECT_NAME
PROJECT_TYPE
PROJECT_DESC
PROJECT_URL
PROJECT_ORG
HOME_HEADING
HOME_BULLETS {
text
Expand All @@ -36,6 +37,11 @@ const QUERY = graphql`
name
url
}
ADDITIONAL_LINKS {
name
href
index
}
}
}
}
Expand Down Expand Up @@ -100,7 +106,7 @@ const QUERY = graphql`
// and makes it available on React context
export default class SiteQuery extends React.Component {
render() {
const { onComplete } = this.props;
const {onComplete} = this.props;
return <StaticQuery query={QUERY} render={onComplete} />;
}
}
8 changes: 4 additions & 4 deletions website/ocular-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,19 @@ module.exports = {

PROJECTS: [
{
name: 'deck.gl',
title: 'deck.gl',
url: 'https://deck.gl'
},
{
name: 'luma.gl',
title: 'luma.gl',
url: 'https://luma.gl'
},
{
name: 'react-map-gl',
title: 'react-map-gl',
url: 'https://uber.github.io/react-map-gl'
},
{
name: 'react-vis',
title: 'react-vis',
url: 'https://uber.github.io/react-vis'
}
],
Expand Down
2 changes: 1 addition & 1 deletion website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"gatsby-plugin-no-sourcemaps": "^2.0.2",
"gatsby-plugin-styletron": "^3.0.5",
"gh-pages": "^2.0.1",
"ocular-gatsby": "1.0.0-alpha.32",
"ocular-gatsby": "1.0.0-alpha.33",
"sharp": "^0.22.0"
}
}
5 changes: 2 additions & 3 deletions website/src/components/site-query.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
// run by gatsby. Rather, a file of the same name must have the same query in the local tree.
// During the init process, ocular copies this file over to the local tree.


import React from 'react';
import { StaticQuery, graphql } from 'gatsby';
import {StaticQuery, graphql} from 'gatsby';

// All common metadata, table-of-contents etc are queried here and put in React context
const QUERY = graphql`
Expand Down Expand Up @@ -107,7 +106,7 @@ const QUERY = graphql`
// and makes it available on React context
export default class SiteQuery extends React.Component {
render() {
const { onComplete } = this.props;
const {onComplete} = this.props;
return <StaticQuery query={QUERY} render={onComplete} />;
}
}

0 comments on commit 72f04bc

Please sign in to comment.