Compare commits

..

No commits in common. "90a03dc17c209cdfd8b61498903c2dc8f153c1a2" and "cb8f6dacccc94b61744f30955938e6203f86e9aa" have entirely different histories.

3 changed files with 5 additions and 6 deletions

View File

@ -34,8 +34,7 @@ module.exports = {
"semi": [ "semi": [
"error", "error",
"always" "always"
], ]
"no-unused-vars": [1]
}, },
"settings": { "settings": {
"react": { "react": {

View File

@ -3,19 +3,19 @@ import { useSelector, useDispatch } from "react-redux";
import { Box, Button, Clock } from "grommet"; import { Box, Button, Clock } from "grommet";
import { setPlugin, selectCore } from "./coreSlice"; import { setPlugin, selectCore } from "./coreSlice";
import plugins from "./plugins"; import * as plugins from "./plugins";
function Core() { function Core() {
const coreState = useSelector(selectCore); const coreState = useSelector(selectCore);
const dispatch = useDispatch(); const dispatch = useDispatch();
const plugin = plugins[coreState.plugin]; const plugin = plugins.default[coreState.plugin];
const props = { const props = {
data: coreState.data, data: coreState.data,
close: () => dispatch(setPlugin(false)) close: () => dispatch(setPlugin(false))
}; };
const dummyButtons = ["Maps", "Home Devices", "Phone"]; const dummyButtons = ["Maps", "Home Devices", "Phone"];
return <> return <>
{plugin ? React.createElement(plugin, props, null) : ( {plugin ? plugin(props) : (
<Box <Box
align="center" align="center"
background="light-1" background="light-1"

View File

@ -17,8 +17,8 @@ function WebSocketProvider({ children }) {
socket = io.connect(WS_BASE); socket = io.connect(WS_BASE);
socket.on("switchPlugin", (payload) => { socket.on("switchPlugin", (payload) => {
dispatch(setData(payload.data || {}));
dispatch(setPlugin(payload.plugin)); dispatch(setPlugin(payload.plugin));
dispatch(setData(payload.data));
if (payload.time) { if (payload.time) {
setTimeout(() => { setTimeout(() => {
dispatch(setData({})); dispatch(setData({}));