Skip to content

Commit

Permalink
Work in progress
Browse files Browse the repository at this point in the history
  • Loading branch information
GermanBluefox committed Jun 6, 2021
1 parent 5945b34 commit ae72bfc
Show file tree
Hide file tree
Showing 20 changed files with 250 additions and 580 deletions.
9 changes: 5 additions & 4 deletions 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.24",
"@iobroker/adapter-react": "^1.6.25",
"@material-ui/core": "^4.11.4",
"@material-ui/data-grid": "^4.0.0-alpha.30",
"@material-ui/icons": "^4.11.2",
Expand All @@ -27,7 +27,7 @@
"echarts": "^4.9.0",
"echarts-for-react": "^2.0.16",
"leaflet": "^1.7.1",
"leaflet-geosearch": "^3.3.2",
"leaflet-geosearch": "^3.2.2",
"lodash": "^4.17.21",
"material-ui-chip-input": "^2.0.0-beta.2",
"ol": "^6.5.0",
Expand All @@ -46,7 +46,8 @@
"react-dropzone": "^11.3.2",
"react-icons": "^4.2.0",
"react-inlinesvg": "^2.3.0",
"react-leaflet": "^3.2.0",
"react-leaflet": "3.1.0",
"@react-leaflet/core": "1.0.2",
"react-markdown": "^6.0.2",
"react-scripts": "^4.0.3",
"react-showdown": "^2.3.0",
Expand Down Expand Up @@ -75,4 +76,4 @@
"last 1 safari version"
]
}
}
}
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 + '//' + window.location.hostname + ':8081/lib/js/socket.io.js' : '%PUBLIC_URL%/lib/js/socket.io.js';
script.src = window.location.port === '3000' ? window.location.protocol + '//iob-server:8081/lib/js/socket.io.js' : '%PUBLIC_URL%/lib/js/socket.io.js';
}, 1000);

document.head.appendChild(script);
Expand Down
22 changes: 0 additions & 22 deletions src-rx/src/assets/devices/Irrigation.svg

This file was deleted.

10 changes: 10 additions & 0 deletions src-rx/src/assets/devices/Printer.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions src-rx/src/assets/devices/SmokeDetector.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 26 additions & 11 deletions src-rx/src/assets/devices/Temperature Sensors.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit ae72bfc

Please sign in to comment.