Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Migrate view to API powered view.
James Cole109fa6622ded
diff --git a/app/Http/Controllers/Json/FrontpageController.php b/app/Http/Controllers/Json/FrontpageController.phpdeleted file mode 100644index e4a6f91ef1..0000000000--- a/app/Http/Controllers/Json/FrontpageController.php+++ /dev/null@@ -1,103 +0,0 @@-<?php--/**- * FrontpageController.php- * Copyright (c) 2019 [email protected]- *- * 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\Json;--use FireflyIII\Exceptions\FireflyException;-use FireflyIII\Http\Controllers\Controller;-use FireflyIII\Models\PiggyBank;-use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;-use Illuminate\Http\JsonResponse;-use Illuminate\Support\Facades\Log;-use Throwable;--/**- * Class FrontpageController.- */-final class FrontpageController extends Controller-{- /**- * Piggy bank pie chart.- *- * @throws FireflyException- */- public function piggyBanks(PiggyBankRepositoryInterface $repository): JsonResponse- {- $set = $repository->getPiggyBanks();- $info = [];-- /** @var PiggyBank $piggyBank */- foreach ($set as $piggyBank) {- $amount = $repository->getCurrentAmount($piggyBank);- $pcAmount = $repository->getCurrentPrimaryCurrencyAmount($piggyBank);- if (1 === bccomp($amount, '0')) {- // percentage!- $pct = 0;- if (0 !== bccomp((string) $piggyBank->target_amount, '0')) {- $pct = (int) bcmul(bcdiv($amount, (string) $piggyBank->target_amount), '100');- }-- $entry = [- 'id' => $piggyBank->id,- 'name' => $piggyBank->name,- 'amount' => $amount,- 'pc_amount' => $pcAmount,- 'target' => $piggyBank->target_amount,- 'pc_target' => $piggyBank->native_target_amount,- 'percentage' => $pct,- // currency:- 'currency_symbol' => $piggyBank->transactionCurrency->symbol,- 'currency_decimal_places' => $piggyBank->transactionCurrency->decimal_places,- 'primary_currency_symbol' => $this->primaryCurrency->symbol,- 'primary_currency_decimal_places' => $this->primaryCurrency->decimal_places,- ];-- $info[] = $entry;- }- }-- // sort by current percentage (lowest at the top)- uasort($info, static fn (array $a, array $b): int => $a['percentage'] <=> $b['percentage']);-- $html = '';- if (0 !== count($info)) {- try {- $convertToPrimary = $this->convertToPrimary;- $primary = $this->primaryCurrency;- $html = view('json.piggy-banks', [- 'info' => $info,- 'convertToPrimary' => $convertToPrimary,- 'primary' => $primary,- ])->render();- } catch (Throwable $e) {- Log::error(sprintf('Cannot render json.piggy-banks: %s', $e->getMessage()));- Log::error($e->getTraceAsString());- $html = sprintf('Could not render view: %s', $e->getMessage());-- throw new FireflyException($html, 0, $e);- }- }-- return response()->json(['html' => $html]);- }-}diff --git a/public/v1/js/ff/index.js b/public/v1/js/ff/index.jsindex dba4ab6e5f..189888832b 100644--- a/public/v1/js/ff/index.js+++ b/public/v1/js/ff/index.js@@ -38,98 +38,4 @@ function drawChart() {columnChart('chart/category/frontpage', 'categories-chart');columnChart(accountExpenseUrl, 'expense-accounts-chart');columnChart(accountRevenueUrl, 'revenue-accounts-chart');- getPiggyBanks();-- function getAllBoxes() {- // get summary.- $.getJSON('api/v1/summary/basic?start=' + sessionStart + '&end=' + sessionEnd).done(function (data) {- var key;-- // balance.- var balance_top = [];- var balance_bottom = [];-- // bills- var unpaid = [];- var paid = [];-- // left to spend.- var left_to_spend_top = [];- var left_to_spend_bottom = [];-- // net worth- var net_worth = [];- var keepGreen = false;- var makeBlue = false;-- for (key in data) {- // balance- if (key.substring(0, 11) === 'balance-in-') {- balance_top.push(data[key].value_parsed);- balance_bottom.push(data[key].sub_title);- }-- // bills- if (key.substring(0, 16) === 'bills-unpaid-in-') {- unpaid.push(data[key].value_parsed);- }- if (key.substring(0, 14) === 'bills-paid-in-') {- paid.push(data[key].value_parsed);- }-- // left to spend- if (key.substring(0, 17) === 'left-to-spend-in-') {- left_to_spend_top.push(data[key].value_parsed);- left_to_spend_bottom.push(data[key].sub_title);- if(true === data[key].no_available_budgets) {- makeBlue = true;- $('#box-left-to-spend-text').text(data[key].title);- }- if(false === data[key].no_available_budgets && parseFloat(data[key].monetary_value) > 0) {- keepGreen = true;- }- }-- // net worth- if (key.substring(0, 13) === 'net-worth-in-') {- net_worth.push(data[key].value_parsed);- }- }- if(!keepGreen) {- $('#box-left-to-spend-box').removeClass('bg-green-gradient').addClass('bg-red-gradient')- }- if(makeBlue) {- $('#box-left-to-spend-box').removeClass('bg-red-gradient').removeClass('bg-green-gradient').addClass('bg-blue-gradient')- }-- // balance- $('#box-balance-sums').html(balance_top.join(', '));- $('#box-balance-list').html(balance_bottom.join(', '));-- // bills- $('#box-bills-unpaid').html(unpaid.join(', '));- $('#box-bills-paid').html(paid.join(', '));-- // left to spend- $('#box-left-to-spend').html(left_to_spend_top.join(', '));- $('#box-left-per-day').html(left_to_spend_bottom.join(', '));-- // net worth- $('#box-net-worth').html(net_worth.join(', '));-- });- }-- //getBoxAmounts();-}--/**- *- */-function getPiggyBanks() {- $.getJSON(piggyInfoUrl).done(function (data) {- if (data.html.length > 0) {- $('#piggy_bank_overview').html(data.html);- }- });}diff --git a/resources/assets/v3/js/pages/dashboard/dashboard.js b/resources/assets/v3/js/pages/dashboard/dashboard.jsindex a68769a946..bb1c5992f7 100644--- a/resources/assets/v3/js/pages/dashboard/dashboard.js+++ b/resources/assets/v3/js/pages/dashboard/dashboard.js@@ -23,12 +23,47 @@ import sidebar from "../../pages/shared/sidebar.js";import dates from "../shared/dates.js";import boxes from "./boxes.js";import Alpine from "alpinejs";+import Get from '../../api/model/piggy-bank/get.js';+import formatMoney from "../../util/format-money.js";let index = function () {return {+ piggyBanks: [],+ loadingPiggyBanks: true,init() {+ this.loadPiggyBanks();console.log("Dashboard");},+ loadPiggyBanks() {+ this.downloadPiggyBanks(1);+ },+ downloadPiggyBanks(page) {+ (new Get).list({page: page}).then((response) => {+ for(let i =0;i<response.data.data.length;i++){+ if(Object.hasOwn(response.data.data, i)){+ let current = response.data.data[i];+ let piggy = {+ id: current.id,+ name: current.attributes.name,+ percentage: null === current.attributes.percentage ? 0 : parseInt(current.attributes.percentage),+ amount: formatMoney(current.attributes.current_amount, current.attributes.currency_code) + ' / ' + formatMoney(current.attributes.target_amount, current.attributes.currency_code)+ };+ if(null === current.attributes.target_amount) {+ piggy.amount = formatMoney(current.attributes.current_amount, current.attributes.currency_code) + ' / ∞';+ }++ this.piggyBanks.push(piggy);+ }+ }++ let totalPages = parseInt(response.data.meta.pagination.total_pages);+ if(totalPages > page) {+ this.downloadPiggyBanks(page + 1);+ return;+ }+ this.loadingPiggyBanks = false;+ });+ }};};diff --git a/resources/views/index.blade.php b/resources/views/index.blade.phpindex 5b2d57b9ba..539bc372c6 100644--- a/resources/views/index.blade.php+++ b/resources/views/index.blade.php@@ -154,7 +154,50 @@<!--box for piggy bank data (JSON) --><div id="piggy_bank_overview">-+ <div class="card mb-4">+ <div class="card-header">+ <div class="card-title"><a href="{{ route('piggy-banks.index') }}"+ title="{{ __('firefly.go_to_piggies') }}">{{ __('firefly.piggyBanks') }}</a>+ </div>+ </div>+ <div class="card-body">+ <template x-if="loadingPiggyBanks">+ <div class="text-center">+ <div class="spinner-border spinner-border-sm" role="status">+ <span class="visually-hidden">{{ __('firefly.thinking') }}</span>+ </div>+ </div>+ </template>+ <template x-if="!loadingPiggyBanks && piggyBanks.length === 0">+ <p><em>{{ __('firefly.no_piggies_intro_default') }}</em></p>+ </template>+ <template x-for="piggyBank in piggyBanks" :key="piggyBank.id">+ <div>+ <a :href="'./piggy-banks/show/' + piggyBank.id" :title="piggyBank.name"><strong+ x-text="piggyBank.name"></strong></a><br>+ <div class="progress">+ <div class="progress-bar progress-bar-striped" role="progressbar"+ :class="'w-'+piggyBank.percentage" :aria-valuenow="piggyBank.percentage"+ aria-valuemin="0" aria-valuemax="100">+ <template x-if="piggyBank.percentage > 50">+ <span x-text="piggyBank.amount"></span>+ </template>+ </div>+ <template x-if="piggyBank.percentage <= 50">+ <span> + <span class="ml-1" x-text="piggyBank.amount"></span>+ </span>+ </template>+ </div>+ </div>+ </template>+ </div>+ <div class="card-footer text-end">+ <a href="{{ route('piggy-banks.index') }}" title="{{ __('firefly.go_to_piggies') }}"+ class="btn btn-primary btn-sm"><span+ class="bi bi-bullseye"></span> {{ __('firefly.go_to_piggies') }}</a>+ </div>+ </div></div></div></div>@@ -214,7 +257,7 @@var piggyInfoUrl = '{{ route('json.fp.piggy-banks') }}';var drawVerticalLine = '';{{-- render vertical line with text "today" --}}- @if($start->lte($today) && $end->gte($today))+ @if($start->lte($today) && $end->gte($today))drawVerticalLine = '{{ $today->isoFormat($monthAndDayFormat) }}';@endif</script>diff --git a/resources/views/json/piggy-banks.blade.php b/resources/views/json/piggy-banks.blade.phpdeleted file mode 100644index c4da90da7e..0000000000--- a/resources/views/json/piggy-banks.blade.php+++ /dev/null@@ -1,37 +0,0 @@-<div class="card mb-4">- <div class="card-header">- <div class="card-title"><a href="{{ route('piggy-banks.index') }}" title="{{ __('firefly.piggyBanks') }}">{{ __('firefly.piggyBanks') }}</a></div>-- </div>- <div class="card-body">- @foreach($info as $entry)- <strong>{{ $entry['name'] }}</strong><br/>- <div class="progress">- <div class="progress-bar progress-bar-striped w-{{ round($entry['percentage']) }}" role="progressbar" aria-valuenow="{{ $entry['percentage'] }}" aria-valuemin="0" aria-valuemax="100">- @if($entry['percentage'] > 20)- @if($convertToPrimary && 0 !== $entry['pc_amount'])- {!! format_amount_by_symbol($entry['pc_amount'], $entry['primary_currency_symbol'], $entry['primary_currency_decimal_places'], false) !!}- ({!! format_amount_by_symbol($entry['amount'], $entry['currency_symbol'], $entry['currency_decimal_places'], false) !!})- @endif- @if(!$convertToPrimary)- {!! format_amount_by_symbol($entry['amount'], $entry['currency_symbol'], $entry['currency_decimal_places'], false) !!}- @endif- @endif- </div>- @if($entry['percentage'] <= 20)- - @if($convertToPrimary && 0 !== $entry['pc_amount'])- {!! format_amount_by_symbol($entry['pc_amount'], $entry['primary_currency_symbol'], $entry['primary_currency_decimal_places'], false) !!}- ({!! format_amount_by_symbol($entry['amount'], $entry['currency_symbol'], $entry['currency_decimal_places'], false) !!})- @endif- @if(!$convertToPrimary)- {!! format_amount_by_symbol($entry['amount'], $entry['currency_symbol'], $entry['currency_decimal_places'], false) !!}- @endif- @endif- </div>- @endforeach- </div>- <div class="card-footer text-end">- <a href="{{ route('piggy-banks.index') }}" class="btn btn-primary btn-sm"><span class="bi bi-bullseye"></span> {{ __('firefly.go_to_piggies') }}</a>- </div>-</div>diff --git a/routes/web.php b/routes/web.phpindex 8e00913ff1..537a6616ad 100644--- a/routes/web.php+++ b/routes/web.php@@ -794,12 +794,6 @@ Route::group(Route::get('trigger', ['uses' => 'Json\RuleController@trigger', 'as' => 'trigger']);Route::get('action', ['uses' => 'Json\RuleController@action', 'as' => 'action']);- // front page- Route::get('frontpage/piggy-banks', ['uses' => 'Json\FrontpageController@piggyBanks', 'as' => 'fp.piggy-banks']);-- // currency conversion:- // Route::get('rate/{fromCurrencyCode}/{toCurrencyCode}/{date}', ['uses' => 'Json\ExchangeController@getRate', 'as' => 'rate']);-// intro things:Route::post('intro/finished/{route}/{specificPage?}', ['uses' => 'Json\IntroController@postFinished', 'as' => 'intro.finished']);Route::post('intro/enable/{route}/{specificPage?}', ['uses' => 'Json\IntroController@postEnable', 'as' => 'intro.enable']);