mirrors/Speedtest-Tracker
1
0
Fork 0
mirror of https://github.com/henrywhitaker3/Speedtest-Tracker.git synced 2025-12-21 21:33:08 +01:00
Code Issues Projects Releases Wiki Activity

Added UI for testing healthchecks

Browse Source 
Also added close button on settings modals and test more info modals
This commit is contained in:
Henry Whitaker
2020-08-15 15:38:20 +01:00
parent 532837621f
commit 30ead5e82a
5 changed files with 65 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/SettingsController.php
View File

@@ -135,19 +135,4 @@ class SettingsController extends Controller
{ {
return SettingsHelper::getConfig(); return SettingsHelper::getConfig();
} }
/**
* Trigger a test of all notification agents
*
* @return JsonResponse
*/
public function testNotification()
{
SettingsHelper::testNotification();
return response()->json([
'method' => 'test notificaiton agents'
], 200);
}
} }

2
public/js/app.js vendored
View File

File diff suppressed because one or more lines are too long

2
resources/js/components/Graphics/TableRow.js vendored
View File

@@ -62,7 +62,7 @@ export default class TableRow extends Component {
<td> <td>
<span onClick={this.toggleShow} className="ti-arrow-top-right mouse"></span> <span onClick={this.toggleShow} className="ti-arrow-top-right mouse"></span>
<Modal show={show} onHide={this.toggleShow}> <Modal show={show} onHide={this.toggleShow}>
<Modal.Header> <Modal.Header closeButton>
<Modal.Title>More info</Modal.Title> <Modal.Title>More info</Modal.Title>
</Modal.Header> </Modal.Header>
<Modal.Body className="text-center"> <Modal.Body className="text-center">

31
resources/js/components/Settings/SettingWithModal.js vendored
View File

@@ -101,7 +101,7 @@ export default class SettingWithModal extends Component {
<> <>
<SettingsModalCard title={title} description={description} toggleShow={this.toggleShow} /> <SettingsModalCard title={title} description={description} toggleShow={this.toggleShow} />
<Modal show={show} onHide={this.toggleShow}> <Modal show={show} onHide={this.toggleShow}>
<Modal.Header> <Modal.Header closeButton>
<Modal.Title>{title}</Modal.Title> <Modal.Title>{title}</Modal.Title>
</Modal.Header> </Modal.Header>
<Modal.Body> <Modal.Body>
@@ -248,6 +248,35 @@ export default class SettingWithModal extends Component {
} }
</Row> </Row>
) )
} else if(e.type == 'group') {
return (
<div key={e.obj.id}>
<Row>
<Col md={md} sm={sm}>
<p>{name}</p>
</Col>
{e.description == null &&
<Col md={md} sm={sm}>
<p>{e.obj.description}</p>
</Col>
}
</Row>
<Row>
<Col sm={{ span: 12 }}>
{e.children.map((ee,ii) => {
if(ee.type == 'button-get') {
return (
<Button key={ii} variant={ee.btnType} className={'mr-2 mb-3'} onClick={() => { Axios.get(ee.url)
.then((resp) => { toast.success('Healthcheck sent') })
.catch((resp) => { resp = resp.response; toast.error(resp.data.error) })
}} >{ee.text}</Button>
)
}
})}
</Col>
</Row>
</div>
)
} }
})} })}
<Button variant="primary" type="submit" onClick={this.update} >Save</Button> <Button variant="primary" type="submit" onClick={this.update} >Save</Button>

35
resources/js/components/Settings/Settings.js vendored
View File

@@ -159,7 +159,7 @@ export default class Settings extends Component {
]} /> ]} />
</Col> </Col>
<Col lg={{ span: 4 }} md={{ span: 6 }} sm={{ span: 12 }}> <Col lg={{ span: 4 }} md={{ span: 6 }} sm={{ span: 12 }}>
<SettingWithModal title="healthchecks.io settings" description="Control settings for healthchecks.io" autoClose={true} settings={[ <SettingWithModal title="healthchecks.io settings" description="Control settings for healthchecks.io" autoClose={false} settings={[
{ {
obj: e.healthchecks_uuid, obj: e.healthchecks_uuid,
type: 'text' type: 'text'
@@ -167,7 +167,38 @@ export default class Settings extends Component {
{ {
obj: e.healthchecks_enabled, obj: e.healthchecks_enabled,
type: 'checkbox' type: 'checkbox'
} },
{
obj: {
id: (Math.floor(Math.random() * 10000) + 1),
name: "Test healthchecks (after saving)",
description: ""
},
type: 'group',
children: [
{
type: 'button-get',
url: 'api/settings/test-healthchecks/start',
btnType: 'outline-success',
text: 'Start',
inline: true,
},
{
type: 'button-get',
url: 'api/settings/test-healthchecks/success',
btnType: 'success',
text: 'Success',
inline: true,
},
{
type: 'button-get',
url: 'api/settings/test-healthchecks/fail',
btnType: 'danger',
text: 'Fail',
inline: true,
},
]
},
]} /> ]} />
</Col> </Col>
<Col lg={{ span: 4 }} md={{ span: 6 }} sm={{ span: 12 }}> <Col lg={{ span: 4 }} md={{ span: 6 }} sm={{ span: 12 }}>