kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Excluded more files from the "old" libraries and included new ones instead. This should greatly clean up the code base.

Browse Source
This commit is contained in:
James Cole
2014-11-12 07:31:48 +01:00
parent 5cb9907bf8
commit 638fa9005f
9 changed files with 53 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/AccountController.php
View File

@@ -1,6 +1,6 @@
<?php <?php
use Firefly\Exception\FireflyException; use FireflyIII\Exception\FireflyException;
use Illuminate\Support\MessageBag; use Illuminate\Support\MessageBag;
/** /**

2
app/controllers/BudgetController.php
View File

@@ -1,6 +1,6 @@
<?php <?php
use Firefly\Exception\FireflyException; use FireflyIII\Exception\FireflyException;
use Illuminate\Support\MessageBag; use Illuminate\Support\MessageBag;

2
app/controllers/CategoryController.php
View File

@@ -1,5 +1,5 @@
<?php <?php
use Firefly\Exception\FireflyException; use FireflyIII\Exception\FireflyException;
use Illuminate\Support\MessageBag; use Illuminate\Support\MessageBag;
/** /**

2
app/controllers/GoogleTableController.php
View File

@@ -1,6 +1,6 @@
<?php <?php
use Carbon\Carbon; use Carbon\Carbon;
use Firefly\Exception\FireflyException; use FireflyIII\Exception\FireflyException;
/** /**
* Class GoogleTableController * Class GoogleTableController

2
app/controllers/PiggybankController.php
View File

@@ -1,6 +1,6 @@
<?php <?php
use Firefly\Exception\FireflyException; use FireflyIII\Exception\FireflyException;
use FireflyIII\Exception\NotImplementedException; use FireflyIII\Exception\NotImplementedException;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Illuminate\Support\MessageBag; use Illuminate\Support\MessageBag;

37
app/controllers/PreferencesController.php
View File

@@ -1,8 +1,5 @@
<?php <?php
use Firefly\Helper\Preferences\PreferencesHelperInterface as PHI;
use Firefly\Storage\Account\AccountRepositoryInterface as ARI;
/** /**
* Class PreferencesController * Class PreferencesController
* *
@@ -10,20 +7,14 @@ use Firefly\Storage\Account\AccountRepositoryInterface as ARI;
*/ */
class PreferencesController extends BaseController class PreferencesController extends BaseController
{ {
protected $_accounts;
protected $_preferences;
/** /**
* @param ARI $accounts *
* @param PHI $preferences
*/ */
public function __construct(ARI $accounts, PHI $preferences) public function __construct()
{ {
$this->_accounts = $accounts; View::share('title', 'Preferences');
$this->_preferences = $preferences; View::share('mainTitleIcon', 'fa-gear');
View::share('title','Preferences');
View::share('mainTitleIcon','fa-gear');
} }
/** /**
@@ -31,13 +22,16 @@ class PreferencesController extends BaseController
*/ */
public function index() public function index()
{ {
$accounts = $this->_accounts->getDefault(); /** @var \FireflyIII\Database\Account $acct */
$acct = App::make('FireflyIII\Database\Account');
$viewRange = $this->_preferences->get('viewRange', '1M'); /** @var \FireflyIII\Shared\Preferences\Preferences $preferences */
$preferences = App::make('FireflyIII\Shared\Preferences\Preferences');
$accounts = $acct->getAssetAccounts();
$viewRange = $preferences->get('viewRange', '1M');
$viewRangeValue = $viewRange->data; $viewRangeValue = $viewRange->data;
$frontpage = $preferences->get('frontpageAccounts', []);
// pref:
$frontpage = $this->_preferences->get('frontpageAccounts', []);
return View::make('preferences.index')->with('accounts', $accounts)->with('frontpageAccounts', $frontpage) return View::make('preferences.index')->with('accounts', $accounts)->with('frontpageAccounts', $frontpage)
->with('viewRange', $viewRangeValue); ->with('viewRange', $viewRangeValue);
@@ -49,15 +43,18 @@ class PreferencesController extends BaseController
public function postIndex() public function postIndex()
{ {
/** @var \FireflyIII\Shared\Preferences\Preferences $preferences */
$preferences = App::make('FireflyIII\Shared\Preferences\Preferences');
// frontpage accounts // frontpage accounts
$frontpageAccounts = []; $frontpageAccounts = [];
foreach (Input::get('frontpageAccounts') as $id) { foreach (Input::get('frontpageAccounts') as $id) {
$frontpageAccounts[] = intval($id); $frontpageAccounts[] = intval($id);
} }
$this->_preferences->set('frontpageAccounts', $frontpageAccounts); $preferences->set('frontpageAccounts', $frontpageAccounts);
// view range: // view range:
$this->_preferences->set('viewRange', Input::get('viewRange')); $preferences->set('viewRange', Input::get('viewRange'));
// forget session values: // forget session values:
Session::forget('start'); Session::forget('start');
Session::forget('end'); Session::forget('end');

12
app/controllers/ProfileController.php
View File

@@ -23,9 +23,9 @@ class ProfileController extends BaseController
public function index() public function index()
{ {
return View::make('profile.index') return View::make('profile.index')
->with('title', 'Profile') ->with('title', 'Profile')
->with('subTitle', Auth::user()->email) ->with('subTitle', Auth::user()->email)
->with('mainTitleIcon', 'fa-user'); ->with('mainTitleIcon', 'fa-user');
} }
/** /**
@@ -34,9 +34,9 @@ class ProfileController extends BaseController
public function changePassword() public function changePassword()
{ {
return View::make('profile.change-password') return View::make('profile.change-password')
->with('title', Auth::user()->email) ->with('title', Auth::user()->email)
->with('subTitle', 'Change your password') ->with('subTitle', 'Change your password')
->with('mainTitleIcon', 'fa-user'); ->with('mainTitleIcon', 'fa-user');
} }
/** /**

14
app/lib/FireflyIII/Exception/FireflyException.php Normal file
View File

@@ -0,0 +1,14 @@
<?php
namespace FireflyIII\Exception;
/**
* Class FireflyException
*
* @package Firefly\Exception
*/
class FireflyException extends \Exception
{
}

11
app/lib/FireflyIII/Exception/ValidationException.php Normal file
View File

@@ -0,0 +1,11 @@
<?php
namespace FireflyIII\Exception;
/**
* Class ValidationException
*
* @package Firefly\Exception
*/
class ValidationException extends \Exception {
}