Skip to content
This repository has been archived by the owner on Jun 29, 2020. It is now read-only.

Improvements #24

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
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
8 changes: 5 additions & 3 deletions controller/mitsubishi/kgsa3c/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,11 @@ func (c *remoteController) Set(d *models.RemoteData) error {
return err
}

if err := sender.Send(signal); err != nil {
return err
}
go func() {
if err := sender.Send(signal); err != nil {
panic(err)
}
}()

if err := c.database.UpdateState(data); err != nil {
return err
Expand Down
22 changes: 19 additions & 3 deletions frontend/src/actions/remote/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,20 @@ export function fetchRemoteSuccess(payload) {
}
}

export function fetchRemoteError(error) {
return {
type: 'FETCH_REMOTE_FAILED',
error: error,
}
}

export function fetchRemote(dispatch) {
const request = httpClient({
method: 'GET',
url: `${API_URL}/api/v1/remote`,
})
.then(response => dispatch(fetchRemoteSuccess(response.data)))
.catch(error => error.response);
.catch(error => dispatch(fetchRemoteError(error.response)));
return {
type: 'FETCH_REMOTE',
payload: request
Expand All @@ -30,7 +37,7 @@ export function fetchRemoteByMode(dispatch, mode) {
}
})
.then(response => dispatch(fetchRemoteSuccess(response.data)))
.catch(error => error.response);
.catch(error => dispatch(fetchRemoteError(error.response)));
return {
type: 'FETCH_REMOTE',
payload: request
Expand All @@ -52,6 +59,14 @@ export function postRemoteSuccess(payload) {
}
}

export function postRemoteError(error) {
console.log('failed')
return {
type: 'POST_REMOTE_FAILED',
error: error,
}
}

export function postRemote(dispatch, payload) {
console.log('payload')
console.log(payload)
Expand All @@ -62,7 +77,8 @@ export function postRemote(dispatch, payload) {
data: payload,
})
.then(response => dispatch(postRemoteSuccess(response.data)))
.catch(error => error.response);
.catch(error => dispatch(postRemoteError(error.response))
);
return {
type: 'POST_REMOTE',
payload: request
Expand Down
9 changes: 8 additions & 1 deletion frontend/src/actions/template/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,19 @@ export function fetchTemplateSuccess(payload) {
}
}

export function fetchTemplateError(error) {
return {
type: 'FETCH_TEMPLATE_FAILED',
error: error,
}
}

export function fetchTemplate(dispatch) {
const request = httpClient({
method: 'GET',
url: `${API_URL}/api/v1/template`
}).then(response => dispatch(fetchTemplateSuccess(response.data))
).catch(error => error.response);
).catch(error => dispatch(fetchTemplateError(error.response)));
return {
type: 'FETCH_TEMPLATE',
payload: request
Expand Down
38 changes: 38 additions & 0 deletions frontend/src/components/basement/Modal.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import { Button, Modal } from 'react-bootstrap';
import React from 'react';

class ModalPopup extends React.Component {
constructor(props) {
super(props);
this.state = {
show: true
};
}
render() {
const { title, body } = this.props;
const handleClose = () => {
this.setState({
show: false
})
}
return (
<div>
<Modal show={this.state.show} onHide={handleClose}>
<Modal.Header closeButton={this.props.closable}>
<Modal.Title>{title}</Modal.Title>
</Modal.Header>
<Modal.Body>{this.props.body}</Modal.Body>
{this.props.type === "ERROR_MODAL" &&
<Modal.Footer>
<Button variant="primary" onClick={this.props.onReload}>
Refresh
</Button>
</Modal.Footer>
}
</Modal>
</div>
)
}
}

export default ModalPopup;
Loading