Skip to content

Commit

Permalink
Merge be3cdcb into e76d5e8
Browse files Browse the repository at this point in the history
  • Loading branch information
RaymondDashWu committed Jan 10, 2021
2 parents e76d5e8 + be3cdcb commit f340045
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"@deck.gl/react": "8.2.0",
"@deck.gl/mapbox": "8.2.0",
"@luma.gl/constants": "8.2.0",
"@luma.gl/core": "8.2.0",
"@luma.gl/core": "^8.2.0",
"@luma.gl/debug": "8.2.0",
"@luma.gl/engine": "8.2.0",
"@luma.gl/gltools": "8.2.0",
Expand Down
4 changes: 2 additions & 2 deletions website/gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ module.exports = {
{
title: 'Kepler.gl Animation',
path: 'examples/kepler-integration/',
image: 'images/demo-thumb-animate-camera.jpg',
componentUrl: resolve('../examples/kepler-integration/src/main.js')
image: 'images/demo-thumb-kepler-example.jpg',
componentUrl: resolve('./src/pages/kepler-example.jsx')
}
],
}
Expand Down
2 changes: 1 addition & 1 deletion website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@deck.gl/layers": "8.2.0",
"@deck.gl/mesh-layers": "8.2.0",
"@deck.gl/react": "8.2.0",
"@luma.gl/core": "8.2.0",
"@luma.gl/core": "<=8.3.1",
"d3-color": "^1.4.1",
"react": "^16.13.1",
"react-dom": "^16.13.1",
Expand Down
36 changes: 36 additions & 0 deletions website/src/pages/kepler-example.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// Copyright (c) 2020 Uber Technologies, Inc.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

import React from 'react';
import document from 'global/document';
import {Provider} from 'react-redux';
import {render} from 'react-dom';
import store from '../../../examples/kepler-integration/src/store';
import App from '../../../examples/kepler-integration/src/app';

export default function KeplerShowcase() {
return ( // Tried all positions but didn't work
<div style={{}}>
<Provider store={store}>
<App />
</Provider>
</div>
)
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit f340045

Please sign in to comment.