mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-11-26 10:13:38 +08:00
Added shelves and search shortcuts to profile page
This commit is contained in:
Dan Brown
parent
666ced9c3b
commit
17969c0bbf
|
|
@ -6,6 +6,7 @@ use BookStack\Exceptions\NotFoundException;
|
|||
use BookStack\Exceptions\UserUpdateException;
|
||||
use BookStack\Uploads\Image;
|
||||
use Exception;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Images;
|
||||
|
||||
class UserRepo
|
||||
|
|
@ -48,7 +49,7 @@ class UserRepo
|
|||
|
||||
/**
|
||||
* Get all the users with their permissions.
|
||||
* @return \Illuminate\Database\Eloquent\Builder|static
|
||||
* @return Builder|static
|
||||
*/
|
||||
public function getAllUsers()
|
||||
{
|
||||
|
|
@ -59,7 +60,7 @@ class UserRepo
|
|||
* Get all the users with their permissions in a paginated format.
|
||||
* @param int $count
|
||||
* @param $sortData
|
||||
* @return \Illuminate\Database\Eloquent\Builder|static
|
||||
* @return Builder|static
|
||||
*/
|
||||
public function getAllUsersPaginatedAndSorted($count, $sortData)
|
||||
{
|
||||
|
|
@ -223,16 +224,15 @@ class UserRepo
|
|||
*/
|
||||
public function getRecentlyCreated(User $user, $count = 20)
|
||||
{
|
||||
$createdByUserQuery = function(Builder $query) use ($user) {
|
||||
$query->where('created_by', '=', $user->id);
|
||||
};
|
||||
|
||||
return [
|
||||
'pages' => $this->entityRepo->getRecentlyCreated('page', $count, 0, function ($query) use ($user) {
|
||||
$query->where('created_by', '=', $user->id);
|
||||
}),
|
||||
'chapters' => $this->entityRepo->getRecentlyCreated('chapter', $count, 0, function ($query) use ($user) {
|
||||
$query->where('created_by', '=', $user->id);
|
||||
}),
|
||||
'books' => $this->entityRepo->getRecentlyCreated('book', $count, 0, function ($query) use ($user) {
|
||||
$query->where('created_by', '=', $user->id);
|
||||
})
|
||||
'pages' => $this->entityRepo->getRecentlyCreated('page', $count, 0, $createdByUserQuery),
|
||||
'chapters' => $this->entityRepo->getRecentlyCreated('chapter', $count, 0, $createdByUserQuery),
|
||||
'books' => $this->entityRepo->getRecentlyCreated('book', $count, 0, $createdByUserQuery),
|
||||
'shelves' => $this->entityRepo->getRecentlyCreated('bookshelf', $count, 0, $createdByUserQuery)
|
||||
];
|
||||
}
|
||||
|
||||
|
|
@ -247,6 +247,7 @@ class UserRepo
|
|||
'pages' => $this->entityRepo->getUserTotalCreated('page', $user),
|
||||
'chapters' => $this->entityRepo->getUserTotalCreated('chapter', $user),
|
||||
'books' => $this->entityRepo->getUserTotalCreated('book', $user),
|
||||
'shelves' => $this->entityRepo->getUserTotalCreated('bookshelf', $user),
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ return [
|
|||
// Actions
|
||||
'actions' => 'Actions',
|
||||
'view' => 'View',
|
||||
'view_all' => 'View All',
|
||||
'create' => 'Create',
|
||||
'update' => 'Update',
|
||||
'edit' => 'Edit',
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ return [
|
|||
'recently_updated_pages' => 'Recently Updated Pages',
|
||||
'recently_created_chapters' => 'Recently Created Chapters',
|
||||
'recently_created_books' => 'Recently Created Books',
|
||||
'recently_created_shelves' => 'Recently Created Shelves',
|
||||
'recently_update' => 'Recently Updated',
|
||||
'recently_viewed' => 'Recently Viewed',
|
||||
'recent_activity' => 'Recent Activity',
|
||||
|
|
@ -67,6 +68,7 @@ return [
|
|||
// Shelves
|
||||
'shelf' => 'Shelf',
|
||||
'shelves' => 'Shelves',
|
||||
'x_shelves' => ':count Shelf|:count Shelves',
|
||||
'shelves_long' => 'Bookshelves',
|
||||
'shelves_empty' => 'No shelves have been created',
|
||||
'shelves_create' => 'Create New Shelf',
|
||||
|
|
@ -274,6 +276,7 @@ return [
|
|||
'profile_not_created_pages' => ':userName has not created any pages',
|
||||
'profile_not_created_chapters' => ':userName has not created any chapters',
|
||||
'profile_not_created_books' => ':userName has not created any books',
|
||||
'profile_not_created_shelves' => ':userName has not created any shelves',
|
||||
|
||||
// Comments
|
||||
'comment' => 'Comment',
|
||||
|
|
|
|||
|
|
@ -1,9 +1,5 @@
|
|||
@extends('simple-layout')
|
||||
|
||||
{{--TODO - Include links to search based on this user being the creator for each entity type--}}
|
||||
{{--Linking either the "Created content" items or as "View All" links next to headers--}}
|
||||
{{--TODO - Add shelves?--}}
|
||||
|
||||
@section('body')
|
||||
|
||||
<div class="container pt-xl">
|
||||
|
|
@ -13,13 +9,13 @@
|
|||
<div>
|
||||
<div id="recent-user-activity" class="mb-xl">
|
||||
<h5>{{ trans('entities.recent_activity') }}</h5>
|
||||
@include('partials/activity-list', ['activity' => $activity])
|
||||
@include('partials.activity-list', ['activity' => $activity])
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="card content-wrap auto-height">
|
||||
<div class="grid left-focus v-center">
|
||||
<div class="grid half v-center">
|
||||
<div>
|
||||
<div class="mr-m float left">
|
||||
<img class="avatar square huge" src="{{ $user->getAvatar(120) }}" alt="{{ $user->name }}">
|
||||
|
|
@ -33,19 +29,27 @@
|
|||
</div>
|
||||
<div id="content-counts">
|
||||
<div class="text-muted">{{ trans('entities.profile_created_content') }}</div>
|
||||
<div class="icon-list">
|
||||
<a href="#recent-books" class="text-book icon-list-item">
|
||||
<span>@icon('book')</span>
|
||||
<span>{{ trans_choice('entities.x_books', $assetCounts['books']) }}</span>
|
||||
</a>
|
||||
<a href="#recent-chapters" class="text-chapter icon-list-item">
|
||||
<span>@icon('chapter')</span>
|
||||
<span>{{ trans_choice('entities.x_chapters', $assetCounts['chapters']) }}</span>
|
||||
</a>
|
||||
<a href="#recent-pages" class="text-page icon-list-item">
|
||||
<span>@icon('page')</span>
|
||||
<span>{{ trans_choice('entities.x_pages', $assetCounts['pages']) }}</span>
|
||||
</a>
|
||||
<div class="grid half v-center">
|
||||
<div class="icon-list">
|
||||
<a href="#recent-pages" class="text-page icon-list-item">
|
||||
<span>@icon('page')</span>
|
||||
<span>{{ trans_choice('entities.x_pages', $assetCounts['pages']) }}</span>
|
||||
</a>
|
||||
<a href="#recent-chapters" class="text-chapter icon-list-item">
|
||||
<span>@icon('chapter')</span>
|
||||
<span>{{ trans_choice('entities.x_chapters', $assetCounts['chapters']) }}</span>
|
||||
</a>
|
||||
</div>
|
||||
<div class="icon-list">
|
||||
<a href="#recent-books" class="text-book icon-list-item">
|
||||
<span>@icon('book')</span>
|
||||
<span>{{ trans_choice('entities.x_books', $assetCounts['books']) }}</span>
|
||||
</a>
|
||||
<a href="#recent-shelves" class="text-bookshelf icon-list-item">
|
||||
<span>@icon('bookshelf')</span>
|
||||
<span>{{ trans_choice('entities.x_shelves', $assetCounts['shelves']) }}</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
@ -53,31 +57,60 @@
|
|||
</div>
|
||||
|
||||
<div class="card content-wrap auto-height book-contents">
|
||||
<h2 id="recent-pages" class="list-heading">{{ trans('entities.recently_created_pages') }}</h2>
|
||||
<h2 id="recent-pages" class="list-heading">
|
||||
{{ trans('entities.recently_created_pages') }}
|
||||
@if (count($recentlyCreated['pages']) > 0)
|
||||
<a href="{{ baseUrl('/search?term=' . urlencode('{created_by:'.$user->id.'} {type:page}') ) }}" class="text-small ml-s">{{ trans('common.view_all') }}</a>
|
||||
@endif
|
||||
</h2>
|
||||
@if (count($recentlyCreated['pages']) > 0)
|
||||
@include('partials/entity-list', ['entities' => $recentlyCreated['pages']])
|
||||
@include('partials.entity-list', ['entities' => $recentlyCreated['pages'], 'showPath' => true])
|
||||
@else
|
||||
<p class="text-muted">{{ trans('entities.profile_not_created_pages', ['userName' => $user->name]) }}</p>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<div class="card content-wrap auto-height book-contents">
|
||||
<h2 id="recent-chapters" class="list-heading">{{ trans('entities.recently_created_chapters') }}</h2>
|
||||
<h2 id="recent-chapters" class="list-heading">
|
||||
{{ trans('entities.recently_created_chapters') }}
|
||||
@if (count($recentlyCreated['chapters']) > 0)
|
||||
<a href="{{ baseUrl('/search?term=' . urlencode('{created_by:'.$user->id.'} {type:chapter}') ) }}" class="text-small ml-s">{{ trans('common.view_all') }}</a>
|
||||
@endif
|
||||
</h2>
|
||||
@if (count($recentlyCreated['chapters']) > 0)
|
||||
@include('partials/entity-list', ['entities' => $recentlyCreated['chapters']])
|
||||
@include('partials.entity-list', ['entities' => $recentlyCreated['chapters'], 'showPath' => true])
|
||||
@else
|
||||
<p class="text-muted">{{ trans('entities.profile_not_created_chapters', ['userName' => $user->name]) }}</p>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<div class="card content-wrap auto-height book-contents">
|
||||
<h2 id="recent-books" class="list-heading">{{ trans('entities.recently_created_books') }}</h2>
|
||||
<h2 id="recent-books" class="list-heading">
|
||||
{{ trans('entities.recently_created_books') }}
|
||||
@if (count($recentlyCreated['books']) > 0)
|
||||
<a href="{{ baseUrl('/search?term=' . urlencode('{created_by:'.$user->id.'} {type:book}') ) }}" class="text-small ml-s">{{ trans('common.view_all') }}</a>
|
||||
@endif
|
||||
</h2>
|
||||
@if (count($recentlyCreated['books']) > 0)
|
||||
@include('partials/entity-list', ['entities' => $recentlyCreated['books']])
|
||||
@include('partials.entity-list', ['entities' => $recentlyCreated['books'], 'showPath' => true])
|
||||
@else
|
||||
<p class="text-muted">{{ trans('entities.profile_not_created_books', ['userName' => $user->name]) }}</p>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<div class="card content-wrap auto-height book-contents">
|
||||
<h2 id="recent-shelves" class="list-heading">
|
||||
{{ trans('entities.recently_created_shelves') }}
|
||||
@if (count($recentlyCreated['shelves']) > 0)
|
||||
<a href="{{ baseUrl('/search?term=' . urlencode('{created_by:'.$user->id.'} {type:bookshelf}') ) }}" class="text-small ml-s">{{ trans('common.view_all') }}</a>
|
||||
@endif
|
||||
</h2>
|
||||
@if (count($recentlyCreated['shelves']) > 0)
|
||||
@include('partials.entity-list', ['entities' => $recentlyCreated['shelves'], 'showPath' => true])
|
||||
@else
|
||||
<p class="text-muted">{{ trans('entities.profile_not_created_shelves', ['userName' => $user->name]) }}</p>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user