This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Disconnect front end update state from ipc actions and create a new sequelizeManager class#1

Merged
chriddyp merged 8 commits into from
May 16, 2016
Merged

Disconnect front end update state from ipc actions and create a new sequelizeManager class #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fb2fdd2
Delete the query actions, they are within the ipc
alexandresobolevski May 13, 2016
4363f01
Create object sequelizeManager that is seen by all ipc events and sep…
alexandresobolevski May 13, 2016
71163e0
decouple update state from ipc actions using buttons
alexandresobolevski May 13, 2016
5f896ff
Remove console.log or change to console.warn
alexandresobolevski May 14, 2016
91b09d8
Remove useless comment
alexandresobolevski May 14, 2016
bec4cff
Make visible connection message
alexandresobolevski May 14, 2016
2a35b62
Send back to the app the connection state
alexandresobolevski May 14, 2016
0e7c9da
Add style to buttons and make the editor smaller
alexandresobolevski May 16, 2016
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
7 changes: 7 additions & 0 deletions app/actions/ipc.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,3 +11,10 @@ export function query (statement) {
ipcRenderer.send('receive', {statement});
}
}

export function connect (statement) {
return dispatch => {
console.warn('proceeding to connect to database');
ipcRenderer.send('connect', {statement});
}
}
35 changes: 0 additions & 35 deletions app/actions/query.js
View file
Open in desktop

This file was deleted.

24 changes: 24 additions & 0 deletions app/components/Configuration.css
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
.btnGroup {
position: relative;
top: 0px;
width: 420px;
margin: 0 auto;
}

.btn {
font-size: 0.75rem;
font-weight: bold;
background-color: #fff;
border-radius: 50%;
margin: 10px;
width: 75px;
height: 75px;
opacity: .7;
cursor: pointer;
font-family: Arial, Helvetica, Helvetica Neue;
}

.btn:hover {
color: white;
background-color: rgba(0, 0, 0, 0.5);
}
45 changes: 27 additions & 18 deletions app/components/Configuration.react.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import Immutable from 'immutable';
import AceEditor from 'react-ace';
import brace from 'brace';
import styles from './Configuration.css';


