+ | 'Form' => [
+ | 'is_safe' => [
+ | 'open'
+ | ]
+ | ]
+ |
+ |
+ | The values of the `is_safe` array must match the called method on the facade
+ | in order to be marked as safe.
+ |
+ */
+ 'facades' => [
+ 'Breadcrumbs' => [
+ 'is_safe' => [
+ 'renderIfExists'
+ ]
+ ],
+ 'Session',
+ 'Route'
+ ],
+
+ /*
+ |--------------------------------------------------------------------------
+ | Functions
+ |--------------------------------------------------------------------------
+ |
+ | Available functions. Access like `{{ secure_url(...) }}`.
+ |
+ | Each function can take an optional array of options. These options are
+ | passed directly to `Twig_SimpleFunction`.
+ |
+ | So for example, to mark a function as safe you can do the following:
+ |
+ |
+ | 'link_to' => [
+ | 'is_safe' => ['html']
+ | ]
+ |
+ |
+ | The options array also takes a `callback` that allows you to name the
+ | function differently in your Twig templates than what it's actually called.
+ |
+ |
+ | 'link' => [
+ | 'callback' => 'link_to'
+ | ]
+ |
+ |
+ */
+ 'functions' => [
+ 'elixir',
+ 'head',
+ 'last',
+ ],
+
+ /*
+ |--------------------------------------------------------------------------
+ | Filters
+ |--------------------------------------------------------------------------
+ |
+ | Available filters. Access like `{{ variable|filter }}`.
+ |
+ | Each filter can take an optional array of options. These options are
+ | passed directly to `Twig_SimpleFilter`.
+ |
+ | So for example, to mark a filter as safe you can do the following:
+ |
+ |
+ | 'studly_case' => [
+ | 'is_safe' => ['html']
+ | ]
+ |
+ |
+ | The options array also takes a `callback` that allows you to name the
+ | filter differently in your Twig templates than what is actually called.
+ |
+ |
+ | 'snake' => [
+ | 'callback' => 'snake_case'
+ | ]
+ |
+ |
+ */
+ 'filters' => [],
+ ],
+ ]
]
);
}
diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php
index 1b57c3508e..e047b1dbb9 100644
--- a/app/Providers/FireflyServiceProvider.php
+++ b/app/Providers/FireflyServiceProvider.php
@@ -3,6 +3,7 @@
namespace FireflyIII\Providers;
use App;
+use FireflyIII\Models\Account;
use FireflyIII\Support\Amount;
use FireflyIII\Support\ExpandedForm;
use FireflyIII\Support\Navigation;
@@ -10,7 +11,10 @@ use FireflyIII\Support\Preferences;
use FireflyIII\Support\Steam;
use FireflyIII\Validation\FireflyValidator;
use Illuminate\Support\ServiceProvider;
+use Route;
use Twig;
+use Twig_SimpleFilter;
+use Twig_SimpleFunction;
use TwigBridge\Extension\Loader\Functions;
use Validator;
@@ -28,14 +32,89 @@ class FireflyServiceProvider extends ServiceProvider
return new FireflyValidator($translator, $data, $rules, $messages);
}
);
+ /*
+ * Default Twig configuration:
+ */
+ $config = App::make('config');
+ Twig::addExtension(new Functions($config));
+
+ /*
+ * Amount::format
+ */
+ $filter = new Twig_SimpleFilter(
+ 'formatAmount', function ($string) {
+ return App::make('amount')->format($string);
+ }, ['is_safe' => ['html']]
+ );
+ Twig::addFilter($filter);
+
+ /*
+ * Amount::formatJournal
+ */
+ $filter = new Twig_SimpleFilter(
+ 'formatJournal', function ($journal) {
+ return App::make('amount')->formatJournal($journal);
+ }, ['is_safe' => ['html']]
+ );
+ Twig::addFilter($filter);
+
+ /*
+ * Steam::balance()
+ */
+
+ $filter = new Twig_SimpleFilter(
+ 'balance', function (Account $account = null) {
+ if (is_null($account)) {
+ return 'NULL';
+ }
+
+ return App::make('amount')->format(App::make('steam')->balance($account));
+ //return App::make('steam')->balance($account);
+ },['is_safe' => ['html']]
+ );
+ Twig::addFilter($filter);
+
+
+ /*
+ * Current active route.
+ */
+ $filter = new Twig_SimpleFilter(
+ 'activeRoute', function ($string) {
+ if (Route::getCurrentRoute()->getName() == $string) {
+ return 'active';
+ }
+
+ return '';
+ }
+ );
+ Twig::addFilter($filter);
+
+ /*
+ * Amount::getCurrencyCode()
+ */
+ $function = new Twig_SimpleFunction(
+ 'getCurrencyCode', function () {
+ return App::make('amount')->getCurrencyCode();
+ }
+ );
+ Twig::addFunction($function);
+
+
+ /*
+ * env
+ */
+ $function = new Twig_SimpleFunction(
+ 'env', function ($a, $b) {
+ return env($a, $b);
+ }
+ );
+ Twig::addFunction($function);
}
public function register()
{
- $config = App::make('config');
- Twig::addExtension(new Functions($config));
$this->app->bind(
'preferences', function () {
diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php
index b886074aa9..b8cf753024 100644
--- a/app/Validation/FireflyValidator.php
+++ b/app/Validation/FireflyValidator.php
@@ -13,6 +13,7 @@ use Illuminate\Contracts\Encryption\DecryptException;
use Illuminate\Validation\Validator;
use Log;
use Navigation;
+use Symfony\Component\Translation\TranslatorInterface;
/**
* Class FireflyValidator
@@ -22,6 +23,18 @@ use Navigation;
class FireflyValidator extends Validator
{
+ /**
+ * @param TranslatorInterface $translator
+ * @param array $data
+ * @param array $rules
+ * @param array $messages
+ * @param array $customAttributes
+ */
+ public function __construct(TranslatorInterface $translator, array $data, array $rules, array $messages = [], array $customAttributes = [])
+ {
+ parent::__construct($translator, $data, $rules, $messages);
+ }
+
/**
* @param $attribute
* @param $value
diff --git a/resources/twig/index.twig b/resources/twig/index.twig
new file mode 100644
index 0000000000..c767243e4c
--- /dev/null
+++ b/resources/twig/index.twig
@@ -0,0 +1,215 @@
+{% extends "./layout/default.twig" %}
+{% block content %}
+{{ Breadcrumbs.renderIfExists }}
+
+{% if count == 0 %}
+Welcome to Firefly III.
+ ++ Create a new asset account to get started. +
+Mark your asset accounts as "Savings account" to fill this panel.
+ {% else %} + {% for account in savings %} + +Create piggy banks to fill this panel.
+ {% else %} + {% for account in piggyBankAccounts %} +