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

Merge pull request #4 from henrywhitaker3/dev-v1

Browse Source 
Added a button to start the first scan
This commit is contained in:
Henry Whitaker
2020-04-09 15:38:09 +00:00
committed by GitHub
parent db73f855cf 04bb133f2c
commit fd75773ac3
3 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
public/js/app.js vendored
View File

@@ -126799,8 +126799,8 @@ var HistoryGraph = /*#__PURE__*/function (_Component) {
duData.datasets[0].data.push(download);
duData.datasets[1].data.push(upload);
pingData.datasets[0].data.push(ping);
duData.labels.push(new Date(e.created_at).toLocaleDateString());
pingData.labels.push(new Date(e.created_at).toLocaleDateString());
duData.labels.push(new Date(e.created_at).toLocaleString());
pingData.labels.push(new Date(e.created_at).toLocaleString());
});
_this.setState({
@@ -127019,6 +127019,10 @@ var LatestResults = /*#__PURE__*/function (_Component) {
loading: false
});
})["catch"](function (err) {
_this.setState({
data: false
});
console.log(err);
});
});
@@ -127054,7 +127058,7 @@ var LatestResults = /*#__PURE__*/function (_Component) {
var loading = this.state.loading;
var data = this.state.data;
if (loading) {
if (loading && data !== false) {
return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(react_bootstrap__WEBPACK_IMPORTED_MODULE_4__["Container"], {
fluid: true
}, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(react_bootstrap__WEBPACK_IMPORTED_MODULE_4__["Row"], null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(react_bootstrap__WEBPACK_IMPORTED_MODULE_4__["Col"], {
@@ -127064,6 +127068,18 @@ var LatestResults = /*#__PURE__*/function (_Component) {
}, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(react_bootstrap__WEBPACK_IMPORTED_MODULE_4__["Spinner"], {
animation: "grow"
}))));
} else if (data === false) {
return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(react_bootstrap__WEBPACK_IMPORTED_MODULE_4__["Container"], {
fluid: true
}, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(react_bootstrap__WEBPACK_IMPORTED_MODULE_4__["Row"], null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(react_bootstrap__WEBPACK_IMPORTED_MODULE_4__["Col"], {
sm: {
span: 12
},
className: "text-center"
}, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(react_bootstrap__WEBPACK_IMPORTED_MODULE_4__["Button"], {
variant: "primary",
onClick: this.newScan
}, "Start your first scan!")))));
} else {
return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(react_bootstrap__WEBPACK_IMPORTED_MODULE_4__["Container"], {
fluid: true

17
resources/js/components/Graphics/LatestResults.js vendored
View File

@@ -37,6 +37,9 @@ export default class LatestResults extends Component {
});
})
.catch((err) => {
this.setState({
data: false
});
console.log(err);
})
}
@@ -64,7 +67,7 @@ export default class LatestResults extends Component {
var loading = this.state.loading;
var data = this.state.data;
if(loading) {
if(loading && data !== false) {
return (
<Container fluid>
<Row>
@@ -74,6 +77,18 @@ export default class LatestResults extends Component {
</Row>
</Container>
);
} else if(data === false) {
return (
<Container fluid>
<Row>
<Col sm={{ span: 12 }} className="text-center">
<div>
<Button variant="primary" onClick={this.newScan}>Start your first scan!</Button>
</div>
</Col>
</Row>
</Container>
);
} else {
return (
<Container fluid>

3
routes/api.php
View File

@@ -26,6 +26,5 @@ Route::group([
Route::get('time/{time}', 'SpeedtestController@time')
->name('speedtest.time');
Route::get('run', 'SpeedtestController@run')
->name('speedtest.run')
->middleware('throttle:5,1');
->name('speedtest.run');
});