Skip to content

Commit

Permalink
### __WORK IN PROGRESS__
Browse files Browse the repository at this point in the history
* (bluefox) Improved the list of predefined icons
  • Loading branch information
GermanBluefox committed Jun 6, 2021
1 parent ae72bfc commit b37bbf3
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 13 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ The icons may not be reused in other projects without the proper flaticon licens
-->

## Changelog
### __WORK IN PROGRESS__
* (bluefox) Improved the list of predefined icons

### 5.1.7 (2021-06-04)
* (bluefox) Added the possibility to clear the schedule

Expand Down
2 changes: 1 addition & 1 deletion src-rx/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@date-io/core": "^1.3.13",
"@date-io/date-fns": "^1.3.13",
"@fnando/sparkline": "^0.3.10",
"@iobroker/adapter-react": "^1.6.25",
"@iobroker/adapter-react": "^1.6.26",
"@material-ui/core": "^4.11.4",
"@material-ui/data-grid": "^4.0.0-alpha.30",
"@material-ui/icons": "^4.11.2",
Expand Down
2 changes: 1 addition & 1 deletion src-rx/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
};

setTimeout(() => {
script.src = window.location.port === '3000' ? window.location.protocol + '//iob-server:8081/lib/js/socket.io.js' : '%PUBLIC_URL%/lib/js/socket.io.js';
script.src = window.location.port === '3000' ? window.location.protocol + '//' + window.location.hostname + ':8081/lib/js/socket.io.js' : '%PUBLIC_URL%/lib/js/socket.io.js';
}, 1000);

document.head.appendChild(script);
Expand Down
10 changes: 5 additions & 5 deletions src-rx/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ import { expertModeDialogFunc } from './dialogs/ExpertModeDialog';
import { checkMessages, newsAdminDialogFunc } from './dialogs/NewsAdminDialog';
import { hostWarningDialogFunc } from './dialogs/HostWarningDialog';
import ToggleThemeMenu from './components/ToggleThemeMenu';
import LogsWorker from './components/Workers/LogsWorker';
import InstancesWorker from './components/Workers/InstancesWorker';
import HostsWorker from './components/Workers/HostsWorker';
import AdaptersWorker from './components/Workers/AdaptersWorker';
import ObjectsWorker from './components/Workers/ObjectsWorker';
import LogsWorker from './Workers/LogsWorker';
import InstancesWorker from './Workers/InstancesWorker';
import HostsWorker from './Workers/HostsWorker';
import AdaptersWorker from './Workers/AdaptersWorker';
import ObjectsWorker from './Workers/ObjectsWorker';
import DiscoveryDialog from './dialogs/DiscoveryDialog';
import SlowConnectionWarningDialog from './dialogs/SlowConnectionWarningDialog';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Utils from '../../Utils'
import Utils from '../Utils'

class AdaptersWorker {
constructor(socket) {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Utils from '../../Utils'
import Utils from '../Utils'

class InstancesWorker {
constructor(socket) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Utils from '../../Utils';
import Utils from '../Utils';

class LogsWorker {
constructor(socket, maxLogs) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Utils from '../../Utils'
import Utils from '../Utils'

class ObjectsWorker {
constructor(socket) {
Expand Down
2 changes: 1 addition & 1 deletion src-rx/src/components/Connection.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class Connection {
this.autoSubscribeLog = this.props.autoSubscribeLog;

this.props.protocol = this.props.protocol || window.location.protocol;
this.props.host = this.props.host || (window.location.port === '3000' ? 'iob-server' : window.location.hostname);
this.props.host = this.props.host || window.location.hostname;
this.props.port = this.props.port || (window.location.port === '3000' ? 8081 : window.location.port);
this.props.ioTimeout = Math.max(this.props.ioTimeout || 20000, 20000);
this.props.cmdTimeout = Math.max(this.props.cmdTimeout || 5000, 5000);
Expand Down
2 changes: 1 addition & 1 deletion src-rx/src/components/Enums/EnumEditDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ function EnumEditDialog(props) {
{ props.t( 'Enum parameters' ) }
</DialogTitle>
<DialogContent classes={{root: props.classes.contentRoot}}>
<Grid container spacing={4} className={props.classes.dialog}>
<Grid container spacing={2} className={props.classes.dialog}>
<Grid item xs={12} md={6}>
<IOTextField
label="Name"
Expand Down

0 comments on commit b37bbf3

Please sign in to comment.