From c0d3554acb73eab345e85c7d88fbca285627cd08 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 5 Jul 2021 20:01:36 +0200 Subject: [PATCH] Clean up views and code --- .ci/.env.ci | 6 - .deploy/heroku/.env.heroku | 6 - .../Correction/FixPostgresSequences.php | 1 - app/Exceptions/Handler.php | 1 - .../Controllers/Admin/TelemetryController.php | 66 --------- app/Http/Controllers/DebugController.php | 2 - app/Models/Telemetry.php | 75 ---------- app/Providers/FireflyServiceProvider.php | 8 -- app/Support/Facades/Telemetry.php | 41 ------ app/Support/Telemetry.php | 88 ------------ config/app.php | 3 - config/firefly.php | 2 - .../2021_07_05_193044_drop_tele_table.php | 31 ++++ frontend/src/components/accounts/Index.vue | 3 - frontend/src/components/bills/Index.vue | 134 ++++++++++++++++-- frontend/yarn.lock | 28 ++-- resources/lang/en_US/breadcrumbs.php | 2 - resources/lang/en_US/firefly.php | 26 ---- resources/views/v1/admin/index.twig | 3 - resources/views/v1/admin/telemetry/index.twig | 43 ------ .../v2/bills/{indexx.twig => index.twig} | 0 routes/breadcrumbs.php | 16 --- routes/web.php | 3 - 23 files changed, 169 insertions(+), 419 deletions(-) delete mode 100644 app/Http/Controllers/Admin/TelemetryController.php delete mode 100644 app/Models/Telemetry.php delete mode 100644 app/Support/Facades/Telemetry.php delete mode 100644 app/Support/Telemetry.php create mode 100644 database/migrations/2021_07_05_193044_drop_tele_table.php delete mode 100644 resources/views/v1/admin/telemetry/index.twig rename resources/views/v2/bills/{indexx.twig => index.twig} (100%) diff --git a/.ci/.env.ci b/.ci/.env.ci index 38e6a837c8..7bdf5582eb 100644 --- a/.ci/.env.ci +++ b/.ci/.env.ci @@ -260,12 +260,6 @@ DISABLE_CSP_HEADER=false TRACKER_SITE_ID= TRACKER_URL= -# -# Firefly III can collect telemetry on how you use Firefly III. This is opt-in. -# In order to allow this, change the following variable to true. -# To read more about this feature, go to this page: https://docs.firefly-iii.org/support/telemetry -SEND_TELEMETRY=false - # You can fine tune the start-up of a Docker container by editing these environment variables. # Use this at your own risk. Disabling certain checks and features may result in lost of inconsistent data. # However if you know what you're doing you can significantly speed up container start times. diff --git a/.deploy/heroku/.env.heroku b/.deploy/heroku/.env.heroku index 013b5b810a..f9974abbe3 100644 --- a/.deploy/heroku/.env.heroku +++ b/.deploy/heroku/.env.heroku @@ -261,12 +261,6 @@ DISABLE_CSP_HEADER=false TRACKER_SITE_ID= TRACKER_URL= -# -# Firefly III can collect telemetry on how you use Firefly III. This is opt-in. -# In order to allow this, change the following variable to true. -# To read more about this feature, go to this page: https://docs.firefly-iii.org/support/telemetry -SEND_TELEMETRY=false - # You can fine tune the start-up of a Docker container by editing these environment variables. # Use this at your own risk. Disabling certain checks and features may result in lost of inconsistent data. # However if you know what you're doing you can significantly speed up container start times. diff --git a/app/Console/Commands/Correction/FixPostgresSequences.php b/app/Console/Commands/Correction/FixPostgresSequences.php index 2ac42466c9..e012790f71 100644 --- a/app/Console/Commands/Correction/FixPostgresSequences.php +++ b/app/Console/Commands/Correction/FixPostgresSequences.php @@ -88,7 +88,6 @@ class FixPostgresSequences extends Command 'rules', 'tag_transaction_journal', 'tags', - 'telemetry', 'transaction_currencies', 'transaction_groups', 'transaction_journals', diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 5bbc3ede7d..f6fdbd6244 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -136,7 +136,6 @@ class Handler extends ExceptionHandler */ public function report(Throwable $e) { - // do email the user (no telemetry) $doMailError = config('firefly.send_error_message'); if ($this->shouldntReportLocal($e) || !$doMailError) { parent::report($e); diff --git a/app/Http/Controllers/Admin/TelemetryController.php b/app/Http/Controllers/Admin/TelemetryController.php deleted file mode 100644 index 470b3a710f..0000000000 --- a/app/Http/Controllers/Admin/TelemetryController.php +++ /dev/null @@ -1,66 +0,0 @@ -. - */ - -declare(strict_types=1); - -namespace FireflyIII\Http\Controllers\Admin; - -use FireflyIII\Http\Controllers\Controller; - -/** - * Class TelemetryController - */ -class TelemetryController extends Controller -{ - /** - * TelemetryController constructor. - */ - public function __construct() - { - if (false === config('firefly.feature_flags.telemetry')) { - die('Telemetry is disabled.'); - } - parent::__construct(); - - $this->middleware( - function ($request, $next) { - app('view')->share('title', (string)trans('firefly.administration')); - app('view')->share('mainTitleIcon', 'fa-hand-spock-o'); - - return $next($request); - } - ); - } - - /** - * Index - */ - public function index() - { - app('view')->share('subTitleIcon', 'fa-eye'); - app('view')->share('subTitle', (string)trans('firefly.telemetry_admin_index')); - $version = config('firefly.version'); - $enabled = config('firefly.send_telemetry', false) && config('firefly.feature_flags.telemetry'); - return prefixView('admin.telemetry.index', compact('version', 'enabled')); - } - -} diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php index d7a6081a7c..acc35ec5bf 100644 --- a/app/Http/Controllers/DebugController.php +++ b/app/Http/Controllers/DebugController.php @@ -150,7 +150,6 @@ class DebugController extends Controller $foundDBversion = FireflyConfig::get('db_version', 1)->data; // some new vars. - $telemetry = true === config('firefly.send_telemetry') && true === config('firefly.feature_flags.telemetry'); $defaultLanguage = (string)config('firefly.default_language'); $defaultLocale = (string)config('firefly.default_locale'); $userLanguage = app('steam')->getLanguage(); @@ -218,7 +217,6 @@ class DebugController extends Controller 'logContent', 'cacheDriver', 'trustedProxies', - 'telemetry', 'userLanguage', 'userLocale', 'defaultLanguage', diff --git a/app/Models/Telemetry.php b/app/Models/Telemetry.php deleted file mode 100644 index e9ebd9b239..0000000000 --- a/app/Models/Telemetry.php +++ /dev/null @@ -1,75 +0,0 @@ -. - */ - -declare(strict_types=1); - -namespace FireflyIII\Models; -use Eloquent; -use Illuminate\Database\Eloquent\Builder; -use Illuminate\Database\Eloquent\Model; -use Illuminate\Support\Carbon; - -/** - * FireflyIII\Models\Telemetry - * - * @property int $id - * @property Carbon|null $created_at - * @property Carbon|null $updated_at - * @property Carbon|null $submitted - * @property int|null $user_id - * @property string $installation_id - * @property string $type - * @property string $key - * @property array $value - * @method static Builder|Telemetry newModelQuery() - * @method static Builder|Telemetry newQuery() - * @method static Builder|Telemetry query() - * @method static Builder|Telemetry whereCreatedAt($value) - * @method static Builder|Telemetry whereId($value) - * @method static Builder|Telemetry whereInstallationId($value) - * @method static Builder|Telemetry whereKey($value) - * @method static Builder|Telemetry whereSubmitted($value) - * @method static Builder|Telemetry whereType($value) - * @method static Builder|Telemetry whereUpdatedAt($value) - * @method static Builder|Telemetry whereUserId($value) - * @method static Builder|Telemetry whereValue($value) - * @mixin Eloquent - */ -class Telemetry extends Model -{ - /** @var string */ - protected $table = 'telemetry'; - - /** @var array */ - protected $fillable = ['installation_id', 'submitted', 'user_id', 'key', 'type', 'value']; - /** - * The attributes that should be cast to native types. - * - * @var array - */ - protected $casts - = [ - 'submitted' => 'datetime', - 'value' => 'array', - ]; - -} diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php index 5430e9c5aa..fcd2200ca6 100644 --- a/app/Providers/FireflyServiceProvider.php +++ b/app/Providers/FireflyServiceProvider.php @@ -64,7 +64,6 @@ use FireflyIII\Support\Form\RuleForm; use FireflyIII\Support\Navigation; use FireflyIII\Support\Preferences; use FireflyIII\Support\Steam; -use FireflyIII\Support\Telemetry; use FireflyIII\TransactionRules\Engine\RuleEngineInterface; use FireflyIII\TransactionRules\Engine\SearchRuleEngine; use FireflyIII\Validation\FireflyValidator; @@ -165,13 +164,6 @@ class FireflyServiceProvider extends ServiceProvider } ); - $this->app->bind( - 'telemetry', - static function () { - return new Telemetry; - } - ); - // chart generator: $this->app->bind(GeneratorInterface::class, ChartJsGenerator::class); // other generators diff --git a/app/Support/Facades/Telemetry.php b/app/Support/Facades/Telemetry.php deleted file mode 100644 index 1ff4d604f8..0000000000 --- a/app/Support/Facades/Telemetry.php +++ /dev/null @@ -1,41 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Support\Facades; - -use Illuminate\Support\Facades\Facade; - -/** - * Class Telemetry - */ -class Telemetry extends Facade -{ - /** - * Get the registered name of the component. - * - * @return string - */ - protected static function getFacadeAccessor(): string - { - return 'telemetry'; - } -} diff --git a/app/Support/Telemetry.php b/app/Support/Telemetry.php deleted file mode 100644 index c260103518..0000000000 --- a/app/Support/Telemetry.php +++ /dev/null @@ -1,88 +0,0 @@ -. - */ - -declare(strict_types=1); - -namespace FireflyIII\Support; - -use Carbon\Carbon; -use FireflyIII\Support\System\GeneratesInstallationId; -use Sentry\Severity; -use Sentry\State\Scope; -use function Sentry\captureMessage; -use function Sentry\configureScope; - -/** - * Class Telemetry - */ -class Telemetry -{ - use GeneratesInstallationId; - - /** - * Feature telemetry stores a $value for the given $feature. - * Will only store the given $feature / $value combination once. - * - * - * Examples: - * - execute-cli-command [value] - * - use-help-pages - * - has-created-bill - * - first-time-install - * - more - * - * Its use should be limited to exotic and strange use cases in Firefly III. - * Because time and date are logged as well, useful to track users' evolution in Firefly III. - * - * Any meta-data stored is strictly non-financial. - * - * @param string $key - * @param string $value - */ - public function feature(string $key, string $value): void - { - if (false === config('firefly.send_telemetry') || false === config('firefly.feature_flags.telemetry')) { - // hard stop if not allowed to do telemetry. - // do nothing! - return; - } - $this->generateInstallationId(); - $installationId = app('fireflyconfig')->get('installation_id'); - - // add some context: - configureScope( - function (Scope $scope) use ($installationId, $key, $value): void { - $scope->setContext( - 'telemetry', [ - 'installation_id' => $installationId->data, - 'version' => config('firefly.version'), - 'collected_at' => Carbon::now()->format('r'), - 'key' => $key, - 'value' => $value, - ] - ); - } - ); - captureMessage(sprintf('FIT: %s/%s', $key, $value), Severity::info()); - } - -} diff --git a/config/app.php b/config/app.php index a5774e4eba..b789433432 100644 --- a/config/app.php +++ b/config/app.php @@ -21,8 +21,6 @@ declare(strict_types=1); -use FireflyIII\Support\Facades\Telemetry; - return [ 'name' => envNonEmpty('APP_NAME', 'Firefly III'), 'env' => envNonEmpty('APP_ENV', 'local'), @@ -143,7 +141,6 @@ return [ 'AccountForm' => \FireflyIII\Support\Facades\AccountForm::class, 'PiggyBankForm' => \FireflyIII\Support\Facades\PiggyBankForm::class, 'RuleForm' => \FireflyIII\Support\Facades\RuleForm::class, - 'Telemetry' => Telemetry::class, 'Google2FA' => PragmaRX\Google2FALaravel\Facade::class, 'Twig' => TwigBridge\Facade\Twig::class, diff --git a/config/firefly.php b/config/firefly.php index b6900a3b7b..62ff1611fa 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -120,7 +120,6 @@ return [ 'enable_external_map' => env('ENABLE_EXTERNAL_MAP', false), 'disable_frame_header' => env('DISABLE_FRAME_HEADER', false), 'disable_csp_header' => env('DISABLE_CSP_HEADER', false), - 'send_telemetry' => env('SEND_TELEMETRY', false), 'allow_webhooks' => env('ALLOW_WEBHOOKS', false), // email flags @@ -143,7 +142,6 @@ return [ // static config (cannot be changed by user) 'update_endpoint' => 'https://version.firefly-iii.org/index.json', - 'telemetry_endpoint' => 'https://telemetry.firefly-iii.org', 'update_minimum_age' => 7, // web configuration: diff --git a/database/migrations/2021_07_05_193044_drop_tele_table.php b/database/migrations/2021_07_05_193044_drop_tele_table.php new file mode 100644 index 0000000000..7d6b5f82de --- /dev/null +++ b/database/migrations/2021_07_05_193044_drop_tele_table.php @@ -0,0 +1,31 @@ + - - \ No newline at end of file + \ No newline at end of file diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 3952a3968d..2e9a91e6d7 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1058,7 +1058,7 @@ dependencies: "@types/node" "*" -"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": +"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7": version "7.0.7" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad" integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA== @@ -5019,9 +5019,9 @@ pdfkit@>=0.8.1, pdfkit@^0.12.0: png-js "^1.0.0" pdfmake@^0.1.70: - version "0.1.71" - resolved "https://registry.yarnpkg.com/pdfmake/-/pdfmake-0.1.71.tgz#9cb20032cfed534f1bb5aa95026343fd7b4a5953" - integrity sha512-uXUy+NZ8R5pwJ6rYLJRu7VRw/w5ogBScNk440CHpMZ6Z0+E1uc1XvwK4I1U5ry0UZQ3qPD0dpSvbzAkRBKYoJA== + version "0.1.72" + resolved "https://registry.yarnpkg.com/pdfmake/-/pdfmake-0.1.72.tgz#b5ef0057e40e7a22b23a19aaf0be35ada902a3bf" + integrity sha512-xZrPS+Safjf1I8ZYtMoXX83E6C6Pd1zFwa168yNTeeJWHclqf1z9DoYajjlY2uviN7gGyxwVZeou39uSk1oh1g== dependencies: iconv-lite "^0.6.2" linebreak "^1.0.2" @@ -5743,11 +5743,11 @@ schema-utils@^2.6.5: ajv-keywords "^3.5.2" schema-utils@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef" - integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA== + version "3.1.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.0.tgz#95986eb604f66daadeed56e379bfe7a7f963cdb9" + integrity sha512-tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w== dependencies: - "@types/json-schema" "^7.0.6" + "@types/json-schema" "^7.0.7" ajv "^6.12.5" ajv-keywords "^3.5.2" @@ -5924,9 +5924,9 @@ sockjs@^0.3.21: websocket-driver "^0.7.4" sortablejs@^1.13.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.13.0.tgz#3ab2473f8c69ca63569e80b1cd1b5669b51269e9" - integrity sha512-RBJirPY0spWCrU5yCmWM1eFs/XgX2J5c6b275/YyxFRgnzPhKl/TDeU2hNR8Dt7ITq66NRPM4UlOt+e5O4CFHg== + version "1.14.0" + resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.14.0.tgz#6d2e17ccbdb25f464734df621d4f35d4ab35b3d8" + integrity sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w== source-list-map@^2.0.0, source-list-map@^2.0.1: version "2.0.1" @@ -6670,9 +6670,9 @@ webpack-sources@^2.3.0: source-map "^0.6.1" webpack@^5.38.1, webpack@^5.40.0: - version "5.42.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.42.0.tgz#39aadbce84ad2cebf86cc5f88a2c53db65cbddfb" - integrity sha512-Ln8HL0F831t1x/yPB/qZEUVmZM4w9BnHZ1EQD/sAUHv8m22hthoPniWTXEzFMh/Sf84mhrahut22TX5KxWGuyQ== + version "5.42.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.42.1.tgz#3347d0d93e79fe70bf62e51981024c80b9c8c3df" + integrity sha512-msikozzXrG2Hdx+dElq0fyNvxPFsaM2dKLc/l+xkMmhO/1qwVJ9K9gY+fi/49MYWcpSP7alnK5Q78Evrd1LiqQ== dependencies: "@types/eslint-scope" "^3.7.0" "@types/estree" "^0.0.48" diff --git a/resources/lang/en_US/breadcrumbs.php b/resources/lang/en_US/breadcrumbs.php index 6b34495186..148bd0ef5d 100644 --- a/resources/lang/en_US/breadcrumbs.php +++ b/resources/lang/en_US/breadcrumbs.php @@ -58,8 +58,6 @@ return [ 'edit_tag' => 'Edit tag ":tag"', 'delete_tag' => 'Delete tag ":tag"', 'delete_journal_link' => 'Delete link between transactions', - 'telemetry_index' => 'Telemetry', - 'telemetry_view' => 'View telemetry', 'edit_object_group' => 'Edit group ":title"', 'delete_object_group' => 'Delete group ":title"', 'logout_others' => 'Logout other sessions' diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 8b81f6d08c..7a466f105f 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -1830,32 +1830,6 @@ return [ 'box_net_worth_in_currency' => 'Net worth (:currency)', 'box_spend_per_day' => 'Left to spend per day: :amount', - // telemetry - 'telemetry_admin_index' => 'Telemetry', - 'telemetry_intro' => 'Firefly III supports the collection and sending of usage telemetry. This means that Firefly III will try to collect info on how you use Firefly III, and send it to the developer of Firefly III. This is always opt-in, and is disabled by default. Firefly III will never collect or send financial information. Firefly III will also never collect or send financial meta-information, like sums or calculations. The collected data will never be made publicly accessible.', - 'telemetry_what_collected' => 'What Firefly III collects and sends exactly is different for each version. You are running version :version. What Firefly III collects in version :version is something you can read in the help pages. Click the (?)-icon in the top-right corner or visit the documentation page.', - 'telemetry_is_enabled_yes_no' => 'Is Firefly III telemetry enabled?', - 'telemetry_disabled_no' => 'Telemetry is NOT enabled', - 'telemetry_disabled_yes' => 'Telemetry is enabled', - 'telemetry_enabled_now_what' => 'You can disable telemetry the same way you enabled it: in your .env file or in your Docker configuration.', - 'telemetry_disabled_now_what' => 'If you want to, you can enable telemetry in your .env file or in your Docker configuration.', - 'telemetry_collected_info' => 'Collected information', - 'no_telemetry_present' => 'Firefly III has collected zero telemetry records.', - 'records_telemetry_present' => 'Firefly III has collected :count telemetry record.|Firefly III has collected :count telemetry records.', - 'telemetry_button_view' => 'View telemetry', - 'telemetry_button_delete' => 'Delete all telemetry', - 'telemetry_admin_overview' => 'Telemetry overview', - 'telemetry_back_to_index' => 'Back to telemetry index', - 'not_yet_submitted' => 'Not yet submitted', - 'telemetry_type_feature' => 'Feature flag', - 'telemetry_type_string' => 'Text', - 'telemetry_type_recurring' => 'Recurring', - 'telemetry_submit_all' => 'Submit records', - 'telemetry_delete_submitted_records' => 'Delete submitted records', - 'telemetry_submission_executed' => 'Records have been submitted. Check your log files for more info.', - 'telemetry_all_deleted' => 'All telemetry records have been deleted.', - 'telemetry_submitted_deleted' => 'All submitted telemetry records have been deleted.', - // debug page 'debug_page' => 'Debug page', 'debug_submit_instructions' => 'If you are running into problems, you can use the information in this box as debug information. Please copy-and-paste into a new or existing GitHub issue. It will generate a beautiful table that can be used to quickly diagnose your problem.', diff --git a/resources/views/v1/admin/index.twig b/resources/views/v1/admin/index.twig index c860328c8a..5cd009cffc 100644 --- a/resources/views/v1/admin/index.twig +++ b/resources/views/v1/admin/index.twig @@ -14,9 +14,6 @@ diff --git a/resources/views/v1/admin/telemetry/index.twig b/resources/views/v1/admin/telemetry/index.twig deleted file mode 100644 index 13f62849b2..0000000000 --- a/resources/views/v1/admin/telemetry/index.twig +++ /dev/null @@ -1,43 +0,0 @@ -{% extends './v1/layout/default' %} - -{% block breadcrumbs %} - {{ Breadcrumbs.render }} -{% endblock %} -{% block content %} -
-
-
-
-

