From 3b667e265fccb80788f041c5af8bc7a7e1701827 Mon Sep 17 00:00:00 2001 From: Ronan Fitzpatrick Date: Thu, 10 Aug 2017 11:22:44 -0700 Subject: [PATCH 001/163] Refactor to work with transit library --- package.json | 3 ++- src/App.jsx | 3 ++- src/store.js | 7 ++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 015ae77..5e5a964 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,8 @@ "version": "1.0.0", "private": true, "dependencies": { - "@databraid/transit-widget": "^1.0.5", + "@databraid/slack-widget": "1.0.3", + "@databraid/transit-widget": "1.0.12", "react": "15.6.1", "react-dom": "15.6.1", "react-grid-layout": "0.14.7", diff --git a/src/App.jsx b/src/App.jsx index 5c47d1a..04f6253 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,6 +1,7 @@ import React from 'react'; import ReactGridLayout from 'react-grid-layout'; import TransitComponent from '@databraid/transit-widget/lib'; +import SlackComponent from '@databraid/slack-widget/lib'; import { TRANSIT_WIDGET_ID, SLACK_WIDGET_ID, @@ -31,7 +32,7 @@ const App = () => {
GitHub
-
Slack
+
); }; diff --git a/src/store.js b/src/store.js index 6073996..bc46458 100644 --- a/src/store.js +++ b/src/store.js @@ -1,14 +1,15 @@ import { createStore, applyMiddleware } from 'redux'; -import thunk from 'redux-thunk'; +import thunkMiddleware from 'redux-thunk'; +import { TRANSIT_API } from '@databraid/transit-widget/lib'; import rootReducer from './reducers'; /* eslint-disable no-underscore-dangle */ -const middleware = [thunk]; const store = createStore( rootReducer, window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__(), - applyMiddleware(...middleware), + applyMiddleware(thunkMiddleware.withExtraArgument({ TRANSIT_API })), + // applyMiddleware(...middleware), ); export default store; From 2543c7b7dc7662c4dc79e52410644c8005eb7205 Mon Sep 17 00:00:00 2001 From: TYLER LANGENBRUNNER Date: Thu, 10 Aug 2017 12:47:17 -0700 Subject: [PATCH 002/163] Add google maps api script in public html --- public/index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/index.html b/public/index.html index fc76eb1..34b9d01 100644 --- a/public/index.html +++ b/public/index.html @@ -23,6 +23,7 @@ --> React App +