archive/BookStackApp_BookStack
0
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-17 05:42:06 +00:00
Code Issues Projects Releases Wiki Activity

Added shelves and search shortcuts to profile page

Browse source
This commit is contained in:
Dan Brown 2019-04-06 16:21:20 +01:00
parent 666ced9c3b
commit 17969c0bbf
No known key found for this signature in database
GPG key ID: 46D9F943C24A2EF9
5 changed files with 81 additions and 41 deletions
app/Http/Controllers
UserController.php

12
app/Http/Controllers/UserController.php
View file

@ -41,7 +41,7 @@ class UserController extends Controller
$users = $this->userRepo->getAllUsersPaginatedAndSorted(20, $listDetails);
$this->setPageTitle(trans('settings.users'));
$users->appends($listDetails);
return view('users/index', ['users' => $users, 'listDetails' => $listDetails]);
return view('users.index', ['users' => $users, 'listDetails' => $listDetails]);
}
/**
@ -53,7 +53,7 @@ class UserController extends Controller
$this->checkPermission('users-manage');
$authMethod = config('auth.method');
$roles = $this->userRepo->getAllRoles();
return view('users/create', ['authMethod' => $authMethod, 'roles' => $roles]);
return view('users.create', ['authMethod' => $authMethod, 'roles' => $roles]);
}
/**
@ -118,7 +118,7 @@ class UserController extends Controller
$activeSocialDrivers = $socialAuthService->getActiveDrivers();
$this->setPageTitle(trans('settings.user_profile'));
$roles = $this->userRepo->getAllRoles();
return view('users/edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers, 'authMethod' => $authMethod, 'roles' => $roles]);
return view('users.edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers, 'authMethod' => $authMethod, 'roles' => $roles]);
}
/**
@ -190,7 +190,7 @@ class UserController extends Controller
$user = $this->userRepo->getById($id);
$this->setPageTitle(trans('settings.users_delete_named', ['userName' => $user->name]));
return view('users/delete', ['user' => $user]);
return view('users.delete', ['user' => $user]);
}
/**
@ -232,10 +232,12 @@ class UserController extends Controller
public function showProfilePage($id)
{
$user = $this->userRepo->getById($id);
$userActivity = $this->userRepo->getActivity($user);
$recentlyCreated = $this->userRepo->getRecentlyCreated($user, 5, 0);
$assetCounts = $this->userRepo->getAssetCounts($user);
return view('users/profile', [
return view('users.profile', [
'user' => $user,
'activity' => $userActivity,
'recentlyCreated' => $recentlyCreated,