Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION=0.0.56-r0
VERSION=0.0.57-r0
1 change: 1 addition & 0 deletions user-interface/.env.development
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ESLINT_NO_DEV_ERRORS=true
1 change: 1 addition & 0 deletions user-interface/.env.production
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DISABLE_ESLINT_PLUGIN=true
21 changes: 21 additions & 0 deletions user-interface/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"env": {
"browser": true,
"es2021": true
},
"extends": [
"plugin:react/recommended",
"standard"
],
"overrides": [
],
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": [
"react"
],
"rules": {
}
}
7 changes: 4 additions & 3 deletions user-interface/Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
FROM node:16.3.0-alpine3.13
FROM node:16.19.0-alpine3.17
WORKDIR /app
COPY . .
RUN npm install && npm run build
COPY package* ./
RUN npm install
COPY . ./
CMD [ "npm", "start" ]
10 changes: 6 additions & 4 deletions user-interface/Dockerfile.prod
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
FROM node:16.3.0-alpine3.13 as build-env
FROM node:16.19.0-alpine3.17 as build-env
WORKDIR /app
COPY package* .
RUN npm ci
COPY . .
RUN npm ci && npm run build
RUN npm run build

FROM node:16.3.0-alpine3.13
FROM node:16.19.0-alpine3.17
WORKDIR /app
COPY --from=build-env /app/build /app/build
RUN npm install -g serve@13.0.2
RUN npm install -g serve@14.1.2
CMD [ "sh", "-c", "serve build --single --listen ${PORT}" ]
10,058 changes: 6,927 additions & 3,131 deletions user-interface/package-lock.json

Large diffs are not rendered by default.

11 changes: 9 additions & 2 deletions user-interface/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
"react-redux": "^7.2.3",
"react-resize-aware": "^3.1.1",
"react-scripts": "^5.0.1",
"streamsaver": "^2.0.6"
"streamsaver": "^2.0.6",
"vis-network": "^7.10.2"
},
"scripts": {
"start": "react-scripts start",
Expand All @@ -45,6 +46,12 @@
]
},
"devDependencies": {
"babel-plugin-module-resolver": "4.1.0"
"babel-plugin-module-resolver": "4.1.0",
"eslint": "^8.26.0",
"eslint-config-standard": "^17.0.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-n": "^15.3.0",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-react": "^7.31.10"
}
}
Binary file added user-interface/resources/add_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added user-interface/resources/connect_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 17 additions & 17 deletions user-interface/src/App.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
import React from "react";
import Tabs from "@mui/material/Tabs";
import Tab from "@mui/material/Tab";
import Box from "@mui/material/Box";
import "./App.css";
import { TabPanel, a11yProps } from "./features/tab_panel/TabPanel";
import { AgentsTab } from "./features/agents_tab/AgentsTab";
import { MessageTab } from "./features/message_tab/MessageTab";
import GraphTab from "./features/graph_tab/GraphTab";
import { VisualizationTab } from "./features/visualization_tab/VisualizationTab";
import React from 'react'
import Tabs from '@mui/material/Tabs'
import Tab from '@mui/material/Tab'
import Box from '@mui/material/Box'
import './App.css'
import { TabPanel, a11yProps } from './features/tab_panel/TabPanel'
import { AgentsTab } from './features/agents_tab/AgentsTab'
import { MessageTab } from './features/message_tab/MessageTab'
import GraphTab from './features/graph_tab/GraphTab'
import { VisualizationTab } from './features/visualization_tab/VisualizationTab'

function App() {
const [value, setValue] = React.useState(0);
function App () {
const [value, setValue] = React.useState(0)

const handleChange = (event, newValue) => {
setValue(newValue);
};
setValue(newValue)
}

return (
<div className="App">
<Box sx={{ borderBottom: 1, borderColor: "divider" }}>
<Box sx={{ borderBottom: 1, borderColor: 'divider' }}>
<Tabs
value={value}
onChange={handleChange}
Expand All @@ -43,7 +43,7 @@ function App() {
<VisualizationTab />
</TabPanel>
</div>
);
)
}

export default App;
export default App
16 changes: 8 additions & 8 deletions user-interface/src/App.test.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import React from 'react';
import { render } from '@testing-library/react';
import { Provider } from 'react-redux';
import { store } from './app/store';
import App from './App';
import React from 'react'
import { render } from '@testing-library/react'
import { Provider } from 'react-redux'
import { store } from './app/store'
import App from './App'

test('renders learn react link', () => {
const { getByText } = render(
<Provider store={store}>
<App />
</Provider>
);
)

expect(getByText(/learn/i)).toBeInTheDocument();
});
expect(getByText(/learn/i)).toBeInTheDocument()
})
20 changes: 10 additions & 10 deletions user-interface/src/app/store.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { configureStore } from '@reduxjs/toolkit';
import counterReducer from '../features/counter/counterSlice';
import agentsTabReducer from '../features/agents_tab/agentsTabSlice';
import messageTabReducer from '../features/message_tab/messageTabSlice';
import enumSliceReducer from '../features/components/enumSlice';
import simulationSliceReducer from '../features/simulationSlice';
import editorSliceReducer from "../features/agents_tab/editors/editorSlice";
import { configureStore } from '@reduxjs/toolkit'
import counterReducer from '../features/counter/counterSlice'
import agentsTabReducer from '../features/agents_tab/agentsTabSlice'
import messageTabReducer from '../features/message_tab/messageTabSlice'
import enumSliceReducer from '../features/components/enumSlice'
import simulationSliceReducer from '../features/simulationSlice'
import editorSliceReducer from '../features/agents_tab/editors/editorSlice'

export const store = configureStore({
reducer: {
Expand All @@ -13,6 +13,6 @@ export const store = configureStore({
messageTab: messageTabReducer,
enumSlice: enumSliceReducer,
simulation: simulationSliceReducer,
editor: editorSliceReducer,
},
});
editor: editorSliceReducer
}
})
Loading