Merge pull request #413 from henrywhitaker3/dev

Bump react-dom from 16.13.1 to 16.14.0

README.md

@@ -1,6 +1,6 @@
 # Speedtest Tracker
 
-[![Docker pulls](https://img.shields.io/docker/pulls/henrywhitaker3/speedtest-tracker?style=flat-square)](https://hub.docker.com/r/henrywhitaker3/speedtest-tracker) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Stable?label=master&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Dev?label=dev&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![last_commit](https://img.shields.io/github/last-commit/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) [![issues](https://img.shields.io/github/issues/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/issues) [![commit_freq](https://img.shields.io/github/commit-activity/m/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) ![version](https://img.shields.io/badge/version-v1.9.6-success?style=flat-square) [![license](https://img.shields.io/github/license/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/blob/master/LICENSE)
+[![Docker pulls](https://img.shields.io/docker/pulls/henrywhitaker3/speedtest-tracker?style=flat-square)](https://hub.docker.com/r/henrywhitaker3/speedtest-tracker) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Stable?label=master&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Dev?label=dev&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![last_commit](https://img.shields.io/github/last-commit/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) [![issues](https://img.shields.io/github/issues/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/issues) [![commit_freq](https://img.shields.io/github/commit-activity/m/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) ![version](https://img.shields.io/badge/version-v1.10.0-success?style=flat-square) [![license](https://img.shields.io/github/license/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/blob/master/LICENSE)
 
 This program runs a speedtest check every hour and graphs the results. The back-end is written in [Laravel](https://laravel.com/) and the front-end uses [React](https://reactjs.org/). It uses the [Ookla's speedtest cli](https://www.speedtest.net/apps/cli) package to get the data and uses [Chart.js](https://www.chartjs.org/) to plot the results.
 

app/Helpers/SettingsHelper.php

@@ -7,7 +7,8 @@ use App\Setting;
 use Cache;
 use Carbon\Carbon;
 
-class SettingsHelper {
+class SettingsHelper
+{
 
     /**
      * Get a Setting object by name
@@ -19,9 +20,9 @@ class SettingsHelper {
     {
         $name = Setting::where('name', $name)->get();
 
-        if(sizeof($name) == 0) {
+        if (sizeof($name) == 0) {
             return false;
-        } else if(sizeof($name) == 1) {
+        } else if (sizeof($name) == 1) {
             return $name[0];
         } else {
             $name = $name->keyBy('name');
@@ -40,11 +41,11 @@ class SettingsHelper {
     {
         $setting = SettingsHelper::get($name);
 
-        if($value === false) {
+        if ($value === false) {
             $value = "0";
         }
 
-        if($setting !== false) {
+        if ($setting !== false) {
             $setting->value = $value;
             $setting->save();
         } else {
@@ -54,7 +55,7 @@ class SettingsHelper {
             ]);
         }
 
-        if($name == 'show_failed_tests_on_graph') {
+        if ($name == 'show_failed_tests_on_graph') {
             Cache::flush();
         }
 
@@ -69,13 +70,13 @@ class SettingsHelper {
     public static function getBase()
     {
         $base = env('BASE_PATH', '/');
-        if($base == '') {
+        if ($base == '') {
             $base = '/';
         } else {
-            if($base[0] != '/') {
+            if ($base[0] != '/') {
                 $base = '/' . $base;
             }
-            if($base[-1] != '/') {
+            if ($base[-1] != '/') {
                 $base = $base . '/';
             }
         }
@@ -95,7 +96,7 @@ class SettingsHelper {
         // Try exact key
         $val = exec('echo $' . $key);
 
-        if($val == "") {
+        if ($val == "") {
             array_push($results, true);
         } else {
             array_push($results, false);
@@ -104,25 +105,25 @@ class SettingsHelper {
         // Try key all caps
         $val = exec('echo $' . strtoupper($key));
 
-        if($val == "") {
+        if ($val == "") {
             array_push($results, true);
         } else {
             array_push($results, false);
         }
 
-        if(env($key, false) == false) {
+        if (env($key, false) == false) {
             array_push($results, true);
         } else {
             array_push($results, false);
         }
 
-        if(env(strtoupper($key), false) == false) {
+        if (env(strtoupper($key), false) == false) {
             array_push($results, true);
         } else {
             array_push($results, false);
         }
 
-        if(in_array(false, $results)) {
+        if (in_array(false, $results)) {
             return false;
         }
 
@@ -138,6 +139,11 @@ class SettingsHelper {
     {
         return [
             'base' => SettingsHelper::getBase(),
+            'widgets' => [
+                'show_average' => (bool)SettingsHelper::get('show_average')->value,
+                'show_max' => (bool)SettingsHelper::get('show_max')->value,
+                'show_min' => (bool)SettingsHelper::get('show_min')->value,
+            ],
             'graphs' => [
                 'download_upload_graph_enabled' => SettingsHelper::get('download_upload_graph_enabled'),
                 'download_upload_graph_width' => SettingsHelper::get('download_upload_graph_width'),
@@ -163,15 +169,15 @@ class SettingsHelper {
      */
     public static function testNotification($agent = true)
     {
-        $agents = [ 'slack', 'telegram' ];
+        $agents = ['slack', 'telegram'];
 
-        if($agent === true) {
+        if ($agent === true) {
             event(new TestNotificationEvent($agents));
             return true;
         }
 
-        if(in_array($agent, $agents)) {
-            event(new TestNotificationEvent([ $agent ]));
+        if (in_array($agent, $agents)) {
+            event(new TestNotificationEvent([$agent]));
             return true;
         }
 
@@ -188,14 +194,14 @@ class SettingsHelper {
             'telegram_chat_id' => SettingsHelper::get('telegram_chat_id')->value,
         ];
 
-        foreach($settings as $key => $value) {
+        foreach ($settings as $key => $value) {
             $key = 'integrations.' . $key;
 
-            if($value === "") {
+            if ($value === "") {
                 $value = null;
             }
 
-            config()->set([ $key => $value ]);
+            config()->set([$key => $value]);
         }
     }
 }

app/Http/Controllers/SpeedtestController.php

@@ -18,9 +18,9 @@ class SpeedtestController extends Controller
 {
     public function __construct()
     {
-        if((bool)SettingsHelper::get('auth')->value === true) {
+        if ((bool)SettingsHelper::get('auth')->value === true) {
             $this->middleware('auth:api')
-                 ->only([ 'run', 'delete', 'deleteAll' ]);
+                ->only(['run', 'delete', 'deleteAll']);
         }
     }
 
@@ -32,7 +32,7 @@ class SpeedtestController extends Controller
     public function index()
     {
         $data = Speedtest::orderBy('created_at', 'desc')
-                         ->paginate();
+            ->paginate();
 
         return response()->json([
             'method' => 'index of speedtests',
@@ -49,12 +49,12 @@ class SpeedtestController extends Controller
     public function time($days)
     {
         $rule = [
-            'days' => [ 'required', 'integer' ],
+            'days' => ['required', 'integer'],
         ];
 
-        $validator = Validator::make([ 'days' => $days ], $rule);
+        $validator = Validator::make(['days' => $days], $rule);
 
-        if($validator->fails()) {
+        if ($validator->fails()) {
             return response()->json([
                 'method' => 'get speedtests in last x days',
                 'error' => $validator->errors(),
@@ -65,16 +65,16 @@ class SpeedtestController extends Controller
         $data = Cache::remember('speedtest-days-' . $days, $ttl, function () use ($days) {
             $showFailed = (bool)SettingsHelper::get('show_failed_tests_on_graph')->value;
 
-            if($showFailed === true) {
+            if ($showFailed === true) {
                 return Speedtest::where('created_at', '>=', Carbon::now()->subDays($days))
-                                ->orderBy('created_at', 'asc')
-                                ->get();
+                    ->orderBy('created_at', 'asc')
+                    ->get();
             }
 
             return Speedtest::where('created_at', '>=', Carbon::now()->subDays($days))
-                             ->where('failed', false)
-                             ->orderBy('created_at', 'asc')
-                             ->get();
+                ->where('failed', false)
+                ->orderBy('created_at', 'asc')
+                ->get();
         });
 
         return response()->json([
@@ -93,12 +93,12 @@ class SpeedtestController extends Controller
     public function fail($days)
     {
         $rule = [
-            'days' => [ 'required', 'integer' ],
+            'days' => ['required', 'integer'],
         ];
 
-        $validator = Validator::make([ 'days' => $days ], $rule);
+        $validator = Validator::make(['days' => $days], $rule);
 
-        if($validator->fails()) {
+        if ($validator->fails()) {
             return response()->json([
                 'method' => 'get speedtests in last x days',
                 'error' => $validator->errors(),
@@ -122,20 +122,38 @@ class SpeedtestController extends Controller
     public function latest()
     {
         $data = SpeedtestHelper::latest();
-        $avg = Speedtest::select(DB::raw('AVG(ping) as ping, AVG(download) as download, AVG(upload) as upload'))
-                        ->where('failed', false)
-                        ->get();
-        $max = Speedtest::select(DB::raw('MAX(ping) as ping, MAX(download) as download, MAX(upload) as upload'))
-                        ->where('failed', false)
-                        ->get();
 
-        if($data) {
-            return response()->json([
-                'method' => 'get latest speedtest',
-                'data' => $data,
-                'average' => $avg[0],
-                'max' => $max[0],
-            ], 200);
+        $response = [
+            'method' => 'get latest speedtest',
+            'data' => $data,
+        ];
+
+        if (SettingsHelper::get('show_average')) {
+            $avg = Speedtest::select(DB::raw('AVG(ping) as ping, AVG(download) as download, AVG(upload) as upload'))
+                ->where('failed', false)
+                ->first()
+                ->toArray();
+            $response['average'] = $avg;
+        }
+
+        if (SettingsHelper::get('show_max')) {
+            $max = Speedtest::select(DB::raw('MAX(ping) as ping, MAX(download) as download, MAX(upload) as upload'))
+                ->where('failed', false)
+                ->first()
+                ->toArray();
+            $response['maximum'] = $max;
+        }
+
+        if (SettingsHelper::get('show_min')) {
+            $min = Speedtest::select(DB::raw('MIN(ping) as ping, MIN(download) as download, MIN(upload) as upload'))
+                ->where('failed', false)
+                ->first()
+                ->toArray();
+            $response['minimum'] = $min;
+        }
+
+        if ($data) {
+            return response()->json($response, 200);
         } else {
             return response()->json([
                 'method' => 'get latest speedtest',
@@ -158,7 +176,7 @@ class SpeedtestController extends Controller
                 'method' => 'run speedtest',
                 'data' => 'a new speedtest has been added to the queue'
             ], 200);
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             return response()->json([
                 'method' => 'run speedtest',
                 'error' => $e
@@ -175,7 +193,7 @@ class SpeedtestController extends Controller
     {
         $ret = SpeedtestHelper::deleteAll();
 
-        if($ret['success']) {
+        if ($ret['success']) {
             return response()->json([
                 'method' => 'delete all speedtests from the database',
                 'success' => true

changelog.json

@@ -1,4 +1,46 @@
 {
+    "1.10.0": [
+        {
+            "description": "Added automated build for ARM.",
+            "link": ""
+        },
+        {
+            "description": "Updated dependencies.",
+            "link": ""
+        }
+    ],
+    "1.9.10": [
+        {
+            "description": "Laravel will now log into daily files and logs will only be kept for 7 days.",
+            "link": ""
+        }
+    ],
+    "1.9.9": [
+        {
+            "description": "Updated dependencies.",
+            "link": ""
+        }
+    ],
+    "1.9.8": [
+        {
+            "description": "Fixed bug with minimum display setting.",
+            "link": ""
+        }
+    ],
+    "1.9.7": [
+        {
+            "description": "Added option to display minimum values on the top widgets.",
+            "link": ""
+        },
+        {
+            "description": "New general settings section.",
+            "link": ""
+        },
+        {
+            "description": "Updated dependencies.",
+            "link": ""
+        }
+    ],
     "1.9.6": [
         {
             "description": "Clear the cache on restore.",

composer.json

@@ -15,7 +15,7 @@
         "fruitcake/laravel-cors": "^2.0",
         "guzzlehttp/guzzle": "^7.0",
         "henrywhitaker3/healthchecks-io": "^1.0",
-        "laravel-notification-channels/telegram": "^0.4.0",
+        "laravel-notification-channels/telegram": "^0.5.0",
         "laravel/framework": "^7.0",
         "laravel/slack-notification-channel": "^2.0",
         "laravel/tinker": "^2.0",

config/logging.php

@@ -37,7 +37,7 @@ return [
     'channels' => [
         'stack' => [
             'driver' => 'stack',
-            'channels' => ['single'],
+            'channels' => ['daily'],
             'ignore_exceptions' => false,
         ],
 
@@ -51,7 +51,7 @@ return [
             'driver' => 'daily',
             'path' => storage_path('logs/laravel.log'),
             'level' => 'debug',
-            'days' => 14,
+            'days' => 7,
         ],
 
         'slack' => [

config/speedtest.php

@@ -7,7 +7,7 @@ return [
     |--------------------------------------------------------------------------
     */
 
-    'version' => '1.9.6',
+    'version' => '1.10.0',
 
     /*
     |--------------------------------------------------------------------------

database/migrations/2020_09_10_231121_add_widget_card_settings.php

@@ -0,0 +1,56 @@
+<?php
+
+use App\Helpers\SettingsHelper;
+use App\Setting;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddWidgetCardSettings extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if (!SettingsHelper::get('show_average')) {
+            Setting::create([
+                'name' => 'show_average',
+                'value' => true,
+                'description' => 'If enabled, the average value for speedtests will be shown in the widgets.'
+            ]);
+        }
+
+        if (!SettingsHelper::get('show_max')) {
+            Setting::create([
+                'name' => 'show_max',
+                'value' => true,
+                'description' => 'If enabled, the maximum value for speedtests will be shown in the widgets.'
+            ]);
+        }
+
+        if (!SettingsHelper::get('show_min')) {
+            Setting::create([
+                'name' => 'show_min',
+                'value' => true,
+                'description' => 'If enabled, the minimum value for speedtests will be shown in the widgets.'
+            ]);
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Setting::whereIn('name', [
+            'show_average',
+            'show_max',
+            'show_min',
+        ])->delete();
+    }
+}

package.json

@@ -10,29 +10,29 @@
         "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
     },
     "devDependencies": {
-        "@babel/preset-react": "^7.10.4",
-        "axios": "^0.20",
-        "bootstrap": "^4.5.2",
+        "axios": "^0.21",
+        "@babel/preset-react": "^7.12.10",
+        "bootstrap": "^4.5.3",
         "cross-env": "^7.0",
         "jquery": "^3.5",
-        "laravel-mix": "^5.0.5",
+        "laravel-mix": "^5.0.9",
         "lodash": "^4.17.20",
         "popper.js": "^1.12",
-        "react": "^16.2.0",
-        "react-dom": "^16.2.0",
-        "resolve-url-loader": "^3.1.0",
-        "sass": "^1.26.10",
-        "sass-loader": "^10.0.1"
+        "react": "^16.14.0",
+        "react-dom": "^16.14.0",
+        "resolve-url-loader": "^3.1.2",
+        "sass-loader": "^10.1.0",
+        "sass": "^1.30.0"
     },
     "dependencies": {
-        "@babel/plugin-proposal-class-properties": "^7.10.4",
-        "chart.js": "^2.9.3",
+        "@babel/plugin-proposal-class-properties": "^7.12.1",
+        "chart.js": "^2.9.4",
         "csv-file-validator": "^1.8.0",
         "js-cookie": "^2.2.1",
-        "react-bootstrap": "^1.3.0",
-        "react-chartjs-2": "^2.10.0",
+        "react-bootstrap": "^1.4.0",
+        "react-chartjs-2": "^2.11.1",
         "react-router": "^5.2.0",
         "react-router-dom": "^5.2.0",
-        "react-toastify": "^6.0.8"
+        "react-toastify": "^6.2.0"
     }
 }

public/js/app.js.LICENSE.txt

@@ -12,7 +12,7 @@ License: MIT
 */
 
 /*!
-  * Bootstrap v4.5.2 (https://getbootstrap.com/)
+  * Bootstrap v4.5.3 (https://getbootstrap.com/)
   * Copyright 2011-2020 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
   * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
   */
@@ -24,9 +24,9 @@ License: MIT
 */
 
 /*!
- * Chart.js v2.9.3
+ * Chart.js v2.9.4
  * https://www.chartjs.org
- * (c) 2019 Chart.js Contributors
+ * (c) 2020 Chart.js Contributors
  * Released under the MIT License
  */
 
@@ -81,15 +81,6 @@ License: MIT
  * LICENSE file in the root directory of this source tree.
  */
 
-/** @license React v16.13.1
- * react-dom.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
 /** @license React v16.13.1
  * react-is.production.min.js
  *
@@ -99,7 +90,16 @@ License: MIT
  * LICENSE file in the root directory of this source tree.
  */
 
-/** @license React v16.13.1
+/** @license React v16.14.0
+ * react-dom.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/** @license React v16.14.0
  * react.production.min.js
  *
  * Copyright (c) Facebook, Inc. and its affiliates.
@@ -132,3 +132,7 @@ License: MIT
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
+//! moment.js
+
+//! moment.js locale configuration

resources/js/components/Graphics/LatestResults.js

@@ -131,9 +131,7 @@ export default class LatestResults extends Component {
                         >
                             <Widget
                                 title="Ping"
-                                value={parseFloat(data.data.ping).toFixed(1)}
-                                avg={parseFloat(data.average.ping).toFixed(1)}
-                                max={parseFloat(data.max.ping).toFixed(1)}
+                                data={data}
                                 failed={data.data.failed}
                                 unit="ms"
                                 icon="ping"
@@ -147,9 +145,7 @@ export default class LatestResults extends Component {
                         >
                             <Widget
                                 title="Download"
-                                value={parseFloat(data.data.download).toFixed(1)}
-                                avg={parseFloat(data.average.download).toFixed(1)}
-                                max={parseFloat(data.max.download).toFixed(1)}
+                                data={data}
                                 failed={data.data.failed}
                                 unit="Mbit/s"
                                 icon="dl"
@@ -163,9 +159,7 @@ export default class LatestResults extends Component {
                         >
                             <Widget
                                 title="Upload"
-                                value={parseFloat(data.data.upload).toFixed(1)}
-                                avg={parseFloat(data.average.upload).toFixed(1)}
-                                max={parseFloat(data.max.upload).toFixed(1)}
+                                data={data}
                                 failed={data.data.failed}
                                 unit="Mbit/s"
                                 icon="ul"

resources/js/components/Graphics/Widget.js

@@ -8,38 +8,88 @@ export default class Widget extends Component {
 
         this.state = {
             title: this.props.title,
-            value: this.props.value,
             unit: this.props.unit,
             icon: this.props.icon,
-            avg: this.props.avg,
-            max: this.props.max,
             failed: this.props.failed,
+            data: this.props.data
         }
     }
 
+    parseData(title, data) {
+        var returnData = {};
+
+
+        if(title == 'Ping') {
+            returnData.value = parseFloat(data.data.ping).toFixed(1);
+
+            if(window.config.widgets.show_average) {
+                returnData.avg = parseFloat(data.average.ping).toFixed(1);
+            }
+
+            if(window.config.widgets.show_max) {
+                returnData.max = parseFloat(data.maximum.ping).toFixed(1);
+            }
+
+            if(window.config.widgets.show_min) {
+                returnData.min = parseFloat(data.minimum.ping).toFixed(1);
+            }
+        }
+
+        if(title == 'Upload') {
+            returnData.value = parseFloat(data.data.upload).toFixed(1);
+
+            if(window.config.widgets.show_average) {
+                returnData.avg = parseFloat(data.average.upload).toFixed(1);
+            }
+
+            if(window.config.widgets.show_max) {
+                returnData.max = parseFloat(data.maximum.upload).toFixed(1);
+            }
+
+            if(window.config.widgets.show_min) {
+                returnData.min = parseFloat(data.minimum.upload).toFixed(1);
+            }
+        }
+
+        if(title == 'Download') {
+            returnData.value = parseFloat(data.data.download).toFixed(1);
+
+            if(window.config.widgets.show_average) {
+                returnData.avg = parseFloat(data.average.download).toFixed(1);
+            }
+
+            if(window.config.widgets.show_max) {
+                returnData.max = parseFloat(data.maximum.download).toFixed(1);
+            }
+
+            if(window.config.widgets.show_min) {
+                returnData.min = parseFloat(data.minimum.download).toFixed(1);
+            }
+        }
+
+        return returnData;
+    }
+
     componentDidUpdate = () => {
-        if(this.props.title != this.state.title || this.props.value != this.state.value || this.props.unit != this.state.unit || this.props.icon != this.state.icon || this.props.avg != this.state.avg || this.props.max != this.state.max || this.props.failed != this.state.failed) {
+        if(this.props.title != this.state.title || this.props.data != this.state.data || this.props.unit != this.state.unit || this.props.icon != this.state.icon || this.props.failed != this.state.failed) {
             this.setState({
                 title: this.props.title,
-                value: this.props.value,
                 unit: this.props.unit,
                 icon: this.props.icon,
-                avg: this.props.avg,
-                max: this.props.max,
                 failed: this.props.failed,
+                data: this.props.data
             });
         }
     }
 
     render() {
         var title = this.state.title;
-        var value = this.state.value;
         var unit = this.state.unit;
         var icon = this.state.icon;
-        var max = this.state.max;
-        var avg = this.state.avg;
         var failed = Boolean(Number(this.state.failed));
 
+        var data = this.parseData(title, this.state.data);
+
         switch(icon) {
             case 'ping':
                 icon = <span className="ti-pulse icon text-success"></span>;
@@ -63,17 +113,30 @@ export default class Widget extends Component {
                             </div>
 
                             <div className="text-truncate">
-                                <h3 className="d-inline">{(!failed) ? value : <span className="ti-close text-danger"></span> }</h3>
+                                <h3 className="d-inline">{(!failed) ? data.value : <span className="ti-close text-danger"></span> }</h3>
                                 <p className="d-inline ml-2">{unit} (current)</p>
                             </div>
-                            <div className="text-muted text-truncate">
-                                <h5 className="d-inline">{avg}</h5>
-                                <p className="d-inline ml-2">{unit} (average)</p>
-                            </div>
-                            <div className="text-muted text-truncate">
-                                <h5 className="d-inline">{max}</h5>
-                                <p className="d-inline ml-2">{unit} (maximum)</p>
-                            </div>
+
+                            {window.config.widgets.show_average &&
+                                <div className="text-muted text-truncate">
+                                    <h5 className="d-inline">{data.avg}</h5>
+                                    <p className="d-inline ml-2">{unit} (average)</p>
+                                </div>
+                            }
+
+                            {window.config.widgets.show_max &&
+                                <div className="text-muted text-truncate">
+                                    <h5 className="d-inline">{data.max}</h5>
+                                    <p className="d-inline ml-2">{unit} (maximum)</p>
+                                </div>
+                            }
+
+                            {window.config.widgets.show_min &&
+                                <div className="text-muted text-truncate">
+                                    <h5 className="d-inline">{data.min}</h5>
+                                    <p className="d-inline ml-2">{unit} (minimum)</p>
+                                </div>
+                            }
                         </div>
                     </div>
                 </Card.Body>

resources/js/components/Settings/SettingWithModal.js

@@ -47,6 +47,10 @@ export default class SettingWithModal extends Component {
             if(this.state.autoClose) {
                 this.toggleShow();
             }
+            Axios.get('api/settings/config')
+            .then((resp) => {
+                window.config = resp.data;
+            })
         })
         .catch((err) => {
             if(err.response.status == 422) {
@@ -194,7 +198,7 @@ export default class SettingWithModal extends Component {
                                         </Col>
                                         {e.description == null &&
                                             <Col md={md} sm={sm}>
-                                                <p>{e.obj.description}</p>
+                                                <p dangerouslySetInnerHTML={{ __html: e.obj.description}}></p>
                                             </Col>
                                         }
                                     </Row>

resources/js/components/Settings/Settings.js

@@ -59,10 +59,28 @@ export default class Settings extends Component {
         return (
             <Row>
                 <Col lg={{ span: 4 }} md={{ span: 6 }} sm={{ span: 12 }}>
-                    <Setting name={e.schedule.name} value={e.schedule.value} description={e.schedule.description} />
-                </Col>
-                <Col lg={{ span: 4 }} md={{ span: 6 }} sm={{ span: 12 }}>
-                    <Setting name={e.server.name} value={e.server.value} description={e.server.description} />
+                    <SettingWithModal title="General settings" description="Configure general settings for the app." autoClose={true} settings={[
+                        {
+                            obj: e.schedule,
+                            type: 'text'
+                        },
+                        {
+                            obj: e.server,
+                            type: 'text'
+                        },
+                        {
+                            obj: e.show_average,
+                            type: 'checkbox'
+                        },
+                        {
+                            obj: e.show_max,
+                            type: 'checkbox'
+                        },
+                        {
+                            obj: e.show_min,
+                            type: 'checkbox'
+                        },
+                    ]} />
                 </Col>
                 <Col lg={{ span: 4 }} md={{ span: 6 }} sm={{ span: 12 }}>
                     <SettingWithModal title="Graph settings" description="Control settings for the graphs." autoClose={true} settings={[

tests/Feature/APISpeedtestTest.php

@@ -27,13 +27,13 @@ class APISpeedtestTest extends TestCase
         $dl = [];
         $ul = [];
 
-        for($i = 0; $i < 3; $i++) {
+        for ($i = 0; $i < 3; $i++) {
             $pingVal = $faker->randomFloat();
-            array_push($ping,$pingVal);
+            array_push($ping, $pingVal);
             $dlVal = $faker->randomFloat();
-            array_push($dl,$dlVal);
+            array_push($dl, $dlVal);
             $ulVal = $faker->randomFloat();
-            array_push($ul,$ulVal);
+            array_push($ul, $ulVal);
 
             Speedtest::create([
                 'ping' => $pingVal,
@@ -70,7 +70,12 @@ class APISpeedtestTest extends TestCase
                 'download',
                 'upload',
             ],
-            'max' => [
+            'maximum' => [
+                'ping',
+                'download',
+                'upload',
+            ],
+            'minimum' => [
                 'ping',
                 'download',
                 'upload',

tests/Unit/Controllers/SpeedtestController/LatestTest.php

@@ -19,7 +19,7 @@ class LatestTest extends TestCase
      */
     private $controller;
 
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -53,6 +53,7 @@ class LatestTest extends TestCase
 
         $this->assertArrayHasKey('data', $resp);
         $this->assertArrayHasKey('average', $resp);
-        $this->assertArrayHasKey('max', $resp);
+        $this->assertArrayHasKey('maximum', $resp);
+        $this->assertArrayHasKey('minimum', $resp);
     }
 }