mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2026-09-03 20:52:58 -05:00
New colors.
This commit is contained in:
James Cole
@@ -54,7 +54,7 @@ final class InstallController extends Controller
|
||||
|
||||
public const string BASEDIR_ERROR = 'Firefly III cannot execute the upgrade commands. It is not allowed to because of an open_basedir restriction.';
|
||||
public const string FORBIDDEN_ERROR = 'Internal PHP function "proc_close" is disabled for your installation. Auto-migration is not possible.';
|
||||
public const string OTHER_ERROR = 'An unknown error prevented Firefly III from executing the "%s"-command. Sorry.';
|
||||
public const string OTHER_ERROR = 'An unknown error prevented Firefly III from executing the "<code>%s</code>"-command. Sorry.';
|
||||
|
||||
private string $lastError = '';
|
||||
// empty on purpose.
|
||||
|
||||
@@ -24,20 +24,49 @@ $color-mode-type: data;
|
||||
$link-decoration: none;
|
||||
$font-family-sans-serif: "Roboto", sans-serif;
|
||||
|
||||
$danger: #CD5029;
|
||||
$primary: #1E6581;
|
||||
$success: #64B624;
|
||||
// colors are for light mode.
|
||||
$danger: #CD5029; // original
|
||||
//$danger: #993B1E; // slightly darker for WCAG on white bg
|
||||
$primary: #1E6581; // original
|
||||
//$primary: #1C5E78; // slightly darker for WCAG test on white bg
|
||||
$success: #64B624; // original
|
||||
//$success: #356114; // darker for WCAG pass
|
||||
//$info: #065E6F;
|
||||
|
||||
//$danger: #000;
|
||||
//$primary: #000;
|
||||
//$success: #000;
|
||||
|
||||
|
||||
@use "admin-lte/src/scss/adminlte" with (
|
||||
$color-mode-type: $color-mode-type,
|
||||
$color-mode-type: $color-mode-type,
|
||||
$link-decoration: $link-decoration,
|
||||
$font-family-sans-serif: $font-family-sans-serif,
|
||||
$danger: $danger,
|
||||
$primary: $primary,
|
||||
$success: $success
|
||||
);
|
||||
// for light mode, different money colors are used.
|
||||
html[data-bs-theme="light"] .money-negative {
|
||||
color: #993B1E !important;
|
||||
}
|
||||
html[data-bs-theme="light"] .money-positive {
|
||||
color: #356114 !important;
|
||||
}
|
||||
html[data-bs-theme="light"] .money-transfer {
|
||||
color: #065E6F !important;
|
||||
}
|
||||
|
||||
// for dark mode, different money colors are used.
|
||||
html[data-bs-theme="dark"] .money-negative {
|
||||
color: #E69F89 !important;
|
||||
}
|
||||
html[data-bs-theme="dark"] .money-positive {
|
||||
color: #6BC427 !important;
|
||||
}
|
||||
html[data-bs-theme="dark"] .money-transfer {
|
||||
color: #0BC1E5 !important;
|
||||
}
|
||||
|
||||
@import 'shepherd.js/dist/css/shepherd.css';
|
||||
|
||||
|
||||
+127
-111
@@ -2,33 +2,37 @@
|
||||
@section('content')
|
||||
<!-- TODO internals modal voor pagina settings -->
|
||||
<!-- TODO wizard modal voor weet ik veel -->
|
||||
<x-dashboard.boxes :start="$start" :end="$end" />
|
||||
<x-dashboard.boxes :start="$start" :end="$end"/>
|
||||
|
||||
<div class="row" x-data="index">
|
||||
<div class="col-lg-8 col-md-12 col-sm-12">
|
||||
<!--ACCOUNTS -->
|
||||
<div class="card card-primary card-outline mb-4">
|
||||
<div class="card mb-2 card-outline">
|
||||
<div class="card-header">
|
||||
<div class="card-title"><a href="{{ route('accounts.index',['asset']) }}" title="{{ __('firefly.yourAccounts') }}">{{ __('firefly.yourAccounts') }}</a></div>
|
||||
<div class="card-title"><a href="{{ route('accounts.index',['asset']) }}"
|
||||
title="{{ __('firefly.yourAccounts') }}">{{ __('firefly.yourAccounts') }}</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<canvas id="accounts-chart" class="wide-chart" height="400" width="100%"></canvas>
|
||||
<canvas id="accounts-chart" class="wide-chart" height="400" width="100%"></canvas>
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
<a href="{{ route('accounts.index',['asset']) }}" class="btn btn-primary btn-sm"><span class="bi bi-cash"></span> {{ __('firefly.go_to_asset_accounts') }}</a>
|
||||
<div class="card-footer text-end">
|
||||
<a href="{{ route('accounts.index',['asset']) }}" class="btn btn-primary btn-sm"><span
|
||||
class="bi bi-cash"></span> {{ __('firefly.go_to_asset_accounts') }}</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!--BUDGETS -->
|
||||
<div class="card card-outline mb-4">
|
||||
<div class="card mb-2 card-outline">
|
||||
<div class="card-header ">
|
||||
<div class="card-title"><a href="{{ route('budgets.index') }}"
|
||||
title="{{ __('firefly.budgetsAndSpending') }}">{{ __('firefly.budgetsAndSpending') }}</a></div>
|
||||
title="{{ __('firefly.budgetsAndSpending') }}">{{ __('firefly.budgetsAndSpending') }}</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<canvas id="budgets-chart" class="wide-chart" height="400" width="100%"></canvas>
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
<div class="card-footer text-end">
|
||||
<a href="{{ route('budgets.index') }}" class="btn btn-primary btn-sm">
|
||||
<span class="bi bi-pie-chart"></span>
|
||||
<span>{{ __('firefly.go_to_budgets') }}</span>
|
||||
@@ -36,16 +40,17 @@
|
||||
</div>
|
||||
</div>
|
||||
<!--CATEGORIES -->
|
||||
<div class="card card-outline mb-4">
|
||||
<div class="card mb-2 card-outline">
|
||||
<div class="card-header">
|
||||
<div class="card-title"><a href="{{ route('categories.index') }}"
|
||||
title="{{ __('firefly.categories') }}">{{ __('firefly.categories') }}</a></div>
|
||||
title="{{ __('firefly.categories') }}">{{ __('firefly.categories') }}</a>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<canvas id="categories-chart" class="wide-chart" height="400" width="100%"></canvas>
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
<div class="card-footer text-end">
|
||||
<a href="{{ route('categories.index') }}" class="btn btn-primary btn-sm">
|
||||
<span class="bi bi-bookmark"></span>
|
||||
<span>{{ __('firefly.go_to_categories') }}</span>
|
||||
@@ -56,87 +61,96 @@
|
||||
<div class="col-lg-4 col-md-6 col-sm-12">
|
||||
|
||||
<!--TRANSACTIONS -->
|
||||
<div id="all_transactions">
|
||||
@foreach($transactions as $data)
|
||||
<div class="card mb-4">
|
||||
@foreach($transactions as $data)
|
||||
<div class="card card-outline mb-2">
|
||||
<div class="card-header">
|
||||
<div class="card-title"><a href="{{ route('accounts.show', [$data['account']['id']]) }}">{{ $data['account']['name'] }}</a>
|
||||
<div class="card-title"><a
|
||||
href="{{ route('accounts.show', [$data['account']['id']]) }}">{{ $data['account']['name'] }}</a>
|
||||
</div>
|
||||
</div>
|
||||
@if(count($data['transactions']) > 0)
|
||||
<div class="card-body p-0">
|
||||
<x-lists.groups-tiny :transactions="$data['transactions']" />
|
||||
</div>
|
||||
<div class="card-body p-0">
|
||||
<x-lists.groups-tiny :transactions="$data['transactions']"/>
|
||||
</div>
|
||||
@endif
|
||||
@if(0 === count($data['transactions']))
|
||||
<div class="card-body">
|
||||
<p>
|
||||
<em>
|
||||
{{ __('firefly.no_transactions_account', ['name' => $data['account']['name']]) }}
|
||||
</em>
|
||||
</p>
|
||||
<div class="card-body">
|
||||
<p>
|
||||
<em>
|
||||
{{ __('firefly.no_transactions_account', ['name' => $data['account']['name']]) }}
|
||||
</em>
|
||||
</p>
|
||||
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="card-footer">
|
||||
<!-- Single button -->
|
||||
<div class="btn-group" role="group">
|
||||
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">{{ __('firefly.sidebar_frontpage_create') }}</button>
|
||||
<ul class="dropdown-menu">
|
||||
<li>
|
||||
<a class="dropdown-item" href="{{ route('transactions.create', ['withdrawal']) }}?source={{ $data['account']['id'] }}">{{ __('firefly.create_new_withdrawal') }}</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="dropdown-item" href="{{ route('transactions.create', ['deposit']) }}?destination={{ $data['account']['id'] }}">{{ __('firefly.create_new_deposit') }}</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="dropdown-item" href="{{ route('transactions.create', ['transfer']) }}?source={{ $data['account']['id'] }}">{{ __('firefly.create_new_transfer') }}</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="btn-group" role="group">
|
||||
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
|
||||
{{ account_balance($data['account']) }}
|
||||
</button>
|
||||
<ul class="dropdown-menu">
|
||||
<li>
|
||||
<a class="dropdown-item" href="{{ route('accounts.show', [$data['account']['id']]) }}">{{ __('firefly.show') }}</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="dropdown-item" href="{{ route('accounts.reconcile', [$data['account']['id']]) }}">{{ __('firefly.reconcile') }}</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="dropdown-item" href="{{ route('accounts.edit', [$data['account']['id']]) }}">{{ __('firefly.edit') }}</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="dropdown-item" href="{{ route('accounts.delete', [$data['account']['id']]) }}">{{ __('firefly.delete') }}</a>
|
||||
</li>
|
||||
</ul>
|
||||
@endif
|
||||
<div class="card-footer">
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<button type="button" class="btn btn-primary btn-sm dropdown-toggle"
|
||||
data-bs-toggle="dropdown"
|
||||
aria-expanded="false">{{ __('firefly.sidebar_frontpage_create') }}</button>
|
||||
<ul class="dropdown-menu">
|
||||
<li>
|
||||
<a class="dropdown-item"
|
||||
href="{{ route('transactions.create', ['withdrawal']) }}?source={{ $data['account']['id'] }}">{{ __('firefly.create_new_withdrawal') }}</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="dropdown-item"
|
||||
href="{{ route('transactions.create', ['deposit']) }}?destination={{ $data['account']['id'] }}">{{ __('firefly.create_new_deposit') }}</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="dropdown-item"
|
||||
href="{{ route('transactions.create', ['transfer']) }}?source={{ $data['account']['id'] }}">{{ __('firefly.create_new_transfer') }}</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="col-6 text-end">
|
||||
<button type="button" class="btn btn-primary btn-sm dropdown-toggle"
|
||||
data-bs-toggle="dropdown" aria-expanded="false">
|
||||
{{ account_balance($data['account']) }}
|
||||
</button>
|
||||
<ul class="dropdown-menu">
|
||||
<li>
|
||||
<a class="dropdown-item"
|
||||
href="{{ route('accounts.show', [$data['account']['id']]) }}">{{ __('firefly.show') }}</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="dropdown-item"
|
||||
href="{{ route('accounts.reconcile', [$data['account']['id']]) }}">{{ __('firefly.reconcile') }}</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="dropdown-item"
|
||||
href="{{ route('accounts.edit', [$data['account']['id']]) }}">{{ __('firefly.edit') }}</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="dropdown-item"
|
||||
href="{{ route('accounts.delete', [$data['account']['id']]) }}">{{ __('firefly.delete') }}</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
@endforeach
|
||||
|
||||
@if($billCount > 0)
|
||||
<!--BILLS -->
|
||||
<div class="card mb-4">
|
||||
<div class="card-header">
|
||||
<div class="card-title"><a href="{{ route('subscriptions.index') }}" title="{{ __('firefly.bills') }}">{{ __('firefly.bills') }}</a></div>
|
||||
<!--BILLS -->
|
||||
<div class="card mb-2">
|
||||
<div class="card-header">
|
||||
<div class="card-title"><a href="{{ route('subscriptions.index') }}"
|
||||
title="{{ __('firefly.bills') }}">{{ __('firefly.bills') }}</a></div>
|
||||
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="center-chart">
|
||||
<canvas id="bills-chart" class="low-chart" height="200"></canvas>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="center-chart">
|
||||
<canvas id="bills-chart" class="low-chart" height="200"></canvas>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-footer text-end">
|
||||
<a href="{{ route('bills.index') }}" class="btn btn-primary btn-sm"><span
|
||||
class="bi bi-calendar"></span> {{ __('firefly.go_to_bills') }}</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
<a href="{{ route('bills.index') }}" class="btn btn-primary btn-sm"><span
|
||||
class="bi bi-calendar"></span> {{ __('firefly.go_to_bills') }}</a>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<!--box for piggy bank data (JSON) -->
|
||||
@@ -148,32 +162,34 @@
|
||||
<div class="row">
|
||||
<div class="col-lg-12 col-md-12 col-sm-12">
|
||||
<!--EXPENSE ACCOUNTS -->
|
||||
<div class="card mb-4">
|
||||
<div class="card mb-2">
|
||||
<div class="card-header">
|
||||
<div class="card-title"><a href="{{ route('accounts.index',['expense']) }}" title="{{ __('firefly.expense_accounts') }}">{{ __('firefly.expense_accounts') }}</a>
|
||||
<div class="card-title"><a href="{{ route('accounts.index',['expense']) }}"
|
||||
title="{{ __('firefly.expense_accounts') }}">{{ __('firefly.expense_accounts') }}</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<canvas id="expense-accounts-chart" class="wide-chart" height="400"
|
||||
width="100%"></canvas>
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
<div class="card-footer text-end">
|
||||
<a href="{{ route('accounts.index', ['expense']) }}" class="btn btn-primary btn-sm"><span
|
||||
class="bi bi-cart"></span> {{ __('firefly.go_to_expense_accounts') }}</a>
|
||||
</div>
|
||||
</div>
|
||||
<!--OPTIONAL REVENUE ACCOUNTS -->
|
||||
<div class="card mb-4">
|
||||
<div class="card mb-2">
|
||||
<div class="card-header">
|
||||
<div class="card-title"><a href="{{ route('accounts.index',['revenue']) }}"
|
||||
title="{{ __('firefly.revenue_accounts') }}">{{ __('firefly.revenue_accounts') }}</a></div>
|
||||
title="{{ __('firefly.revenue_accounts') }}">{{ __('firefly.revenue_accounts') }}</a>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<canvas id="revenue-accounts-chart" class="wide-chart" height="400"
|
||||
width="100%"></canvas>
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
<div class="card-footer text-end">
|
||||
<a href="{{ route('accounts.index', ['revenue']) }}" class="btn btn-primary btn-sm"><span
|
||||
class="bi bi-box-arrow-down"></span> {{ __('firefly.go_to_revenue_accounts') }}</a>
|
||||
</div>
|
||||
@@ -199,7 +215,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>
|
||||
@@ -214,32 +230,32 @@
|
||||
<script type="text/javascript" src="v1/js/ff/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
|
||||
|
||||
@endsection
|
||||
{{--
|
||||
<script type="text/javascript" nonce="{{ $JS_NONCE }}">
|
||||
var lineColor = 'red';
|
||||
var lineTextColor = '#000';
|
||||
if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) {
|
||||
lineColor = '#a00';
|
||||
lineTextColor = '#bec5cb';
|
||||
}
|
||||
var billCount = {{ $billCount }};
|
||||
var accountFrontpageUrl = '{{ route('chart.account.frontpage') }}';
|
||||
var accountRevenueUrl = '{{ route('chart.account.revenue') }}';
|
||||
var accountExpenseUrl = '{{ route('chart.account.expense') }}';
|
||||
var piggyInfoUrl = '{{ route('json.fp.piggy-banks') }}';
|
||||
var drawVerticalLine = '';
|
||||
<!--render vertical line with text "today" -->
|
||||
@if($start->lte($today) and $end->gte($today))
|
||||
drawVerticalLine = '{{ $today->isoFormat($monthAndDayFormat) }}';
|
||||
@endif
|
||||
</script>
|
||||
{{--
|
||||
<script type="text/javascript" nonce="{{ $JS_NONCE }}">
|
||||
var lineColor = 'red';
|
||||
var lineTextColor = '#000';
|
||||
if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) {
|
||||
lineColor = '#a00';
|
||||
lineTextColor = '#bec5cb';
|
||||
}
|
||||
var billCount = {{ $billCount }};
|
||||
var accountFrontpageUrl = '{{ route('chart.account.frontpage') }}';
|
||||
var accountRevenueUrl = '{{ route('chart.account.revenue') }}';
|
||||
var accountExpenseUrl = '{{ route('chart.account.expense') }}';
|
||||
var piggyInfoUrl = '{{ route('json.fp.piggy-banks') }}';
|
||||
var drawVerticalLine = '';
|
||||
<!--render vertical line with text "today" -->
|
||||
@if($start->lte($today) and $end->gte($today))
|
||||
drawVerticalLine = '{{ $today->isoFormat($monthAndDayFormat) }}';
|
||||
@endif
|
||||
</script>
|
||||
|
||||
<script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}"
|
||||
nonce="{{ $JS_NONCE }}"></script>
|
||||
<script type="text/javascript" src="v1/js/lib/chartjs-plugin-annotation.min.js?v={{ $FF_BUILD_TIME }}"
|
||||
nonce="{{ $JS_NONCE }}"></script>
|
||||
<script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}"
|
||||
nonce="{{ $JS_NONCE }}"></script>
|
||||
<script type="text/javascript" src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
|
||||
<script type="text/javascript" src="v1/js/ff/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
|
||||
<script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}"
|
||||
nonce="{{ $JS_NONCE }}"></script>
|
||||
<script type="text/javascript" src="v1/js/lib/chartjs-plugin-annotation.min.js?v={{ $FF_BUILD_TIME }}"
|
||||
nonce="{{ $JS_NONCE }}"></script>
|
||||
<script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}"
|
||||
nonce="{{ $JS_NONCE }}"></script>
|
||||
<script type="text/javascript" src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
|
||||
<script type="text/javascript" src="v1/js/ff/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
|
||||
--}}
|
||||
|
||||
Reference in New Issue
Block a user