diff --git a/public/js/app.js b/public/js/app.js index 6d296d53..a2012b20 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -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 diff --git a/resources/js/components/Graphics/LatestResults.js b/resources/js/components/Graphics/LatestResults.js index 433745a0..86534899 100644 --- a/resources/js/components/Graphics/LatestResults.js +++ b/resources/js/components/Graphics/LatestResults.js @@ -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 ( @@ -74,6 +77,18 @@ export default class LatestResults extends Component { ); + } else if(data === false) { + return ( + + + + + Start your first scan! + + + + + ); } else { return ( diff --git a/routes/api.php b/routes/api.php index b53ff112..cfb009da 100644 --- a/routes/api.php +++ b/routes/api.php @@ -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'); });