{{ 'telemetry_admin_index'|_ }}

-
-
-

- {{ 'telemetry_intro'|_ }} -

-

- {{ trans('firefly.telemetry_what_collected', {version: version})|raw }} -

-

- {{ 'telemetry_is_enabled_yes_no'|_ }} - {% if enabled %} - {{ 'telemetry_disabled_yes'|_ }} - {% else %} - {{ 'telemetry_disabled_no'|_ }} - {% endif %} -

- {% if enabled %} -

- {{ 'telemetry_enabled_now_what'|_ }} -

- {% else %} -

- {{ 'telemetry_disabled_now_what'|_ }} -

- {% endif %} -
-
-
-
-{% endblock %} -{% block scripts %} -{% endblock %} diff --git a/resources/views/v2/bills/indexx.twig b/resources/views/v2/bills/index.twig similarity index 100% rename from resources/views/v2/bills/indexx.twig rename to resources/views/v2/bills/index.twig diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php index cdc532f5f5..345882a6f0 100644 --- a/routes/breadcrumbs.php +++ b/routes/breadcrumbs.php @@ -272,22 +272,6 @@ try { } ); - Breadcrumbs::for( - 'admin.telemetry.index', - static function (Generator $breadcrumbs) { - $breadcrumbs->parent('admin.index'); - $breadcrumbs->push(trans('breadcrumbs.telemetry_index'), route('admin.telemetry.index')); - } - ); - - Breadcrumbs::for( - 'admin.telemetry.view', - static function (Generator $breadcrumbs) { - $breadcrumbs->parent('admin.telemetry.index'); - $breadcrumbs->push(trans('breadcrumbs.telemetry_view')); - } - ); - Breadcrumbs::for( 'transactions.link.delete', static function (Generator $breadcrumbs, TransactionJournalLink $link) { diff --git a/routes/web.php b/routes/web.php index f450c1ba1e..e61c45ac71 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1101,9 +1101,6 @@ Route::group( Route::post('users/update/{user}', ['uses' => 'UserController@update', 'as' => 'users.update']); Route::post('users/destroy/{user}', ['uses' => 'UserController@destroy', 'as' => 'users.destroy']); - // telemetry manager: - Route::get('telemetry', ['uses' => 'TelemetryController@index', 'as' => 'telemetry.index']); - // journal links manager Route::get('links', ['uses' => 'LinkController@index', 'as' => 'links.index']); Route::get('links/create', ['uses' => 'LinkController@create', 'as' => 'links.create']);