Merge branch 'alpha' into dev

henrywhitaker3 · Apr 10, 2021 · cb5abcf · cb5abcf
2 parents dd87160 + 76e21bf
commit cb5abcf
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 89 deletions.
diff --git a/app/Console/Commands/SpeedtestCommand.php b/app/Console/Commands/SpeedtestCommand.php
@@ -2,6 +2,7 @@
 
 namespace App\Console\Commands;
 
+use App\Exceptions\SpeedtestFailureException;
 use App\Helpers\SpeedtestHelper;
 use App\Interfaces\SpeedtestProvider;
 use Illuminate\Console\Command;
@@ -45,9 +46,9 @@ public function handle()
     {
         $this->info('Running speedtest, this might take a while...');
 
-        $results = $this->speedtestProvider->run(false, false);
-
-        if (!is_object($results)) {
+        try {
+            $results = $this->speedtestProvider->run(false, false);
+        } catch (SpeedtestFailureException $e) {
             $this->error('Something went wrong running the speedtest.');
             exit();
         }

diff --git a/composer.json b/composer.json
@@ -28,7 +28,6 @@
         "brianium/paratest": "^6.2",
         "facade/ignition": "^2.3.6",
         "fzaninotto/faker": "^1.9.1",
-        "itsgoingd/clockwork": "^5.0",
         "mockery/mockery": "^1.3.1",
         "nunomaduro/collision": "^5.3",
         "nunomaduro/larastan": "^0.7.0",

diff --git a/composer.lock b/composer.lock
diff --git a/public/js/app.js b/public/js/app.js
@@ -146804,18 +146804,30 @@ var TableRow = /*#__PURE__*/function (_Component) {
           }
         }, "Delete")))) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("td", null));
       } else {
-        return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("tr", null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("td", null, e.id), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("td", null, new Date(e.created_at).toLocaleString()), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("td", null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("span", {
-          className: "ti-close text-danger"
-        })), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("td", null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("span", {
-          className: "ti-close text-danger"
-        })), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("td", null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("span", {
-          className: "ti-close text-danger"
-        })), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("td", null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(react_bootstrap__WEBPACK_IMPORTED_MODULE_2__["Button"], {
+        return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("tr", null, fields.visible.map(function (e, i) {
+          console.log(e);
+
+          if (e.name === 'created_at') {
+            return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("td", {
+              key: i
+            }, new Date(e.value).toLocaleString());
+          } else if (e.name === 'id') {
+            return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("td", {
+              key: i
+            }, e.value);
+          }
+
+          return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("td", {
+            key: i
+          }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("span", {
+            className: "ti-close text-danger"
+          }));
+        }), window.config.auth && window.authenticated || !window.config.auth ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("td", null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(react_bootstrap__WEBPACK_IMPORTED_MODULE_2__["Button"], {
           variant: "danger",
           onClick: function onClick() {
             _this2["delete"](e.id);
           }
-        }, "Delete")));
+        }, "Delete")) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("td", null));
       }
     }
   }]);

diff --git a/resources/js/components/Graphics/TableRow.js b/resources/js/components/Graphics/TableRow.js
@@ -28,7 +28,7 @@ export default class TableRow extends Component {
     }
 
     delete = (id) => {
-        var url = 'api/speedtest/delete/' + id;
+        var url = 'api/speedtest/delete/' + id + '?token=' + window.token;
 
         Axios.delete(url)
         .then((resp) => {
@@ -134,12 +134,23 @@ export default class TableRow extends Component {
         } else {
             return (
                 <tr>
-                    <td>{e.id}</td>
-                    <td>{new Date(e.created_at).toLocaleString()}</td>
-                    <td><span className="ti-close text-danger"></span></td>
-                    <td><span className="ti-close text-danger"></span></td>
-                    <td><span className="ti-close text-danger"></span></td>
-                    <td><Button variant="danger" onClick={() => { this.delete(e.id) }}>Delete</Button></td>
+                    {fields.visible.map((e, i) => {
+                        console.log(e);
+                        if(e.name === 'created_at') {
+                            return <td key={i}>{new Date(e.value).toLocaleString()}</td>
+                        } else if (e.name === 'id') {
+                            return <td key={i}>{e.value}</td>
+                        }
+
+                        return (
+                            <td key={i}><span className="ti-close text-danger"></span></td>
+                        );
+                    })}
+                    {(window.config.auth && window.authenticated) || !window.config.auth ?
+                        <td><Button variant="danger" onClick={() => { this.delete(e.id) }}>Delete</Button></td>
+                    :
+                        <td></td>
+                    }
                 </tr>
             );
         }