Rebuild frontend.

This commit is contained in:
James Cole
2021-04-19 06:49:58 +02:00
parent f1798a1c97
commit 6e0be9a6a2
29 changed files with 67 additions and 66 deletions

View File

@@ -186,20 +186,20 @@ export default {
}, },
generateWeekly: function () { generateWeekly: function () {
console.log('weekly'); //console.log('weekly');
let today = new Date(this.range.start); let today = new Date(this.range.start);
console.log('Today is ' + today); //console.log('Today is ' + today);
let start = startOfDay(startOfWeek(subDays(today, 7), {weekStartsOn: 1})); let start = startOfDay(startOfWeek(subDays(today, 7), {weekStartsOn: 1}));
let end = endOfDay(endOfWeek(subDays(today, 7), {weekStartsOn: 1})); let end = endOfDay(endOfWeek(subDays(today, 7), {weekStartsOn: 1}));
let dateFormat = this.$t('config.week_in_year_fns'); let dateFormat = this.$t('config.week_in_year_fns');
console.log('Date format: "'+dateFormat+'"'); //console.log('Date format: "'+dateFormat+'"');
let title = format(start, dateFormat); let title = format(start, dateFormat);
// last week // last week
console.log('Last week'); // console.log('Last week');
console.log(start); // console.log(start);
console.log(end); // console.log(end);
console.log(title); // console.log(title);
this.periods.push( this.periods.push(
{ {
start: start.toDateString(), start: start.toDateString(),
@@ -212,10 +212,10 @@ export default {
start = startOfDay(startOfWeek(today, {weekStartsOn: 1})); start = startOfDay(startOfWeek(today, {weekStartsOn: 1}));
end = endOfDay(endOfWeek(today, {weekStartsOn: 1})); end = endOfDay(endOfWeek(today, {weekStartsOn: 1}));
title = format(start, dateFormat); title = format(start, dateFormat);
console.log('This week'); // console.log('This week');
console.log(start); // console.log(start);
console.log(end); // console.log(end);
console.log(title); // console.log(title);
this.periods.push( this.periods.push(
{ {
start: start.toDateString(), start: start.toDateString(),
@@ -228,10 +228,10 @@ export default {
start = startOfDay(startOfWeek(addDays(today, 7), {weekStartsOn: 1})); start = startOfDay(startOfWeek(addDays(today, 7), {weekStartsOn: 1}));
end = endOfDay(endOfWeek(addDays(today, 7), {weekStartsOn: 1})); end = endOfDay(endOfWeek(addDays(today, 7), {weekStartsOn: 1}));
title = format(start, dateFormat); title = format(start, dateFormat);
console.log('Next week'); // console.log('Next week');
console.log(start); // console.log(start);
console.log(end); // console.log(end);
console.log(title); // console.log(title);
this.periods.push( this.periods.push(
{ {
start: start.toDateString(), start: start.toDateString(),

View File

@@ -123,13 +123,14 @@ export default {
drawChart: function () { drawChart: function () {
//console.log('drawChart'); //console.log('drawChart');
if ('undefined' !== typeof this._chart) { if ('undefined' !== typeof this._chart) {
//console.log('destroy or update!'); // console.log('update!');
this._chart.data = this.dataCollection; this._chart.data = this.dataCollection;
this._chart.update(); this._chart.update();
this.initialised = true;
} }
if ('undefined' === typeof this._chart) { if ('undefined' === typeof this._chart) {
//console.log('new!'); // console.log('new!');
this._chart = new ChartJs.Chart(this.$refs.canvas.getContext('2d'), { this._chart = new ChartJs.Chart(this.$refs.canvas.getContext('2d'), {
type: 'line', type: 'line',
data: this.dataCollection, data: this.dataCollection,
@@ -140,9 +141,9 @@ export default {
} }
}, },
updateChart: function () { updateChart: function () {
//console.log('updateChart'); // console.log('updateChart');
if (this.initialised) { if (this.initialised) {
//console.log('MUST Update chart!'); // console.log('MUST Update chart!');
// reset some vars so it wont trigger again: // reset some vars so it wont trigger again:
this.initialised = false; this.initialised = false;
this.initialiseChart(); this.initialiseChart();

View File

@@ -179,9 +179,9 @@ const actions = {
end = endOfDay(end); end = endOfDay(end);
break; break;
} }
console.log('Range is ' + viewRange); // console.log('Range is ' + viewRange);
console.log('Start is ' + start); // console.log('Start is ' + start);
console.log('End is ' + end); // console.log('End is ' + end);
context.commit('setStart', start); context.commit('setStart', start);
context.commit('setEnd', end); context.commit('setEnd', end);
context.commit('setDefaultStart', start); context.commit('setDefaultStart', start);

View File

@@ -142,8 +142,8 @@
}, },
"config": { "config": {
"html_language": "de", "html_language": "de",
"week_in_year_fns": "'Week' w, yyyy", "week_in_year_fns": "'Woche' ww\/yyyy",
"quarter_fns": "'Q'Q, yyyy", "quarter_fns": "'Q'QQQ, yyyy",
"half_year_fns": "'H{half}', yyyy" "half_year_fns": "'H{half}', yyyy"
}, },
"form": { "form": {

View File

@@ -142,7 +142,7 @@
}, },
"config": { "config": {
"html_language": "fr", "html_language": "fr",
"week_in_year_fns": "'Week' w, yyyy", "week_in_year_fns": "'Semaine' w, yyyy",
"quarter_fns": "'Q'Q, yyyy", "quarter_fns": "'Q'Q, yyyy",
"half_year_fns": "'H{half}', yyyy" "half_year_fns": "'H{half}', yyyy"
}, },

View File

@@ -142,7 +142,7 @@
}, },
"config": { "config": {
"html_language": "it", "html_language": "it",
"week_in_year_fns": "'Week' w, yyyy", "week_in_year_fns": "'Settimana' w, yyyy",
"quarter_fns": "'Q'Q, yyyy", "quarter_fns": "'Q'Q, yyyy",
"half_year_fns": "'H{half}', yyyy" "half_year_fns": "'H{half}', yyyy"
}, },

View File

@@ -110,7 +110,7 @@
"account_type_Loan": "Empr\u00e9stimo", "account_type_Loan": "Empr\u00e9stimo",
"account_type_Mortgage": "Hipoteca", "account_type_Mortgage": "Hipoteca",
"timezone_difference": "Seu navegador reporta o fuso hor\u00e1rio \"{local}\". O Firefly III est\u00e1 configurado para o fuso hor\u00e1rio \"{system}\". Este gr\u00e1fico pode variar.", "timezone_difference": "Seu navegador reporta o fuso hor\u00e1rio \"{local}\". O Firefly III est\u00e1 configurado para o fuso hor\u00e1rio \"{system}\". Este gr\u00e1fico pode variar.",
"stored_new_account_js": "New account \"<a href=\"accounts\/show\/{ID}\">{name}<\/a>\" stored!", "stored_new_account_js": "Nova conta \"<a href=\"accounts\/show\/{ID}\">{name}<\/a>\" armazenada!",
"account_type_Debt": "D\u00edvida", "account_type_Debt": "D\u00edvida",
"delete": "Apagar", "delete": "Apagar",
"store_new_asset_account": "Armazenar nova conta de ativo", "store_new_asset_account": "Armazenar nova conta de ativo",
@@ -142,9 +142,9 @@
}, },
"config": { "config": {
"html_language": "pt-br", "html_language": "pt-br",
"week_in_year_fns": "'Week' w, yyyy", "week_in_year_fns": "'Semana' w, yyyy",
"quarter_fns": "'Q'Q, yyyy", "quarter_fns": "'T'Q, yyyy",
"half_year_fns": "'H{half}', yyyy" "half_year_fns": "'S{half}', yyyy"
}, },
"form": { "form": {
"foreign_amount": "Montante em moeda estrangeira", "foreign_amount": "Montante em moeda estrangeira",
@@ -168,7 +168,7 @@
"currency_id": "Moeda", "currency_id": "Moeda",
"liability_type": "Tipo de passivo", "liability_type": "Tipo de passivo",
"account_role": "Fun\u00e7\u00e3o de conta", "account_role": "Fun\u00e7\u00e3o de conta",
"liability_direction": "Liability in\/out", "liability_direction": "Passivo entrada\/sa\u00edda",
"book_date": "Data reserva", "book_date": "Data reserva",
"permDeleteWarning": "Exclus\u00e3o de dados do Firefly III s\u00e3o permanentes e n\u00e3o podem ser desfeitos.", "permDeleteWarning": "Exclus\u00e3o de dados do Firefly III s\u00e3o permanentes e n\u00e3o podem ser desfeitos.",
"account_areYouSure_js": "Tem certeza que deseja excluir a conta \"{name}\"?", "account_areYouSure_js": "Tem certeza que deseja excluir a conta \"{name}\"?",

View File

@@ -142,7 +142,7 @@
}, },
"config": { "config": {
"html_language": "pt", "html_language": "pt",
"week_in_year_fns": "'Week' w, yyyy", "week_in_year_fns": "'Semana' w, yyyy",
"quarter_fns": "'Trimestre' Q, yyyy", "quarter_fns": "'Trimestre' Q, yyyy",
"half_year_fns": "'H{half}', yyyy" "half_year_fns": "'H{half}', yyyy"
}, },

View File

@@ -2042,9 +2042,9 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0" lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001196, caniuse-lite@^1.0.30001208: caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001196, caniuse-lite@^1.0.30001208:
version "1.0.30001209" version "1.0.30001210"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001209.tgz#1bb4be0bd118e98e21cfb7ef617b1ef2164622f4" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001210.tgz#7c12d029e93b725cc2fe44a5eaabd9b838250d33"
integrity sha512-2Ktt4OeRM7EM/JaOZjuLzPYAIqmbwQMNnYbgooT+icoRGrKOyAxA1xhlnotBD1KArRSPsuJp3TdYcZYrL7qNxA== integrity sha512-avmGf0Jo00I8vB0I89J4Pba48kddasErV7slu7wrkyM5uY9gE5P+B+V3hjABv8Hp4YNG2nBqIUFUXlnqNteXEA==
chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2:
version "2.4.2" version "2.4.2"
@@ -4180,9 +4180,9 @@ http-parser-js@>=0.5.1:
integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg== integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==
http-proxy-middleware@^1.1.0: http-proxy-middleware@^1.1.0:
version "1.1.2" version "1.2.0"
resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.1.2.tgz#38d062ce4182b2931442efc2d9a0c429cab634f8" resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.2.0.tgz#87776ea3d4d8dda3dc2594a076787bbc6fe4d995"
integrity sha512-YRFUeOG3q85FJjAaYVJUoNRW9a73SDlOtAyQOS5PHLr18QeZ/vEhxywNoOPiEO8BxCegz4RXzTHcvyLEGB78UA== integrity sha512-vNw+AxT0+6VTM1rCJw1bpiIaUQ1Ww/vTyIEOUzdW9kNX4yuhhqV3jLSKDJo/Y/lqEIshaKCDujtvEqWiD9Dn6Q==
dependencies: dependencies:
"@types/http-proxy" "^1.17.5" "@types/http-proxy" "^1.17.5"
http-proxy "^1.18.1" http-proxy "^1.18.1"

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -40,10 +40,10 @@ return [
'date_time_js' => 'Do MMMM YYYY um HH:mm:ss', 'date_time_js' => 'Do MMMM YYYY um HH:mm:ss',
'specific_day_js' => 'D. MMMM YYYY', 'specific_day_js' => 'D. MMMM YYYY',
'week_in_year_js' => '[Week]. KW, YYYY', 'week_in_year_js' => '[Week]. KW, YYYY',
'week_in_year_fns' => "'Week' w, yyyy", 'week_in_year_fns' => "'Woche' ww/yyyy",
'year_js' => 'YYYY', 'year_js' => 'YYYY',
'half_year_js' => 'Q. Quartal YYYY', 'half_year_js' => 'Q. Quartal YYYY',
'quarter_fns' => "'Q'Q, yyyy", 'quarter_fns' => "'Q'QQQ, yyyy",
'half_year_fns' => "'H{half}', yyyy", 'half_year_fns' => "'H{half}', yyyy",
'dow_1' => 'Montag', 'dow_1' => 'Montag',
'dow_2' => 'Dienstag', 'dow_2' => 'Dienstag',

View File

@@ -40,7 +40,7 @@ return [
'date_time_js' => 'Do MMMM YYYY, à HH:mm:ss', 'date_time_js' => 'Do MMMM YYYY, à HH:mm:ss',
'specific_day_js' => 'D MMMM YYYY', 'specific_day_js' => 'D MMMM YYYY',
'week_in_year_js' => '[Week] w, YYYY', 'week_in_year_js' => '[Week] w, YYYY',
'week_in_year_fns' => "'Week' w, yyyy", 'week_in_year_fns' => "'Semaine' w, yyyy",
'year_js' => 'YYYY', 'year_js' => 'YYYY',
'half_year_js' => 'Q YYYY', 'half_year_js' => 'Q YYYY',
'quarter_fns' => "'Q'Q, yyyy", 'quarter_fns' => "'Q'Q, yyyy",

View File

@@ -40,7 +40,7 @@ return [
'date_time_js' => 'Do MMMM YYYY, @ HH:mm:ss', 'date_time_js' => 'Do MMMM YYYY, @ HH:mm:ss',
'specific_day_js' => 'G MMMM AAAA', 'specific_day_js' => 'G MMMM AAAA',
'week_in_year_js' => '[Week] s, AAAA', 'week_in_year_js' => '[Week] s, AAAA',
'week_in_year_fns' => "'Week' w, yyyy", 'week_in_year_fns' => "'Settimana' w, yyyy",
'year_js' => 'AAAA', 'year_js' => 'AAAA',
'half_year_js' => 'T AAAA', 'half_year_js' => 'T AAAA',
'quarter_fns' => "'Q'Q, yyyy", 'quarter_fns' => "'Q'Q, yyyy",

View File

@@ -40,11 +40,11 @@ return [
'date_time_js' => 'MMMM Do, YYYY, @ HH:mm:ss', 'date_time_js' => 'MMMM Do, YYYY, @ HH:mm:ss',
'specific_day_js' => 'D MMMM YYYY', 'specific_day_js' => 'D MMMM YYYY',
'week_in_year_js' => '[Week] s, AAAA', 'week_in_year_js' => '[Week] s, AAAA',
'week_in_year_fns' => "'Week' w, yyyy", 'week_in_year_fns' => "'Semana' w, yyyy",
'year_js' => 'YYYY', 'year_js' => 'YYYY',
'half_year_js' => 'Q YYYY', 'half_year_js' => 'Q YYYY',
'quarter_fns' => "'Q'Q, yyyy", 'quarter_fns' => "'T'Q, yyyy",
'half_year_fns' => "'H{half}', yyyy", 'half_year_fns' => "'S{half}', yyyy",
'dow_1' => 'Segunda', 'dow_1' => 'Segunda',
'dow_2' => 'Terça', 'dow_2' => 'Terça',
'dow_3' => 'Quarta', 'dow_3' => 'Quarta',

View File

@@ -1104,7 +1104,7 @@ return [
'save_transactions_by_moving' => 'Salve esta transação movendo-a para outra conta:|Salve essas transações movendo-as para outra conta:', 'save_transactions_by_moving' => 'Salve esta transação movendo-a para outra conta:|Salve essas transações movendo-as para outra conta:',
'save_transactions_by_moving_js' => 'Nenhuma transação.|Salve esta transação movendo-a para outra conta.|Salve essas transações movendo-as para outra conta.', 'save_transactions_by_moving_js' => 'Nenhuma transação.|Salve esta transação movendo-a para outra conta.|Salve essas transações movendo-as para outra conta.',
'stored_new_account' => 'Nova conta ":name" armazenado!', 'stored_new_account' => 'Nova conta ":name" armazenado!',
'stored_new_account_js' => 'New account "<a href="accounts/show/{ID}">{name}</a>" stored!', 'stored_new_account_js' => 'Nova conta "<a href="accounts/show/{ID}">{name}</a>" armazenada!',
'updated_account' => 'Conta ":name" atualizada', 'updated_account' => 'Conta ":name" atualizada',
'credit_card_options' => 'Opções de cartão de crédito', 'credit_card_options' => 'Opções de cartão de crédito',
'no_transactions_account' => 'Não há transações (neste período) para a conta ativa ":name".', 'no_transactions_account' => 'Não há transações (neste período) para a conta ativa ":name".',

View File

@@ -170,7 +170,7 @@ return [
'recurring_keep_transactions' => 'A única transação criada por esta transação recorrente não será excluída.|Todas as :count transações criadas por esta transação recorrente não serão excluídas.', 'recurring_keep_transactions' => 'A única transação criada por esta transação recorrente não será excluída.|Todas as :count transações criadas por esta transação recorrente não serão excluídas.',
'tag_keep_transactions' => 'A única transação conectada a esta tag não será excluída.|Todas as :count transações conectadas a esta tag não serão excluídas.', 'tag_keep_transactions' => 'A única transação conectada a esta tag não será excluída.|Todas as :count transações conectadas a esta tag não serão excluídas.',
'check_for_updates' => 'Buscar atualizações', 'check_for_updates' => 'Buscar atualizações',
'liability_direction' => 'Liability in/out', 'liability_direction' => 'Passivo entrada/saída',
'delete_object_group' => 'Excluir grupo ":title"', 'delete_object_group' => 'Excluir grupo ":title"',

View File

@@ -24,13 +24,13 @@ declare(strict_types=1);
return [ return [
'html_language' => 'pt', 'html_language' => 'pt',
'locale' => 'pt, Portugues, pt_PT.utf8, pt_PT.UTF-8', 'locale' => 'pt, Português, pt_PT.utf8, pt_PT.UTF-8',
'month' => '%B %Y', 'month' => '%B %Y',
'month_and_day' => '%B %e, %Y', 'month_and_day' => '%e %B, %Y',
'month_and_day_moment_js' => 'MMM D, YYYY', 'month_and_day_moment_js' => 'MMM D, YYYY',
'month_and_date_day' => '%A %B %e, %Y', 'month_and_date_day' => '%A %e %B, %Y',
'month_and_day_no_year' => '%B %e', 'month_and_day_no_year' => '%e %B',
'date_time' => '%B %e, %Y, @ %T', 'date_time' => '%e %B, %Y, @ %T',
'specific_day' => '%e %B %Y', 'specific_day' => '%e %B %Y',
'week_in_year' => 'Semana %V, %G', 'week_in_year' => 'Semana %V, %G',
'year' => '%Y', 'year' => '%Y',
@@ -40,7 +40,7 @@ return [
'date_time_js' => 'MMMM Do, YYYY, @ HH:mm:ss', 'date_time_js' => 'MMMM Do, YYYY, @ HH:mm:ss',
'specific_day_js' => 'D MMMM YYYY', 'specific_day_js' => 'D MMMM YYYY',
'week_in_year_js' => '[Week] w, YYYY', 'week_in_year_js' => '[Week] w, YYYY',
'week_in_year_fns' => "'Week' w, yyyy", 'week_in_year_fns' => "'Semana' w, yyyy",
'year_js' => 'YYYY', 'year_js' => 'YYYY',
'half_year_js' => 'Q YYYY', 'half_year_js' => 'Q YYYY',
'quarter_fns' => "'Trimestre' Q, yyyy", 'quarter_fns' => "'Trimestre' Q, yyyy",