chore: refactor account model (#3570)

This commit is contained in:
Regis Freyd
2020-02-13 10:48:51 -05:00
committed by GitHub
parent 2e8a597c27
commit 5bf26262dc
45 changed files with 837 additions and 696 deletions
+25 -9
View File
@@ -8,6 +8,7 @@ use App\Models\Contact\Tag;
use Illuminate\Support\Str;
use Illuminate\Http\Request;
use App\Helpers\LocaleHelper;
use App\Helpers\AccountHelper;
use App\Helpers\TimezoneHelper;
use App\Jobs\ExportAccountAsSQL;
use App\Jobs\AddContactFromVCard;
@@ -50,7 +51,10 @@ class SettingsController
'nickname',
];
$accountHasLimitations = AccountHelper::hasLimitations(auth()->user()->account);
return view('settings.index')
->withAccountHasLimitations($accountHasLimitations)
->withNamesOrder($namesOrder)
->withLocales(LocaleHelper::getLocaleList()->sortByCollator('name-orig'))
->withHours(DateHelper::getListOfHours())
@@ -152,7 +156,8 @@ class SettingsController
*/
public function export()
{
return view('settings.export');
return view('settings.export')
->with('accountHasLimitations', AccountHelper::hasLimitations(auth()->user()->account));
}
/**
@@ -178,11 +183,15 @@ class SettingsController
*/
public function import()
{
$accountHasLimitations = AccountHelper::hasLimitations(auth()->user()->account);
if (auth()->user()->account->importjobs->count() == 0) {
return view('settings.imports.blank');
return view('settings.imports.blank')
->withAccountHasLimitations($accountHasLimitations);
}
return view('settings.imports.index');
return view('settings.imports.index')
->withAccountHasLimitations($accountHasLimitations);
}
/**
@@ -235,12 +244,15 @@ class SettingsController
public function users()
{
$users = auth()->user()->account->users;
$accountHasLimitations = AccountHelper::hasLimitations(auth()->user()->account);
if ($users->count() == 1 && auth()->user()->account->invitations()->count() == 0) {
return view('settings.users.blank');
return view('settings.users.blank')
->withAccountHasLimitations($accountHasLimitations);
}
return view('settings.users.index', compact('users'));
return view('settings.users.index', compact('users'))
->withAccountHasLimitations($accountHasLimitations);
}
/**
@@ -347,7 +359,8 @@ class SettingsController
*/
public function tags()
{
return view('settings.tags');
return view('settings.tags')
->with('accountHasLimitations', AccountHelper::hasLimitations(auth()->user()->account));
}
/**
@@ -370,7 +383,8 @@ class SettingsController
public function api()
{
return view('settings.api.index');
return view('settings.api.index')
->with('accountHasLimitations', AccountHelper::hasLimitations(auth()->user()->account));
}
public function dav()
@@ -382,7 +396,8 @@ class SettingsController
->withDavRoute($davroute)
->withCardDavRoute("{$davroute}/addressbooks/{$email}/contacts")
->withCalDavBirthdaysRoute("{$davroute}/calendars/{$email}/birthdays")
->withCalDavTasksRoute("{$davroute}/calendars/{$email}/tasks");
->withCalDavTasksRoute("{$davroute}/calendars/{$email}/tasks")
->with('accountHasLimitations', AccountHelper::hasLimitations(auth()->user()->account));
}
public function security()
@@ -395,7 +410,8 @@ class SettingsController
return view('settings.security.index')
->with('is2FAActivated', Google2FA::isActivated())
->with('currentkeys', U2fKeyResource::collection($u2fKeys))
->withWebauthnKeys(WebauthnKeyResource::collection($webauthnKeys));
->withWebauthnKeys(WebauthnKeyResource::collection($webauthnKeys))
->with('accountHasLimitations', AccountHelper::hasLimitations(auth()->user()->account));
}
/**