From 5db1106c37689c49150af16a1672e264b5d8bf63 Mon Sep 17 00:00:00 2001 From: Henry Whitaker Date: Sat, 10 Apr 2021 21:57:31 +0100 Subject: [PATCH 01/14] Adds support for influxdb version 1 --- app/Console/Commands/TestInfluxConnection.php | 62 ++++++++++ .../InfluxDBConnectionErrorException.php | 10 ++ .../InfluxDBNotEnabledException.php | 10 ++ app/Observers/SpeedtestObserver.php | 31 +++++ app/Providers/EventServiceProvider.php | 4 +- app/Speedtest.php | 14 +++ app/Utils/InfluxDB/InfluxDB.php | 104 ++++++++++++++++ .../InfluxDB/InfluxDBVersion1Wrapper.php | 71 +++++++++++ .../InfluxDB/InfluxDBWrapperInterface.php | 13 ++ composer.json | 2 + composer.lock | 114 +++++++++++++++++- config/services.php | 5 + ...21_04_10_182503_add_influx_db_settings.php | 74 ++++++++++++ 13 files changed, 512 insertions(+), 2 deletions(-) create mode 100644 app/Console/Commands/TestInfluxConnection.php create mode 100644 app/Exceptions/InfluxDBConnectionErrorException.php create mode 100644 app/Exceptions/InfluxDBNotEnabledException.php create mode 100644 app/Observers/SpeedtestObserver.php create mode 100644 app/Utils/InfluxDB/InfluxDB.php create mode 100644 app/Utils/InfluxDB/InfluxDBVersion1Wrapper.php create mode 100644 app/Utils/InfluxDB/InfluxDBWrapperInterface.php create mode 100644 database/migrations/2021_04_10_182503_add_influx_db_settings.php diff --git a/app/Console/Commands/TestInfluxConnection.php b/app/Console/Commands/TestInfluxConnection.php new file mode 100644 index 00000000..ae789eeb --- /dev/null +++ b/app/Console/Commands/TestInfluxConnection.php @@ -0,0 +1,62 @@ +enabled = (bool) SettingsHelper::get('influx_db_enabled')->value; + } + + /** + * Execute the console command. + * + * @return int + */ + public function handle() + { + if (!$this->enabled) { + $this->warn('InfluxDB is not enabled'); + exit; + } + + try { + InfluxDB::connect(); + $this->info('Connected successfully'); + } catch (InfluxDBConnectionErrorException $e) { + $this->error('Couldn\'t connect'); + return 1; + } + + return 0; + } +} diff --git a/app/Exceptions/InfluxDBConnectionErrorException.php b/app/Exceptions/InfluxDBConnectionErrorException.php new file mode 100644 index 00000000..24266020 --- /dev/null +++ b/app/Exceptions/InfluxDBConnectionErrorException.php @@ -0,0 +1,10 @@ +store($speedtest); + } catch (InfluxDBNotEnabledException $e) { + info('not enabled'); + } catch (Exception $e) { + Log::error($e); + } + } +} diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index b33e65d5..25c07449 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -10,6 +10,8 @@ use App\Listeners\SpeedtestCompleteListener; use App\Listeners\SpeedtestFailedListener; use App\Listeners\SpeedtestOverviewListener; use App\Listeners\TestNotificationListener; +use App\Observers\SpeedtestObserver; +use App\Speedtest; use Illuminate\Auth\Events\Registered; use Illuminate\Auth\Listeners\SendEmailVerificationNotification; use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider; @@ -49,6 +51,6 @@ class EventServiceProvider extends ServiceProvider { parent::boot(); - // + Speedtest::observe(SpeedtestObserver::class); } } diff --git a/app/Speedtest.php b/app/Speedtest.php index f0bc85ad..f7dbe02e 100644 --- a/app/Speedtest.php +++ b/app/Speedtest.php @@ -25,4 +25,18 @@ class Speedtest extends Model ]; protected $table = 'speedtests'; + + public function formatForInfluxDB() + { + return [ + 'id' => (int) $this->id, + 'download' => (float) $this->download, + 'upload' => (float) $this->upload, + 'ping' => (float) $this->ping, + 'server_id' => (int) $this->server_id, + 'server_host' => $this->server_host, + 'server_name' => $this->server_name, + 'scheduled' => (bool) $this->scheduled, + ]; + } } diff --git a/app/Utils/InfluxDB/InfluxDB.php b/app/Utils/InfluxDB/InfluxDB.php new file mode 100644 index 00000000..ebe9a00b --- /dev/null +++ b/app/Utils/InfluxDB/InfluxDB.php @@ -0,0 +1,104 @@ +client = $client; + } + + /** + * Connect to influx db + * + * @param string $host + * @param integer $port + * @param string $database + * @return InfluxDB + */ + public static function connect() + { + if (!(bool) SettingsHelper::get('influx_db_enabled')->value) { + throw new InfluxDBNotEnabledException(); + } + + $host = SettingsHelper::get('influx_db_host')->value; + $port = SettingsHelper::get('influx_db_port')->value; + $token = ''; + $database = SettingsHelper::get('influx_db_database')->value; + $version = (int) SettingsHelper::get('influx_db_version')->value; + + $wrapper = $version === 1 + ? new InfluxDBVersion1Wrapper( + new Version1(str_replace(['http://', 'https://'], '', $host), $port) + ) + : new InfluxDBVersion2Wrapper( + new Version2([]) + ); + + return (new self($wrapper))->setDatabase($database) + ->testConnection(); + } + + /** + * Set the database field + * + * @param string $database + * @return InfluxDB + */ + public function setDatabase(string $database): InfluxDB + { + $this->database = $database; + + return $this; + } + + /** + * Test the connection + * + * @throws InfluxDBConnectionErrorException + * @return InfluxDB + */ + public function testConnection(): InfluxDB + { + if (!$this->client->testConnection()) { + throw new InfluxDBConnectionErrorException(); + } + + if (!$this->doesDatabaseExist()) { + $this->createDatabase(); + } + + return $this; + } + + public function doesDatabaseExist(): bool + { + return $this->client->doesDatabaseExist($this->database); + } + + public function createDatabase(): bool + { + return $this->client->createDatabase($this->database); + } + + public function store(Speedtest $speedtest): InfluxDB + { + $this->client->store($speedtest); + + return $this; + } +} diff --git a/app/Utils/InfluxDB/InfluxDBVersion1Wrapper.php b/app/Utils/InfluxDB/InfluxDBVersion1Wrapper.php new file mode 100644 index 00000000..7f4cabec --- /dev/null +++ b/app/Utils/InfluxDB/InfluxDBVersion1Wrapper.php @@ -0,0 +1,71 @@ +client = $client; + } + + public function testConnection(): bool + { + try { + $this->client->listDatabases(); + + return true; + } catch (Exception $e) { + Log::error($e); + + return false; + } + } + + public function doesDatabaseExist(string $database): bool + { + $this->database = $this->client->selectDB($database); + + return (bool) $this->database->exists(); + } + + public function createDatabase(string $database): bool + { + try { + $this->database->create(new RetentionPolicy( + 'speedtest_retention_policy', + config('services.influxdb.retention'), + 1, + true + )); + + return true; + } catch (Exception $e) { + Log::error($e); + return false; + } + } + + public function store(Speedtest $speedtest): bool + { + return $this->database->writePoints([ + new Point( + 'speedtest', + null, + ['host' => config('services.influxdb.host')], + $speedtest->formatForInfluxDB(), + ) + ]); + } +} diff --git a/app/Utils/InfluxDB/InfluxDBWrapperInterface.php b/app/Utils/InfluxDB/InfluxDBWrapperInterface.php new file mode 100644 index 00000000..3c72c7ea --- /dev/null +++ b/app/Utils/InfluxDB/InfluxDBWrapperInterface.php @@ -0,0 +1,13 @@ +=7.1" + }, + "require-dev": { + "phpunit/phpunit": "^7.4|^9.1", + "squizlabs/php_codesniffer": "~2.6" + }, + "type": "library", + "autoload": { + "psr-4": { + "InfluxDB2\\": "src/InfluxDB2" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "InfluxDB (v2+) Client Library for PHP", + "homepage": "https://www.github.com/influxdata/influxdb-client-php", + "keywords": [ + "influxdb" + ], + "support": { + "issues": "https://github.com/influxdata/influxdb-client-php/issues", + "source": "https://github.com/influxdata/influxdb-client-php/tree/1.12.0" + }, + "time": "2021-04-01T06:28:57+00:00" + }, + { + "name": "influxdb/influxdb-php", + "version": "1.15.2", + "source": { + "type": "git", + "url": "https://github.com/influxdata/influxdb-php.git", + "reference": "d6e59f4f04ab9107574fda69c2cbe36671253d03" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/influxdata/influxdb-php/zipball/d6e59f4f04ab9107574fda69c2cbe36671253d03", + "reference": "d6e59f4f04ab9107574fda69c2cbe36671253d03", + "shasum": "" + }, + "require": { + "guzzlehttp/guzzle": "^6.0|^7.0", + "php": "^5.5 || ^7.0 || ^8.0" + }, + "require-dev": { + "dms/phpunit-arraysubset-asserts": "^0.2.1", + "phpunit/phpunit": "^9.5" + }, + "suggest": { + "ext-curl": "Curl extension, needed for Curl driver", + "stefanotorresi/influxdb-php-async": "An asyncronous client for InfluxDB, implemented via ReactPHP." + }, + "type": "library", + "autoload": { + "psr-4": { + "InfluxDB\\": "src/InfluxDB" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Stephen Hoogendijk", + "email": "stephen@tca0.nl" + }, + { + "name": "Daniel Martinez", + "email": "danimartcas@hotmail.com" + }, + { + "name": "Gianluca Arbezzano", + "email": "gianarb92@gmail.com" + } + ], + "description": "InfluxDB client library for PHP", + "keywords": [ + "client", + "influxdata", + "influxdb", + "influxdb class", + "influxdb client", + "influxdb library", + "time series" + ], + "support": { + "issues": "https://github.com/influxdata/influxdb-php/issues", + "source": "https://github.com/influxdata/influxdb-php/tree/1.15.2" + }, + "time": "2020-12-26T17:45:17+00:00" + }, { "name": "laravel-notification-channels/telegram", "version": "0.5.1", diff --git a/config/services.php b/config/services.php index 88eb96e4..c966d76e 100644 --- a/config/services.php +++ b/config/services.php @@ -34,4 +34,9 @@ return [ 'token' => env('TELEGRAM_BOT_TOKEN', 'YOUR BOT TOKEN HERE') ], + 'influxdb' => [ + 'retention' => env('INFLUXDB_RETENTION', '30d'), + 'host' => env('INFLUXDB_HOST_TAG', 'speedtest'), + ], + ]; diff --git a/database/migrations/2021_04_10_182503_add_influx_db_settings.php b/database/migrations/2021_04_10_182503_add_influx_db_settings.php new file mode 100644 index 00000000..2a1e66eb --- /dev/null +++ b/database/migrations/2021_04_10_182503_add_influx_db_settings.php @@ -0,0 +1,74 @@ + 'influx_db_enabled', + 'value' => false, + 'description' => 'Enable the InfluxDB integration for speedtests.' + ]); + } + + if (!SettingsHelper::get('influx_db_host')) { + Setting::create([ + 'name' => 'influx_db_host', + 'value' => '', + 'description' => 'InfluxDB hostname, include the protocol (http:// or https://).' + ]); + } + + if (!SettingsHelper::get('influx_db_port')) { + Setting::create([ + 'name' => 'influx_db_port', + 'value' => '', + 'description' => 'InfluxDB port' + ]); + } + + if (!SettingsHelper::get('influx_db_database')) { + Setting::create([ + 'name' => 'influx_db_database', + 'value' => '', + 'description' => 'InfluxDB database' + ]); + } + + if (!SettingsHelper::get('influx_db_version')) { + Setting::create([ + 'name' => 'influx_db_version', + 'value' => 1, + 'description' => 'InfluxDB version' + ]); + } + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Setting::whereIn('name', [ + 'influx_db_enabled', + 'influx_db_host', + 'influx_db_port', + 'influx_db_database', + 'influx_db_version', + ])->delete(); + } +} From 4e6049b7ece86b26febab038de80888f5eae21b5 Mon Sep 17 00:00:00 2001 From: Henry Whitaker Date: Sat, 10 Apr 2021 21:58:41 +0100 Subject: [PATCH 02/14] Remove logging --- app/Observers/SpeedtestObserver.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Observers/SpeedtestObserver.php b/app/Observers/SpeedtestObserver.php index 61439423..2ba992e1 100644 --- a/app/Observers/SpeedtestObserver.php +++ b/app/Observers/SpeedtestObserver.php @@ -18,12 +18,11 @@ class SpeedtestObserver */ public function created(Speedtest $speedtest) { - info('trying influx'); try { InfluxDB::connect() ->store($speedtest); } catch (InfluxDBNotEnabledException $e) { - info('not enabled'); + // / } catch (Exception $e) { Log::error($e); } From 845359726d31c74453ca0e64d6fb0c003f9a631f Mon Sep 17 00:00:00 2001 From: Henry Whitaker Date: Sat, 10 Apr 2021 22:02:27 +0100 Subject: [PATCH 03/14] Formatting --- app/Utils/InfluxDB/InfluxDBVersion1Wrapper.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/Utils/InfluxDB/InfluxDBVersion1Wrapper.php b/app/Utils/InfluxDB/InfluxDBVersion1Wrapper.php index 7f4cabec..d3fec128 100644 --- a/app/Utils/InfluxDB/InfluxDBVersion1Wrapper.php +++ b/app/Utils/InfluxDB/InfluxDBVersion1Wrapper.php @@ -43,12 +43,14 @@ class InfluxDBVersion1Wrapper implements InfluxDBWrapperInterface public function createDatabase(string $database): bool { try { - $this->database->create(new RetentionPolicy( - 'speedtest_retention_policy', - config('services.influxdb.retention'), - 1, - true - )); + $this->database->create( + new RetentionPolicy( + 'speedtest_retention_policy', + config('services.influxdb.retention'), + 1, + true + ) + ); return true; } catch (Exception $e) { From 7b16f1ab09a276be40d050605e65eed786de0d98 Mon Sep 17 00:00:00 2001 From: Henry Whitaker Date: Sat, 10 Apr 2021 22:08:07 +0100 Subject: [PATCH 04/14] Remove influx console command --- app/Console/Commands/TestInfluxConnection.php | 62 ------------------- 1 file changed, 62 deletions(-) delete mode 100644 app/Console/Commands/TestInfluxConnection.php diff --git a/app/Console/Commands/TestInfluxConnection.php b/app/Console/Commands/TestInfluxConnection.php deleted file mode 100644 index ae789eeb..00000000 --- a/app/Console/Commands/TestInfluxConnection.php +++ /dev/null @@ -1,62 +0,0 @@ -enabled = (bool) SettingsHelper::get('influx_db_enabled')->value; - } - - /** - * Execute the console command. - * - * @return int - */ - public function handle() - { - if (!$this->enabled) { - $this->warn('InfluxDB is not enabled'); - exit; - } - - try { - InfluxDB::connect(); - $this->info('Connected successfully'); - } catch (InfluxDBConnectionErrorException $e) { - $this->error('Couldn\'t connect'); - return 1; - } - - return 0; - } -} From 0b8ccfd8d34ab624c96715308fd16140957f70bf Mon Sep 17 00:00:00 2001 From: Henry Whitaker Date: Sat, 10 Apr 2021 22:27:31 +0100 Subject: [PATCH 05/14] Added speedtest seeder --- app/Speedtest.php | 3 ++ composer.json | 10 +++--- database/factories/SpeedtestFactory.php | 31 +++++++++++++++++++ .../{seeds => seeders}/DatabaseSeeder.php | 5 ++- database/seeders/SpeedtestSeeder.php | 21 +++++++++++++ 5 files changed, 63 insertions(+), 7 deletions(-) create mode 100644 database/factories/SpeedtestFactory.php rename database/{seeds => seeders}/DatabaseSeeder.php (64%) create mode 100644 database/seeders/SpeedtestSeeder.php diff --git a/app/Speedtest.php b/app/Speedtest.php index f7dbe02e..80cb2644 100644 --- a/app/Speedtest.php +++ b/app/Speedtest.php @@ -2,10 +2,13 @@ namespace App; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; class Speedtest extends Model { + use HasFactory; + /** * The attributes that are mass assignable. * diff --git a/composer.json b/composer.json index fe020273..aa56ac7e 100644 --- a/composer.json +++ b/composer.json @@ -47,12 +47,10 @@ }, "autoload": { "psr-4": { - "App\\": "app/" - }, - "classmap": [ - "database/seeds", - "database/factories" - ] + "App\\": "app/", + "Database\\Factories\\": "database/factories/", + "Database\\Seeders\\": "database/seeders/" + } }, "autoload-dev": { "psr-4": { diff --git a/database/factories/SpeedtestFactory.php b/database/factories/SpeedtestFactory.php new file mode 100644 index 00000000..f2a59d93 --- /dev/null +++ b/database/factories/SpeedtestFactory.php @@ -0,0 +1,31 @@ + rand(15, 900), + 'upload' => rand(15, 900), + 'ping' => rand(1, 25), + 'scheduled' => (bool) rand(0, 1), + ]; + } +} diff --git a/database/seeds/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php similarity index 64% rename from database/seeds/DatabaseSeeder.php rename to database/seeders/DatabaseSeeder.php index 237dfc5d..79580814 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -1,5 +1,8 @@ call(UserSeeder::class); + $this->call(SpeedtestSeeder::class); } } diff --git a/database/seeders/SpeedtestSeeder.php b/database/seeders/SpeedtestSeeder.php new file mode 100644 index 00000000..1b8ed32f --- /dev/null +++ b/database/seeders/SpeedtestSeeder.php @@ -0,0 +1,21 @@ +count(250) + ->create(); + } +} From 99c64af48207c51c25aef08b6e50e295b270884d Mon Sep 17 00:00:00 2001 From: Henry Whitaker Date: Sat, 10 Apr 2021 22:32:51 +0100 Subject: [PATCH 06/14] Move models into Models dir --- app/Actions/GetFailedSpeedtestData.php | 2 +- app/Actions/GetLatestSpeedtestData.php | 2 +- app/Actions/GetSpeedtestTimeData.php | 2 +- app/Helpers/BackupHelper.php | 2 +- app/Helpers/EmailVerificationHelper.php | 2 +- app/Helpers/SettingsHelper.php | 2 +- app/Helpers/SpeedtestHelper.php | 2 +- app/Http/Controllers/AuthController.php | 2 +- app/Http/Controllers/SettingsController.php | 2 +- app/Http/Controllers/SpeedtestController.php | 2 +- app/Interfaces/SpeedtestProvider.php | 2 +- app/{ => Models}/Setting.php | 2 +- app/{ => Models}/Speedtest.php | 2 +- app/{ => Models}/User.php | 4 ++-- app/Observers/SpeedtestObserver.php | 2 +- app/Providers/EventServiceProvider.php | 2 +- app/Utils/InfluxDB/InfluxDB.php | 2 +- .../InfluxDB/InfluxDBVersion1Wrapper.php | 2 +- .../InfluxDB/InfluxDBWrapperInterface.php | 2 +- app/Utils/OoklaTester.php | 2 +- database/factories/SpeedtestFactory.php | 2 +- database/factories/UserFactory.php | 2 +- .../2014_10_12_000000_create_users_table.php | 2 +- ...020_05_18_211812_create_settings_table.php | 2 +- ...6_21_171849_add_notifications_settings.php | 2 +- .../2020_07_06_105930_add_graph_settings.php | 2 +- ...215412_add_notification_agent_settings.php | 2 +- ...08_12_123941_add_healthchecks_settings.php | 2 +- ..._21_133343_add_authentication_settings.php | 2 +- ...add_conditional_notifications_settings.php | 2 +- ...8_192136_add_show_failed_tests_setting.php | 2 +- ..._09_10_231121_add_widget_card_settings.php | 2 +- ...19_211232_add_schedule_enabled_setting.php | 2 +- ...2020_12_19_234248_add_app_name_setting.php | 2 +- ...001345_add_custom_healthchecks_setting.php | 2 +- ..._101259_add_speedtest_provider_setting.php | 2 +- ..._update_speedtest_server_settings_text.php | 2 +- ..._10_082758_add_visible_columns_setting.php | 2 +- ...4_10_102320_add_hidden_columns_setting.php | 2 +- ...21_04_10_182503_add_influx_db_settings.php | 2 +- database/seeders/SpeedtestSeeder.php | 2 +- database/speed.db | Bin 139264 -> 139264 bytes routes/api.php | 2 +- tests/Feature/APISpeedtestTest.php | 2 +- .../SpeedtestController/DeleteTest.php | 2 +- .../SpeedtestController/LatestTest.php | 2 +- .../SpeedtestHelper/AbsoluteThresholdTest.php | 2 +- .../SpeedtestHelper/FailureRateTest.php | 2 +- .../PercentageThresholdTest.php | 2 +- .../SpeedtestCompleteListener/SlackTest.php | 2 +- .../TelegramTest.php | 2 +- .../SpeedtestFailedListener/SlackTest.php | 2 +- .../SpeedtestFailedListener/TelegramTest.php | 2 +- .../SpeedtestOverviewListener/SlackTest.php | 2 +- .../TelegramTest.php | 2 +- 55 files changed, 55 insertions(+), 55 deletions(-) rename app/{ => Models}/Setting.php (95%) rename app/{ => Models}/Speedtest.php (97%) rename app/{ => Models}/User.php (97%) diff --git a/app/Actions/GetFailedSpeedtestData.php b/app/Actions/GetFailedSpeedtestData.php index 7ffd586a..652f85c7 100644 --- a/app/Actions/GetFailedSpeedtestData.php +++ b/app/Actions/GetFailedSpeedtestData.php @@ -2,7 +2,7 @@ namespace App\Actions; -use App\Speedtest; +use App\Models\Speedtest; use Cache; use Carbon\Carbon; use DB; diff --git a/app/Actions/GetLatestSpeedtestData.php b/app/Actions/GetLatestSpeedtestData.php index ec6b8044..bc456ded 100644 --- a/app/Actions/GetLatestSpeedtestData.php +++ b/app/Actions/GetLatestSpeedtestData.php @@ -4,7 +4,7 @@ namespace App\Actions; use App\Helpers\SettingsHelper; use App\Helpers\SpeedtestHelper; -use App\Speedtest; +use App\Models\Speedtest; use DB; use Henrywhitaker3\LaravelActions\Interfaces\ActionInterface; diff --git a/app/Actions/GetSpeedtestTimeData.php b/app/Actions/GetSpeedtestTimeData.php index 105baa00..d2b15988 100644 --- a/app/Actions/GetSpeedtestTimeData.php +++ b/app/Actions/GetSpeedtestTimeData.php @@ -3,7 +3,7 @@ namespace App\Actions; use App\Helpers\SettingsHelper; -use App\Speedtest; +use App\Models\Speedtest; use Cache; use Carbon\Carbon; use Henrywhitaker3\LaravelActions\Interfaces\ActionInterface; diff --git a/app/Helpers/BackupHelper.php b/app/Helpers/BackupHelper.php index 48c332d9..1ec966a0 100644 --- a/app/Helpers/BackupHelper.php +++ b/app/Helpers/BackupHelper.php @@ -2,7 +2,7 @@ namespace App\Helpers; -use App\Speedtest; +use App\Models\Speedtest; use Cache; use DateTime; use Exception; diff --git a/app/Helpers/EmailVerificationHelper.php b/app/Helpers/EmailVerificationHelper.php index d12fc5ca..a6a3bedd 100644 --- a/app/Helpers/EmailVerificationHelper.php +++ b/app/Helpers/EmailVerificationHelper.php @@ -3,7 +3,7 @@ namespace App\Helpers; use App\Auth\EmailVerification; -use App\User; +use App\Models\User; class EmailVerificationHelper { public static function checkVerificationAttempt($userID, $token) diff --git a/app/Helpers/SettingsHelper.php b/app/Helpers/SettingsHelper.php index 767f70e3..3a9fb7bd 100644 --- a/app/Helpers/SettingsHelper.php +++ b/app/Helpers/SettingsHelper.php @@ -3,7 +3,7 @@ namespace App\Helpers; use App\Events\TestNotificationEvent; -use App\Setting; +use App\Models\Setting; use Cache; use Carbon\Carbon; diff --git a/app/Helpers/SpeedtestHelper.php b/app/Helpers/SpeedtestHelper.php index b4bf3e10..a5b9c1d6 100644 --- a/app/Helpers/SpeedtestHelper.php +++ b/app/Helpers/SpeedtestHelper.php @@ -2,7 +2,7 @@ namespace App\Helpers; -use App\Speedtest; +use App\Models\Speedtest; use App\Utils\OoklaTester; use Carbon\Carbon; use Exception; diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 2a610fe9..c712ac59 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -9,7 +9,7 @@ use Illuminate\Support\Facades\Auth; use App\Http\Controllers\Controller; use App\LoginSession; use App\Rules\CurrentPasswordMatches; -use App\User; +use App\Models\User; use DateTime; use Hash; use Illuminate\Support\Facades\Request as RequestFacade; diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 4d7202d6..b8359c37 100644 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -4,7 +4,7 @@ namespace App\Http\Controllers; use App\Helpers\SettingsHelper; use App\Rules\Cron; -use App\Setting; +use App\Models\Setting; use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Validator; diff --git a/app/Http/Controllers/SpeedtestController.php b/app/Http/Controllers/SpeedtestController.php index f4204ff0..20169675 100644 --- a/app/Http/Controllers/SpeedtestController.php +++ b/app/Http/Controllers/SpeedtestController.php @@ -9,7 +9,7 @@ use App\Actions\QueueSpeedtest; use App\Helpers\SettingsHelper; use App\Helpers\SpeedtestHelper; use App\Jobs\SpeedtestJob; -use App\Speedtest; +use App\Models\Speedtest; use Carbon\Carbon; use Exception; use Illuminate\Http\Request; diff --git a/app/Interfaces/SpeedtestProvider.php b/app/Interfaces/SpeedtestProvider.php index f0124d7f..6a9ad0fe 100644 --- a/app/Interfaces/SpeedtestProvider.php +++ b/app/Interfaces/SpeedtestProvider.php @@ -2,7 +2,7 @@ namespace App\Interfaces; -use App\Speedtest; +use App\Models\Speedtest; interface SpeedtestProvider { diff --git a/app/Setting.php b/app/Models/Setting.php similarity index 95% rename from app/Setting.php rename to app/Models/Setting.php index 075fa304..3f208599 100644 --- a/app/Setting.php +++ b/app/Models/Setting.php @@ -1,6 +1,6 @@ attributes['password'] = Hash::make($password); } } diff --git a/app/Observers/SpeedtestObserver.php b/app/Observers/SpeedtestObserver.php index 2ba992e1..1ad26d27 100644 --- a/app/Observers/SpeedtestObserver.php +++ b/app/Observers/SpeedtestObserver.php @@ -3,7 +3,7 @@ namespace App\Observers; use App\Exceptions\InfluxDBNotEnabledException; -use App\Speedtest; +use App\Models\Speedtest; use App\Utils\InfluxDB\InfluxDB; use Exception; use Log; diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 25c07449..e343a8b6 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -11,7 +11,7 @@ use App\Listeners\SpeedtestFailedListener; use App\Listeners\SpeedtestOverviewListener; use App\Listeners\TestNotificationListener; use App\Observers\SpeedtestObserver; -use App\Speedtest; +use App\Models\Speedtest; use Illuminate\Auth\Events\Registered; use Illuminate\Auth\Listeners\SendEmailVerificationNotification; use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider; diff --git a/app/Utils/InfluxDB/InfluxDB.php b/app/Utils/InfluxDB/InfluxDB.php index ebe9a00b..e283790c 100644 --- a/app/Utils/InfluxDB/InfluxDB.php +++ b/app/Utils/InfluxDB/InfluxDB.php @@ -5,7 +5,7 @@ namespace App\Utils\InfluxDB; use App\Exceptions\InfluxDBConnectionErrorException; use App\Exceptions\InfluxDBNotEnabledException; use App\Helpers\SettingsHelper; -use App\Speedtest; +use App\Models\Speedtest; use InfluxDB\Client as Version1; use InfluxDB2\Client as Version2; use App\Utils\InfluxDB\InfluxDBWrapperInterface as Client; diff --git a/app/Utils/InfluxDB/InfluxDBVersion1Wrapper.php b/app/Utils/InfluxDB/InfluxDBVersion1Wrapper.php index d3fec128..d8192a5d 100644 --- a/app/Utils/InfluxDB/InfluxDBVersion1Wrapper.php +++ b/app/Utils/InfluxDB/InfluxDBVersion1Wrapper.php @@ -2,7 +2,7 @@ namespace App\Utils\InfluxDB; -use App\Speedtest; +use App\Models\Speedtest; use Exception; use InfluxDB\Client; use InfluxDB\Database; diff --git a/app/Utils/InfluxDB/InfluxDBWrapperInterface.php b/app/Utils/InfluxDB/InfluxDBWrapperInterface.php index 3c72c7ea..e91df405 100644 --- a/app/Utils/InfluxDB/InfluxDBWrapperInterface.php +++ b/app/Utils/InfluxDB/InfluxDBWrapperInterface.php @@ -2,7 +2,7 @@ namespace App\Utils\InfluxDB; -use App\Speedtest; +use App\Models\Speedtest; interface InfluxDBWrapperInterface { diff --git a/app/Utils/OoklaTester.php b/app/Utils/OoklaTester.php index 74e617da..f127b08f 100644 --- a/app/Utils/OoklaTester.php +++ b/app/Utils/OoklaTester.php @@ -6,7 +6,7 @@ use App\Exceptions\SpeedtestFailureException; use App\Helpers\SettingsHelper; use App\Helpers\SpeedtestHelper; use App\Interfaces\SpeedtestProvider; -use App\Speedtest; +use App\Models\Speedtest; use Cache; use Exception; use JsonException; diff --git a/database/factories/SpeedtestFactory.php b/database/factories/SpeedtestFactory.php index f2a59d93..4cc2efc3 100644 --- a/database/factories/SpeedtestFactory.php +++ b/database/factories/SpeedtestFactory.php @@ -2,7 +2,7 @@ namespace Database\Factories; -use App\Speedtest; +use App\Models\Speedtest; use Illuminate\Database\Eloquent\Factories\Factory; class SpeedtestFactory extends Factory diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index 741edead..fa9360e7 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -2,7 +2,7 @@ /** @var \Illuminate\Database\Eloquent\Factory $factory */ -use App\User; +use App\Models\User; use Faker\Generator as Faker; use Illuminate\Support\Str; diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index 4bfd7b91..5d0ad5dc 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -1,6 +1,6 @@ %)sO0T9y6H<5K@^WBttSY-P1i&HIoDqk^mtgke3h;o0{pGOp~7O zrmH(MK~SpWW3MhQtAeiA_3?3)1y=F8xcGkXQLd}&s@IR}imw$P$hs>&?kdXN-Fr^; zW2(CUlP$RFMf^APWai)hU!DK?o>QkzRiDR^LkIFzLzyX6=JcwPCd&w=WT&DK;=h>? zGQi(a{*LkYoA}$u->nyI{j&7G{20TR{bek)lf?Yzlf>~vFupPNaP+;AcZN4dUgSSt z-X45B7zl_X;|mEO0VMF8B2Yga3ihpAM_<09s!tURvuqf-s$o{m#oxla5AWS|bgy!B z*Chw`Dg%oj3@Doi^0@&eU#uD@jEYh$Rh43`P*BR1{G47nt(-JYD|)S3$`_|A#+*^C zZdC@#`QnKIWu{Q#jd4rB&AHNik=yvux<0Cvm-v7mRIeJjtX>^Za{RYye$L>Bs+Gkb zU1rm$oH8m|N5I^-X)Nk<#(;84uT0PCl|}Px$>fJ#G}kHx=bz^EtdXk~3?6hfUp&n* zY)%bw^^BhHFt&55vFXoH|)2Q;JoG`N@m~5?>zqw|# zY>8$O96Px0(6PPBzJq)AUMqs{RtzYm;^HTwgzUTxS}%$Q`_`CylvtRmC4c3`kh!@<7ZUV6r`sfka;JL0C*5;>|?I~Qj?7aFOwDp*^? zQI+-6jY?lN7F_3vUacB)D{k~gY;^K)+2Pw@&V&Tjim0d!8zogWWI z{+#^qIn`wSmV&9LgTcNnTjW8b3qEGZAx6aHY|`t_|gr*SdK ziZ;gaYrvg#$0yG!%hRP|(co23G|Zh>nwM;$jD=~V*~WKjnqfMx*X`Q9``F>b zdk-GX9^H54-XlkMU3qnz-=OXb_NDr$6|^gvC>}H0DD1{n(zf`UMBJCiZs$fjZ`%bb z`#1xGR#po3_4Uy+jg#O0*#6;jgKq0YTMyKNC9i#rbRdbd+III^%DQRJmnv{-&*0=8 zyqX0>>vp_x`EQ)4rojuhIBl5jKP6Y5J3ibjvbdEi2dxd%?mE_2+Q*#BpQtoW)y3bK z>qrBOA3UpC+LnXpr}XOdYYWzQ{jC?u*PtCL=Nz;R^{M0VIF~kN^@u0!RP}JZA`OJ>(-d zghrF2scbTnO(nA_ZFDS|&g!`wf9y3=s4Zl3Q~U`=<0)bCY9BFN-pSGQXwvqc&F6AP zF*{u<)aHt2OOm?EM@~2uNo`ae(`?15yqOnIlsY8a4*JN8o04=ksb*87DK#~oZ9J3B zwx1pIBCiaRxxv>kIcEm$<*lBgq_}^vRo;h%IEk)kfwI*fRB`fisyec%YP=5 zsdQ${R!!H;YH2PzYv_gQEPq-%eX^ao3-|lT@wO~AksVEEMl+4f>E&|cDQq)|(JOo; z@A6HhIJ-t*&4<8QqbMG+91u+wQOo)G?gB2q%m8X&o*zK?T7QNM7Ce%BeyMzQat;a@v(-8-_z&v;+9@7Wch>k z#V08(v6;HGS-zYZPcoHFrPJw5qyF$`IJ5kLee>x{TQaiON2c2ea^9T7M5d7|h_X4h zr(HU{Ht_#PQ)3yf6Lr)XRaQU2lWV85dAE-oYo^0x;~e1FM7mK~`E6!-w(Y51;v=<1 zPhROJ#*&$d?iwdjY%*+A+KF90GT&5=3*w{cv2;4sr8Mne=k#KYlWa(nJDcYcCn zoSM>jqMf;F*EVzLVjsyaCdTXPcxEg)3M6LVOmDf!N3L(WkMZ-Gr;*Y)w#FTQJM&rF zdD9LbIns2_h@#|Y&3Hy_Ig3X}4acGFi$OFUlUlm%*gnUa?xWk<)tUn z$L)BQ*GOV~(noGyj74ZN{LE@;oDVyi5B3_m;fcoS!cRnz0shl|wRDaLTn+!tTBCxb z8V%oQhrj)trr{~>|E0v2Na81n#}Z#kJdk+cIn#h+AV>fSAOR$R1dsp{Kmter2_OL^ zfCT=43G6z1-V>6vjx9c`pudH)NZsF>KsVk4qrB9x|tbEDI>*lUKaZA3iFE2(u4J9)}siZQRnoO#b=?TCT z=J}$De7AE@ll0AOR$R1dsp{Kmter2_OL^fCP|0 zlK|fTV^u%`NB{{S0VIF~kN^@u0!RP}AOR%s{3jsh|Ks@o=YKh44v_#7Kmter2_OL^ zfCP{L5V^b66CMDLB>n#d&9 zCjNJ9Eb&Av7pujtiCq!@dgAkmdlPrWABaB^do)gBuaEsrd`tX_=u^MJ@bFMb00|%g zB!C2v01`j~NB{{uZwT~CBQ#%}DbyCSxvA_aqhjVu#f__^l*5|StNN5~8XHzfgAQ}K zRH?3an`TR9b-;Z{qo_|6jNCfmIGfMqjAC}WRH)4rO=YFDg`UcrdH#9Jw)R|U8=W=u zLUnd})|ftNW=*5QqsrDQh4Z7*8mgDe*`hvYtm%=4sL6eDHLh+Za-Q%oXG`X!;3b_4(4ShG9m}^Z2q=!>pRwQZaj?qL*j;*GZSr>TJc}M=RvA zdcmkvv-*_DBd;3Sa=v(?Z@sjCX^&dDP||a&HcD45?UO6b7ll{vh0^h*y^5u3ekMPy zS9!UZJtFGPu*ybd+9+0erdDp1ZaB-wS=X^v$WkxWYt`B1qQG3tYqflCS-&*qwl*Or zMCGU&1%rc{%TAT5*=p&eQH+ZMX`82K^=dYsi!GNnQL~^=pUlo1Q?sSg$!MRHrUH4b zVl+@^=kvMhY-F{hcG#Qgg~fpdai@Do1mQ3?edV>%Zrb9SZ4`o278Jz_f8IPoKvY1p zY#2FFA+jZ2TTbPT`D`^mXZS^t1D`pu`rLZwN2U~(R?|j(W)W#ks8xMq@k{w+{#TOt zQ{BmjxaUEcfSpAM&Zv1JV|D z58F$BNO#1q`+shdtTdC!>Ut!WPB((wURI_Hx@qnh$PML-g?!N%xM+82ZcZOEjj~?R zt42;KHNdO%#di+corH*9GINzcWxsZS=CS$lbt(Ro#JT`aGeH5zG%Ge+Sj*lhm9tWn`LKo@pyuxrd# zel|E;%*86huWwx~N3%u)H5D*f7p{`Ye(SQcMcTMtv}0}jDWWZu=6|=r4)@CBDr^7Q zf^A*J+Tpeg|6c-TJwb9j&#U5+)xcSn!p?Rc8kl)dO>MAyGz|rn&u72W2n;Y;ffYe=!yEu?F;sVV ztpiz`)S~~hf_C}xAnBdpafqH^BMn9T%1^jvr*qgN{)?6c$w-V>S?2{dE4q?E{sGfM zB1pzg^GIC!=H;as8Fc;57ptNxD*DGAR~)aAUmOpTl!(0DeQoz@fj9xvju^l8x(?9n z{{p^%X)+oln}poeQwAIX(`+P2(${lpK%ZK4F9b2WgWc->H2rvotZFEBlRpj|7BJly z4ifdUu9Uh9s5=FZ7xx=N9OHhTf}>+^#|~!1zLY$Z3>=erF{|#wcSpZ?SdUSg!64bK z^TW0pVBo$3%s|V3qD*;%zxp1zd5}+D6a60N|@vKe5aMx{gkV%a$n|Cqd?^YOjeIiT+vr^2tZWM z%T2TK(3M6E&X0J~)!A0l-nb^1b}J&z8-DLoRYo&*&OG-}=cORocC#xeXM)X3pDX{3 z6b*i>dD?L;vdL9yMbl#`@%ulqI-Kieox4^hTP**fbh_g~%Wi%%&hNbVU71p<%xO(UVyLh+#sCYUupz!BF1!Fj$+d5q_#O+^JuWoJCtgVe|yj7e)Kyd-4x}WmS z{F&8jc?mXeTA*9b*2&ZI>1gG}%^JtVZzM(EQk2{7!&e<_R={CJ+)8fO75*q^X2(G5 z-fg;4;tx!whELQgwGol63cm^2F_5+IN(YpRQP?q1ES1Vek&`KwxYno`m4SA0mm-_>1G0#O2uE^KbI6 ziz(5^qwkKI(a9)@d?xam$kE6-;eX;!1PbAF=vSeShh84qA6g;*qx=>*Ctn!+Y4D-o zZNc5aP~Z!Jy8P?;774>ATXsQb`(PPqR<5SF(ewhdxT* zMo-Wo@^ha2vv{d|?*d9$IxV!a99%Dz-T50Go6M+yNxO&(SzG8Me?{j2H^8Lra417^ zguH^h9&iIp>UN=|jbKA^pLD?_;02hpZH^>mIV2q+PXKO!Nt<*iLvn&%KzP@E(ixd}ibkF79gxZiRRK^aGZ+cX2bt!%9 zPwCwrm0MiO1bv+R)T8o3m$F|=Hx(?-L@@|hx#ijI zk@u22Ju1(0DZ}(bY}ljnT$geg`+F(sO{tzElx;v!+E?%<)K76+2&gDc}Z}REaAWdnAz*0V+F`O)JCVBp3{)(`@y{*1590 zQ+oSnKXGP7X=mk^3z7S-9o|{n{;3Pb)^zk!QmM&w$N6fT4uvn>wfDfjYugWGhG%r6 zkY5mA3QuZDE!nyOpP!!}UUcH0j_{!t{43y*>5=Kw#FTDmGee`vnem~_w2>RqGBZ;{ z>Ub_alNmRrlDQdcKW&CB4P7I`zWAv(+;P>nx8-)0Z+&p$+GSHa=MTPp)7IBN=w_8l zc84uYc0VIF~kN^@u0!RP}AOR$R1dsp{ zKmter2_OL^fCP{L5pg*z5j>)_xMe}=KFWw!@gJg4)~T!UzOf0>Cy%4N9?_< z#wHo1kI+}st7$L!IuE1krPcY$9gfxdR?|K7$L^IC_&R@M8Nj60#o8UMl__L7dJDS} za05(Q-MMy0NDk8|{Se>>n6$cc@s5zZj6KHw67T~|THU#Nhb;H8`{`E!Kft8boy&KK zh4;S35`Z6I8n4^ycQn^=3CY3yCcq0YX?5l*ndRhZdI#VKn6x@|Nu$h9Hv@ivNvji= zG{O?(qktb^(yW)dqyh3-@-W~Bm^AAp4rxeU$#&7smAaOwg_?DnLn_NLdW3pT^;VZO zL=UoEKy-jfwO%Zw?NVJKU42uxTjxqYJPT>fy2X*G$m%BgIEdyfNL&kKswBR?lsk_LmCp8 z$a}m=Rm%b$RQ2M{p>O7Ip7-{Qdtg@SI~}) zo5XqEu~wLE(ySM{q%o$_T6e&(^m>PsFE~t#bk>_xwXWmR#ZnEIp-vi{=y6A)vfLxB zBKLbsRI{#iNJWSAN!qy@+me*7aY*?R+w=~o{{aO&ZoPm@Tk8?>7UJ?XUc)`+NHZk+ z=^N>vd6SM?N5vw4?W#|{-@R(}61CxoE6wHPTlDMR($uWOE@_;-ngRW12$5zTa!GsX zG4iOlR8{M0A#LVVT;Yzsz^n2qhcd*Qv;Q=_DK+b$BV1WtLB2#RuhJ`B(mqyUC2vyI zI^c+xH^1zmYrQEozJ<}^jib0m9U=e6tMm$&bOkN4{a&T}98$ihIQg{nVz1K6UD7Cd zAN!eC>17TnU+bM+MT6d?;{JbQ@V3VN|J8}!_}AlaiyQF^V?Sx%|Nm|DHPIu{{>V2Y z?}*GshQdD!KNP+-yek|CeJ*ro=ve3+`P=ee$a#5~?-2L_ekgn)0VIF~kN^@u0%s$j z)$Q#r+FQ}|Nv9dmtsm>Yl#gk3=Y|&{dAT$WJw$?~&K)m8vc$eZ?*ozmOj_N!<%KN! z*oLlMNchbJoT_ur3*LXEAE)mCk^oFvebCXpk>zF59J>PW158?dvr8Ig|H8fk_yH!Z zzR4lwd-kwhU8{{RnOCv%MQe%t5Xbad2He!bn4EiG$o&3ifL;eg2bi?FbMuRkEc12e zzYq8UCavz={X*s)$X>bu@B>U*-MRgREU%*fOcww@z@*ik`(K3QUh)g_VZaYCX?5oY z7_uzWH&ft=15DW70i%7=Ete*}2khJfL)=UMgna;r4lrqT=O!4UaNY_%&x8V2>-H`f z?fY8B{J`B4q}1xpT`)Lc{)i9wo&}cL+hDXQh1pT|A|PLYNvk_I!r=F8e3K*K_6bha zxf6!ilj)1>uey_fzU|ZM&aE)S!-~f}f6r2P?u8*LQ-u7;YpQ%R49A%sAm1aN19onQ z!Bb`5rk#7Z@b(4Ht8+gLo>%fQ+PUS-5>mBpZ-~*ZOe@J<<6g7s+z>;2ZLx>-dX+kN z#Nc1ikgqV{*$kXj=av|}3e$(Zev7Nt?L9G?RhXZ0^IiK7EdfcZJ9oth$#E$~f#+9H zylP!+i_v<<$4m7#@=mXiocm&k7UDJZ%U-3W75=ku zHoP(PqtN?8r$ZNq{PN$)ual3<>w=F5-yJlA6G0MqB=E<9!-0PPxBP$MzsaBS{nGbQ z-x=Q(zGZv`fIpX}r9nP+>TlR>Y&Q$jFVef|^;99>=YcHw(kwAiy)~##%r3r&UEDQ3 zA~OM)G|N3zeTB4v-T?RkCe3nARp;}O*uC^ifFEGeEaz19kQ^l+q*cHVFlp|Y>R~BQ zJ_5J_Ce1xjJtpm8ZwK4}lWNaXZx0MwM&C0GcmXEOIZIuP3wkkm3*ZKrR53}tHCBeR z9boSRya1Eto}<2;T}r!Wk%Co06;sq(N%8?^o9Vs4@d1ztAv;tPuW zHS3R+?P=%DQ28nv^n-(d7huxdlg@qgIMf+|PD{<6bKag1u!=oS zflDT+wC9|+n}R5Nozw$_2ADMGoO7`l0Ar5>Zh%R1PB|CXubb&kzzr~I_Kfp(v>|4) z0^kOi#`%o%c2gOW=^$_oQoD7k);Zn$A^J7I4KQi$+2;N10lFP<15BE8vbmVa@-X=< z;0BmfG1q*t{pq=$0oOe+o0mGy627JhO)(QVK48-JI+Wsy`9Z0BIDQ69bB{yGCt{JG zNkB&!QmVU!vVDg6r1ijs4-#sZIFb~T)o!FCK%M}Tw#%jLAs+^oXo9o3)1_QSKSkaE zBmkI}yxqnRkN^@u0!RP}AOR$R1dsp{Kmter2_OL^fCP{L5zE2{1tJFOuV+_iwW?kfx@_I)8&TFbW z98x|4lKz?iTS7vqs@8TcT^zg=o+I6(3YUm?n=8=}`6FnvAt+JJnsiCywG{#TR?(tSjNXK1LneC$=^&0S)OX{ON6xdb^ zBCJ{&A#D%V>LE`Qy(OwzX|8Nl2;M@hq>p)1YSySL++Ok&0~QU2!qu#lL&~?NA&<~~ zUQRzTkP9K7H0E8(ym#G(X zG=2*0un0??%hdD5@!7TX39kV=m#G)CnVzKGV|l^4uUdSWddDS$-6M4m83dJ@{aU9b%~Mx-aSTtEZL1b zsaftt>ifxmlcInhU>dj9^9tM=EX{X0Isj~|1*bXSIBCQ(=-Z_3xd>pms%rDnO8 zr}xvt}jqWb#GUJ(XdJRNd>-%j5^p}k;2HANp0NenRW;s`<7n_>=iu@7a2beU=y*hndT2DR*_yH!(606fY=c#-L>Uuy$ zqgn3d=^4|>-9Qq6NwdWA^sQ9IrY2vLUIzF9Ce3oMPaj~{vDX5AfJwFN_37K~Qi6P| zdv5U(bwA{Ym(SN_6BOvRz?5W%RBSr%Jz!Gc5~&7VQXk*+^+q6HfJwCiT)KF{=)IL4 z1Ka?UX8B!-_R+hfTf6+=DVLVdC5=kEXm{lYrQjVm8j%1JKmter2_OL^fCP{L5XRFon})!`)n zuVV$)q&k`DShdbJU9~YtMurm3P)->YGhZsUqiO!_@qnCT>37GH9N!QmsgbqL_;Y$y zpVCdEoq?9YEE`6yYM52`DtAkvIj}xR1~>IO4_z)*7E4L|p(VABu%+9{~%$wOC^LF0Ui6ffLgtB2)Ra=llw}iss zP+ky1q2AX*p-_y%Rtkd@7AW*l@IGO0W9h$C#^^);IM9DBG_diBQ1pptWbpQZKim3T z|F3V^&_B6(+omm%7dL*LlJEfm5C8!XST6+54n&61JHl6@nqFda7PD=B2jo5fcpEPl*Y`FcwC{#q#}Xu8eLFjLSCThQy3icmAPs%p*)=h(cU)@?)6 zizcfw-QFv>2NW)-W^q>accFw5vx=rxvo%AH`RP;~rCm@fb=DHwI1r^!!K%$l1=WrT zCEBvJDszOOw0e!lbVwVS>fbmN-yXIcv}cVOt3WvGtkC>D(5P{PWiX4&k;ig|&c3mc zs~fjOhPH1HFBlF)p2|aiJ3McvRfBVn;*;?i)YSQkp;ANGY>ryMPf%@}Rckg08Ehh= zV^TAl7aDk)=`L^ef~r-xCOBN1iGIng*n`O>Q2aHGQ7iVptq$>VQyUWwlJSxaZ;lQ*ye0`MdRt9` zEik=T7IRyFGU4vF>VgLu6>zuJ8hLpp=OTb$UJwwQO!|htQI;rpgx$ zU1y}0d?*j9YhxS>MlU&tvAH5^oE3umG{kHh`#p_6aQfuQ$z!Jqrw$*ToI17t=%dX} zF{1WGhQy)pm58HmyrHau+wAUn)rr~AAkuzPU7XoH6*%!6l~WF#Q1#x((9lqL;QRWRXbz4ec0dXX)7t_C#*?no4a?! zI-}af*~O#d$N-Hyk--;3(SL}3I;uyNX#e1=^b;Qt009sH0T2KI5C8!X009sH0TB54 z6WBA>7y9sKDJdlj$#g-?79>&3ic-P7_ooM!jmZY*&ilShUude4IaNqz3!;?Hq{h6= z{7F*5$rw-fg$nH%lUcc$(SOM6W|vZZAobTAp{g`G>{6&}p7OMN(0P1NoiDHg3*==u4pu z(a(mWZ$w{>ekJ;C+QbJ0KmY_l00ck)1V8`;KmY_l00cnb=Sv{Ep?6of<#xY!Q*ZC~ zFn@-zjRbS7hz9$5cZU6k74fY-y*t9*BaxoLFr_w41*|bX{~wM%8KVFAfB*=900@8p z2!H?xfB*=900@8p2&|gGm0jV@r-$~0u56HHkv?jP&BVvbNfu9~lF4|Ejj8dnDw8n+ zP19#f8MRc^bmuGYe2*55>TYR%x0u{LSF5sgee&2`(RjkBo;xyAeq5bl7pxP6LpCqH_`deY8(^yra?Pdxg|Rryf)LmD@ah$qu=F)K*2B8@3xx z4+ww&2!H?xfB*=900@8p2!H?xfWUena9i)5&4DKj8>n7A(f{VPyFL1ryRjasiaLM* z2!H?xfB*=900@8p2!H?xfB*;(fjfHW>y|LL|EER&@c{u4009sH0T2KI5C8!X009sH z0T5Wn1aSYqjvE(M0|5{K0T2KI5C8!X009sH0T2Lz1_A#5Kj#0T4j=#mAOHd&00JNY z0w4eaAOHd&u)YcK`Ttw{p9)3)GHOQm48A`2?BHXA(Sg4mxH6z@{mIrp-O9G!)BpYc z-|K&B(}SJYYWB*(82N&M_@)y(pp5OKMGk>6O`%WNp zMv*feqQ>|5``%A!I=HN)8>@r6A~m8W?~jBcT>iXV{^K7% z`}uf&;$we(Z0g0Q^1Dv|Y~V8kUvi5{$EBnoNlG%Mq~+F<#}r9a#O&mVSIlF-FMi-h zbKlMHfBxKt^1@4b;mBjB4n2OcwHQ%J=M*{BshDA}80j0EsGRxy#HBBPQ+wwp`JHdS za=i52zLsLdq#_a5T&H60^NKn6$*(NjrazP4{=GlcK37cTcRg_E*Y8*B)N^03|1BT;^ex4SkCX$&WEH6mu~*D5HH&%QU!DEc|NW=@ z#M6KN^!Kib`JLjo-?{fd-77}S2}!C{N|8EBv)e01dgUdmm64yAfA)FhtFPyGPQ7&J zzdm($pcq+6bws?&D@K<7>oaftu$rH^{Np!Yee;>T@Z{IVrheAYJ6cuVl}1{krD9$& z(m#JbKKNK)e&Xc&KdDEq<#&$$%`JB>Tnk7;ZJu?bT=nzV?DUF}KS*R^-^x#@FF$kF zXRqb&{?ZRVk^GatYcEF3D(Q}u61-v_$vu9{%+c@UCm#An{f#gFATOxr57IW}ZfArea|K#_-eEa9l zUfG?$C${^6T)h}5CcQ*4JG^4j)5C9m^*5*U6K3SMUO)a+e&_GLRyq81h#qy92k5!)HARzG_Wsv*o(to5C8!X009sH0T2KI5C8!X0D*P_ zgI70(H-&aA+_6)Zt>P>z)hq15noz8$mbEWdifejB(^+hMirIoa%LFfvP&Q1#sxelw znPppoZ3t#v7wVR#pK&rCIC=aS&s0_IQQ^TvZTvx1m^E2>Uu@R4YnGBo6iq|7)tS*V zb+ev`3ASpUVfMaQVWy($=VF4%D*Ix(Vbqw;OhGqjUuH5hHhyYWvjj`C*@FpnTqvr# zFv}`6;i6{GHV$Z$5TnVIaKHPn`7*lm7P&O0h>b-ITGo7!A;o41@b%GE{6rqYd-FKDHPV9PZZ9T`((iO>J{M1K^D z{*=D(0Ra#I0T2KI5C8!X009sH0T2KI5ctI=u%-8ou=`-4r@wc{X75=Pe?dRI;R_-9 zj}Hid00@AK>lf-lADb*&UrVp2{nvGiCvK9&-5 z@l-Y`#b;7w7MGKfSk9>>F)gQJdt)Wds#VnaV``PrPWx-M>FEy|GuHI^KPlf? z`c`6xE0uax)9K;$^z?~3tJ9wYYNg_AmJZQ_>IyUSMT((4s_NV+Q)5<4(d(6p^Luix z$ZED`=*`Fyql0@nY^}Mn01JIA4f*da3G7$CRvc z$x>v>LiL=EJ#g#+OQ9vCr|D3-&Wc>*Mr@iQ&pS15fC1?AG^x+2{~-AWv!YX#M& zf!i5?hjYB!cT~M*1>)lzAD2q(&fxs0R%6`CBH?W~$V4gIE*eQc?MojYZ;_fOwRIJ7 zbp!NDhZ;}7fTYR5xx~vh?QOIP>qQ16Ufn?MNlcfyJKpn`x)2ZqKmY_l00ck)1V8`; zKmY_l00ck)1V8`;KmY_l00ck)1V8`;KmY_l00ck)1V8`;KmY_l00ck)1V8`;KmY_l z00ck)1V8`;KmY_l00ck)1V8`;KmY_l00ck)1V8`;KmY_l00ck)1V8`;KmY_l00h;Gf@ ze_y8(&2`=vxlh3Q|EqRz;=^oiVg3K*yux@3;s;jM$NK*(@VG-4%tQR5c{#?NTt5W- zD|pS&;d9mY>2e(#vr(66 zj<8Xe_&9NNkvb?-oqe787tjsQaUF~DU7tza8S0x?nTsyoCa8c zr<+^83p9C6W4$$BEgSlLqS$_Xy7zXRpgM@8bl}w75SFBHGR4Q)94pps=Oie1XM}GY zvP~{g;%)$^+!}CUYKBfXCL9iD>51q4b;eIVa>{EO=7XfjBV|P^s@!>NqgO6=O4urf zfA}@s5G;3iDZ~BcEe)eZ-1vCOI9Vr;vQFzcMAmc;SWYA{m0YDrjx1d}12`S5g@fB{ z{A{#BY;^v0B<#+B|1kFv>gW@H^5qEo2zfGPuCGo}3S7^7THaD2U&U58+^eRoS*kuP z2mFEh5;gmjD^aWKR5>SHs*;z}%TiKG#*>-2I3|cWC6%K8H_@aSstN)i00JNY0w4ea zAOHd&00JNY0yixI*#FAXv6Af?$Wy+v#tfymOm#Kp zuBR8-f8@FO2klW+=T4a#vto)~uT-4hlXFE@**4lL^=tw%gK> z-tV_I z6FFbf=9b&Ta{=SHX7Y4Pl@!IZy6ld1PA4Pqz|iB%)!g!pU&QWM<#-mo%NSV)Ex=pG zMV{0)DvGNcpjXO&_o~@+#NKuzF3lJj)K24TDnH z|I=$0=6vFyQLI;2@Xp6_ZS6H=pg-LZE$z-Z=(>sk`~SvG+^XM3bFuPULH^RGYls!- z^zLQvqWiy=F~2*fB3Cr`64wz7_W#S@v%vnpvfM2mU9~tieO$8|rkAeX!~VZmP)$>H z-hGDsf4!>ds?Bcf+t0B7Z{9TcVApj21N(n&Sl?z~5BvYxY;8Cv!v4SgjR@HP7thhN zzm?v?`_}gB!v0@Wr1UT3^cRE%0T2KI5C8!X009sH0T2KI5C8!X009sH0T2KI5C8!X z009sH0T2KI5C8!XSVUksn{e3w^VeWkZ9%<+DSgm2#gbOkE$^tfdD`Dn>CQW7O9&17 zfA?MJRV#sOtG>uazG2wd>DA3ed1*1&hQA7||L@q{!v24SZ%4JfB7yb)8SMYt-)r~n zty^9rb>FAK`u~QRShkZb4R8%_Kg0gt$JyM1{lA$AuHoKzGl?vavHt%oYqj4Fl4@CZ z-BBdi{|AY{{=Zd!mL2fdm;Jv?E&!5?9tI!+1V8`;KmY_l00ck)1V8`;KmY_l00ck) z1V8`;KmY_l00ck)1V8`;KmY_l00ck)1V8`;KmY_l00ck)1V8`;KmY_l00ck)1V8`; wKmY_l00ck)1V8`;KmY_l00ck)1V8`;KmY_l00ck)1V8`;KmY_l;D!_Ue`ChJv;Y7A diff --git a/routes/api.php b/routes/api.php index 939628e3..8970db36 100644 --- a/routes/api.php +++ b/routes/api.php @@ -7,7 +7,7 @@ use App\Http\Controllers\HomepageDataController; use App\Http\Controllers\SettingsController; use App\Http\Controllers\SpeedtestController; use App\Http\Controllers\UpdateController; -use App\Speedtest; +use App\Models\Speedtest; use Illuminate\Http\Request; use Illuminate\Support\Facades\Route; diff --git a/tests/Feature/APISpeedtestTest.php b/tests/Feature/APISpeedtestTest.php index fa13e7d0..4c40ca10 100644 --- a/tests/Feature/APISpeedtestTest.php +++ b/tests/Feature/APISpeedtestTest.php @@ -2,7 +2,7 @@ namespace Tests\Feature; -use App\Speedtest; +use App\Models\Speedtest; use Faker\Factory; use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Foundation\Testing\WithFaker; diff --git a/tests/Unit/Controllers/SpeedtestController/DeleteTest.php b/tests/Unit/Controllers/SpeedtestController/DeleteTest.php index 00e1ed95..4265c184 100644 --- a/tests/Unit/Controllers/SpeedtestController/DeleteTest.php +++ b/tests/Unit/Controllers/SpeedtestController/DeleteTest.php @@ -3,7 +3,7 @@ namespace Tests\Unit\Controllers\SpeedtestController; use App\Http\Controllers\SpeedtestController; -use App\Speedtest; +use App\Models\Speedtest; use Illuminate\Foundation\Testing\RefreshDatabase; use Tests\TestCase; diff --git a/tests/Unit/Controllers/SpeedtestController/LatestTest.php b/tests/Unit/Controllers/SpeedtestController/LatestTest.php index af7209cd..f1e18b53 100644 --- a/tests/Unit/Controllers/SpeedtestController/LatestTest.php +++ b/tests/Unit/Controllers/SpeedtestController/LatestTest.php @@ -3,7 +3,7 @@ namespace Tests\Unit\Controllers\SpeedtestController; use App\Http\Controllers\SpeedtestController; -use App\Speedtest; +use App\Models\Speedtest; use DB; use Illuminate\Foundation\Testing\RefreshDatabase; use Tests\TestCase; diff --git a/tests/Unit/Helpers/SpeedtestHelper/AbsoluteThresholdTest.php b/tests/Unit/Helpers/SpeedtestHelper/AbsoluteThresholdTest.php index f257f6ff..b372dc50 100644 --- a/tests/Unit/Helpers/SpeedtestHelper/AbsoluteThresholdTest.php +++ b/tests/Unit/Helpers/SpeedtestHelper/AbsoluteThresholdTest.php @@ -4,7 +4,7 @@ namespace Tests\Unit\Helpers\SpeedtestHelper; use App\Helpers\SettingsHelper; use App\Helpers\SpeedtestHelper; -use App\Speedtest; +use App\Models\Speedtest; use Illuminate\Foundation\Testing\RefreshDatabase; use InvalidArgumentException; use Tests\TestCase; diff --git a/tests/Unit/Helpers/SpeedtestHelper/FailureRateTest.php b/tests/Unit/Helpers/SpeedtestHelper/FailureRateTest.php index fe32692e..50ab4332 100644 --- a/tests/Unit/Helpers/SpeedtestHelper/FailureRateTest.php +++ b/tests/Unit/Helpers/SpeedtestHelper/FailureRateTest.php @@ -3,7 +3,7 @@ namespace Tests\Unit\Helpers\SpeedtestHelper; use App\Helpers\SpeedtestHelper; -use App\Speedtest; +use App\Models\Speedtest; use Illuminate\Foundation\Testing\RefreshDatabase; use Tests\TestCase; diff --git a/tests/Unit/Helpers/SpeedtestHelper/PercentageThresholdTest.php b/tests/Unit/Helpers/SpeedtestHelper/PercentageThresholdTest.php index 2ac63c27..d3ab232a 100644 --- a/tests/Unit/Helpers/SpeedtestHelper/PercentageThresholdTest.php +++ b/tests/Unit/Helpers/SpeedtestHelper/PercentageThresholdTest.php @@ -4,7 +4,7 @@ namespace Tests\Unit\Helpers\SpeedtestHelper; use App\Helpers\SettingsHelper; use App\Helpers\SpeedtestHelper; -use App\Speedtest; +use App\Models\Speedtest; use Illuminate\Foundation\Testing\RefreshDatabase; use Tests\TestCase; diff --git a/tests/Unit/Listeners/SpeedtestCompleteListener/SlackTest.php b/tests/Unit/Listeners/SpeedtestCompleteListener/SlackTest.php index 65708a8e..72b94ffb 100644 --- a/tests/Unit/Listeners/SpeedtestCompleteListener/SlackTest.php +++ b/tests/Unit/Listeners/SpeedtestCompleteListener/SlackTest.php @@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestCompleteListener; use App\Helpers\SettingsHelper; use App\Listeners\SpeedtestCompleteListener; -use App\Speedtest; +use App\Models\Speedtest; use Exception; use Illuminate\Foundation\Testing\RefreshDatabase; use stdClass; diff --git a/tests/Unit/Listeners/SpeedtestCompleteListener/TelegramTest.php b/tests/Unit/Listeners/SpeedtestCompleteListener/TelegramTest.php index 8c37051b..17fd28a2 100644 --- a/tests/Unit/Listeners/SpeedtestCompleteListener/TelegramTest.php +++ b/tests/Unit/Listeners/SpeedtestCompleteListener/TelegramTest.php @@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestCompleteListener; use App\Helpers\SettingsHelper; use App\Listeners\SpeedtestCompleteListener; -use App\Speedtest; +use App\Models\Speedtest; use Exception; use Illuminate\Foundation\Testing\RefreshDatabase; use stdClass; diff --git a/tests/Unit/Listeners/SpeedtestFailedListener/SlackTest.php b/tests/Unit/Listeners/SpeedtestFailedListener/SlackTest.php index fea50dc1..1ab96fda 100644 --- a/tests/Unit/Listeners/SpeedtestFailedListener/SlackTest.php +++ b/tests/Unit/Listeners/SpeedtestFailedListener/SlackTest.php @@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestFailedListener; use App\Helpers\SettingsHelper; use App\Listeners\SpeedtestFailedListener; -use App\Speedtest; +use App\Models\Speedtest; use Exception; use Illuminate\Foundation\Testing\RefreshDatabase; use stdClass; diff --git a/tests/Unit/Listeners/SpeedtestFailedListener/TelegramTest.php b/tests/Unit/Listeners/SpeedtestFailedListener/TelegramTest.php index 2e273738..f437abe5 100644 --- a/tests/Unit/Listeners/SpeedtestFailedListener/TelegramTest.php +++ b/tests/Unit/Listeners/SpeedtestFailedListener/TelegramTest.php @@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestFailedListener; use App\Helpers\SettingsHelper; use App\Listeners\SpeedtestFailedListener; -use App\Speedtest; +use App\Models\Speedtest; use Exception; use Illuminate\Foundation\Testing\RefreshDatabase; use stdClass; diff --git a/tests/Unit/Listeners/SpeedtestOverviewListener/SlackTest.php b/tests/Unit/Listeners/SpeedtestOverviewListener/SlackTest.php index 8e471aa0..aa88395c 100644 --- a/tests/Unit/Listeners/SpeedtestOverviewListener/SlackTest.php +++ b/tests/Unit/Listeners/SpeedtestOverviewListener/SlackTest.php @@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestOverviewListener; use App\Helpers\SettingsHelper; use App\Listeners\SpeedtestOverviewListener; -use App\Speedtest; +use App\Models\Speedtest; use Exception; use Illuminate\Foundation\Testing\RefreshDatabase; use stdClass; diff --git a/tests/Unit/Listeners/SpeedtestOverviewListener/TelegramTest.php b/tests/Unit/Listeners/SpeedtestOverviewListener/TelegramTest.php index fb841e03..001e0189 100644 --- a/tests/Unit/Listeners/SpeedtestOverviewListener/TelegramTest.php +++ b/tests/Unit/Listeners/SpeedtestOverviewListener/TelegramTest.php @@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestOverviewListener; use App\Helpers\SettingsHelper; use App\Listeners\SpeedtestOverviewListener; -use App\Speedtest; +use App\Models\Speedtest; use Exception; use Illuminate\Foundation\Testing\RefreshDatabase; use stdClass; From 7cf8dfc0b2d36fb6ea158f86c429a1878f91c2bd Mon Sep 17 00:00:00 2001 From: Henry Whitaker Date: Sat, 10 Apr 2021 22:55:19 +0100 Subject: [PATCH 07/14] Moved auth models into right folder --- .../Commands/ClearOldSessionsCommand.php | 2 +- app/Helpers/EmailVerificationHelper.php | 2 +- app/Http/Controllers/AuthController.php | 4 ++-- app/Http/Middleware/CheckActiveSession.php | 2 +- app/{ => Models}/Auth/EmailVerification.php | 2 +- app/{ => Models}/Auth/LoginSession.php | 2 +- database/speed.db | Bin 139264 -> 139264 bytes 7 files changed, 7 insertions(+), 7 deletions(-) rename app/{ => Models}/Auth/EmailVerification.php (86%) rename app/{ => Models}/Auth/LoginSession.php (91%) diff --git a/app/Console/Commands/ClearOldSessionsCommand.php b/app/Console/Commands/ClearOldSessionsCommand.php index b6d69933..223b2bf5 100644 --- a/app/Console/Commands/ClearOldSessionsCommand.php +++ b/app/Console/Commands/ClearOldSessionsCommand.php @@ -2,7 +2,7 @@ namespace App\Console\Commands; -use App\Auth\LoginSession; +use App\Models\Auth\LoginSession; use Carbon\Carbon; use Illuminate\Console\Command; use Log; diff --git a/app/Helpers/EmailVerificationHelper.php b/app/Helpers/EmailVerificationHelper.php index a6a3bedd..4d5695a7 100644 --- a/app/Helpers/EmailVerificationHelper.php +++ b/app/Helpers/EmailVerificationHelper.php @@ -2,7 +2,7 @@ namespace App\Helpers; -use App\Auth\EmailVerification; +use App\Models\Auth\EmailVerification; use App\Models\User; class EmailVerificationHelper { diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index c712ac59..abbf0564 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers; -use App\Auth\EmailVerification; -use App\Auth\LoginSession as AuthLoginSession; +use App\Models\Auth\EmailVerification; +use App\Models\Auth\LoginSession as AuthLoginSession; use App\Helpers\EmailVerificationHelper; use Illuminate\Support\Facades\Auth; use App\Http\Controllers\Controller; diff --git a/app/Http/Middleware/CheckActiveSession.php b/app/Http/Middleware/CheckActiveSession.php index 6b46bfb1..11c43a27 100644 --- a/app/Http/Middleware/CheckActiveSession.php +++ b/app/Http/Middleware/CheckActiveSession.php @@ -2,7 +2,7 @@ namespace App\Http\Middleware; -use App\Auth\LoginSession; +use App\Models\Auth\LoginSession; use Closure; use Exception; diff --git a/app/Auth/EmailVerification.php b/app/Models/Auth/EmailVerification.php similarity index 86% rename from app/Auth/EmailVerification.php rename to app/Models/Auth/EmailVerification.php index 7c9a96b2..c46b9bf7 100644 --- a/app/Auth/EmailVerification.php +++ b/app/Models/Auth/EmailVerification.php @@ -1,6 +1,6 @@ i>g&n7hNUf3&siUGf@^*=4GTaPjk<_ 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 Date: Sat, 10 Apr 2021 22:57:11 +0100 Subject: [PATCH 08/14] Move influx interface into interfaces folder --- app/{Utils/InfluxDB => Interfaces}/InfluxDBWrapperInterface.php | 2 +- app/Utils/InfluxDB/InfluxDB.php | 2 +- app/Utils/InfluxDB/InfluxDBVersion1Wrapper.php | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) rename app/{Utils/InfluxDB => Interfaces}/InfluxDBWrapperInterface.php (90%) diff --git a/app/Utils/InfluxDB/InfluxDBWrapperInterface.php b/app/Interfaces/InfluxDBWrapperInterface.php similarity index 90% rename from app/Utils/InfluxDB/InfluxDBWrapperInterface.php rename to app/Interfaces/InfluxDBWrapperInterface.php index e91df405..329429b7 100644 --- a/app/Utils/InfluxDB/InfluxDBWrapperInterface.php +++ b/app/Interfaces/InfluxDBWrapperInterface.php @@ -1,6 +1,6 @@ Date: Sat, 10 Apr 2021 23:43:35 +0100 Subject: [PATCH 09/14] Added username/password fields --- app/Utils/InfluxDB/InfluxDB.php | 15 ++++++++++++--- ...021_04_10_182503_add_influx_db_settings.php | 18 ++++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/app/Utils/InfluxDB/InfluxDB.php b/app/Utils/InfluxDB/InfluxDB.php index 5664bed2..defe5f63 100644 --- a/app/Utils/InfluxDB/InfluxDB.php +++ b/app/Utils/InfluxDB/InfluxDB.php @@ -37,16 +37,25 @@ class InfluxDB $host = SettingsHelper::get('influx_db_host')->value; $port = SettingsHelper::get('influx_db_port')->value; - $token = ''; + $username = SettingsHelper::get('influx_db_username')->value; + $password = SettingsHelper::get('influx_db_password')->value; $database = SettingsHelper::get('influx_db_database')->value; $version = (int) SettingsHelper::get('influx_db_version')->value; $wrapper = $version === 1 ? new InfluxDBVersion1Wrapper( - new Version1(str_replace(['http://', 'https://'], '', $host), $port) + new Version1( + str_replace(['http://', 'https://'], '', $host), + $port, + $username, + $password + ) ) : new InfluxDBVersion2Wrapper( - new Version2([]) + new Version2([ + 'url' => $host . ':' . $port, + 'token' => '', + ]) ); return (new self($wrapper))->setDatabase($database) diff --git a/database/migrations/2021_04_10_182503_add_influx_db_settings.php b/database/migrations/2021_04_10_182503_add_influx_db_settings.php index 7ff7e8a5..33993cf3 100644 --- a/database/migrations/2021_04_10_182503_add_influx_db_settings.php +++ b/database/migrations/2021_04_10_182503_add_influx_db_settings.php @@ -47,6 +47,22 @@ class AddInfluxDbSettings extends Migration ]); } + if (!SettingsHelper::get('influx_db_username')) { + Setting::create([ + 'name' => 'influx_db_username', + 'value' => '', + 'description' => 'InfluxDB username' + ]); + } + + if (!SettingsHelper::get('influx_db_password')) { + Setting::create([ + 'name' => 'influx_db_password', + 'value' => '', + 'description' => 'InfluxDB password' + ]); + } + if (!SettingsHelper::get('influx_db_version')) { Setting::create([ 'name' => 'influx_db_version', @@ -68,6 +84,8 @@ class AddInfluxDbSettings extends Migration 'influx_db_host', 'influx_db_port', 'influx_db_database', + 'influx_db_username', + 'influx_db_password', 'influx_db_version', ])->delete(); } From 91b7ec7fab3af4de7cc96ffc099707216e9c174d Mon Sep 17 00:00:00 2001 From: Henry Whitaker Date: Sat, 10 Apr 2021 23:48:29 +0100 Subject: [PATCH 10/14] Added helm chart to readme --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 1b738472..1abcee48 100644 --- a/README.md +++ b/README.md @@ -101,3 +101,7 @@ After enabling, you should change the password through the web UI. ### Manual Install For manual installations, please follow the instructions [here](https://github.com/henrywhitaker3/Speedtest-Tracker/wiki/Manual-Installation). + +### Kubernetes + +There is a 3rd party helm chart available [here](https://github.com/sOblivionsCall/charts). From f809f816c166b190b0c2908c0d9a36ebec8df448 Mon Sep 17 00:00:00 2001 From: Henry Whitaker Date: Sun, 11 Apr 2021 08:46:01 +0100 Subject: [PATCH 11/14] Used a mock ooklatester in tests Speed up test suite --- README.md | 5 +- app/Helpers/SpeedtestHelper.php | 3 +- .../InfluxDB/InfluxDBVersion2Wrapper.php | 37 +++++++++++ changelog.json | 6 ++ config/speedtest.php | 2 +- database/factories/SpeedtestFactory.php | 1 + database/speed.db | Bin 139264 -> 139264 bytes tests/Feature/SpeedtestTest.php | 14 +++++ .../InfluxDB/InfluxDBWrapperWrapperTest.php | 26 ++++++++ tests/Mocks/OoklaTesterMocker.php | 59 ++++++++++++++++++ .../SpeedtestHelper/CheckOutputTest.php | 2 + .../Helpers/SpeedtestHelper/SpeedtestTest.php | 13 +--- 12 files changed, 154 insertions(+), 14 deletions(-) create mode 100644 app/Utils/InfluxDB/InfluxDBVersion2Wrapper.php create mode 100644 tests/Feature/Utils/InfluxDB/InfluxDBWrapperWrapperTest.php create mode 100644 tests/Mocks/OoklaTesterMocker.php diff --git a/README.md b/README.md index 1abcee48..c1ce12fc 100644 --- a/README.md +++ b/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.11.1-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.12.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. @@ -18,6 +18,7 @@ Disclaimer: You will need to accept Ookla's EULA and privacy agreements in order - Slack/Discord/Telegram notifications - [healthchecks.io](https://healthchecks.io) integration - Organizr integration +- InfluxDB integration (currently v1 only, v2 is a WIP) ## Installation & Setup @@ -84,6 +85,8 @@ Container images are configured using parameters passed at runtime (such as thos | `-e PUID` | Optional. Supply a local user ID for volume permissions | | `-e PGID` | Optional. Supply a local group ID for volume permissions | | `-e AUTH` | Optional. Set to 'true' to enable authentication for the app | +| `-e INFLUXDB_RETENTION`| Optional. Sets the InfluxDB retention period, defaults to `30d` | +| `-e INFLUXDB_HOST_TAG | Optional. Sets the InfluxDB host tag value, defaults to `speedtest` | ### Authentication diff --git a/app/Helpers/SpeedtestHelper.php b/app/Helpers/SpeedtestHelper.php index a5b9c1d6..016da06e 100644 --- a/app/Helpers/SpeedtestHelper.php +++ b/app/Helpers/SpeedtestHelper.php @@ -2,6 +2,7 @@ namespace App\Helpers; +use App\Interfaces\SpeedtestProvider; use App\Models\Speedtest; use App\Utils\OoklaTester; use Carbon\Carbon; @@ -25,7 +26,7 @@ class SpeedtestHelper */ public static function runSpeedtest() { - $tester = new OoklaTester(); + $tester = app()->make(SpeedtestProvider::class); return $tester->run(); } diff --git a/app/Utils/InfluxDB/InfluxDBVersion2Wrapper.php b/app/Utils/InfluxDB/InfluxDBVersion2Wrapper.php new file mode 100644 index 00000000..f7d24946 --- /dev/null +++ b/app/Utils/InfluxDB/InfluxDBVersion2Wrapper.php @@ -0,0 +1,37 @@ +client = $client; + } + + public function testConnection(): bool + { + return $this->client->health()->getStatus() !== 'pass'; + } + + public function doesDatabaseExist(string $database): bool + { + return true; + } + + public function createDatabase(string $database): bool + { + return true; + } + + public function store(Speedtest $speedtest): bool + { + return true; + } +} diff --git a/changelog.json b/changelog.json index 7302b2c9..89c3ab38 100644 --- a/changelog.json +++ b/changelog.json @@ -1,4 +1,10 @@ { + "1.12.0": [ + { + "description": "Added InfluxDB intergation.", + "link": "" + } + ], "1.11.1": [ { "description": "Add option to show/hide columns in the all tests table.", diff --git a/config/speedtest.php b/config/speedtest.php index 1db30b80..d39eaf89 100644 --- a/config/speedtest.php +++ b/config/speedtest.php @@ -7,7 +7,7 @@ return [ |-------------------------------------------------------------------------- */ - 'version' => '1.11.1', + 'version' => '1.12.0', /* |-------------------------------------------------------------------------- diff --git a/database/factories/SpeedtestFactory.php b/database/factories/SpeedtestFactory.php index 4cc2efc3..c09c6798 100644 --- a/database/factories/SpeedtestFactory.php +++ b/database/factories/SpeedtestFactory.php @@ -26,6 +26,7 @@ class SpeedtestFactory extends Factory 'upload' => rand(15, 900), 'ping' => rand(1, 25), 'scheduled' => (bool) rand(0, 1), + 'failed' => false, ]; } } diff --git a/database/speed.db b/database/speed.db index f2560a3d4a286bdf2a5fda0111761895fb767b4b..b84a194ab10a1a607e3d10c529090c1d7f9b40fb 100644 GIT binary patch delta 2180 zcmai!Uu;uV9LH}@v90a7_iS?vX?xpkY#o!8-9P=aE?XFrfdi-V<(~*t~im0dG7DzrPRL_zQO)A%l^Y|e; zeGN*)2S>u0cq*CZKGCMi9#3nvM0!z|j%G6Pa z4uriix9U;+0m*YT+9G-2!(F!5hFU@g4!smqGCeQGd&gz6EVez338+nn;H zJ#Bt>>h9=9x4Oa4}mw^eQ_BF%PKhILlJGirT}_PcAl zzLr>(Hmv`@ucfi^or}y|bn3T|m0bDxzX`1VVsJI!AjfYP#*C4SvC+5tBS-s(!|C)`Y9!)%QXWl5N0Q-0 zGZNE-nl*h#mJ>#N~TK3=jYP7=!rg{znWV z^57JMDF5e7eaV_qRB7Z6#|b1J*g(9^L;Vr~-C`rdci-X!!`Dz@2sCb{vm^r+t*E06;gLZIQ;MhM#%FIk2470qj3iD{iD|z#NO4j3}R{Z&(g$aI^DqJ zz@|zQp65thCtEs+$QBT9vB#)H$O4cXjGIDY=uc}Y?v6uhrYJc_|@VGbD6PF5QIuiL{pij?zs4!ZD)trp(GMcV=B#OLgF@FoWA3Upw~ z-T>`5XRn7h@K1ZSsO{6hmISuKme_9@T0YMvFYc|8wB>&vVknScWFVbZQ}Gc8g@Ou5 zs_`?Cv^ty`NzBVJRu$=2lxWoFb4L3c6sIQ=@i_y&zJSx)7xl=onB1@UUHH*UmQw>q znwpbG+QOlx7Ox!cdbPtJsFUA|hC;{HrqR*P*4FmdhB`y(p`)o*Polm>^}EirMBK95 z<&-^6mt5|41-+i2w?SuVzR~n9R3f>oILun>`!tnm+N){%P`AZ2QBB*MHf5rh=j;U) zY%^0jv%+v|(OBsqV}f{qo@EJkoE6f$^mCEWaq>5rBG<@wkMJ7n&W$H?E=TwSXLx-CmDv;tT?z# zHQ!*)Q*YvMY~9HreqP_tA&l8>4l$ms;t)S(EAtam8}|GF9@=Q*5VIRQ#!xqo;!W-I zl<$gSe3KXH51U;t=JiMzi-cosOi^(7o`m5iHJp+&Pu}MczNe!c;+LnVIm9blpXCU> zsm1lJ+c`onz6F41JqsnUvi&M;oa)_GViYF?rqV1uM-}m=IHCPc#ze#Gj_Kuhz@2l` nt2cc!30@AOq+rMV>bjguK@Z0zn}T)@q7K83i1iA62~hG6ob%j{ diff --git a/tests/Feature/SpeedtestTest.php b/tests/Feature/SpeedtestTest.php index 4efc6e17..e3560a20 100644 --- a/tests/Feature/SpeedtestTest.php +++ b/tests/Feature/SpeedtestTest.php @@ -3,14 +3,28 @@ namespace Tests\Feature; use App\Helpers\SpeedtestHelper; +use App\Interfaces\SpeedtestProvider; use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Foundation\Testing\WithFaker; +use Tests\Mocks\OoklaTesterMocker; use Tests\TestCase; class SpeedtestTest extends TestCase { use RefreshDatabase; + public function setUp(): void + { + parent::setUp(); + + $this->app->singleton( + SpeedtestProvider::class, + function () { + return new OoklaTesterMocker(); + } + ); + } + /** * Runs a speedtest * diff --git a/tests/Feature/Utils/InfluxDB/InfluxDBWrapperWrapperTest.php b/tests/Feature/Utils/InfluxDB/InfluxDBWrapperWrapperTest.php new file mode 100644 index 00000000..2ccdc5e8 --- /dev/null +++ b/tests/Feature/Utils/InfluxDB/InfluxDBWrapperWrapperTest.php @@ -0,0 +1,26 @@ +expectException(InfluxDBNotEnabledException::class); + + InfluxDB::connect(); + } +} diff --git a/tests/Mocks/OoklaTesterMocker.php b/tests/Mocks/OoklaTesterMocker.php new file mode 100644 index 00000000..035696c3 --- /dev/null +++ b/tests/Mocks/OoklaTesterMocker.php @@ -0,0 +1,59 @@ +passes = $passes; + } + + public function run($output = null): Speedtest + { + $output = $output ?? $this->output(); + + try { + $output = json_decode($output, true, 512, JSON_THROW_ON_ERROR); + } catch (Exception $e) { + throw new SpeedtestFailureException(); + } + + return $this->passes + ? Speedtest::factory()->create() + : Speedtest::factory()->create([ + 'download' => 0, + 'upload' => 0, + 'ping' => 0, + 'failed' => true, + ]); + } + + public function output() + { + return !$this->passes + ? null + : json_encode([ + 'type' => 'result', + 'download' => ['bandwidth' => '50'], + 'upload' => ['bandwidth' => '50'], + 'ping' => ['latency' => '50'], + 'server' => [ + 'id' => '1', + 'name' => 'PHPUnit', + 'host' => 'phpunit', + 'port' => '443', + ], + 'result' => [ + 'url' => 'some-url', + ] + ]); + } +} diff --git a/tests/Unit/Helpers/SpeedtestHelper/CheckOutputTest.php b/tests/Unit/Helpers/SpeedtestHelper/CheckOutputTest.php index d017cb7b..febf818f 100644 --- a/tests/Unit/Helpers/SpeedtestHelper/CheckOutputTest.php +++ b/tests/Unit/Helpers/SpeedtestHelper/CheckOutputTest.php @@ -4,6 +4,7 @@ namespace Tests\Unit\Helpers\SpeedtestHelper; use App\Utils\OoklaTester; use PHPUnit\Framework\TestCase; +use Tests\Mocks\OoklaTesterMocker; class CheckOutputTest extends TestCase { @@ -12,6 +13,7 @@ class CheckOutputTest extends TestCase public function setUp(): void { $this->speedtestProvider = new OoklaTester(); + $this->mocker = new OoklaTesterMocker(); } /** diff --git a/tests/Unit/Helpers/SpeedtestHelper/SpeedtestTest.php b/tests/Unit/Helpers/SpeedtestHelper/SpeedtestTest.php index 9c5db28f..7e4670bb 100644 --- a/tests/Unit/Helpers/SpeedtestHelper/SpeedtestTest.php +++ b/tests/Unit/Helpers/SpeedtestHelper/SpeedtestTest.php @@ -6,6 +6,7 @@ use App\Exceptions\SpeedtestFailureException; use App\Helpers\SpeedtestHelper; use App\Utils\OoklaTester; use Illuminate\Foundation\Testing\RefreshDatabase; +use Tests\Mocks\OoklaTesterMocker; use Tests\TestCase; class SpeedtestTest extends TestCase @@ -22,17 +23,7 @@ class SpeedtestTest extends TestCase $this->speedtestProvider = new OoklaTester(); - $this->output = $this->speedtestProvider->output(); - } - - /** - * A basic unit test example. - * - * @return void - */ - public function testOutputFunction() - { - $this->assertJson($this->output); + $this->output = (new OoklaTesterMocker())->output(); } /** From 48fbbc3713a3153eb719d0369bef2b627964da91 Mon Sep 17 00:00:00 2001 From: Henry Whitaker Date: Sun, 11 Apr 2021 09:13:13 +0100 Subject: [PATCH 12/14] Added version 1 fields to settings page --- public/js/app.js | 153 +++++++++++++++++- .../js/components/Settings/SettingsIndex.js | 24 ++- .../js/components/Settings/SettingsInput.js | 13 ++ .../js/components/Settings/SettingsTabs.js | 7 + .../Settings/tabs/InfluxDBSettings.js | 46 ++++++ 5 files changed, 240 insertions(+), 3 deletions(-) create mode 100644 resources/js/components/Settings/tabs/InfluxDBSettings.js diff --git a/public/js/app.js b/public/js/app.js index 24d6b2cc..e7ae6b17 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -146695,7 +146695,7 @@ var TableRow = /*#__PURE__*/function (_Component) { }); _defineProperty(_assertThisInitialized(_this), "delete", function (id) { - var url = 'api/speedtest/delete/' + id; + var url = 'api/speedtest/delete/' + id + '?token=' + window.token; axios__WEBPACK_IMPORTED_MODULE_3___default.a["delete"](url).then(function (resp) { console.log(resp); react_toastify__WEBPACK_IMPORTED_MODULE_4__["toast"].success('Speedtest deleted'); @@ -148414,6 +148414,22 @@ var SettingsIndex = /*#__PURE__*/function (_Component) { inline: true, earlyReturn: true, classes: 'mr-2' + }], + influxdb: [{ + obj: data.influx_db_enabled, + type: 'checkbox' + }, { + obj: data.influx_db_host, + type: 'text' + }, { + obj: data.influx_db_port, + type: 'number' + }, { + obj: data.influx_db_username, + type: 'text' + }, { + obj: data.influx_db_password, + type: 'password' }] }; }); @@ -148552,6 +148568,10 @@ var SettingsInput = /*#__PURE__*/function (_Component) { input = _this.generateTextInput(disabled); } + if (_this.state.type === 'password') { + input = _this.generatePasswordInput(disabled); + } + if (_this.state.type === 'btn-get') { input = _this.generateButtonGetInput(); } @@ -148665,6 +148685,17 @@ var SettingsInput = /*#__PURE__*/function (_Component) { onInput: this.handleInput }); } + }, { + key: "generatePasswordInput", + value: function generatePasswordInput(disabled) { + return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(react_bootstrap__WEBPACK_IMPORTED_MODULE_1__["Form"].Control, { + name: this.state.name, + type: this.state.type, + defaultValue: this.state.value, + disabled: disabled, + onInput: this.handleInput + }); + } }, { key: "generateButtonGetInput", value: function generateButtonGetInput() { @@ -148723,6 +148754,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _tabs_NotificationsSettings__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./tabs/NotificationsSettings */ "./resources/js/components/Settings/tabs/NotificationsSettings.js"); /* harmony import */ var _Authentication_Authentication__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../Authentication/Authentication */ "./resources/js/components/Authentication/Authentication.js"); /* harmony import */ var _tabs_TableSettings__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./tabs/TableSettings */ "./resources/js/components/Settings/tabs/TableSettings.js"); +/* harmony import */ var _tabs_InfluxDBSettings__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./tabs/InfluxDBSettings */ "./resources/js/components/Settings/tabs/InfluxDBSettings.js"); function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); } function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } @@ -148762,6 +148794,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope + var SettingsTabs = /*#__PURE__*/function (_Component) { _inherits(SettingsTabs, _Component); @@ -148775,7 +148808,7 @@ var SettingsTabs = /*#__PURE__*/function (_Component) { _this = _super.call(this, props); _defineProperty(_assertThisInitialized(_this), "generateTabs", function () { - var tabs = ['General', 'Graphs', 'Tables', 'Notifications', 'healthchecks.io', 'Reset', 'Backup/Restore']; + var tabs = ['General', 'Graphs', 'Tables', 'Notifications', 'healthchecks.io', 'InfluxDB', 'Reset', 'Backup/Restore']; if (window.config.auth) { tabs.push('Authentication'); @@ -148881,6 +148914,13 @@ var SettingsTabs = /*#__PURE__*/function (_Component) { save: _this.save }); + case 'InfluxDB': + return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement(_tabs_InfluxDBSettings__WEBPACK_IMPORTED_MODULE_14__["default"], { + data: data.influxdb, + generateInputs: _this.generateInputs, + save: _this.save + }); + case 'Reset': return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement(_tabs_ResetSettings__WEBPACK_IMPORTED_MODULE_6__["default"], { data: data.healthchecks, @@ -149356,6 +149396,115 @@ if (document.getElementById('HealthchecksSettings')) { /***/ }), +/***/ "./resources/js/components/Settings/tabs/InfluxDBSettings.js": +/*!*******************************************************************!*\ + !*** ./resources/js/components/Settings/tabs/InfluxDBSettings.js ***! + \*******************************************************************/ +/*! exports provided: default */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return InfluxDBSettings; }); +/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "./node_modules/react/index.js"); +/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__); +/* harmony import */ var react_dom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react-dom */ "./node_modules/react-dom/index.js"); +/* harmony import */ var react_dom__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react_dom__WEBPACK_IMPORTED_MODULE_1__); +/* harmony import */ var react_bootstrap__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react-bootstrap */ "./node_modules/react-bootstrap/esm/index.js"); +/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! axios */ "./node_modules/axios/index.js"); +/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_3__); +function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); } + +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } + +function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } + +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } + +function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } + +function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } + +function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } + +function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } + +function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } } + +function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } + +function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } + + + + + + +var InfluxDBSettings = /*#__PURE__*/function (_Component) { + _inherits(InfluxDBSettings, _Component); + + var _super = _createSuper(InfluxDBSettings); + + function InfluxDBSettings(props) { + var _this; + + _classCallCheck(this, InfluxDBSettings); + + _this = _super.call(this, props); + + _defineProperty(_assertThisInitialized(_this), "inputHandler", function (name, val) { + var settings = _this.state.data; + var i = 0; + settings.forEach(function (ele) { + if (ele.obj.name == name) { + ele.obj.value = val; + } + + settings[i] = ele; + i++; + }); + + _this.setState({ + data: settings + }); + }); + + _this.state = { + data: _this.props.data + }; + return _this; + } + + _createClass(InfluxDBSettings, [{ + key: "render", + value: function render() { + var _this2 = this; + + var settings = this.props.generateInputs(this.state.data, this.inputHandler); + return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(react_bootstrap__WEBPACK_IMPORTED_MODULE_2__["Tab"].Content, null, settings, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", { + className: "mt-3" + }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("button", { + className: "btn btn-primary", + onClick: function onClick() { + _this2.props.save(_this2.state.data, 'healthchecks.io'); + } + }, "Save"))); + } + }]); + + return InfluxDBSettings; +}(react__WEBPACK_IMPORTED_MODULE_0__["Component"]); + + + +if (document.getElementById('InfluxDBSettings')) { + react_dom__WEBPACK_IMPORTED_MODULE_1___default.a.render( /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(InfluxDBSettings, null), document.getElementById('InfluxDBSettings')); +} + +/***/ }), + /***/ "./resources/js/components/Settings/tabs/NotificationsSettings.js": /*!************************************************************************!*\ !*** ./resources/js/components/Settings/tabs/NotificationsSettings.js ***! diff --git a/resources/js/components/Settings/SettingsIndex.js b/resources/js/components/Settings/SettingsIndex.js index ddd5c8cf..4c831856 100644 --- a/resources/js/components/Settings/SettingsIndex.js +++ b/resources/js/components/Settings/SettingsIndex.js @@ -259,7 +259,29 @@ export default class SettingsIndex extends Component { classes: 'mr-2' }, - ] + ], + influxdb: [ + { + obj: data.influx_db_enabled, + type: 'checkbox' + }, + { + obj: data.influx_db_host, + type: 'text' + }, + { + obj: data.influx_db_port, + type: 'number' + }, + { + obj: data.influx_db_username, + type: 'text' + }, + { + obj: data.influx_db_password, + type: 'password' + } + ], }; } diff --git a/resources/js/components/Settings/SettingsInput.js b/resources/js/components/Settings/SettingsInput.js index 464edd3c..caca1a54 100644 --- a/resources/js/components/Settings/SettingsInput.js +++ b/resources/js/components/Settings/SettingsInput.js @@ -112,6 +112,15 @@ export default class SettingsInput extends Component { onInput={this.handleInput} /> } + generatePasswordInput(disabled) { + return + } + generateButtonGetInput() { var url = this.state.url; @@ -146,6 +155,10 @@ export default class SettingsInput extends Component { input = this.generateTextInput(disabled); } + if(this.state.type === 'password') { + input = this.generatePasswordInput(disabled); + } + if(this.state.type === 'btn-get') { input = this.generateButtonGetInput(); } diff --git a/resources/js/components/Settings/SettingsTabs.js b/resources/js/components/Settings/SettingsTabs.js index d4721dac..28ff1825 100644 --- a/resources/js/components/Settings/SettingsTabs.js +++ b/resources/js/components/Settings/SettingsTabs.js @@ -12,6 +12,7 @@ import HealthchecksSettings from './tabs/HealthchecksSettings'; import NotificationsSettings from './tabs/NotificationsSettings'; import Authentication from '../Authentication/Authentication'; import TableSettings from './tabs/TableSettings'; +import InfluxDBSettings from './tabs/InfluxDBSettings'; export default class SettingsTabs extends Component { constructor(props) { @@ -30,6 +31,7 @@ export default class SettingsTabs extends Component { 'Tables', 'Notifications', 'healthchecks.io', + 'InfluxDB', 'Reset', 'Backup/Restore', ]; @@ -138,6 +140,11 @@ export default class SettingsTabs extends Component { data={data.healthchecks} generateInputs={this.generateInputs} save={this.save} /> + case 'InfluxDB': + return case 'Reset': return { + var settings = this.state.data; + var i = 0; + settings.forEach(ele => { + if(ele.obj.name == name) { + ele.obj.value = val; + } + settings[i] = ele; + i++; + }); + this.setState({ + data: settings + }); + } + + render() { + var settings = this.props.generateInputs(this.state.data, this.inputHandler); + + return ( + + {settings} +
+ +
+ + ); + } +} + +if (document.getElementById('InfluxDBSettings')) { + ReactDOM.render(, document.getElementById('InfluxDBSettings')); +} From a962865867cbcff27e71223897b6469c8fb6cab9 Mon Sep 17 00:00:00 2001 From: Henry Whitaker Date: Sun, 11 Apr 2021 09:40:30 +0100 Subject: [PATCH 13/14] Add db field to settings page --- public/js/app.js | 3 +++ resources/js/components/Settings/SettingsIndex.js | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/public/js/app.js b/public/js/app.js index e7ae6b17..a1500918 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -148424,6 +148424,9 @@ var SettingsIndex = /*#__PURE__*/function (_Component) { }, { obj: data.influx_db_port, type: 'number' + }, { + obj: data.influx_db_database, + type: 'text' }, { obj: data.influx_db_username, type: 'text' diff --git a/resources/js/components/Settings/SettingsIndex.js b/resources/js/components/Settings/SettingsIndex.js index 4c831856..d25731bd 100644 --- a/resources/js/components/Settings/SettingsIndex.js +++ b/resources/js/components/Settings/SettingsIndex.js @@ -273,6 +273,10 @@ export default class SettingsIndex extends Component { obj: data.influx_db_port, type: 'number' }, + { + obj: data.influx_db_database, + type: 'text' + }, { obj: data.influx_db_username, type: 'text' From ce549b5b7a0ecb66a76eb3a709bfa588d1e24cbb Mon Sep 17 00:00:00 2001 From: Henry Whitaker Date: Sun, 11 Apr 2021 10:31:28 +0100 Subject: [PATCH 14/14] Try to stop chrome form autofilling --- public/js/app.js | 20 ++++++++++++------- .../js/components/Settings/SettingsIndex.js | 6 ++++-- .../js/components/Settings/SettingsInput.js | 10 +++++++--- .../js/components/Settings/SettingsTabs.js | 1 + .../Settings/tabs/InfluxDBSettings.js | 6 +++++- 5 files changed, 30 insertions(+), 13 deletions(-) diff --git a/public/js/app.js b/public/js/app.js index a1500918..fabc9b55 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -148429,10 +148429,12 @@ var SettingsIndex = /*#__PURE__*/function (_Component) { type: 'text' }, { obj: data.influx_db_username, - type: 'text' + type: 'text', + autoComplete: false }, { obj: data.influx_db_password, - type: 'password' + type: 'password', + autoComplete: false }] }; }); @@ -148616,7 +148618,8 @@ var SettingsInput = /*#__PURE__*/function (_Component) { url: _this.props.url, inline: _this.props.inline ? 'd-inline-block' : 'd-block', btnType: _this.props.btnType, - earlyReturn: _this.props.earlyReturn ? true : false + earlyReturn: _this.props.earlyReturn ? true : false, + autoComplete: String(_this.props.autoComplete ? true : "off") }; return _this; } @@ -148644,7 +148647,8 @@ var SettingsInput = /*#__PURE__*/function (_Component) { disabled: disabled, min: this.state.min, max: this.state.max, - onInput: this.handleInput + onInput: this.handleInput, + autoComplete: this.state.autoComplete }); } }, { @@ -148685,7 +148689,8 @@ var SettingsInput = /*#__PURE__*/function (_Component) { type: this.state.type, defaultValue: this.state.value, disabled: disabled, - onInput: this.handleInput + onInput: this.handleInput, + autoComplete: this.state.autoComplete }); } }, { @@ -148696,7 +148701,8 @@ var SettingsInput = /*#__PURE__*/function (_Component) { type: this.state.type, defaultValue: this.state.value, disabled: disabled, - onInput: this.handleInput + onInput: this.handleInput, + autoComplete: this.state.autoComplete }); } }, { @@ -148874,7 +148880,7 @@ var SettingsTabs = /*#__PURE__*/function (_Component) { description: setting.obj.description, handler: handler, label: setting.obj.name - }, _defineProperty(_React$createElement, "description", setting.obj.description), _defineProperty(_React$createElement, "options", setting.type == 'select' ? setting.options : []), _defineProperty(_React$createElement, "hideDescription", setting.hideDescription ? setting.hideDescription : false), _defineProperty(_React$createElement, "min", setting.min ? setting.min : false), _defineProperty(_React$createElement, "max", setting.max ? setting.max : false), _defineProperty(_React$createElement, "btnType", setting.btnType), _defineProperty(_React$createElement, "inline", setting.inline), _defineProperty(_React$createElement, "url", setting.url), _defineProperty(_React$createElement, "earlyReturn", setting.earlyReturn ? true : false), _defineProperty(_React$createElement, "classes", setting.classes ? setting.classes : ''), _React$createElement)); + }, _defineProperty(_React$createElement, "description", setting.obj.description), _defineProperty(_React$createElement, "options", setting.type == 'select' ? setting.options : []), _defineProperty(_React$createElement, "hideDescription", setting.hideDescription ? setting.hideDescription : false), _defineProperty(_React$createElement, "min", setting.min ? setting.min : false), _defineProperty(_React$createElement, "max", setting.max ? setting.max : false), _defineProperty(_React$createElement, "btnType", setting.btnType), _defineProperty(_React$createElement, "inline", setting.inline), _defineProperty(_React$createElement, "url", setting.url), _defineProperty(_React$createElement, "earlyReturn", setting.earlyReturn ? true : false), _defineProperty(_React$createElement, "classes", setting.classes ? setting.classes : ''), _defineProperty(_React$createElement, "autoComplete", setting.autoComplete ? true : false), _React$createElement)); }); }); diff --git a/resources/js/components/Settings/SettingsIndex.js b/resources/js/components/Settings/SettingsIndex.js index d25731bd..0733e7d2 100644 --- a/resources/js/components/Settings/SettingsIndex.js +++ b/resources/js/components/Settings/SettingsIndex.js @@ -279,11 +279,13 @@ export default class SettingsIndex extends Component { }, { obj: data.influx_db_username, - type: 'text' + type: 'text', + autoComplete: false, }, { obj: data.influx_db_password, - type: 'password' + type: 'password', + autoComplete: false, } ], }; diff --git a/resources/js/components/Settings/SettingsInput.js b/resources/js/components/Settings/SettingsInput.js index caca1a54..2d11f9f6 100644 --- a/resources/js/components/Settings/SettingsInput.js +++ b/resources/js/components/Settings/SettingsInput.js @@ -24,6 +24,7 @@ export default class SettingsInput extends Component { inline: this.props.inline ? 'd-inline-block' : 'd-block', btnType: this.props.btnType, earlyReturn: this.props.earlyReturn ? true : false, + autoComplete: String(this.props.autoComplete ? true : Math.random().toString(36).replace(/[^a-z]+/g, '').substr(0, 7)), } } @@ -72,7 +73,8 @@ export default class SettingsInput extends Component { disabled={disabled} min={this.state.min} max={this.state.max} - onInput={this.handleInput} /> + onInput={this.handleInput} + autoComplete={this.state.autoComplete} /> } generateSelectInput(disabled) { @@ -109,7 +111,8 @@ export default class SettingsInput extends Component { type={this.state.type} defaultValue={this.state.value} disabled={disabled} - onInput={this.handleInput} /> + onInput={this.handleInput} + autoComplete={this.state.autoComplete} /> } generatePasswordInput(disabled) { @@ -118,7 +121,8 @@ export default class SettingsInput extends Component { type={this.state.type} defaultValue={this.state.value} disabled={disabled} - onInput={this.handleInput} /> + onInput={this.handleInput} + autoComplete={this.state.autoComplete} /> } generateButtonGetInput() { diff --git a/resources/js/components/Settings/SettingsTabs.js b/resources/js/components/Settings/SettingsTabs.js index 28ff1825..59dc4cba 100644 --- a/resources/js/components/Settings/SettingsTabs.js +++ b/resources/js/components/Settings/SettingsTabs.js @@ -107,6 +107,7 @@ export default class SettingsTabs extends Component { url={setting.url} earlyReturn={setting.earlyReturn ? true : false} classes={setting.classes ? setting.classes : ''} + autoComplete={setting.autoComplete ? true : false} /> }) } diff --git a/resources/js/components/Settings/tabs/InfluxDBSettings.js b/resources/js/components/Settings/tabs/InfluxDBSettings.js index d3ba155e..c27202bd 100644 --- a/resources/js/components/Settings/tabs/InfluxDBSettings.js +++ b/resources/js/components/Settings/tabs/InfluxDBSettings.js @@ -32,7 +32,11 @@ export default class InfluxDBSettings extends Component { return ( - {settings} +
{ e.preventDefault() }} autoComplete="off"> + + + {settings} +