Started work on user profile pages

app/Http/Controllers/UserController.php

@@ -2,6 +2,7 @@
 
 namespace BookStack\Http\Controllers;
 
+use BookStack\Activity;
 use Illuminate\Http\Request;
 
 use Illuminate\Http\Response;
@@ -92,10 +93,9 @@ class UserController extends Controller
             $user->save();
         }
 
-        return redirect('/users');
+        return redirect('/settings/users');
     }
 
-
     /**
      * Show the form for editing the specified user.
      * @param  int              $id
@@ -159,7 +159,7 @@ class UserController extends Controller
         }
 
         $user->save();
-        return redirect('/users');
+        return redirect('/settings/users');
     }
 
     /**
@@ -197,6 +197,19 @@ class UserController extends Controller
         }
         $this->userRepo->destroy($user);
 
-        return redirect('/users');
+        return redirect('/settings/users');
+    }
+
+    /**
+     * Show the user profile page
+     * @param $id
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function showProfilePage($id)
+    {
+        $user = $this->userRepo->getById($id);
+        $userActivity = $this->userRepo->getActivity($user);
+        $recentPages = $this->userRepo->getCreatedPages($user, 5, 0);
+        return view('users/profile', ['user' => $user, 'activity' => $userActivity, 'recentPages' => $recentPages]);
     }
 }

app/Http/routes.php

@@ -47,14 +47,8 @@ Route::group(['middleware' => 'auth'], function () {
 
     });
 
-    // Users
-    Route::get('/users', 'UserController@index');
-    Route::get('/users/create', 'UserController@create');
-    Route::get('/users/{id}/delete', 'UserController@delete');
-    Route::post('/users/create', 'UserController@store');
-    Route::get('/users/{id}', 'UserController@edit');
-    Route::put('/users/{id}', 'UserController@update');
-    Route::delete('/users/{id}', 'UserController@destroy');
+    // User Profile routes
+    Route::get('/user/{userId}', 'UserController@showProfilePage');
 
     // Image routes
     Route::group(['prefix' => 'images'], function() {
@@ -82,8 +76,18 @@ Route::group(['middleware' => 'auth'], function () {
     Route::get('/home', 'HomeController@index');
 
     // Settings
-    Route::get('/settings', 'SettingController@index');
-    Route::post('/settings', 'SettingController@update');
+    Route::group(['prefix' => 'settings'], function() {
+        Route::get('/', 'SettingController@index');
+        Route::post('/', 'SettingController@update');
+        // Users
+        Route::get('/users', 'UserController@index');
+        Route::get('/users/create', 'UserController@create');
+        Route::get('/users/{id}/delete', 'UserController@delete');
+        Route::post('/users/create', 'UserController@store');
+        Route::get('/users/{id}', 'UserController@edit');
+        Route::put('/users/{id}', 'UserController@update');
+        Route::delete('/users/{id}', 'UserController@destroy');
+    });
 
 });
 

app/Repos/UserRepo.php

@@ -1,7 +1,9 @@
 <?php namespace BookStack\Repos;
 
 
+use BookStack\Page;
 use BookStack\Role;
+use BookStack\Services\EntityService;
 use BookStack\User;
 use Setting;
 
@@ -10,15 +12,19 @@ class UserRepo
 
     protected $user;
     protected $role;
+    protected $entityService;
 
     /**
      * UserRepo constructor.
-     * @param $user
+     * @param User $user
+     * @param Role $role
+     * @param EntityService $entityService
      */
-    public function __construct(User $user, Role $role)
+    public function __construct(User $user, Role $role, EntityService $entityService)
     {
         $this->user = $user;
         $this->role = $role;
+        $this->entityService = $entityService;
     }
 
     /**
@@ -112,4 +118,42 @@ class UserRepo
         $user->socialAccounts()->delete();
         $user->delete();
     }
+
+    /**
+     * Get the latest activity for a user.
+     * @param User $user
+     * @param int $count
+     * @param int $page
+     * @return array
+     */
+    public function getActivity(User $user, $count = 20, $page = 0)
+    {
+        return \Activity::userActivity($user, $count, $page);
+    }
+
+    /**
+     * Get the pages the the given user has created.
+     * @param User $user
+     * @param int $count
+     * @param int $page
+     * @return mixed
+     */
+    public function getCreatedPages(User $user, $count = 20, $page = 0)
+    {
+        return $this->entityService->page->where('created_by', '=', $user->id)->orderBy('created_at', 'desc')
+            ->skip($page * $count)->take($count)->get();
+    }
+
+    /**
+     * Get asset created counts for the give user.
+     * @return array
+     */
+    public function getAssetCounts(User $user)
+    {
+        return [
+            'pages' => $this->entityService->page->where('created_by', '=', $user->id)->count(),
+            'chapters' => $this->entityService->chapter->where('created_by', '=', $user->id)->count(),
+            'books' => $this->entityService->book->where('created_by', '=', $user->id)->count(),
+        ];
+    }
 }

app/Services/ActivityService.php

@@ -91,14 +91,14 @@ class ActivityService
     }
 
     /**
-     * Gets the latest activity for an entitiy, Filtering out similar
+     * Gets the latest activity for an entity, Filtering out similar
      * items to prevent a message activity list.
      * @param Entity $entity
      * @param int    $count
      * @param int    $page
      * @return array
      */
-    function entityActivity($entity, $count = 20, $page = 0)
+    public function entityActivity($entity, $count = 20, $page = 0)
     {
         $activity = $entity->hasMany('BookStack\Activity')->orderBy('created_at', 'desc')
             ->skip($count * $page)->take($count)->get();
@@ -107,15 +107,30 @@ class ActivityService
     }
 
     /**
-     * Filters out similar activity.
-     * @param Activity[] $activity
+     * Get latest activity for a user, Filtering out similar
+     * items.
+     * @param $user
+     * @param int $count
+     * @param int $page
      * @return array
      */
-    protected function filterSimilar($activity)
+    public function userActivity($user, $count = 20, $page = 0)
+    {
+        $activity = $this->activity->where('user_id', '=', $user->id)
+            ->orderBy('created_at', 'desc')->skip($count * $page)->take($count)->get();
+        return $this->filterSimilar($activity);
+    }
+
+    /**
+     * Filters out similar activity.
+     * @param Activity[] $activities
+     * @return array
+     */
+    protected function filterSimilar($activities)
     {
         $newActivity = [];
         $previousItem = false;
-        foreach ($activity as $activityItem) {
+        foreach ($activities as $activityItem) {
             if ($previousItem === false) {
                 $previousItem = $activityItem;
                 $newActivity[] = $activityItem;

app/Services/EntityService.php

@@ -0,0 +1,29 @@
+<?php namespace BookStack\Services;
+
+
+use BookStack\Book;
+use BookStack\Chapter;
+use BookStack\Page;
+
+class EntityService
+{
+
+    public $book;
+    public $chapter;
+    public $page;
+
+    /**
+     * EntityService constructor.
+     * @param $book
+     * @param $chapter
+     * @param $page
+     */
+    public function __construct(Book $book, Chapter $chapter, Page $page)
+    {
+        $this->book = $book;
+        $this->chapter = $chapter;
+        $this->page = $page;
+    }
+
+
+}

app/User.php

@@ -164,6 +164,6 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
     public function getEditUrl()
     {
-        return '/users/' . $this->id;
+        return '/settings/users/' . $this->id;
     }
 }