Skip to content

Commit b0c2503

Browse files
committed
Fix eslint and get the apps running again
1 parent a9150f4 commit b0c2503

31 files changed

+277
-255
lines changed

.Rhistory

Whitespace-only changes.

.eslintrc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
"jest": true
88
},
99
"extends": [
10-
"airbnb",
11-
"airbnb/hooks",
1210
"plugin:react/recommended",
1311
"plugin:react-hooks/recommended",
1412
"plugin:jsx-a11y/recommended",

web/package-lock.json

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/packages/api/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const swaggerOpts = {
3434
description: 'ComptoxAI\'s public REST API',
3535
},
3636
{
37-
url: 'http://0.0.0.0:3001',
37+
url: 'http://0.0.0.0:3000',
3838
description: 'Default local (dev) API server',
3939
},
4040
],

web/packages/api/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ nconf.env(['PORT', 'NODE_ENV']).argv({
2525
USERNAME: process.env.COMPTOX_AI_DATABASE_USERNAME,
2626
PASSWORD: process.env.COMPTOX_AI_DATABASE_PASSWORD,
2727
neo4j: 'local',
28-
'neo4j-local': process.env.COMPTOX_AI_DATABASE_URL || 'bolt://165.123.13.192:7687',
28+
'neo4j-local': process.env.COMPTOX_AI_DATABASE_URL || 'bolt://54.147.33.120:7687',
2929
base_url: 'http://0.0.0.0:3000',
3030
api_path: '/api',
3131
});

web/packages/app/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@
4848
"@testing-library/jest-dom": "^6.1.3",
4949
"@testing-library/react": "^12.0.0",
5050
"@testing-library/user-event": "^12.0.0",
51+
"airbnb": "^0.0.2",
5152
"eslint": "^8.49.0",
53+
"eslint-plugin-simple-import-sort": "^12.1.1",
5254
"react-scripts": "5.0.1"
5355
}
5456
}

web/packages/app/scripts/build-custom.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// and https://github.com/greenelab/connectivity-search-frontend/blob/master/scripts/build-non-split.js
33

44
const rewire = require('rewire');
5+
56
const defaults = rewire('react-scripts/scripts/build.js');
67
const config = defaults.__get__('config');
78

web/packages/app/src/App.js

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
11
import React from 'react';
2+
import { adaptV4Theme,createTheme, StyledEngineProvider, ThemeProvider } from '@mui/material';
23
import Container from '@mui/material/Container';
3-
// import { Helmet } from 'react-helmet';
4-
// import ScriptTag from 'react-script-tag';
54

5+
import DatasetBuilder from './components/DatasetBuilder';
6+
import ExpandNetwork from './components/ExpandNetwork';
7+
import NodeResults from './components/NodeResults';
68
import NodeSearch from './components/NodeSearch';
7-
import ChemicalSearch from './components/ChemicalSearch';
8-
import RelationshipSearch from './components/RelationshipSearch';
99
import PathSearch from './components/PathSearch';
10-
import DatasetBuilder from './components/DatasetBuilder';
10+
// import ChemicalSearch from './components/ChemicalSearch';
11+
import RelationshipSearch from './components/RelationshipSearch';
1112
import ShortestPath from './components/ShortestPath';
12-
import ExpandNetwork from './components/ExpandNetwork';
13+
import * as chemLists from './data/chemical_list_data.json';
14+
import * as config from './data/data.json';
1315

1416
import './App.css';
1517

16-
import * as config from './data/data.json';
17-
import * as chemLists from './data/chemical_list_data.json'
18-
import { createTheme, ThemeProvider, StyledEngineProvider, adaptV4Theme } from '@mui/material';
19-
import NodeResults from './components/NodeResults';
20-
2118
const theme = createTheme(adaptV4Theme({
2219
spacing: 2
2320
}));
@@ -29,7 +26,7 @@ class App extends React.Component {
2926
this.state = {
3027
relationshipResults: [],
3128
pathResults: []
32-
}
29+
};
3330
}
3431

3532
render() {
@@ -40,13 +37,13 @@ class App extends React.Component {
4037
<Container>
4138
<h1>ComptoxAI interactive data portal</h1>
4239
<p>
43-
From this page, you can search for individual entities (nodes) in ComptoxAI's graph database. When you select a query result, adjacent nodes (related data elements) are loaded and displayed below.
40+
From this page, you can search for individual entities (nodes) in ComptoxAI&apos;s graph database. When you select a query result, adjacent nodes (related data elements) are loaded and displayed below.
4441
</p>
4542
<p>
4643
For detailed usage instructions, please see <a href="https://comptox.ai/browse.html">this page</a>.
4744
</p>
4845
{/* <HowToUse /> */}
49-
<ChemicalSearch />
46+
{/* <ChemicalSearch /> */}
5047
<NodeSearch
5148
config={config.default}
5249
/>

web/packages/app/src/App.test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react';
2-
import { render } from '@testing-library/react';
32
import { Provider } from 'react-redux';
3+
import { render } from '@testing-library/react';
4+
45
import { store } from './app/store';
56
import App from './App';
67

web/packages/app/src/BatchQuery.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22

33
class BatchQuery extends React.Component {
44
render() {
5-
return(
5+
return (
66
<div>
77
<h2>Bulk data fetch</h2>
88
<p>

0 commit comments

Comments
 (0)