kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-08 15:05:29 +00:00
Code Issues Projects Releases Wiki Activity

Lots of new code.

Browse Source
This commit is contained in:
James Cole
2023-07-24 18:58:35 +02:00
parent f1173263b6
commit a6503fda39
31 changed files with 693 additions and 15692 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
resources/assets/v2/api/v1/accounts/get.js Normal file
View File

@@ -0,0 +1,48 @@
/*
* list.js
* Copyright (c) 2022 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/>.
*/
import {api} from "../../../boot/axios";
export default class Get {
/**
*
* @param identifier
* @param date
* @returns {Promise<AxiosResponse<any>>}
*/
get(identifier, date) {
let params = {date: date};
if (!date) {
return api.get('/api/v1/accounts/' + identifier);
}
return api.get('/api/v1/accounts/' + identifier, {params: params});
}
/**
*
* @param identifier
* @param page
* @returns {Promise<AxiosResponse<any>>}
*/
transactions(identifier, page) {
return api.get('/api/v1/accounts/' + identifier + '/transactions', {params: {page: page}});
}
}

30
resources/assets/v2/api/v1/chart/account/overview.js Normal file
View File

@@ -0,0 +1,30 @@
/*
* overview.js
* Copyright (c) 2022 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/>.
*/
import {api} from "../../../../boot/axios";
import {format} from "date-fns";
export default class Overview {
overview(start, end) {
let startStr = format(start, 'y-MM-dd');
let endStr = format(end, 'y-MM-dd');
return api.get('/api/v1/chart/account/overview', {params: {start: startStr, end: endStr}});
}
}

2
resources/assets/v2/api/preferences/index.js → resources/assets/v2/api/v1/preferences/index.js
View File