require('brace/mode/sql');
Expand All@@ -13,21 +14,23 @@ require('brace/theme/tomorrow');
export default class Configuration extends Component {
constructor(props) {
super(props);
this.state = {query: ''}
this.state = {query: ''};
}

render() {
console.warn('this.props: ', this.props);
const configuration = this.props.configuration.toJS();

const onChange = query => {
this.setState({query})
this.props.ipcActions.query(query);
/*
this.props.configActions.setValue({
key: e.target.value, value: e.target.value
});
*/
const onChangeQuery = query => {
this.setState({query});
}

const onPressConnect = (event) => {
this.props.ipcActions.connect(this.state.connect);
}

const onSendQuery = (event) => {
this.props.ipcActions.query(this.state.query);
}

return (
Expand All@@ -37,30 +40,36 @@ export default class Configuration extends Component {

<AceEditor
value={this.state.query}
onChange={onChange}
onChange={onChangeQuery}
mode="sql"
theme="tomorrow"
height='100'
/>

<input onChange={onChange}/>
<div className={styles.btnGroup}>
<button className={styles.btn} onClick={onPressConnect}>
connect
</button>
<button className={styles.btn} onClick={onSendQuery}>
query
</button>
</div>

<pre>
{JSON.stringify(this.props.ipc.toJS().log, null, 2)}
{JSON.stringify(this.props.ipc.toJS().rows, null, 2)}
</pre>

<pre>
{JSON.stringify(this.props.ipc.toJS().rows, null, 2)}
{JSON.stringify(this.props.ipc.toJS().log, null, 2)}
</pre>

<pre>
{JSON.stringify(this.props.ipc.toJS().metadata, null, 2)}
</pre>


<pre>
{JSON.stringify(this.props.ipc.toJS().error, null, 2)}
</pre>

<pre>
{JSON.stringify(this.props.ipc.toJS().error, null, 2)}
</pre>

</div>
</div>
Expand Down
2 changes: 0 additions & 2 deletions app/containers/ConfigurationPage.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import Configuration from '../components/Configuration.react';
import * as ConfigurationActions from '../actions/configuration';
import * as QueryActions from '../actions/query';
import * as IpcActions from '../actions/ipc';

function mapStateToProps(state) {
Expand All@@ -16,7 +15,6 @@ function mapStateToProps(state) {
function mapDispatchToProps(dispatch) {
const configActions = bindActionCreators(ConfigurationActions, dispatch);
const ipcActions = bindActionCreators(IpcActions, dispatch);
// const queryActions = bindActionCreators(QueryActions, dispatch);

return {configActions, ipcActions};
}
Expand Down
140 changes: 19 additions & 121 deletions main.development.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,12 @@ import { app, BrowserWindow, Menu, crashReporter, shell } from 'electron';
import { createStore, applyMiddleware, compose } from 'redux';
import { electronEnhancer } from 'redux-electron-store';
import Immutable from 'immutable';
import Sequelize from 'sequelize';
import restify from 'restify';
import parse from './parse';


var sequelizeActions = require('./sequelizeManager');
let sequelizeManager = new sequelizeActions();

const ipcMain = require('electron').ipcMain;

Expand All@@ -13,58 +17,14 @@ let mainWindow = null;

crashReporter.start();


if (process.env.NODE_ENV === 'development') {
require('electron-debug')();
}

/*
// REDUX STORE
let enhancer = compose(
// applyMiddleware(...middleware),
electronEnhancer()
);

const initialState = Immutable.Map({
query: 'asdfasdfasdf',
status: true,
config: {
username: 'chris',
pw: 'test'
}
});

function reducer(state = initialState, action) {
switch (action.type) {
case 'update':
state = state.set(action.key, action.value);
console.warn('updating store: ', state.toJS());
return state;
default:
return state;
}
}

// Note: passing enhancer as the last argument to createStore requires redux@>=3.1.0
let i = 99;
// const initialState = Immutable.Map({test: i});
const store = createStore(reducer, initialState, electronEnhancer());

setInterval(() => {
console.warn(`dispatching ${i}`);
i += 1;
store.dispatch({type: 'update', key: 'test', value: i});
}, 10000);
*/


//////////

app.on('window-all-closed', () => {
if (process.platform !== 'darwin') app.quit();
});


app.on('ready', () => {
mainWindow = new BrowserWindow({
show: false,
Expand All@@ -83,49 +43,6 @@ app.on('ready', () => {
mainWindow = null;
});




function parse(data) {

var nrows = data.length;

if (nrows === undefined || nrows === null){
keys = ['message'];
nrows = 1;
ncols = 1;
rows = [['command executed']];
}else{
var rows = [];
var ncols = Object.keys(data[0]).length;
var keys = Object.keys(data[0]);

for (var i = 0; i < nrows; i++) {
var row = [];
for (var j = 0; j < ncols; j++) {
row.push(data[i][keys[j]]);
};
rows.push(row);
};
};
const data_formatted = { 'columnnames': keys, 'ncols': ncols, 'nrows': nrows, 'rows': rows };

return data_formatted;

};













const server = restify.createServer();
server.use(restify.queryParser());
server.use(restify.CORS({
Expand All@@ -136,59 +53,42 @@ server.use(restify.CORS({

server.listen(5000, function(){
console.log('%s listening at %s', server.name, server.url);
})


// extract variables from the sent url to localhost 5000
var usr = 'readonly';
var psw = 'password';
var db = 'world';
var prt = 3308;
var engine = 'mysql';

console.log('Trying to connect to database ' + db + ' as ' + usr);

const sequelize = new Sequelize(db, usr, psw, {
dialect: engine, // 'mysql'|'mariadb'|'sqlite'|'postgres'|'mssql'
port: prt, // or 5432 (for postgres)
});

mainWindow.webContents.on('did-finish-load', function() {

console.warn('making request');
sequelize.authenticate().then(msg => {
console.warn('succcess: ', msg);
mainWindow.webContents.send('channel', {success: msg});

}).catch(err => {
console.warn('failed: ', err);
mainWindow.webContents.send('channel', {error: err});
ipcMain.on('connect', function(event, payload) {
var usr = 'root';
var psw = 'MyPassword1';
var db = 'fake_plotly';
var prt = 3306;
var engine = 'mysql';

console.warn('payload: ', payload);
sequelizeManager.initialize(usr, psw, db, prt, engine);
console.warn('connection state is ', sequelizeManager.connectionState);
event.sender.send('channel', {error: sequelizeManager.connectionState});
});

ipcMain.on('receive', function(event, payload) {
console.log('payload: ', payload);

sequelize.query(payload.statement).spread((rows, metadata) => {
console.warn('payload: ', payload);
sequelizeManager.connection.query(payload.statement).spread((rows, metadata) => {
const response = {rows, metadata, error: ''};
event.sender.send('channel', response);
}).catch(err => {
console.warn('ERROR: ', err);
event.sender.send('channel', {error: err});
});

});


server.get('/query', function(req, res, next) {
console.warn('query: ', req.query.statement);
const statement = req.query.statement;
mainWindow.webContents.send('channel', {log: statement});
sequelize.query(statement).spread((rows, metadata) => {
sequelizeManager.connection.query(statement).spread((rows, metadata) => {
const response = {rows, metadata, error: ''};

// Send back to app
mainWindow.webContents.send('channel', response);

// Send back to plotly 2.0
const parsedResponse = parse(rows);
console.warn('response: ', parsedResponse);
Expand All@@ -199,8 +99,6 @@ mainWindow.webContents.on('did-finish-load', function() {
res.send({err});
});
});


});

if (process.env.NODE_ENV === 'development') {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content

This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Disconnect front end update state from ipc actions and create a new sequelizeManager class#1
 Merged

chriddyp
merged 8 commits into

from

May 16, 2016
 Merged


Disconnect front end update state from ipc actions and create a new sequelizeManager class
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
fb2fdd2

Delete the query actions, they are within the ipc


alexandresobolevski May 13, 2016
4363f01

Create object sequelizeManager that is seen by all ipc events and sep…


alexandresobolevski May 13, 2016
71163e0

decouple update state from ipc actions using buttons


alexandresobolevski May 13, 2016
5f896ff

Remove console.log or change to console.warn


alexandresobolevski May 14, 2016
91b09d8

Remove useless comment


alexandresobolevski May 14, 2016
bec4cff

Make visible connection message


alexandresobolevski May 14, 2016
2a35b62

Send back to the app the connection state


alexandresobolevski May 14, 2016
0e7c9da

Add style to buttons and make the editor smaller


alexandresobolevski May 16, 2016

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


7 changes: 7 additions & 0 deletions
app/actions/ipc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,3 +11,10 @@ export function query (statement) {
 ipcRenderer.send('receive', {statement});
 }
}

export function connect (statement) {
 return dispatch => {
 console.warn('proceeding to connect to database');
 ipcRenderer.send('connect', {statement});
 }
}

35 changes: 0 additions & 35 deletions
app/actions/query.js

View file


Open in desktop


This file was deleted.


24 changes: 24 additions & 0 deletions
app/components/Configuration.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
.btnGroup {
 position: relative;
 top: 0px;
 width: 420px;
 margin: 0 auto;
}

.btn {
 font-size: 0.75rem;
 font-weight: bold;
 background-color: #fff;
 border-radius: 50%;
 margin: 10px;
 width: 75px;
 height: 75px;
 opacity: .7;
 cursor: pointer;
 font-family: Arial, Helvetica, Helvetica Neue;
}

.btn:hover {
 color: white;
 background-color: rgba(0, 0, 0, 0.5);
}

45 changes: 27 additions & 18 deletions
app/components/Configuration.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import Immutable from 'immutable';
import AceEditor from 'react-ace';
import brace from 'brace';
import styles from './Configuration.css';


require('brace/mode/sql');
Expand All@@ -13,21 +14,23 @@ require('brace/theme/tomorrow');
export default class Configuration extends Component {
 constructor(props) {
 super(props);
 this.state = {query: ''}
 this.state = {query: ''};
 }

 render() {
 console.warn('this.props: ', this.props);
 const configuration = this.props.configuration.toJS();

 const onChange = query => {
 this.setState({query})
 this.props.ipcActions.query(query);
 /*
 this.props.configActions.setValue({
 key: e.target.value, value: e.target.value
 });
 */
 const onChangeQuery = query => {
 this.setState({query});
 }

 const onPressConnect = (event) => {
 this.props.ipcActions.connect(this.state.connect);
 }

 const onSendQuery = (event) => {
 this.props.ipcActions.query(this.state.query);
 }

 return (
Expand All@@ -37,30 +40,36 @@ export default class Configuration extends Component {

 <AceEditor
 value={this.state.query}
 onChange={onChange}
 onChange={onChangeQuery}
 mode="sql"
 theme="tomorrow"
 height='100'
 />

 <input onChange={onChange}/>
 <div className={styles.btnGroup}>
 <button className={styles.btn} onClick={onPressConnect}>
 connect
 </button>
 <button className={styles.btn} onClick={onSendQuery}>
 query
 </button>
 </div>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().log, null, 2)}
 {JSON.stringify(this.props.ipc.toJS().rows, null, 2)}
 </pre>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().rows, null, 2)}
 {JSON.stringify(this.props.ipc.toJS().log, null, 2)}
 </pre>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().metadata, null, 2)}
 </pre>


 <pre>
 {JSON.stringify(this.props.ipc.toJS().error, null, 2)}
 </pre>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().error, null, 2)}
 </pre>

 </div>
 </div>
Expand Down

2 changes: 0 additions & 2 deletions
app/containers/ConfigurationPage.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import Configuration from '../components/Configuration.react';
import * as ConfigurationActions from '../actions/configuration';
import * as QueryActions from '../actions/query';
import * as IpcActions from '../actions/ipc';

function mapStateToProps(state) {
Expand All@@ -16,7 +15,6 @@ function mapStateToProps(state) {
function mapDispatchToProps(dispatch) {
 const configActions = bindActionCreators(ConfigurationActions, dispatch);
 const ipcActions = bindActionCreators(IpcActions, dispatch);
 // const queryActions = bindActionCreators(QueryActions, dispatch);

 return {configActions, ipcActions};
}
Expand Down

140 changes: 19 additions & 121 deletions
main.development.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,12 @@ import { app, BrowserWindow, Menu, crashReporter, shell } from 'electron';
import { createStore, applyMiddleware, compose } from 'redux';
import { electronEnhancer } from 'redux-electron-store';
import Immutable from 'immutable';
import Sequelize from 'sequelize';
import restify from 'restify';
import parse from './parse';


var sequelizeActions = require('./sequelizeManager');
let sequelizeManager = new sequelizeActions();

const ipcMain = require('electron').ipcMain;

Expand All@@ -13,58 +17,14 @@ let mainWindow = null;

crashReporter.start();


if (process.env.NODE_ENV === 'development') {
 require('electron-debug')();
}

/*
// REDUX STORE
let enhancer = compose(
 // applyMiddleware(...middleware),
 electronEnhancer()
);

const initialState = Immutable.Map({
 query: 'asdfasdfasdf',
 status: true,
 config: {
 username: 'chris',
 pw: 'test'
 }
});

function reducer(state = initialState, action) {
 switch (action.type) {
 case 'update':
 state = state.set(action.key, action.value);
 console.warn('updating store: ', state.toJS());
 return state;
 default:
 return state;
 }
}

// Note: passing enhancer as the last argument to createStore requires redux@>=3.1.0
let i = 99;
// const initialState = Immutable.Map({test: i});
const store = createStore(reducer, initialState, electronEnhancer());

setInterval(() => {
 console.warn(`dispatching ${i}`);
 i += 1;
 store.dispatch({type: 'update', key: 'test', value: i});
}, 10000);
*/


//////////

app.on('window-all-closed', () => {
 if (process.platform !== 'darwin') app.quit();
});


app.on('ready', () => {
 mainWindow = new BrowserWindow({
 show: false,
Expand All@@ -83,49 +43,6 @@ app.on('ready', () => {
 mainWindow = null;
 });




 function parse(data) {

 var nrows = data.length;

 if (nrows === undefined || nrows === null){
 keys = ['message'];
 nrows = 1;
 ncols = 1;
 rows = [['command executed']];
 }else{
 var rows = [];
 var ncols = Object.keys(data[0]).length;
 var keys = Object.keys(data[0]);

 for (var i = 0; i < nrows; i++) {
 var row = [];
 for (var j = 0; j < ncols; j++) {
 row.push(data[i][keys[j]]);
 };
 rows.push(row);
 };
 };
 const data_formatted = { 'columnnames': keys, 'ncols': ncols, 'nrows': nrows, 'rows': rows };

 return data_formatted;

 };













const server = restify.createServer();
server.use(restify.queryParser());
server.use(restify.CORS({
Expand All@@ -136,59 +53,42 @@ server.use(restify.CORS({

server.listen(5000, function(){
 console.log('%s listening at %s', server.name, server.url);
})


// extract variables from the sent url to localhost 5000
var usr = 'readonly';
var psw = 'password';
var db = 'world';
var prt = 3308;
var engine = 'mysql';

console.log('Trying to connect to database ' + db + ' as ' + usr);

const sequelize = new Sequelize(db, usr, psw, {
 dialect: engine, // 'mysql'|'mariadb'|'sqlite'|'postgres'|'mssql'
 port: prt, // or 5432 (for postgres)
});

mainWindow.webContents.on('did-finish-load', function() {

 console.warn('making request');
 sequelize.authenticate().then(msg => {
 console.warn('succcess: ', msg);
 mainWindow.webContents.send('channel', {success: msg});

 }).catch(err => {
 console.warn('failed: ', err);
 mainWindow.webContents.send('channel', {error: err});
 ipcMain.on('connect', function(event, payload) {
 var usr = 'root';
 var psw = 'MyPassword1';
 var db = 'fake_plotly';
 var prt = 3306;
 var engine = 'mysql';

 console.warn('payload: ', payload);
 sequelizeManager.initialize(usr, psw, db, prt, engine);
 console.warn('connection state is ', sequelizeManager.connectionState);
 event.sender.send('channel', {error: sequelizeManager.connectionState});
 });

 ipcMain.on('receive', function(event, payload) {
 console.log('payload: ', payload);

 sequelize.query(payload.statement).spread((rows, metadata) => {
 console.warn('payload: ', payload);
 sequelizeManager.connection.query(payload.statement).spread((rows, metadata) => {
 const response = {rows, metadata, error: ''};
 event.sender.send('channel', response);
 }).catch(err => {
 console.warn('ERROR: ', err);
 event.sender.send('channel', {error: err});
 });

 });


 server.get('/query', function(req, res, next) {
 console.warn('query: ', req.query.statement);
 const statement = req.query.statement;
 mainWindow.webContents.send('channel', {log: statement});
sequelize.query(statement).spread((rows, metadata) => {
sequelizeManager.connection.query(statement).spread((rows, metadata) => {
 const response = {rows, metadata, error: ''};

 // Send back to app
 mainWindow.webContents.send('channel', response);

 // Send back to plotly 2.0
 const parsedResponse = parse(rows);
 console.warn('response: ', parsedResponse);
Expand All@@ -199,8 +99,6 @@ mainWindow.webContents.on('did-finish-load', function() {
 res.send({err});
 });
 });


});

 if (process.env.NODE_ENV === 'development') {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Disconnect front end update state from ipc actions and create a new sequelizeManager class#1
 Merged

chriddyp
merged 8 commits into

from

May 16, 2016
 Merged


Disconnect front end update state from ipc actions and create a new sequelizeManager class
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
fb2fdd2

Delete the query actions, they are within the ipc


alexandresobolevski May 13, 2016
4363f01

Create object sequelizeManager that is seen by all ipc events and sep…


alexandresobolevski May 13, 2016
71163e0

decouple update state from ipc actions using buttons


alexandresobolevski May 13, 2016
5f896ff

Remove console.log or change to console.warn


alexandresobolevski May 14, 2016
91b09d8

Remove useless comment


alexandresobolevski May 14, 2016
bec4cff

Make visible connection message


alexandresobolevski May 14, 2016
2a35b62

Send back to the app the connection state


alexandresobolevski May 14, 2016
0e7c9da

Add style to buttons and make the editor smaller


alexandresobolevski May 16, 2016

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


7 changes: 7 additions & 0 deletions
app/actions/ipc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,3 +11,10 @@ export function query (statement) {
 ipcRenderer.send('receive', {statement});
 }
}

export function connect (statement) {
 return dispatch => {
 console.warn('proceeding to connect to database');
 ipcRenderer.send('connect', {statement});
 }
}

35 changes: 0 additions & 35 deletions
app/actions/query.js

View file


Open in desktop


This file was deleted.


24 changes: 24 additions & 0 deletions
app/components/Configuration.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
.btnGroup {
 position: relative;
 top: 0px;
 width: 420px;
 margin: 0 auto;
}

.btn {
 font-size: 0.75rem;
 font-weight: bold;
 background-color: #fff;
 border-radius: 50%;
 margin: 10px;
 width: 75px;
 height: 75px;
 opacity: .7;
 cursor: pointer;
 font-family: Arial, Helvetica, Helvetica Neue;
}

.btn:hover {
 color: white;
 background-color: rgba(0, 0, 0, 0.5);
}

45 changes: 27 additions & 18 deletions
app/components/Configuration.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import Immutable from 'immutable';
import AceEditor from 'react-ace';
import brace from 'brace';
import styles from './Configuration.css';


require('brace/mode/sql');
Expand All@@ -13,21 +14,23 @@ require('brace/theme/tomorrow');
export default class Configuration extends Component {
 constructor(props) {
 super(props);
 this.state = {query: ''}
 this.state = {query: ''};
 }

 render() {
 console.warn('this.props: ', this.props);
 const configuration = this.props.configuration.toJS();

 const onChange = query => {
 this.setState({query})
 this.props.ipcActions.query(query);
 /*
 this.props.configActions.setValue({
 key: e.target.value, value: e.target.value
 });
 */
 const onChangeQuery = query => {
 this.setState({query});
 }

 const onPressConnect = (event) => {
 this.props.ipcActions.connect(this.state.connect);
 }

 const onSendQuery = (event) => {
 this.props.ipcActions.query(this.state.query);
 }

 return (
Expand All@@ -37,30 +40,36 @@ export default class Configuration extends Component {

 <AceEditor
 value={this.state.query}
 onChange={onChange}
 onChange={onChangeQuery}
 mode="sql"
 theme="tomorrow"
 height='100'
 />

 <input onChange={onChange}/>
 <div className={styles.btnGroup}>
 <button className={styles.btn} onClick={onPressConnect}>
 connect
 </button>
 <button className={styles.btn} onClick={onSendQuery}>
 query
 </button>
 </div>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().log, null, 2)}
 {JSON.stringify(this.props.ipc.toJS().rows, null, 2)}
 </pre>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().rows, null, 2)}
 {JSON.stringify(this.props.ipc.toJS().log, null, 2)}
 </pre>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().metadata, null, 2)}
 </pre>


 <pre>
 {JSON.stringify(this.props.ipc.toJS().error, null, 2)}
 </pre>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().error, null, 2)}
 </pre>

 </div>
 </div>
Expand Down

2 changes: 0 additions & 2 deletions
app/containers/ConfigurationPage.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import Configuration from '../components/Configuration.react';
import * as ConfigurationActions from '../actions/configuration';
import * as QueryActions from '../actions/query';
import * as IpcActions from '../actions/ipc';

function mapStateToProps(state) {
Expand All@@ -16,7 +15,6 @@ function mapStateToProps(state) {
function mapDispatchToProps(dispatch) {
 const configActions = bindActionCreators(ConfigurationActions, dispatch);
 const ipcActions = bindActionCreators(IpcActions, dispatch);
 // const queryActions = bindActionCreators(QueryActions, dispatch);

 return {configActions, ipcActions};
}
Expand Down

140 changes: 19 additions & 121 deletions
main.development.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,12 @@ import { app, BrowserWindow, Menu, crashReporter, shell } from 'electron';
import { createStore, applyMiddleware, compose } from 'redux';
import { electronEnhancer } from 'redux-electron-store';
import Immutable from 'immutable';
import Sequelize from 'sequelize';
import restify from 'restify';
import parse from './parse';


var sequelizeActions = require('./sequelizeManager');
let sequelizeManager = new sequelizeActions();

const ipcMain = require('electron').ipcMain;

Expand All@@ -13,58 +17,14 @@ let mainWindow = null;

crashReporter.start();


if (process.env.NODE_ENV === 'development') {
 require('electron-debug')();
}

/*
// REDUX STORE
let enhancer = compose(
 // applyMiddleware(...middleware),
 electronEnhancer()
);

const initialState = Immutable.Map({
 query: 'asdfasdfasdf',
 status: true,
 config: {
 username: 'chris',
 pw: 'test'
 }
});

function reducer(state = initialState, action) {
 switch (action.type) {
 case 'update':
 state = state.set(action.key, action.value);
 console.warn('updating store: ', state.toJS());
 return state;
 default:
 return state;
 }
}

// Note: passing enhancer as the last argument to createStore requires redux@>=3.1.0
let i = 99;
// const initialState = Immutable.Map({test: i});
const store = createStore(reducer, initialState, electronEnhancer());

setInterval(() => {
 console.warn(`dispatching ${i}`);
 i += 1;
 store.dispatch({type: 'update', key: 'test', value: i});
}, 10000);
*/


//////////

app.on('window-all-closed', () => {
 if (process.platform !== 'darwin') app.quit();
});


app.on('ready', () => {
 mainWindow = new BrowserWindow({
 show: false,
Expand All@@ -83,49 +43,6 @@ app.on('ready', () => {
 mainWindow = null;
 });




 function parse(data) {

 var nrows = data.length;

 if (nrows === undefined || nrows === null){
 keys = ['message'];
 nrows = 1;
 ncols = 1;
 rows = [['command executed']];
 }else{
 var rows = [];
 var ncols = Object.keys(data[0]).length;
 var keys = Object.keys(data[0]);

 for (var i = 0; i < nrows; i++) {
 var row = [];
 for (var j = 0; j < ncols; j++) {
 row.push(data[i][keys[j]]);
 };
 rows.push(row);
 };
 };
 const data_formatted = { 'columnnames': keys, 'ncols': ncols, 'nrows': nrows, 'rows': rows };

 return data_formatted;

 };













const server = restify.createServer();
server.use(restify.queryParser());
server.use(restify.CORS({
Expand All@@ -136,59 +53,42 @@ server.use(restify.CORS({

server.listen(5000, function(){
 console.log('%s listening at %s', server.name, server.url);
})


// extract variables from the sent url to localhost 5000
var usr = 'readonly';
var psw = 'password';
var db = 'world';
var prt = 3308;
var engine = 'mysql';

console.log('Trying to connect to database ' + db + ' as ' + usr);

const sequelize = new Sequelize(db, usr, psw, {
 dialect: engine, // 'mysql'|'mariadb'|'sqlite'|'postgres'|'mssql'
 port: prt, // or 5432 (for postgres)
});

mainWindow.webContents.on('did-finish-load', function() {

 console.warn('making request');
 sequelize.authenticate().then(msg => {
 console.warn('succcess: ', msg);
 mainWindow.webContents.send('channel', {success: msg});

 }).catch(err => {
 console.warn('failed: ', err);
 mainWindow.webContents.send('channel', {error: err});
 ipcMain.on('connect', function(event, payload) {
 var usr = 'root';
 var psw = 'MyPassword1';
 var db = 'fake_plotly';
 var prt = 3306;
 var engine = 'mysql';

 console.warn('payload: ', payload);
 sequelizeManager.initialize(usr, psw, db, prt, engine);
 console.warn('connection state is ', sequelizeManager.connectionState);
 event.sender.send('channel', {error: sequelizeManager.connectionState});
 });

 ipcMain.on('receive', function(event, payload) {
 console.log('payload: ', payload);

 sequelize.query(payload.statement).spread((rows, metadata) => {
 console.warn('payload: ', payload);
 sequelizeManager.connection.query(payload.statement).spread((rows, metadata) => {
 const response = {rows, metadata, error: ''};
 event.sender.send('channel', response);
 }).catch(err => {
 console.warn('ERROR: ', err);
 event.sender.send('channel', {error: err});
 });

 });


 server.get('/query', function(req, res, next) {
 console.warn('query: ', req.query.statement);
 const statement = req.query.statement;
 mainWindow.webContents.send('channel', {log: statement});
sequelize.query(statement).spread((rows, metadata) => {
sequelizeManager.connection.query(statement).spread((rows, metadata) => {
 const response = {rows, metadata, error: ''};

 // Send back to app
 mainWindow.webContents.send('channel', response);

 // Send back to plotly 2.0
 const parsedResponse = parse(rows);
 console.warn('response: ', parsedResponse);
Expand All@@ -199,8 +99,6 @@ mainWindow.webContents.on('did-finish-load', function() {
 res.send({err});
 });
 });


});

 if (process.env.NODE_ENV === 'development') {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Disconnect front end update state from ipc actions and create a new sequelizeManager class#1
 Merged

chriddyp
merged 8 commits into

from

May 16, 2016
 Merged


Disconnect front end update state from ipc actions and create a new sequelizeManager class
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
fb2fdd2

Delete the query actions, they are within the ipc


alexandresobolevski May 13, 2016
4363f01

Create object sequelizeManager that is seen by all ipc events and sep…


alexandresobolevski May 13, 2016
71163e0

decouple update state from ipc actions using buttons


alexandresobolevski May 13, 2016
5f896ff

Remove console.log or change to console.warn


alexandresobolevski May 14, 2016
91b09d8

Remove useless comment


alexandresobolevski May 14, 2016
bec4cff

Make visible connection message


alexandresobolevski May 14, 2016
2a35b62

Send back to the app the connection state


alexandresobolevski May 14, 2016
0e7c9da

Add style to buttons and make the editor smaller


alexandresobolevski May 16, 2016

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


7 changes: 7 additions & 0 deletions
app/actions/ipc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,3 +11,10 @@ export function query (statement) {
 ipcRenderer.send('receive', {statement});
 }
}

export function connect (statement) {
 return dispatch => {
 console.warn('proceeding to connect to database');
 ipcRenderer.send('connect', {statement});
 }
}

35 changes: 0 additions & 35 deletions
app/actions/query.js

View file


Open in desktop


This file was deleted.


24 changes: 24 additions & 0 deletions
app/components/Configuration.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
.btnGroup {
 position: relative;
 top: 0px;
 width: 420px;
 margin: 0 auto;
}

.btn {
 font-size: 0.75rem;
 font-weight: bold;
 background-color: #fff;
 border-radius: 50%;
 margin: 10px;
 width: 75px;
 height: 75px;
 opacity: .7;
 cursor: pointer;
 font-family: Arial, Helvetica, Helvetica Neue;
}

.btn:hover {
 color: white;
 background-color: rgba(0, 0, 0, 0.5);
}

45 changes: 27 additions & 18 deletions
app/components/Configuration.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import Immutable from 'immutable';
import AceEditor from 'react-ace';
import brace from 'brace';
import styles from './Configuration.css';


require('brace/mode/sql');
Expand All@@ -13,21 +14,23 @@ require('brace/theme/tomorrow');
export default class Configuration extends Component {
 constructor(props) {
 super(props);
 this.state = {query: ''}
 this.state = {query: ''};
 }

 render() {
 console.warn('this.props: ', this.props);
 const configuration = this.props.configuration.toJS();

 const onChange = query => {
 this.setState({query})
 this.props.ipcActions.query(query);
 /*
 this.props.configActions.setValue({
 key: e.target.value, value: e.target.value
 });
 */
 const onChangeQuery = query => {
 this.setState({query});
 }

 const onPressConnect = (event) => {
 this.props.ipcActions.connect(this.state.connect);
 }

 const onSendQuery = (event) => {
 this.props.ipcActions.query(this.state.query);
 }

 return (
Expand All@@ -37,30 +40,36 @@ export default class Configuration extends Component {

 <AceEditor
 value={this.state.query}
 onChange={onChange}
 onChange={onChangeQuery}
 mode="sql"
 theme="tomorrow"
 height='100'
 />

 <input onChange={onChange}/>
 <div className={styles.btnGroup}>
 <button className={styles.btn} onClick={onPressConnect}>
 connect
 </button>
 <button className={styles.btn} onClick={onSendQuery}>
 query
 </button>
 </div>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().log, null, 2)}
 {JSON.stringify(this.props.ipc.toJS().rows, null, 2)}
 </pre>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().rows, null, 2)}
 {JSON.stringify(this.props.ipc.toJS().log, null, 2)}
 </pre>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().metadata, null, 2)}
 </pre>


 <pre>
 {JSON.stringify(this.props.ipc.toJS().error, null, 2)}
 </pre>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().error, null, 2)}
 </pre>

 </div>
 </div>
Expand Down

2 changes: 0 additions & 2 deletions
app/containers/ConfigurationPage.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import Configuration from '../components/Configuration.react';
import * as ConfigurationActions from '../actions/configuration';
import * as QueryActions from '../actions/query';
import * as IpcActions from '../actions/ipc';

function mapStateToProps(state) {
Expand All@@ -16,7 +15,6 @@ function mapStateToProps(state) {
function mapDispatchToProps(dispatch) {
 const configActions = bindActionCreators(ConfigurationActions, dispatch);
 const ipcActions = bindActionCreators(IpcActions, dispatch);
 // const queryActions = bindActionCreators(QueryActions, dispatch);

 return {configActions, ipcActions};
}
Expand Down

140 changes: 19 additions & 121 deletions
main.development.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,12 @@ import { app, BrowserWindow, Menu, crashReporter, shell } from 'electron';
import { createStore, applyMiddleware, compose } from 'redux';
import { electronEnhancer } from 'redux-electron-store';
import Immutable from 'immutable';
import Sequelize from 'sequelize';
import restify from 'restify';
import parse from './parse';


var sequelizeActions = require('./sequelizeManager');
let sequelizeManager = new sequelizeActions();

const ipcMain = require('electron').ipcMain;

Expand All@@ -13,58 +17,14 @@ let mainWindow = null;

crashReporter.start();


if (process.env.NODE_ENV === 'development') {
 require('electron-debug')();
}

/*
// REDUX STORE
let enhancer = compose(
 // applyMiddleware(...middleware),
 electronEnhancer()
);

const initialState = Immutable.Map({
 query: 'asdfasdfasdf',
 status: true,
 config: {
 username: 'chris',
 pw: 'test'
 }
});

function reducer(state = initialState, action) {
 switch (action.type) {
 case 'update':
 state = state.set(action.key, action.value);
 console.warn('updating store: ', state.toJS());
 return state;
 default:
 return state;
 }
}

// Note: passing enhancer as the last argument to createStore requires redux@>=3.1.0
let i = 99;
// const initialState = Immutable.Map({test: i});
const store = createStore(reducer, initialState, electronEnhancer());

setInterval(() => {
 console.warn(`dispatching ${i}`);
 i += 1;
 store.dispatch({type: 'update', key: 'test', value: i});
}, 10000);
*/


//////////

app.on('window-all-closed', () => {
 if (process.platform !== 'darwin') app.quit();
});


app.on('ready', () => {
 mainWindow = new BrowserWindow({
 show: false,
Expand All@@ -83,49 +43,6 @@ app.on('ready', () => {
 mainWindow = null;
 });




 function parse(data) {

 var nrows = data.length;

 if (nrows === undefined || nrows === null){
 keys = ['message'];
 nrows = 1;
 ncols = 1;
 rows = [['command executed']];
 }else{
 var rows = [];
 var ncols = Object.keys(data[0]).length;
 var keys = Object.keys(data[0]);

 for (var i = 0; i < nrows; i++) {
 var row = [];
 for (var j = 0; j < ncols; j++) {
 row.push(data[i][keys[j]]);
 };
 rows.push(row);
 };
 };
 const data_formatted = { 'columnnames': keys, 'ncols': ncols, 'nrows': nrows, 'rows': rows };

 return data_formatted;

 };













const server = restify.createServer();
server.use(restify.queryParser());
server.use(restify.CORS({
Expand All@@ -136,59 +53,42 @@ server.use(restify.CORS({

server.listen(5000, function(){
 console.log('%s listening at %s', server.name, server.url);
})


// extract variables from the sent url to localhost 5000
var usr = 'readonly';
var psw = 'password';
var db = 'world';
var prt = 3308;
var engine = 'mysql';

console.log('Trying to connect to database ' + db + ' as ' + usr);

const sequelize = new Sequelize(db, usr, psw, {
 dialect: engine, // 'mysql'|'mariadb'|'sqlite'|'postgres'|'mssql'
 port: prt, // or 5432 (for postgres)
});

mainWindow.webContents.on('did-finish-load', function() {

 console.warn('making request');
 sequelize.authenticate().then(msg => {
 console.warn('succcess: ', msg);
 mainWindow.webContents.send('channel', {success: msg});

 }).catch(err => {
 console.warn('failed: ', err);
 mainWindow.webContents.send('channel', {error: err});
 ipcMain.on('connect', function(event, payload) {
 var usr = 'root';
 var psw = 'MyPassword1';
 var db = 'fake_plotly';
 var prt = 3306;
 var engine = 'mysql';

 console.warn('payload: ', payload);
 sequelizeManager.initialize(usr, psw, db, prt, engine);
 console.warn('connection state is ', sequelizeManager.connectionState);
 event.sender.send('channel', {error: sequelizeManager.connectionState});
 });

 ipcMain.on('receive', function(event, payload) {
 console.log('payload: ', payload);

 sequelize.query(payload.statement).spread((rows, metadata) => {
 console.warn('payload: ', payload);
 sequelizeManager.connection.query(payload.statement).spread((rows, metadata) => {
 const response = {rows, metadata, error: ''};
 event.sender.send('channel', response);
 }).catch(err => {
 console.warn('ERROR: ', err);
 event.sender.send('channel', {error: err});
 });

 });


 server.get('/query', function(req, res, next) {
 console.warn('query: ', req.query.statement);
 const statement = req.query.statement;
 mainWindow.webContents.send('channel', {log: statement});
sequelize.query(statement).spread((rows, metadata) => {
sequelizeManager.connection.query(statement).spread((rows, metadata) => {
 const response = {rows, metadata, error: ''};

 // Send back to app
 mainWindow.webContents.send('channel', response);

 // Send back to plotly 2.0
 const parsedResponse = parse(rows);
 console.warn('response: ', parsedResponse);
Expand All@@ -199,8 +99,6 @@ mainWindow.webContents.on('did-finish-load', function() {
 res.send({err});
 });
 });


});

 if (process.env.NODE_ENV === 'development') {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content

This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Disconnect front end update state from ipc actions and create a new sequelizeManager class#1
 Merged

chriddyp
merged 8 commits into

from

May 16, 2016
 Merged


Disconnect front end update state from ipc actions and create a new sequelizeManager class
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
fb2fdd2

Delete the query actions, they are within the ipc


alexandresobolevski May 13, 2016
4363f01

Create object sequelizeManager that is seen by all ipc events and sep…


alexandresobolevski May 13, 2016
71163e0

decouple update state from ipc actions using buttons


alexandresobolevski May 13, 2016
5f896ff

Remove console.log or change to console.warn


alexandresobolevski May 14, 2016
91b09d8

Remove useless comment


alexandresobolevski May 14, 2016
bec4cff

Make visible connection message


alexandresobolevski May 14, 2016
2a35b62

Send back to the app the connection state


alexandresobolevski May 14, 2016
0e7c9da

Add style to buttons and make the editor smaller


alexandresobolevski May 16, 2016

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


7 changes: 7 additions & 0 deletions
app/actions/ipc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,3 +11,10 @@ export function query (statement) {
 ipcRenderer.send('receive', {statement});
 }
}

export function connect (statement) {
 return dispatch => {
 console.warn('proceeding to connect to database');
 ipcRenderer.send('connect', {statement});
 }
}

35 changes: 0 additions & 35 deletions
app/actions/query.js

View file


Open in desktop


This file was deleted.


24 changes: 24 additions & 0 deletions
app/components/Configuration.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
.btnGroup {
 position: relative;
 top: 0px;
 width: 420px;
 margin: 0 auto;
}

.btn {
 font-size: 0.75rem;
 font-weight: bold;
 background-color: #fff;
 border-radius: 50%;
 margin: 10px;
 width: 75px;
 height: 75px;
 opacity: .7;
 cursor: pointer;
 font-family: Arial, Helvetica, Helvetica Neue;
}

.btn:hover {
 color: white;
 background-color: rgba(0, 0, 0, 0.5);
}

45 changes: 27 additions & 18 deletions
app/components/Configuration.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import Immutable from 'immutable';
import AceEditor from 'react-ace';
import brace from 'brace';
import styles from './Configuration.css';


require('brace/mode/sql');
Expand All@@ -13,21 +14,23 @@ require('brace/theme/tomorrow');
export default class Configuration extends Component {
 constructor(props) {
 super(props);
 this.state = {query: ''}
 this.state = {query: ''};
 }

 render() {
 console.warn('this.props: ', this.props);
 const configuration = this.props.configuration.toJS();

 const onChange = query => {
 this.setState({query})
 this.props.ipcActions.query(query);
 /*
 this.props.configActions.setValue({
 key: e.target.value, value: e.target.value
 });
 */
 const onChangeQuery = query => {
 this.setState({query});
 }

 const onPressConnect = (event) => {
 this.props.ipcActions.connect(this.state.connect);
 }

 const onSendQuery = (event) => {
 this.props.ipcActions.query(this.state.query);
 }

 return (
Expand All@@ -37,30 +40,36 @@ export default class Configuration extends Component {

 <AceEditor
 value={this.state.query}
 onChange={onChange}
 onChange={onChangeQuery}
 mode="sql"
 theme="tomorrow"
 height='100'
 />

 <input onChange={onChange}/>
 <div className={styles.btnGroup}>
 <button className={styles.btn} onClick={onPressConnect}>
 connect
 </button>
 <button className={styles.btn} onClick={onSendQuery}>
 query
 </button>
 </div>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().log, null, 2)}
 {JSON.stringify(this.props.ipc.toJS().rows, null, 2)}
 </pre>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().rows, null, 2)}
 {JSON.stringify(this.props.ipc.toJS().log, null, 2)}
 </pre>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().metadata, null, 2)}
 </pre>


 <pre>
 {JSON.stringify(this.props.ipc.toJS().error, null, 2)}
 </pre>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().error, null, 2)}
 </pre>

 </div>
 </div>
Expand Down

2 changes: 0 additions & 2 deletions
app/containers/ConfigurationPage.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import Configuration from '../components/Configuration.react';
import * as ConfigurationActions from '../actions/configuration';
import * as QueryActions from '../actions/query';
import * as IpcActions from '../actions/ipc';

function mapStateToProps(state) {
Expand All@@ -16,7 +15,6 @@ function mapStateToProps(state) {
function mapDispatchToProps(dispatch) {
 const configActions = bindActionCreators(ConfigurationActions, dispatch);
 const ipcActions = bindActionCreators(IpcActions, dispatch);
 // const queryActions = bindActionCreators(QueryActions, dispatch);

 return {configActions, ipcActions};
}
Expand Down

140 changes: 19 additions & 121 deletions
main.development.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,12 @@ import { app, BrowserWindow, Menu, crashReporter, shell } from 'electron';
import { createStore, applyMiddleware, compose } from 'redux';
import { electronEnhancer } from 'redux-electron-store';
import Immutable from 'immutable';
import Sequelize from 'sequelize';
import restify from 'restify';
import parse from './parse';


var sequelizeActions = require('./sequelizeManager');
let sequelizeManager = new sequelizeActions();

const ipcMain = require('electron').ipcMain;

Expand All@@ -13,58 +17,14 @@ let mainWindow = null;

crashReporter.start();


if (process.env.NODE_ENV === 'development') {
 require('electron-debug')();
}

/*
// REDUX STORE
let enhancer = compose(
 // applyMiddleware(...middleware),
 electronEnhancer()
);

const initialState = Immutable.Map({
 query: 'asdfasdfasdf',
 status: true,
 config: {
 username: 'chris',
 pw: 'test'
 }
});

function reducer(state = initialState, action) {
 switch (action.type) {
 case 'update':
 state = state.set(action.key, action.value);
 console.warn('updating store: ', state.toJS());
 return state;
 default:
 return state;
 }
}

// Note: passing enhancer as the last argument to createStore requires redux@>=3.1.0
let i = 99;
// const initialState = Immutable.Map({test: i});
const store = createStore(reducer, initialState, electronEnhancer());

setInterval(() => {
 console.warn(`dispatching ${i}`);
 i += 1;
 store.dispatch({type: 'update', key: 'test', value: i});
}, 10000);
*/


//////////

app.on('window-all-closed', () => {
 if (process.platform !== 'darwin') app.quit();
});


app.on('ready', () => {
 mainWindow = new BrowserWindow({
 show: false,
Expand All@@ -83,49 +43,6 @@ app.on('ready', () => {
 mainWindow = null;
 });




 function parse(data) {

 var nrows = data.length;

 if (nrows === undefined || nrows === null){
 keys = ['message'];
 nrows = 1;
 ncols = 1;
 rows = [['command executed']];
 }else{
 var rows = [];
 var ncols = Object.keys(data[0]).length;
 var keys = Object.keys(data[0]);

 for (var i = 0; i < nrows; i++) {
 var row = [];
 for (var j = 0; j < ncols; j++) {
 row.push(data[i][keys[j]]);
 };
 rows.push(row);
 };
 };
 const data_formatted = { 'columnnames': keys, 'ncols': ncols, 'nrows': nrows, 'rows': rows };

 return data_formatted;

 };













const server = restify.createServer();
server.use(restify.queryParser());
server.use(restify.CORS({
Expand All@@ -136,59 +53,42 @@ server.use(restify.CORS({

server.listen(5000, function(){
 console.log('%s listening at %s', server.name, server.url);
})


// extract variables from the sent url to localhost 5000
var usr = 'readonly';
var psw = 'password';
var db = 'world';
var prt = 3308;
var engine = 'mysql';

console.log('Trying to connect to database ' + db + ' as ' + usr);

const sequelize = new Sequelize(db, usr, psw, {
 dialect: engine, // 'mysql'|'mariadb'|'sqlite'|'postgres'|'mssql'
 port: prt, // or 5432 (for postgres)
});

mainWindow.webContents.on('did-finish-load', function() {

 console.warn('making request');
 sequelize.authenticate().then(msg => {
 console.warn('succcess: ', msg);
 mainWindow.webContents.send('channel', {success: msg});

 }).catch(err => {
 console.warn('failed: ', err);
 mainWindow.webContents.send('channel', {error: err});
 ipcMain.on('connect', function(event, payload) {
 var usr = 'root';
 var psw = 'MyPassword1';
 var db = 'fake_plotly';
 var prt = 3306;
 var engine = 'mysql';

 console.warn('payload: ', payload);
 sequelizeManager.initialize(usr, psw, db, prt, engine);
 console.warn('connection state is ', sequelizeManager.connectionState);
 event.sender.send('channel', {error: sequelizeManager.connectionState});
 });

 ipcMain.on('receive', function(event, payload) {
 console.log('payload: ', payload);

 sequelize.query(payload.statement).spread((rows, metadata) => {
 console.warn('payload: ', payload);
 sequelizeManager.connection.query(payload.statement).spread((rows, metadata) => {
 const response = {rows, metadata, error: ''};
 event.sender.send('channel', response);
 }).catch(err => {
 console.warn('ERROR: ', err);
 event.sender.send('channel', {error: err});
 });

 });


 server.get('/query', function(req, res, next) {
 console.warn('query: ', req.query.statement);
 const statement = req.query.statement;
 mainWindow.webContents.send('channel', {log: statement});
sequelize.query(statement).spread((rows, metadata) => {
sequelizeManager.connection.query(statement).spread((rows, metadata) => {
 const response = {rows, metadata, error: ''};

 // Send back to app
 mainWindow.webContents.send('channel', response);

 // Send back to plotly 2.0
 const parsedResponse = parse(rows);
 console.warn('response: ', parsedResponse);
Expand All@@ -199,8 +99,6 @@ mainWindow.webContents.on('did-finish-load', function() {
 res.send({err});
 });
 });


});

 if (process.env.NODE_ENV === 'development') {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Disconnect front end update state from ipc actions and create a new sequelizeManager class#1
 Merged

chriddyp
merged 8 commits into

from

May 16, 2016
 Merged


Disconnect front end update state from ipc actions and create a new sequelizeManager class
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
fb2fdd2

Delete the query actions, they are within the ipc


alexandresobolevski May 13, 2016
4363f01

Create object sequelizeManager that is seen by all ipc events and sep…


alexandresobolevski May 13, 2016
71163e0

decouple update state from ipc actions using buttons


alexandresobolevski May 13, 2016
5f896ff

Remove console.log or change to console.warn


alexandresobolevski May 14, 2016
91b09d8

Remove useless comment


alexandresobolevski May 14, 2016
bec4cff

Make visible connection message


alexandresobolevski May 14, 2016
2a35b62

Send back to the app the connection state


alexandresobolevski May 14, 2016
0e7c9da

Add style to buttons and make the editor smaller


alexandresobolevski May 16, 2016

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


7 changes: 7 additions & 0 deletions
app/actions/ipc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,3 +11,10 @@ export function query (statement) {
 ipcRenderer.send('receive', {statement});
 }
}

export function connect (statement) {
 return dispatch => {
 console.warn('proceeding to connect to database');
 ipcRenderer.send('connect', {statement});
 }
}

35 changes: 0 additions & 35 deletions
app/actions/query.js

View file


Open in desktop


This file was deleted.


24 changes: 24 additions & 0 deletions
app/components/Configuration.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
.btnGroup {
 position: relative;
 top: 0px;
 width: 420px;
 margin: 0 auto;
}

.btn {
 font-size: 0.75rem;
 font-weight: bold;
 background-color: #fff;
 border-radius: 50%;
 margin: 10px;
 width: 75px;
 height: 75px;
 opacity: .7;
 cursor: pointer;
 font-family: Arial, Helvetica, Helvetica Neue;
}

.btn:hover {
 color: white;
 background-color: rgba(0, 0, 0, 0.5);
}

45 changes: 27 additions & 18 deletions
app/components/Configuration.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import Immutable from 'immutable';
import AceEditor from 'react-ace';
import brace from 'brace';
import styles from './Configuration.css';


require('brace/mode/sql');
Expand All@@ -13,21 +14,23 @@ require('brace/theme/tomorrow');
export default class Configuration extends Component {
 constructor(props) {
 super(props);
 this.state = {query: ''}
 this.state = {query: ''};
 }

 render() {
 console.warn('this.props: ', this.props);
 const configuration = this.props.configuration.toJS();

 const onChange = query => {
 this.setState({query})
 this.props.ipcActions.query(query);
 /*
 this.props.configActions.setValue({
 key: e.target.value, value: e.target.value
 });
 */
 const onChangeQuery = query => {
 this.setState({query});
 }

 const onPressConnect = (event) => {
 this.props.ipcActions.connect(this.state.connect);
 }

 const onSendQuery = (event) => {
 this.props.ipcActions.query(this.state.query);
 }

 return (
Expand All@@ -37,30 +40,36 @@ export default class Configuration extends Component {

 <AceEditor
 value={this.state.query}
 onChange={onChange}
 onChange={onChangeQuery}
 mode="sql"
 theme="tomorrow"
 height='100'
 />

 <input onChange={onChange}/>
 <div className={styles.btnGroup}>
 <button className={styles.btn} onClick={onPressConnect}>
 connect
 </button>
 <button className={styles.btn} onClick={onSendQuery}>
 query
 </button>
 </div>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().log, null, 2)}
 {JSON.stringify(this.props.ipc.toJS().rows, null, 2)}
 </pre>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().rows, null, 2)}
 {JSON.stringify(this.props.ipc.toJS().log, null, 2)}
 </pre>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().metadata, null, 2)}
 </pre>


 <pre>
 {JSON.stringify(this.props.ipc.toJS().error, null, 2)}
 </pre>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().error, null, 2)}
 </pre>

 </div>
 </div>
Expand Down

2 changes: 0 additions & 2 deletions
app/containers/ConfigurationPage.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import Configuration from '../components/Configuration.react';
import * as ConfigurationActions from '../actions/configuration';
import * as QueryActions from '../actions/query';
import * as IpcActions from '../actions/ipc';

function mapStateToProps(state) {
Expand All@@ -16,7 +15,6 @@ function mapStateToProps(state) {
function mapDispatchToProps(dispatch) {
 const configActions = bindActionCreators(ConfigurationActions, dispatch);
 const ipcActions = bindActionCreators(IpcActions, dispatch);
 // const queryActions = bindActionCreators(QueryActions, dispatch);

 return {configActions, ipcActions};
}
Expand Down

140 changes: 19 additions & 121 deletions
main.development.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,12 @@ import { app, BrowserWindow, Menu, crashReporter, shell } from 'electron';
import { createStore, applyMiddleware, compose } from 'redux';
import { electronEnhancer } from 'redux-electron-store';
import Immutable from 'immutable';
import Sequelize from 'sequelize';
import restify from 'restify';
import parse from './parse';


var sequelizeActions = require('./sequelizeManager');
let sequelizeManager = new sequelizeActions();

const ipcMain = require('electron').ipcMain;

Expand All@@ -13,58 +17,14 @@ let mainWindow = null;

crashReporter.start();


if (process.env.NODE_ENV === 'development') {
 require('electron-debug')();
}

/*
// REDUX STORE
let enhancer = compose(
 // applyMiddleware(...middleware),
 electronEnhancer()
);

const initialState = Immutable.Map({
 query: 'asdfasdfasdf',
 status: true,
 config: {
 username: 'chris',
 pw: 'test'
 }
});

function reducer(state = initialState, action) {
 switch (action.type) {
 case 'update':
 state = state.set(action.key, action.value);
 console.warn('updating store: ', state.toJS());
 return state;
 default:
 return state;
 }
}

// Note: passing enhancer as the last argument to createStore requires redux@>=3.1.0
let i = 99;
// const initialState = Immutable.Map({test: i});
const store = createStore(reducer, initialState, electronEnhancer());

setInterval(() => {
 console.warn(`dispatching ${i}`);
 i += 1;
 store.dispatch({type: 'update', key: 'test', value: i});
}, 10000);
*/


//////////

app.on('window-all-closed', () => {
 if (process.platform !== 'darwin') app.quit();
});


app.on('ready', () => {
 mainWindow = new BrowserWindow({
 show: false,
Expand All@@ -83,49 +43,6 @@ app.on('ready', () => {
 mainWindow = null;
 });




 function parse(data) {

 var nrows = data.length;

 if (nrows === undefined || nrows === null){
 keys = ['message'];
 nrows = 1;
 ncols = 1;
 rows = [['command executed']];
 }else{
 var rows = [];
 var ncols = Object.keys(data[0]).length;
 var keys = Object.keys(data[0]);

 for (var i = 0; i < nrows; i++) {
 var row = [];
 for (var j = 0; j < ncols; j++) {
 row.push(data[i][keys[j]]);
 };
 rows.push(row);
 };
 };
 const data_formatted = { 'columnnames': keys, 'ncols': ncols, 'nrows': nrows, 'rows': rows };

 return data_formatted;

 };













const server = restify.createServer();
server.use(restify.queryParser());
server.use(restify.CORS({
Expand All@@ -136,59 +53,42 @@ server.use(restify.CORS({

server.listen(5000, function(){
 console.log('%s listening at %s', server.name, server.url);
})


// extract variables from the sent url to localhost 5000
var usr = 'readonly';
var psw = 'password';
var db = 'world';
var prt = 3308;
var engine = 'mysql';

console.log('Trying to connect to database ' + db + ' as ' + usr);

const sequelize = new Sequelize(db, usr, psw, {
 dialect: engine, // 'mysql'|'mariadb'|'sqlite'|'postgres'|'mssql'
 port: prt, // or 5432 (for postgres)
});

mainWindow.webContents.on('did-finish-load', function() {

 console.warn('making request');
 sequelize.authenticate().then(msg => {
 console.warn('succcess: ', msg);
 mainWindow.webContents.send('channel', {success: msg});

 }).catch(err => {
 console.warn('failed: ', err);
 mainWindow.webContents.send('channel', {error: err});
 ipcMain.on('connect', function(event, payload) {
 var usr = 'root';
 var psw = 'MyPassword1';
 var db = 'fake_plotly';
 var prt = 3306;
 var engine = 'mysql';

 console.warn('payload: ', payload);
 sequelizeManager.initialize(usr, psw, db, prt, engine);
 console.warn('connection state is ', sequelizeManager.connectionState);
 event.sender.send('channel', {error: sequelizeManager.connectionState});
 });

 ipcMain.on('receive', function(event, payload) {
 console.log('payload: ', payload);

 sequelize.query(payload.statement).spread((rows, metadata) => {
 console.warn('payload: ', payload);
 sequelizeManager.connection.query(payload.statement).spread((rows, metadata) => {
 const response = {rows, metadata, error: ''};
 event.sender.send('channel', response);
 }).catch(err => {
 console.warn('ERROR: ', err);
 event.sender.send('channel', {error: err});
 });

 });


 server.get('/query', function(req, res, next) {
 console.warn('query: ', req.query.statement);
 const statement = req.query.statement;
 mainWindow.webContents.send('channel', {log: statement});
sequelize.query(statement).spread((rows, metadata) => {
sequelizeManager.connection.query(statement).spread((rows, metadata) => {
 const response = {rows, metadata, error: ''};

 // Send back to app
 mainWindow.webContents.send('channel', response);

 // Send back to plotly 2.0
 const parsedResponse = parse(rows);
 console.warn('response: ', parsedResponse);
Expand All@@ -199,8 +99,6 @@ mainWindow.webContents.on('did-finish-load', function() {
 res.send({err});
 });
 });


});

 if (process.env.NODE_ENV === 'development') {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Disconnect front end update state from ipc actions and create a new sequelizeManager class#1
 Merged

chriddyp
merged 8 commits into

from

May 16, 2016
 Merged


Disconnect front end update state from ipc actions and create a new sequelizeManager class
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
fb2fdd2

Delete the query actions, they are within the ipc


alexandresobolevski May 13, 2016
4363f01

Create object sequelizeManager that is seen by all ipc events and sep…


alexandresobolevski May 13, 2016
71163e0

decouple update state from ipc actions using buttons


alexandresobolevski May 13, 2016
5f896ff

Remove console.log or change to console.warn


alexandresobolevski May 14, 2016
91b09d8

Remove useless comment


alexandresobolevski May 14, 2016
bec4cff

Make visible connection message


alexandresobolevski May 14, 2016
2a35b62

Send back to the app the connection state


alexandresobolevski May 14, 2016
0e7c9da

Add style to buttons and make the editor smaller


alexandresobolevski May 16, 2016

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


7 changes: 7 additions & 0 deletions
app/actions/ipc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,3 +11,10 @@ export function query (statement) {
 ipcRenderer.send('receive', {statement});
 }
}

export function connect (statement) {
 return dispatch => {
 console.warn('proceeding to connect to database');
 ipcRenderer.send('connect', {statement});
 }
}

35 changes: 0 additions & 35 deletions
app/actions/query.js

View file


Open in desktop


This file was deleted.


24 changes: 24 additions & 0 deletions
app/components/Configuration.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
.btnGroup {
 position: relative;
 top: 0px;
 width: 420px;
 margin: 0 auto;
}

.btn {
 font-size: 0.75rem;
 font-weight: bold;
 background-color: #fff;
 border-radius: 50%;
 margin: 10px;
 width: 75px;
 height: 75px;
 opacity: .7;
 cursor: pointer;
 font-family: Arial, Helvetica, Helvetica Neue;
}

.btn:hover {
 color: white;
 background-color: rgba(0, 0, 0, 0.5);
}

45 changes: 27 additions & 18 deletions
app/components/Configuration.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import Immutable from 'immutable';
import AceEditor from 'react-ace';
import brace from 'brace';
import styles from './Configuration.css';


require('brace/mode/sql');
Expand All@@ -13,21 +14,23 @@ require('brace/theme/tomorrow');
export default class Configuration extends Component {
 constructor(props) {
 super(props);
 this.state = {query: ''}
 this.state = {query: ''};
 }

 render() {
 console.warn('this.props: ', this.props);
 const configuration = this.props.configuration.toJS();

 const onChange = query => {
 this.setState({query})
 this.props.ipcActions.query(query);
 /*
 this.props.configActions.setValue({
 key: e.target.value, value: e.target.value
 });
 */
 const onChangeQuery = query => {
 this.setState({query});
 }

 const onPressConnect = (event) => {
 this.props.ipcActions.connect(this.state.connect);
 }

 const onSendQuery = (event) => {
 this.props.ipcActions.query(this.state.query);
 }

 return (
Expand All@@ -37,30 +40,36 @@ export default class Configuration extends Component {

 <AceEditor
 value={this.state.query}
 onChange={onChange}
 onChange={onChangeQuery}
 mode="sql"
 theme="tomorrow"
 height='100'
 />

 <input onChange={onChange}/>
 <div className={styles.btnGroup}>
 <button className={styles.btn} onClick={onPressConnect}>
 connect
 </button>
 <button className={styles.btn} onClick={onSendQuery}>
 query
 </button>
 </div>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().log, null, 2)}
 {JSON.stringify(this.props.ipc.toJS().rows, null, 2)}
 </pre>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().rows, null, 2)}
 {JSON.stringify(this.props.ipc.toJS().log, null, 2)}
 </pre>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().metadata, null, 2)}
 </pre>


 <pre>
 {JSON.stringify(this.props.ipc.toJS().error, null, 2)}
 </pre>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().error, null, 2)}
 </pre>

 </div>
 </div>
Expand Down

2 changes: 0 additions & 2 deletions
app/containers/ConfigurationPage.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import Configuration from '../components/Configuration.react';
import * as ConfigurationActions from '../actions/configuration';
import * as QueryActions from '../actions/query';
import * as IpcActions from '../actions/ipc';

function mapStateToProps(state) {
Expand All@@ -16,7 +15,6 @@ function mapStateToProps(state) {
function mapDispatchToProps(dispatch) {
 const configActions = bindActionCreators(ConfigurationActions, dispatch);
 const ipcActions = bindActionCreators(IpcActions, dispatch);
 // const queryActions = bindActionCreators(QueryActions, dispatch);

 return {configActions, ipcActions};
}
Expand Down

140 changes: 19 additions & 121 deletions
main.development.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,12 @@ import { app, BrowserWindow, Menu, crashReporter, shell } from 'electron';
import { createStore, applyMiddleware, compose } from 'redux';
import { electronEnhancer } from 'redux-electron-store';
import Immutable from 'immutable';
import Sequelize from 'sequelize';
import restify from 'restify';
import parse from './parse';


var sequelizeActions = require('./sequelizeManager');
let sequelizeManager = new sequelizeActions();

const ipcMain = require('electron').ipcMain;

Expand All@@ -13,58 +17,14 @@ let mainWindow = null;

crashReporter.start();


if (process.env.NODE_ENV === 'development') {
 require('electron-debug')();
}

/*
// REDUX STORE
let enhancer = compose(
 // applyMiddleware(...middleware),
 electronEnhancer()
);

const initialState = Immutable.Map({
 query: 'asdfasdfasdf',
 status: true,
 config: {
 username: 'chris',
 pw: 'test'
 }
});

function reducer(state = initialState, action) {
 switch (action.type) {
 case 'update':
 state = state.set(action.key, action.value);
 console.warn('updating store: ', state.toJS());
 return state;
 default:
 return state;
 }
}

// Note: passing enhancer as the last argument to createStore requires redux@>=3.1.0
let i = 99;
// const initialState = Immutable.Map({test: i});
const store = createStore(reducer, initialState, electronEnhancer());

setInterval(() => {
 console.warn(`dispatching ${i}`);
 i += 1;
 store.dispatch({type: 'update', key: 'test', value: i});
}, 10000);
*/


//////////

app.on('window-all-closed', () => {
 if (process.platform !== 'darwin') app.quit();
});


app.on('ready', () => {
 mainWindow = new BrowserWindow({
 show: false,
Expand All@@ -83,49 +43,6 @@ app.on('ready', () => {
 mainWindow = null;
 });




 function parse(data) {

 var nrows = data.length;

 if (nrows === undefined || nrows === null){
 keys = ['message'];
 nrows = 1;
 ncols = 1;
 rows = [['command executed']];
 }else{
 var rows = [];
 var ncols = Object.keys(data[0]).length;
 var keys = Object.keys(data[0]);

 for (var i = 0; i < nrows; i++) {
 var row = [];
 for (var j = 0; j < ncols; j++) {
 row.push(data[i][keys[j]]);
 };
 rows.push(row);
 };
 };
 const data_formatted = { 'columnnames': keys, 'ncols': ncols, 'nrows': nrows, 'rows': rows };

 return data_formatted;

 };













const server = restify.createServer();
server.use(restify.queryParser());
server.use(restify.CORS({
Expand All@@ -136,59 +53,42 @@ server.use(restify.CORS({

server.listen(5000, function(){
 console.log('%s listening at %s', server.name, server.url);
})


// extract variables from the sent url to localhost 5000
var usr = 'readonly';
var psw = 'password';
var db = 'world';
var prt = 3308;
var engine = 'mysql';

console.log('Trying to connect to database ' + db + ' as ' + usr);

const sequelize = new Sequelize(db, usr, psw, {
 dialect: engine, // 'mysql'|'mariadb'|'sqlite'|'postgres'|'mssql'
 port: prt, // or 5432 (for postgres)
});

mainWindow.webContents.on('did-finish-load', function() {

 console.warn('making request');
 sequelize.authenticate().then(msg => {
 console.warn('succcess: ', msg);
 mainWindow.webContents.send('channel', {success: msg});

 }).catch(err => {
 console.warn('failed: ', err);
 mainWindow.webContents.send('channel', {error: err});
 ipcMain.on('connect', function(event, payload) {
 var usr = 'root';
 var psw = 'MyPassword1';
 var db = 'fake_plotly';
 var prt = 3306;
 var engine = 'mysql';

 console.warn('payload: ', payload);
 sequelizeManager.initialize(usr, psw, db, prt, engine);
 console.warn('connection state is ', sequelizeManager.connectionState);
 event.sender.send('channel', {error: sequelizeManager.connectionState});
 });

 ipcMain.on('receive', function(event, payload) {
 console.log('payload: ', payload);

 sequelize.query(payload.statement).spread((rows, metadata) => {
 console.warn('payload: ', payload);
 sequelizeManager.connection.query(payload.statement).spread((rows, metadata) => {
 const response = {rows, metadata, error: ''};
 event.sender.send('channel', response);
 }).catch(err => {
 console.warn('ERROR: ', err);
 event.sender.send('channel', {error: err});
 });

 });


 server.get('/query', function(req, res, next) {
 console.warn('query: ', req.query.statement);
 const statement = req.query.statement;
 mainWindow.webContents.send('channel', {log: statement});
sequelize.query(statement).spread((rows, metadata) => {
sequelizeManager.connection.query(statement).spread((rows, metadata) => {
 const response = {rows, metadata, error: ''};

 // Send back to app
 mainWindow.webContents.send('channel', response);

 // Send back to plotly 2.0
 const parsedResponse = parse(rows);
 console.warn('response: ', parsedResponse);
Expand All@@ -199,8 +99,6 @@ mainWindow.webContents.on('did-finish-load', function() {
 res.send({err});
 });
 });


});

 if (process.env.NODE_ENV === 'development') {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content

This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Disconnect front end update state from ipc actions and create a new sequelizeManager class#1
 Merged

chriddyp
merged 8 commits into

from

May 16, 2016
 Merged


Disconnect front end update state from ipc actions and create a new sequelizeManager class
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
fb2fdd2

Delete the query actions, they are within the ipc


alexandresobolevski May 13, 2016
4363f01

Create object sequelizeManager that is seen by all ipc events and sep…


alexandresobolevski May 13, 2016
71163e0

decouple update state from ipc actions using buttons


alexandresobolevski May 13, 2016
5f896ff

Remove console.log or change to console.warn


alexandresobolevski May 14, 2016
91b09d8

Remove useless comment


alexandresobolevski May 14, 2016
bec4cff

Make visible connection message


alexandresobolevski May 14, 2016
2a35b62

Send back to the app the connection state


alexandresobolevski May 14, 2016
0e7c9da

Add style to buttons and make the editor smaller


alexandresobolevski May 16, 2016

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


7 changes: 7 additions & 0 deletions
app/actions/ipc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,3 +11,10 @@ export function query (statement) {
 ipcRenderer.send('receive', {statement});
 }
}

export function connect (statement) {
 return dispatch => {
 console.warn('proceeding to connect to database');
 ipcRenderer.send('connect', {statement});
 }
}

35 changes: 0 additions & 35 deletions
app/actions/query.js

View file


Open in desktop


This file was deleted.


24 changes: 24 additions & 0 deletions
app/components/Configuration.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
.btnGroup {
 position: relative;
 top: 0px;
 width: 420px;
 margin: 0 auto;
}

.btn {
 font-size: 0.75rem;
 font-weight: bold;
 background-color: #fff;
 border-radius: 50%;
 margin: 10px;
 width: 75px;
 height: 75px;
 opacity: .7;
 cursor: pointer;
 font-family: Arial, Helvetica, Helvetica Neue;
}

.btn:hover {
 color: white;
 background-color: rgba(0, 0, 0, 0.5);
}

45 changes: 27 additions & 18 deletions
app/components/Configuration.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import Immutable from 'immutable';
import AceEditor from 'react-ace';
import brace from 'brace';
import styles from './Configuration.css';


require('brace/mode/sql');
Expand All@@ -13,21 +14,23 @@ require('brace/theme/tomorrow');
export default class Configuration extends Component {
 constructor(props) {
 super(props);
 this.state = {query: ''}
 this.state = {query: ''};
 }

 render() {
 console.warn('this.props: ', this.props);
 const configuration = this.props.configuration.toJS();

 const onChange = query => {
 this.setState({query})
 this.props.ipcActions.query(query);
 /*
 this.props.configActions.setValue({
 key: e.target.value, value: e.target.value
 });
 */
 const onChangeQuery = query => {
 this.setState({query});
 }

 const onPressConnect = (event) => {
 this.props.ipcActions.connect(this.state.connect);
 }

 const onSendQuery = (event) => {
 this.props.ipcActions.query(this.state.query);
 }

 return (
Expand All@@ -37,30 +40,36 @@ export default class Configuration extends Component {

 <AceEditor
 value={this.state.query}
 onChange={onChange}
 onChange={onChangeQuery}
 mode="sql"
 theme="tomorrow"
 height='100'
 />

 <input onChange={onChange}/>
 <div className={styles.btnGroup}>
 <button className={styles.btn} onClick={onPressConnect}>
 connect
 </button>
 <button className={styles.btn} onClick={onSendQuery}>
 query
 </button>
 </div>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().log, null, 2)}
 {JSON.stringify(this.props.ipc.toJS().rows, null, 2)}
 </pre>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().rows, null, 2)}
 {JSON.stringify(this.props.ipc.toJS().log, null, 2)}
 </pre>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().metadata, null, 2)}
 </pre>


 <pre>
 {JSON.stringify(this.props.ipc.toJS().error, null, 2)}
 </pre>

 <pre>
 {JSON.stringify(this.props.ipc.toJS().error, null, 2)}
 </pre>

 </div>
 </div>
Expand Down

2 changes: 0 additions & 2 deletions
app/containers/ConfigurationPage.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import Configuration from '../components/Configuration.react';
import * as ConfigurationActions from '../actions/configuration';
import * as QueryActions from '../actions/query';
import * as IpcActions from '../actions/ipc';

function mapStateToProps(state) {
Expand All@@ -16,7 +15,6 @@ function mapStateToProps(state) {
function mapDispatchToProps(dispatch) {
 const configActions = bindActionCreators(ConfigurationActions, dispatch);
 const ipcActions = bindActionCreators(IpcActions, dispatch);
 // const queryActions = bindActionCreators(QueryActions, dispatch);

 return {configActions, ipcActions};
}
Expand Down

140 changes: 19 additions & 121 deletions
main.development.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,12 @@ import { app, BrowserWindow, Menu, crashReporter, shell } from 'electron';
import { createStore, applyMiddleware, compose } from 'redux';
import { electronEnhancer } from 'redux-electron-store';
import Immutable from 'immutable';
import Sequelize from 'sequelize';
import restify from 'restify';
import parse from './parse';


var sequelizeActions = require('./sequelizeManager');
let sequelizeManager = new sequelizeActions();

const ipcMain = require('electron').ipcMain;

Expand All@@ -13,58 +17,14 @@ let mainWindow = null;

crashReporter.start();


if (process.env.NODE_ENV === 'development') {
 require('electron-debug')();
}

/*
// REDUX STORE
let enhancer = compose(
 // applyMiddleware(...middleware),
 electronEnhancer()
);

const initialState = Immutable.Map({
 query: 'asdfasdfasdf',
 status: true,
 config: {
 username: 'chris',
 pw: 'test'
 }
});

function reducer(state = initialState, action) {
 switch (action.type) {
 case 'update':
 state = state.set(action.key, action.value);
 console.warn('updating store: ', state.toJS());
 return state;
 default:
 return state;
 }
}

// Note: passing enhancer as the last argument to createStore requires redux@>=3.1.0
let i = 99;
// const initialState = Immutable.Map({test: i});
const store = createStore(reducer, initialState, electronEnhancer());

setInterval(() => {
 console.warn(`dispatching ${i}`);
 i += 1;
 store.dispatch({type: 'update', key: 'test', value: i});
}, 10000);
*/


//////////

app.on('window-all-closed', () => {
 if (process.platform !== 'darwin') app.quit();
});


app.on('ready', () => {
 mainWindow = new BrowserWindow({
 show: false,
Expand All@@ -83,49 +43,6 @@ app.on('ready', () => {
 mainWindow = null;
 });




 function parse(data) {

 var nrows = data.length;

 if (nrows === undefined || nrows === null){
 keys = ['message'];
 nrows = 1;
 ncols = 1;
 rows = [['command executed']];
 }else{
 var rows = [];
 var ncols = Object.keys(data[0]).length;
 var keys = Object.keys(data[0]);

 for (var i = 0; i < nrows; i++) {
 var row = [];
 for (var j = 0; j < ncols; j++) {
 row.push(data[i][keys[j]]);
 };
 rows.push(row);
 };
 };
 const data_formatted = { 'columnnames': keys, 'ncols': ncols, 'nrows': nrows, 'rows': rows };

 return data_formatted;

 };













const server = restify.createServer();
server.use(restify.queryParser());
server.use(restify.CORS({
Expand All@@ -136,59 +53,42 @@ server.use(restify.CORS({

server.listen(5000, function(){
 console.log('%s listening at %s', server.name, server.url);
})


// extract variables from the sent url to localhost 5000
var usr = 'readonly';
var psw = 'password';
var db = 'world';
var prt = 3308;
var engine = 'mysql';

console.log('Trying to connect to database ' + db + ' as ' + usr);

const sequelize = new Sequelize(db, usr, psw, {
 dialect: engine, // 'mysql'|'mariadb'|'sqlite'|'postgres'|'mssql'
 port: prt, // or 5432 (for postgres)
});

mainWindow.webContents.on('did-finish-load', function() {

 console.warn('making request');
 sequelize.authenticate().then(msg => {
 console.warn('succcess: ', msg);
 mainWindow.webContents.send('channel', {success: msg});

 }).catch(err => {
 console.warn('failed: ', err);
 mainWindow.webContents.send('channel', {error: err});
 ipcMain.on('connect', function(event, payload) {
 var usr = 'root';
 var psw = 'MyPassword1';
 var db = 'fake_plotly';
 var prt = 3306;
 var engine = 'mysql';

 console.warn('payload: ', payload);
 sequelizeManager.initialize(usr, psw, db, prt, engine);
 console.warn('connection state is ', sequelizeManager.connectionState);
 event.sender.send('channel', {error: sequelizeManager.connectionState});
 });

 ipcMain.on('receive', function(event, payload) {
 console.log('payload: ', payload);

 sequelize.query(payload.statement).spread((rows, metadata) => {
 console.warn('payload: ', payload);
 sequelizeManager.connection.query(payload.statement).spread((rows, metadata) => {
 const response = {rows, metadata, error: ''};
 event.sender.send('channel', response);
 }).catch(err => {
 console.warn('ERROR: ', err);
 event.sender.send('channel', {error: err});
 });

 });


 server.get('/query', function(req, res, next) {
 console.warn('query: ', req.query.statement);
 const statement = req.query.statement;
 mainWindow.webContents.send('channel', {log: statement});
sequelize.query(statement).spread((rows, metadata) => {
sequelizeManager.connection.query(statement).spread((rows, metadata) => {
 const response = {rows, metadata, error: ''};

 // Send back to app
 mainWindow.webContents.send('channel', response);

 // Send back to plotly 2.0
 const parsedResponse = parse(rows);
 console.warn('response: ', parsedResponse);
Expand All@@ -199,8 +99,6 @@ mainWindow.webContents.on('did-finish-load', function() {
 res.send({err});
 });
 });


});

 if (process.env.NODE_ENV === 'development') {
Expand Down
Loading