mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Clean up views and code
This commit is contained in:
James Cole
parent
8135c034a9
commit
c0d3554acb
@ -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.
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -88,7 +88,6 @@ class FixPostgresSequences extends Command
|
||||
'rules',
|
||||
'tag_transaction_journal',
|
||||
'tags',
|
||||
'telemetry',
|
||||
'transaction_currencies',
|
||||
'transaction_groups',
|
||||
'transaction_journals',
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -1,66 +0,0 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* TelemetryController.php
|
||||
* Copyright (c) 2020 james@firefly-iii.org
|
||||
*
|
||||
* This file is part of Firefly III (https://github.com/firefly-iii).
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
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'));
|
||||
}
|
||||
|
||||
}
|
||||
@ -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',
|
||||
|
||||
@ -1,75 +0,0 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Telemetry.php
|
||||
* Copyright (c) 2020 james@firefly-iii.org
|
||||
*
|
||||
* This file is part of Firefly III (https://github.com/firefly-iii).
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
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',
|
||||
];
|
||||
|
||||
}
|
||||
@ -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
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* Amount.php
|
||||
* Copyright (c) 2019 james@firefly-iii.org
|
||||
*
|
||||
* This file is part of Firefly III (https://github.com/firefly-iii).
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
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';
|
||||
}
|
||||
}
|
||||
@ -1,88 +0,0 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Telemetry.php
|
||||
* Copyright (c) 2020 james@firefly-iii.org
|
||||
*
|
||||
* This file is part of Firefly III (https://github.com/firefly-iii).
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
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());
|
||||
}
|
||||
|
||||
}
|
||||
@ -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,
|
||||
|
||||
|
||||
@ -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:
|
||||
|
||||
31
database/migrations/2021_07_05_193044_drop_tele_table.php
Normal file
31
database/migrations/2021_07_05_193044_drop_tele_table.php
Normal file
@ -0,0 +1,31 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
/**
|
||||
* Class DropTeleTable
|
||||
*/
|
||||
class DropTeleTable extends Migration
|
||||
{
|
||||
/**
|
||||
* Run the migrations.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function up()
|
||||
{
|
||||
Schema::dropIfExists('telemetry');
|
||||
}
|
||||
|
||||
/**
|
||||
* Reverse the migrations.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function down()
|
||||
{
|
||||
Schema::dropIfExists('telemetry');
|
||||
}
|
||||
}
|
||||
@ -215,9 +215,6 @@ export default {
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
storeReady: function () {
|
||||
this.getAccountList();
|
||||
},
|
||||
start: function () {
|
||||
this.getAccountList();
|
||||
},
|
||||
|
||||
@ -19,18 +19,132 @@
|
||||
-->
|
||||
|
||||
<template>
|
||||
<div>
|
||||
Hallo!
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="row" v-for="group in sortedGroups">
|
||||
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<h3 class="card-title">
|
||||
{{ group[1].title }}
|
||||
</h3>
|
||||
</div>
|
||||
<div class="card-body p-0">
|
||||
<b-table id="my-table" striped hover responsive="md" primary-key="id" :no-local-sorting="false"
|
||||
:items="group[1].bills"
|
||||
sort-icon-left
|
||||
:busy.sync="loading"
|
||||
>
|
||||
</b-table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {mapGetters, mapMutations} from "vuex";
|
||||
import {configureAxios} from "../../shared/forageStore";
|
||||
|
||||
export default {
|
||||
name: "Index"
|
||||
name: "Index",
|
||||
data() {
|
||||
return {
|
||||
groups: {},
|
||||
downloaded: false,
|
||||
loading: false,
|
||||
locale: 'en-US',
|
||||
sortedGroups: [],
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
...mapGetters('root', ['cacheKey']),
|
||||
},
|
||||
created() {
|
||||
this.locale = localStorage.locale ?? 'en-US';
|
||||
this.downloadBills(1);
|
||||
},
|
||||
methods: {
|
||||
...mapMutations('root', ['refreshCacheKey',]),
|
||||
resetGroups: function () {
|
||||
this.groups = {};
|
||||
this.groups[0] =
|
||||
{
|
||||
id: 0,
|
||||
title: this.$t('firefly.default_group_title_name'),
|
||||
order: 1,
|
||||
bills: []
|
||||
};
|
||||
},
|
||||
downloadBills: function (page) {
|
||||
this.resetGroups();
|
||||
configureAxios().then(async (api) => {
|
||||
api.get('./api/v1/bills?page=' + page + 'key=' + this.cacheKey)
|
||||
.then(response => {
|
||||
// pages
|
||||
let currentPage = parseInt(response.data.meta.pagination.current_page);
|
||||
let totalPage = parseInt(response.data.meta.pagination.total_pages);
|
||||
this.parseBills(response.data.data);
|
||||
if (currentPage < totalPage) {
|
||||
let nextPage = currentPage + 1;
|
||||
this.downloadBills(nextPage);
|
||||
}
|
||||
if (currentPage >= totalPage) {
|
||||
this.downloaded = true;
|
||||
}
|
||||
this.sortGroups();
|
||||
}
|
||||
);
|
||||
});
|
||||
},
|
||||
sortGroups: function () {
|
||||
const sortable = Object.entries(this.groups);
|
||||
//console.log('sortable');
|
||||
//console.log(sortable);
|
||||
sortable.sort(function (a, b) {
|
||||
return a.order - b.order;
|
||||
});
|
||||
this.sortedGroups = sortable;
|
||||
//console.log(this.sortedGroups);
|
||||
},
|
||||
parseBills: function (data) {
|
||||
for (let key in data) {
|
||||
if (data.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
|
||||
let current = data[key];
|
||||
let bill = {};
|
||||
|
||||
// create group of necessary.
|
||||
let groupId = null === current.attributes.object_group_id ? 0 : parseInt(current.attributes.object_group_id);
|
||||
if (0 !== groupId && !(groupId in this.groups)) {
|
||||
this.groups[groupId] = {
|
||||
id: groupId,
|
||||
title: current.attributes.object_group_title,
|
||||
order: parseInt(current.attributes.object_group_order),
|
||||
bills: []
|
||||
}
|
||||
}
|
||||
|
||||
bill.id = parseInt(current.id);
|
||||
bill.order = parseInt(current.order);
|
||||
bill.name = current.attributes.name;
|
||||
bill.repeat_freq = current.attributes.repeat_freq;
|
||||
bill.skip = current.attributes.skip;
|
||||
bill.active = current.attributes.active;
|
||||
bill.amount_max = parseFloat(current.attributes.amount_max);
|
||||
bill.amount_min = parseFloat(current.attributes.amount_min);
|
||||
bill.currency_code = parseFloat(current.attributes.currency_code);
|
||||
bill.currency_id = parseFloat(current.attributes.currency_id);
|
||||
bill.currency_decimal_places = parseFloat(current.attributes.currency_decimal_places);
|
||||
bill.currency_symbol = parseFloat(current.attributes.currency_symbol);
|
||||
bill.next_expected_match = parseFloat(current.attributes.next_expected_match);
|
||||
bill.notes = parseFloat(current.attributes.notes);
|
||||
bill.paid_dates = parseFloat(current.attributes.paid_dates);
|
||||
bill.pay_dates = parseFloat(current.attributes.pay_dates);
|
||||
|
||||
this.groups[groupId].bills.push(bill);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
</script>
|
||||
@ -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"
|
||||
|
||||
@ -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'
|
||||
|
||||
@ -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 <a href="https://docs.firefly-iii.org/support/telemetry">or visit the documentation page</a>.',
|
||||
'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 <a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub issue</a>. It will generate a beautiful table that can be used to quickly diagnose your problem.',
|
||||
|
||||
@ -14,9 +14,6 @@
|
||||
<ul>
|
||||
<li><a href="{{ route('admin.configuration.index') }}">{{ 'firefly_instance_configuration'|_ }}</a></li>
|
||||
<li><a href="{{ route('admin.links.index') }}">{{ 'journal_link_configuration'|_ }}</a></li>
|
||||
{% if config('firefly.feature_flags.telemetry') %}
|
||||
<li><a href="{{ route('admin.telemetry.index') }}">{{ 'telemetry_admin_index'|_ }}</a></li>
|
||||
{% endif %}
|
||||
<li><a href="{{ route('admin.update-check') }}">{{ 'update_check_title'|_ }}</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
{% extends './v1/layout/default' %}
|
||||
|
||||
{% block breadcrumbs %}
|
||||
{{ Breadcrumbs.render }}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<div class="row">
|
||||
<div class="col-lg-8 col-md-6 col-sm-12 col-xs-12">
|
||||
<div class="box box-default">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">{{ 'telemetry_admin_index'|_ }}</h3>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<p>
|
||||
{{ 'telemetry_intro'|_ }}
|
||||
</p>
|
||||
<p>
|
||||
{{ trans('firefly.telemetry_what_collected', {version: version})|raw }}
|
||||
</p>
|
||||
<p class="lead">
|
||||
{{ 'telemetry_is_enabled_yes_no'|_ }}
|
||||
{% if enabled %}
|
||||
<strong class="text-warning">{{ 'telemetry_disabled_yes'|_ }}</strong>
|
||||
{% else %}
|
||||
<strong class="text-success">{{ 'telemetry_disabled_no'|_ }}</strong>
|
||||
{% endif %}
|
||||
</p>
|
||||
{% if enabled %}
|
||||
<p>
|
||||
{{ 'telemetry_enabled_now_what'|_ }}
|
||||
</p>
|
||||
{% else %}
|
||||
<p>
|
||||
{{ 'telemetry_disabled_now_what'|_ }}
|
||||
</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% block scripts %}
|
||||
{% endblock %}
|
||||
@ -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) {
|
||||
|
||||
@ -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']);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user