@@ -18,7 +18,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {api} from "../../boot/axios";
import {api} from "../../../boot/axios";
export default class Preferences {
getByName(name) {

2
resources/assets/v2/api/summary/index.js → resources/assets/v2/api/v1/summary/index.js
View File

@@ -19,7 +19,7 @@
*/
import {api} from "../../boot/axios.js";
import {api} from "../../../boot/axios.js";
export default class Summary {
get(start, end, code) {

30
resources/assets/v2/api/v2/chart/account/dashboard.js Normal file
View File

@@ -0,0 +1,30 @@
/*
* overview.js
* Copyright (c) 2022 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/>.
*/
import {api} from "../../../../boot/axios";
import {format} from "date-fns";
export default class Dashboard {
dashboard(start, end) {
let startStr = format(start, 'y-MM-dd');
let endStr = format(end, 'y-MM-dd');
return api.get('/api/v2/chart/account/dashboard', {params: {start: startStr, end: endStr}});
}
}

9
resources/assets/v2/bootstrap.js vendored
View File

@@ -9,6 +9,7 @@ import axios from 'axios';
import store from "store";
import observePlugin from 'store/plugins/observe';
import Alpine from "alpinejs";
import * as bootstrap from 'bootstrap'
// add plugin to store and put in window
store.addPlugin(observePlugin);
@@ -33,6 +34,9 @@ Promise.all([
store.set('end', range.end);
}
// save local in window.__ something
window.__localeId__ = values[3];
const event = new Event('firefly-iii-bootstrapped');
document.dispatchEvent(event);
window.bootstrapped = true;
@@ -41,10 +45,5 @@ Promise.all([
window.axios = axios;
window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
// include popper js
import '@popperjs/core';
// include bootstrap CSS
import * as bootstrap from 'bootstrap'
window.Alpine = Alpine

3
resources/assets/v2/dashboard.js
View File

@@ -21,8 +21,9 @@
import './bootstrap.js';
import dates from './pages/shared/dates.js';
import boxes from './pages/dashboard/boxes.js';
import accounts from './pages/dashboard/accounts.js';
const comps = {dates, boxes};
const comps = {dates, boxes, accounts};
function loadPage(comps) {
Object.keys(comps).forEach(comp => {

81
resources/assets/v2/index.js
View File

@@ -1,80 +1 @@
import Summary from "./api/summary/index.js";
import {format} from 'date-fns'
import Alpine from "alpinejs";
//let amounts = [];
class IndexApp {
balanceBox = {foo: 'bar'};
constructor() {
console.log('IndexApp constructor');
}
init() {
console.log('IndexApp init');
this.loadBoxes();
}
loadBoxes() {
console.log('IndexApp loadBoxes');
let getter = new Summary();
let start = window.BasicStore.get('start');
let end = window.BasicStore.get('end');
// check on NULL values:
if (start !== null && end !== null) {
start = new Date(start);
end = new Date(end);
}
getter.get(format(start, 'yyyy-MM-dd'), format(end, 'yyyy-MM-dd'), null).then((response) => {
//
console.log('IndexApp done!');
console.log(response.data);
document.querySelector('#balanceAmount').innerText = 'ok dan';
//window.$refs.balanceAmount.text = 'bar!';
for (const i in response.data) {
if (response.data.hasOwnProperty(i)) {
const current = response.data[i];
if (i.startsWith('balance-in-')) {
//amounts.push(current);
console.log('Balance in: ', current);
}
}
}
});
}
}
let index = new IndexApp();
document.addEventListener("AppReady", (e) => {
index.init();
}, false,);
if (window.BasicStore.isReady()) {
index.init();
}
document.addEventListener('alpine:init', () => {
Alpine.data('balanceBox', () => ({
foo: 'barX'
}))
})
export function amounts() {
return {
amounts: ['bar', 'boo', 'baz'],
add() {
this.amounts.push('foo');
},
get() {
return this.amounts[1];
}
}
}
window.Alpine = Alpine
Alpine.start()
// NOT IN USE

176
resources/assets/v2/pages/dashboard/accounts.js Normal file
View File

@@ -0,0 +1,176 @@
/*
* accounts.js
* Copyright (c) 2023 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/>.
*/
import ApexCharts from "apexcharts";
import {getVariable} from "../../store/get-variable.js";
import Dashboard from "../../api/v2/chart/account/dashboard.js";
import formatLocal from "../../util/format.js";
import {format} from "date-fns";
import formatMoney from "../../util/format-money.js";
import Get from "../../api/v1/accounts/get.js";
// this is very ugly, but I have no better ideas at the moment to save the currency info
// for each series.
window.currencies = [];
export default () => ({
loading: false,
loadingAccounts: false,
accountList: [],
chart: null,
loadChart() {
if (this.loading) {
return;
}
// load chart data
this.loading = true;
const dashboard = new Dashboard();
dashboard.dashboard(new Date(window.store.get('start')), new Date(window.store.get('end')), null).then((response) => {
// chart options (may need to be centralized later on)
window.currencies = [];
let options = {
legend: {show: false},
chart: {
height: 400,
toolbar: {tools: {zoom: false, download: false, pan: false}}, type: 'line'
}, series: [],
settings: [],
xaxis: {
categories: [], labels: {
formatter: function (value) {
if (undefined === value) {
return '';
}
const date = new Date(value);
if (date instanceof Date && !isNaN(date)) {
return formatLocal(date, 'PP');
}
console.error('Could not parse "' + value + '", return "".');
return ':(';
}
}
}, yaxis: {
labels: {
formatter: function (value, index) {
if (undefined === value) {
return value;
}
if (undefined === index) {
return value;
}
if (typeof index === 'object') {
index = index.seriesIndex;
}
//console.log(index);
let currencyCode = window.currencies[index] ?? 'EUR';
return formatMoney(value, currencyCode);
}
}
},
};
// render data:
for (let i = 0; i < response.data.length; i++) {
if (response.data.hasOwnProperty(i)) {
let current = response.data[i];
let entry = [];
window.currencies.push(current.currency_code);
for (const [ii, value] of Object.entries(current.entries)) {
entry.push({x: format(new Date(ii), 'yyyy-MM-dd'), y: parseFloat(value)});
}
options.series.push({name: current.label, data: entry});
}
}
if (null !== this.chart) {
// chart already in place, refresh:
this.chart.updateOptions(options);
}
if (null === this.chart) {
this.chart = new ApexCharts(document.querySelector("#account-chart"), options);
this.chart.render();
}
this.loading = false;
});
}, loadAccounts() {
if (this.loadingAccounts) {
return;
}
this.loadingAccounts = true;
const max = 10;
Promise.all([getVariable('frontpageAccounts'),]).then((values) => {
for (let i = 0; i < values[0].length; i++) {
if (values[0].hasOwnProperty(i)) {
let accountId = values[0][i];
// grab account info for box:
(new Get).get(accountId, new Date(window.store.get('end'))).then((response) => {
let current = response.data.data;
this.accountList[i] = {
name: current.attributes.name,
id: current.id,
balance: formatMoney(current.attributes.current_balance, current.attributes.currency_code),
groups: [],
};
// get groups for account:
(new Get).transactions(current.id, 1).then((response) => {
for (let ii = 0; ii < response.data.data.length; ii++) {
if (ii >= max) {
break;
}
let current = response.data.data[ii];
let group = {
title: null === current.attributes.group_title ? '' : current.attributes.group_title,
id: current.id,
transactions: [],
};
for (let iii = 0; iii < current.attributes.transactions.length; iii++) {
let currentTransaction = current.attributes.transactions[iii];
group.transactions.push({
description: currentTransaction.description,
id: current.id,
amount: formatMoney(currentTransaction.amount, currentTransaction.currency_code),
});
}
this.accountList[i].groups.push(group);
}
// will become false after the FIRST account is loaded.
this.loadingAccounts = false;
});
}).then(() => {
console.log(this.accountList);
});
}
}
});
},
init() {
console.log('init');
Promise.all([getVariable('viewRange'),]).then((values) => {
this.loadChart();
this.loadAccounts();
});
window.store.observe('end', () => {
this.loadChart();
this.loadAccounts();
});
},
});

19
resources/assets/v2/pages/dashboard/boxes.js
View File

@@ -18,7 +18,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import Summary from "../../api/summary/index.js";
import Summary from "../../api/v1/summary/index.js";
import {format} from "date-fns";
import {getVariable} from "../../store/get-variable.js";
@@ -28,8 +28,12 @@ export default () => ({
billBox: {paid: [], unpaid: []},
leftBox: {left: [], perDay: []},
netBox: {net: []},
loading: false,
loadBoxes() {
console.log('loadboxes');
if (this.loading) {
return;
}
this.loading = true;
// get stuff
let getter = new Summary();
@@ -75,22 +79,17 @@ export default () => ({
//console.log('Next up: ', current);
}
}
this.loading = false;
});
},
// Getter
init() {
console.log('Now in boxes');
Promise.all([
getVariable('viewRange'),
]).then((values) => {
Promise.all([getVariable('viewRange'),]).then((values) => {
this.loadBoxes();
});
window.store.observe('start', (newValue, oldValue) => {
// this.loadBoxes();
});
window.store.observe('end', (newValue, oldValue) => {
window.store.observe('end', () => {
this.loadBoxes();
});
},

10
resources/assets/v2/pages/shared/dates.js
View File

@@ -24,7 +24,7 @@ export default () => ({
language: 'en-US',
init() {
console.log('Dates init');
// console.log('Dates init');
this.range = {
start: new Date(window.store.get('start')),
@@ -68,7 +68,7 @@ export default () => ({
buildDateRange() {
console.log('Dates buildDateRange');
// console.log('Dates buildDateRange');
// generate ranges
let nextRange = this.getNextRange();
@@ -123,7 +123,7 @@ export default () => ({
element.setAttribute('data-end', format(ytd.end, 'yyyy-MM-dd'));
// custom range.
console.log('MainApp: buildDateRange end');
// console.log('MainApp: buildDateRange end');
},
getNextRange() {
@@ -161,12 +161,12 @@ export default () => ({
changeDateRange(e) {
e.preventDefault();
console.log('MainApp: changeDateRange');
// console.log('MainApp: changeDateRange');
let target = e.currentTarget;
let start = new Date(target.getAttribute('data-start'));
let end = new Date(target.getAttribute('data-end'));
console.log('MainApp: Change date range', start, end);
// console.log('MainApp: Change date range', start, end);
window.store.set('start', start);
window.store.set('end', end);

2
resources/assets/v2/sass/app.scss
View File

@@ -22,6 +22,8 @@
// Variables
//@import "variables";
$color-mode-type: media-query;
// Bootstrap
//@import "~bootstrap-sass/assets/stylesheets/bootstrap";

10
resources/assets/v2/store/get-variable.js
View File

@@ -18,7 +18,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import Get from "../api/preferences/index.js";
import Get from "../api/v1/preferences/index.js";
export function getVariable(name) {
@@ -26,17 +26,17 @@ export function getVariable(name) {
// to make things available quicker than if the store has to grab it through the API.
// then again, it's not that slow.
if (window.hasOwnProperty(name)) {
console.log('Get from window');
// console.log('Get from window');
return Promise.resolve(window[name]);
}
// load from store2, if it's present.
if (window.store.get(name)) {
console.log('Get from store');
// console.log('Get from store');
return Promise.resolve(window.store.get(name));
}
let getter = (new Get);
return getter.getByName(name).then((response) => {
console.log('Get from API');
// console.log('Get from API');
return Promise.resolve(parseResponse(name, response));
});
@@ -45,7 +45,7 @@ export function getVariable(name) {
function parseResponse(name, response) {
let value = response.data.data.attributes.data;
window.store.set(name, value);
console.log('Store from API');
// console.log('Store from API');
return value;
}

3
resources/assets/v2/support/get-viewrange.js
View File

@@ -13,7 +13,7 @@ function getViewRange(viewRange, today) {
let start;
let end;
console.log('getViewRange: ' + viewRange);
// console.log('getViewRange: ' + viewRange);
switch (viewRange) {
case 'last365':
@@ -100,7 +100,6 @@ function getViewRange(viewRange, today) {
end = endOfDay(end);
break;
}
console.log('MainApp: setDatesFromViewRange done!');
return {start: start, end: end};
}

30
resources/assets/v2/util/format-money.js Normal file
View File

@@ -0,0 +1,30 @@
/*
* format-money.js
* Copyright (c) 2023 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/>.
*/
import {format} from "date-fns";
export default function (amount, currencyCode) {
let locale = window.__localeId__.replace('_', '-');
return Intl.NumberFormat(locale, {
style: 'currency',
currency: currencyCode
}).format(amount);
}