Started work on user profile pages

@@ -2,6 +2,7 @@
 
 
 namespace BookStack\Http\Controllers;
 namespace BookStack\Http\Controllers;
 
 
+use BookStack\Activity;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 
 
 use Illuminate\Http\Response;
 use Illuminate\Http\Response;
@@ -92,10 +93,9 @@ class UserController extends Controller
             $user->save();
             $user->save();
         }
         }
 
 
-        return redirect('/users');
+        return redirect('/settings/users');
     }
     }
 
 
-
     /**
     /**
      * Show the form for editing the specified user.
      * Show the form for editing the specified user.
      * @param  int              $id
      * @param  int              $id
@@ -159,7 +159,7 @@ class UserController extends Controller
         }
         }
 
 
         $user->save();
         $user->save();
-        return redirect('/users');
+        return redirect('/settings/users');
     }
     }
 
 
     /**
     /**
@@ -197,6 +197,19 @@ class UserController extends Controller
         }
         }
         $this->userRepo->destroy($user);
         $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]);
     }
     }
 }
 }

@@ -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
     // Image routes
     Route::group(['prefix' => 'images'], function() {
     Route::group(['prefix' => 'images'], function() {
@@ -82,8 +76,18 @@ Route::group(['middleware' => 'auth'], function () {
     Route::get('/home', 'HomeController@index');
     Route::get('/home', 'HomeController@index');
 
 
     // Settings
     // 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');
+    });
 
 
 });
 });
 
 

 <?php namespace BookStack\Repos;
 <?php namespace BookStack\Repos;
 
 
 
 
+use BookStack\Page;
 use BookStack\Role;
 use BookStack\Role;
+use BookStack\Services\EntityService;
 use BookStack\User;
 use BookStack\User;
 use Setting;
 use Setting;
 
 
@@ -10,15 +12,19 @@ class UserRepo
 
 
     protected $user;
     protected $user;
     protected $role;
     protected $role;
+    protected $entityService;
 
 
     /**
     /**
      * UserRepo constructor.
      * 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->user = $user;
         $this->role = $role;
         $this->role = $role;
+        $this->entityService = $entityService;
     }
     }
 
 
     /**
     /**
@@ -112,4 +118,42 @@ class UserRepo
         $user->socialAccounts()->delete();
         $user->socialAccounts()->delete();
         $user->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(),
+        ];
+    }
 }
 }
\ No newline at end of file

@@ -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.
      * items to prevent a message activity list.
      * @param Entity $entity
      * @param Entity $entity
      * @param int    $count
      * @param int    $count
      * @param int    $page
      * @param int    $page
      * @return array
      * @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')
         $activity = $entity->hasMany('BookStack\Activity')->orderBy('created_at', 'desc')
             ->skip($count * $page)->take($count)->get();
             ->skip($count * $page)->take($count)->get();
@@ -107,15 +107,30 @@ class ActivityService
     }
     }
 
 
     /**
     /**
+     * Get latest activity for a user, Filtering out similar
+     * items.
+     * @param $user
+     * @param int $count
+     * @param int $page
+     * @return array
+     */
+    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.
      * Filters out similar activity.
-     * @param Activity[] $activity
+     * @param Activity[] $activities
      * @return array
      * @return array
      */
      */
-    protected function filterSimilar($activity)
+    protected function filterSimilar($activities)
     {
     {
         $newActivity = [];
         $newActivity = [];
         $previousItem = false;
         $previousItem = false;
-        foreach ($activity as $activityItem) {
+        foreach ($activities as $activityItem) {
             if ($previousItem === false) {
             if ($previousItem === false) {
                 $previousItem = $activityItem;
                 $previousItem = $activityItem;
                 $newActivity[] = $activityItem;
                 $newActivity[] = $activityItem;

+<?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;
+    }
+
+
+}
\ No newline at end of file

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

@@ -18,7 +18,7 @@ class CreateUsersTable extends Migration
             $table->string('email')->unique();
             $table->string('email')->unique();
             $table->string('password', 60);
             $table->string('password', 60);
             $table->rememberToken();
             $table->rememberToken();
-            $table->timestamps();
+            $table->nullableTimestamps();
         });
         });
 
 
         \BookStack\User::forceCreate([
         \BookStack\User::forceCreate([

@@ -17,7 +17,7 @@ class CreateBooksTable extends Migration
             $table->string('name');
             $table->string('name');
             $table->string('slug')->indexed();
             $table->string('slug')->indexed();
             $table->text('description');
             $table->text('description');
-            $table->timestamps();
+            $table->nullableTimestamps();
         });
         });
     }
     }
 
 

@@ -21,7 +21,7 @@ class CreatePagesTable extends Migration
             $table->longText('html');
             $table->longText('html');
             $table->longText('text');
             $table->longText('text');
             $table->integer('priority');
             $table->integer('priority');
-            $table->timestamps();
+            $table->nullableTimestamps();
         });
         });
     }
     }
 
 

@@ -16,7 +16,7 @@ class CreateImagesTable extends Migration
             $table->increments('id');
             $table->increments('id');
             $table->string('name');
             $table->string('name');
             $table->string('url');
             $table->string('url');
-            $table->timestamps();
+            $table->nullableTimestamps();
         });
         });
     }
     }
 
 

@@ -19,7 +19,7 @@ class CreateChaptersTable extends Migration
             $table->text('name');
             $table->text('name');
             $table->text('description');
             $table->text('description');
             $table->integer('priority');
             $table->integer('priority');
-            $table->timestamps();
+            $table->nullableTimestamps();
         });
         });
     }
     }
 
 

@@ -19,7 +19,7 @@ class CreatePageRevisionsTable extends Migration
             $table->longText('html');
             $table->longText('html');
             $table->longText('text');
             $table->longText('text');
             $table->integer('created_by');
             $table->integer('created_by');
-            $table->timestamps();
+            $table->nullableTimestamps();
         });
         });
     }
     }
 
 

@@ -20,7 +20,7 @@ class CreateActivitiesTable extends Migration
             $table->integer('user_id');
             $table->integer('user_id');
             $table->integer('entity_id');
             $table->integer('entity_id');
             $table->string('entity_type');
             $table->string('entity_type');
-            $table->timestamps();
+            $table->nullableTimestamps();
         });
         });
     }
     }
 
 

@@ -28,7 +28,7 @@ class AddRolesAndPermissions extends Migration
             $table->string('name')->unique();
             $table->string('name')->unique();
             $table->string('display_name')->nullable();
             $table->string('display_name')->nullable();
             $table->string('description')->nullable();
             $table->string('description')->nullable();
-            $table->timestamps();
+            $table->nullableTimestamps();
         });
         });
 
 
         // Create table for associating roles to users (Many-to-Many)
         // Create table for associating roles to users (Many-to-Many)
@@ -50,7 +50,7 @@ class AddRolesAndPermissions extends Migration
             $table->string('name')->unique();
             $table->string('name')->unique();
             $table->string('display_name')->nullable();
             $table->string('display_name')->nullable();
             $table->string('description')->nullable();
             $table->string('description')->nullable();
-            $table->timestamps();
+            $table->nullableTimestamps();
         });
         });
 
 
         // Create table for associating permissions to roles (Many-to-Many)
         // Create table for associating permissions to roles (Many-to-Many)

@@ -15,7 +15,7 @@ class CreateSettingsTable extends Migration
         Schema::create('settings', function (Blueprint $table) {
         Schema::create('settings', function (Blueprint $table) {
             $table->string('setting_key')->primary()->indexed();
             $table->string('setting_key')->primary()->indexed();
             $table->text('value');
             $table->text('value');
-            $table->timestamps();
+            $table->nullableTimestamps();
         });
         });
     }
     }
 
 

@@ -18,7 +18,7 @@ class CreateSocialAccountsTable extends Migration
             $table->string('driver')->index();
             $table->string('driver')->index();
             $table->string('driver_id');
             $table->string('driver_id');
             $table->string('avatar');
             $table->string('avatar');
-            $table->timestamps();
+            $table->nullableTimestamps();
         });
         });
     }
     }
 
 

@@ -20,7 +20,7 @@ class AddEmailConfirmationTable extends Migration
             $table->increments('id');
             $table->increments('id');
             $table->integer('user_id')->index();
             $table->integer('user_id')->index();
             $table->string('token')->index();
             $table->string('token')->index();
-            $table->timestamps();
+            $table->nullableTimestamps();
         });
         });
     }
     }
 
 

@@ -18,7 +18,7 @@ class CreateViewsTable extends Migration
             $table->integer('viewable_id');
             $table->integer('viewable_id');
             $table->string('viewable_type');
             $table->string('viewable_type');
             $table->integer('views');
             $table->integer('views');
-            $table->timestamps();
+            $table->nullableTimestamps();
         });
         });
     }
     }
 
 

@@ -58,7 +58,7 @@
                                 </span>
                                 </span>
                                 <ul>
                                 <ul>
                                     <li>
                                     <li>
-                                        <a href="/users/{{$currentUser->id}}" class="text-primary"><i class="zmdi zmdi-edit zmdi-hc-lg"></i>Edit Profile</a>
+                                        <a href="/settings/users/{{$currentUser->id}}" class="text-primary"><i class="zmdi zmdi-edit zmdi-hc-lg"></i>Edit Profile</a>
                                     </li>
                                     </li>
                                     <li>
                                     <li>
                                         <a href="/logout" class="text-neg"><i class="zmdi zmdi-run zmdi-hc-lg"></i>Logout</a>
                                         <a href="/logout" class="text-neg"><i class="zmdi zmdi-run zmdi-hc-lg"></i>Logout</a>

@@ -4,7 +4,7 @@
         <div class="row">
         <div class="row">
             <div class="col-md-12 setting-nav">
             <div class="col-md-12 setting-nav">
                 <a href="/settings" @if($selected == 'settings') class="selected text-button" @endif><i class="zmdi zmdi-settings"></i>Settings</a>
                 <a href="/settings" @if($selected == 'settings') class="selected text-button" @endif><i class="zmdi zmdi-settings"></i>Settings</a>
-                <a href="/users" @if($selected == 'users') class="selected text-button" @endif><i class="zmdi zmdi-accounts"></i>Users</a>
+                <a href="/settings/users" @if($selected == 'users') class="selected text-button" @endif><i class="zmdi zmdi-accounts"></i>Users</a>
             </div>
             </div>
         </div>
         </div>
     </div>
     </div>

@@ -6,7 +6,7 @@
     <div class="container small" ng-non-bindable>
     <div class="container small" ng-non-bindable>
         <h1>Create User</h1>
         <h1>Create User</h1>
 
 
-        <form action="/users/create" method="post">
+        <form action="/settings/users/create" method="post">
             {!! csrf_field() !!}
             {!! csrf_field() !!}
             @include('users.forms.' . $authMethod)
             @include('users.forms.' . $authMethod)
         </form>
         </form>

@@ -7,7 +7,7 @@
         <p>This will fully delete this user with the name '<span class="text-neg">{{$user->name}}</span>' from the system.</p>
         <p>This will fully delete this user with the name '<span class="text-neg">{{$user->name}}</span>' from the system.</p>
         <p class="text-neg">Are you sure you want to delete this user?</p>
         <p class="text-neg">Are you sure you want to delete this user?</p>
 
 
-        <form action="/users/{{$user->id}}" method="POST">
+        <form action="/settings/users/{{$user->id}}" method="POST">
             {!! csrf_field() !!}
             {!! csrf_field() !!}
             <input type="hidden" name="_method" value="DELETE">
             <input type="hidden" name="_method" value="DELETE">
             <a href="/users/{{$user->id}}" class="button muted">Cancel</a>
             <a href="/users/{{$user->id}}" class="button muted">Cancel</a>

@@ -9,7 +9,7 @@
                 <div class="col-sm-6"></div>
                 <div class="col-sm-6"></div>
                 <div class="col-sm-6 faded">
                 <div class="col-sm-6 faded">
                     <div class="action-buttons">
                     <div class="action-buttons">
-                        <a href="/users/{{$user->id}}/delete" class="text-neg text-button"><i class="zmdi zmdi-delete"></i>Delete User</a>
+                        <a href="/settings/users/{{$user->id}}/delete" class="text-neg text-button"><i class="zmdi zmdi-delete"></i>Delete User</a>
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>
@@ -19,7 +19,7 @@
 
 
 
 
     <div class="container small">
     <div class="container small">
-        <form action="/users/{{$user->id}}" method="post">
+        <form action="/settings/users/{{$user->id}}" method="post">
         <div class="row">
         <div class="row">
             <div class="col-md-6" ng-non-bindable>
             <div class="col-md-6" ng-non-bindable>
                 <h1>Edit {{ $user->id === $currentUser->id ? 'Profile' : 'User' }}</h1>
                 <h1>Edit {{ $user->id === $currentUser->id ? 'Profile' : 'User' }}</h1>

@@ -25,6 +25,6 @@
 @endif
 @endif
 
 
 <div class="form-group">
 <div class="form-group">
-    <a href="/users" class="button muted">Cancel</a>
+    <a href="/settings/users" class="button muted">Cancel</a>
     <button class="button pos" type="submit">Save</button>
     <button class="button pos" type="submit">Save</button>
 </div>
 </div>
\ No newline at end of file

@@ -34,7 +34,7 @@
 </div>
 </div>
 
 
 <div class="form-group">
 <div class="form-group">
-    <a href="/users" class="button muted">Cancel</a>
+    <a href="/settings/users" class="button muted">Cancel</a>
     <button class="button pos" type="submit">Save</button>
     <button class="button pos" type="submit">Save</button>
 </div>
 </div>
 
 

@@ -10,7 +10,7 @@
         <h1>Users</h1>
         <h1>Users</h1>
         @if($currentUser->can('user-create'))
         @if($currentUser->can('user-create'))
             <p>
             <p>
-                <a href="/users/create" class="text-pos"><i class="zmdi zmdi-account-add"></i>Add new user</a>
+                <a href="/settings/users/create" class="text-pos"><i class="zmdi zmdi-account-add"></i>Add new user</a>
             </p>
             </p>
         @endif
         @endif
         <table class="table">
         <table class="table">
@@ -25,7 +25,7 @@
                     <td style="line-height: 0;"><img class="avatar med" src="{{$user->getAvatar(40)}}" alt="{{$user->name}}"></td>
                     <td style="line-height: 0;"><img class="avatar med" src="{{$user->getAvatar(40)}}" alt="{{$user->name}}"></td>
                     <td>
                     <td>
                         @if($currentUser->can('user-update') || $currentUser->id == $user->id)
                         @if($currentUser->can('user-update') || $currentUser->id == $user->id)
-                            <a href="/users/{{$user->id}}">
+                            <a href="/settings/users/{{$user->id}}">
                                 @endif
                                 @endif
                                 {{ $user->name }}
                                 {{ $user->name }}
                                 @if($currentUser->can('user-update') || $currentUser->id == $user->id)
                                 @if($currentUser->can('user-update') || $currentUser->id == $user->id)
@@ -34,7 +34,7 @@
                     </td>
                     </td>
                     <td>
                     <td>
                         @if($currentUser->can('user-update') || $currentUser->id == $user->id)
                         @if($currentUser->can('user-update') || $currentUser->id == $user->id)
-                            <a href="/users/{{$user->id}}">
+                            <a href="/settings/users/{{$user->id}}">
                                 @endif
                                 @endif
                                 {{ $user->email }}
                                 {{ $user->email }}
                                 @if($currentUser->can('user-update') || $currentUser->id == $user->id)
                                 @if($currentUser->can('user-update') || $currentUser->id == $user->id)

+@extends('base')
+
+@section('content')
+
+    <div class="container" ng-non-bindable>
+        <div class="row">
+            <div class="col-sm-8">
+
+                <div class="padded-top large"></div>
+                <img class="" src="{{$user->getAvatar(120)}}" alt="{{ $user->name }}">
+                <h3>{{ $user->name }}</h3>
+                <p class="text-muted">
+                    User for {{ $user->created_at->diffForHumans(null, true) }}
+                </p>
+
+            </div>
+
+            <div class="col-sm-4">
+                <h3>Recent Activity</h3>
+                @include('partials/activity-list', ['activity' => $activity])
+            </div>
+
+        </div>
+    </div>
+
+
+@stop
\ No newline at end of file

@@ -129,7 +129,7 @@ class AuthTest extends TestCase
         $user = factory(\BookStack\User::class)->make();
         $user = factory(\BookStack\User::class)->make();
 
 
         $this->asAdmin()
         $this->asAdmin()
-            ->visit('/users')
+            ->visit('/settings/users')
             ->click('Add new user')
             ->click('Add new user')
             ->type($user->name, '#name')
             ->type($user->name, '#name')
             ->type($user->email, '#email')
             ->type($user->email, '#email')
@@ -138,7 +138,7 @@ class AuthTest extends TestCase
             ->type($user->password, '#password-confirm')
             ->type($user->password, '#password-confirm')
             ->press('Save')
             ->press('Save')
             ->seeInDatabase('users', $user->toArray())
             ->seeInDatabase('users', $user->toArray())
-            ->seePageIs('/users')
+            ->seePageIs('/settings/users')
             ->see($user->name);
             ->see($user->name);
     }
     }
 
 
@@ -147,13 +147,13 @@ class AuthTest extends TestCase
         $user = \BookStack\User::all()->last();
         $user = \BookStack\User::all()->last();
         $password = $user->password;
         $password = $user->password;
         $this->asAdmin()
         $this->asAdmin()
-            ->visit('/users')
+            ->visit('/settings/users')
             ->click($user->name)
             ->click($user->name)
-            ->seePageIs('/users/' . $user->id)
+            ->seePageIs('/settings/users/' . $user->id)
             ->see($user->email)
             ->see($user->email)
             ->type('Barry Scott', '#name')
             ->type('Barry Scott', '#name')
             ->press('Save')
             ->press('Save')
-            ->seePageIs('/users')
+            ->seePageIs('/settings/users')
             ->seeInDatabase('users', ['id' => $user->id, 'name' => 'Barry Scott', 'password' => $password])
             ->seeInDatabase('users', ['id' => $user->id, 'name' => 'Barry Scott', 'password' => $password])
             ->notSeeInDatabase('users', ['name' => $user->name]);
             ->notSeeInDatabase('users', ['name' => $user->name]);
     }
     }
@@ -161,7 +161,7 @@ class AuthTest extends TestCase
     public function test_user_password_update()
     public function test_user_password_update()
     {
     {
         $user = \BookStack\User::all()->last();
         $user = \BookStack\User::all()->last();
-        $userProfilePage = '/users/' . $user->id;
+        $userProfilePage = '/settings/users/' . $user->id;
         $this->asAdmin()
         $this->asAdmin()
             ->visit($userProfilePage)
             ->visit($userProfilePage)
             ->type('newpassword', '#password')
             ->type('newpassword', '#password')
@@ -172,7 +172,7 @@ class AuthTest extends TestCase
             ->type('newpassword', '#password')
             ->type('newpassword', '#password')
             ->type('newpassword', '#password-confirm')
             ->type('newpassword', '#password-confirm')
             ->press('Save')
             ->press('Save')
-            ->seePageIs('/users');
+            ->seePageIs('/settings/users');
 
 
             $userPassword = \BookStack\User::find($user->id)->password;
             $userPassword = \BookStack\User::find($user->id)->password;
             $this->assertTrue(Hash::check('newpassword', $userPassword));
             $this->assertTrue(Hash::check('newpassword', $userPassword));
@@ -184,11 +184,11 @@ class AuthTest extends TestCase
         $user = $this->getNewUser($userDetails->toArray());
         $user = $this->getNewUser($userDetails->toArray());
 
 
         $this->asAdmin()
         $this->asAdmin()
-            ->visit('/users/' . $user->id)
+            ->visit('/settings/users/' . $user->id)
             ->click('Delete User')
             ->click('Delete User')
             ->see($user->name)
             ->see($user->name)
             ->press('Confirm')
             ->press('Confirm')
-            ->seePageIs('/users')
+            ->seePageIs('/settings/users')
             ->notSeeInDatabase('users', ['name' => $user->name]);
             ->notSeeInDatabase('users', ['name' => $user->name]);
     }
     }
 
 
@@ -199,10 +199,10 @@ class AuthTest extends TestCase
         $this->assertEquals(1, $adminRole->users()->count());
         $this->assertEquals(1, $adminRole->users()->count());
         $user = $adminRole->users->first();
         $user = $adminRole->users->first();
 
 
-        $this->asAdmin()->visit('/users/' . $user->id)
+        $this->asAdmin()->visit('/settings/users/' . $user->id)
             ->click('Delete User')
             ->click('Delete User')
             ->press('Confirm')
             ->press('Confirm')
-            ->seePageIs('/users/' . $user->id)
+            ->seePageIs('/settings/users/' . $user->id)
             ->see('You cannot delete the only admin');
             ->see('You cannot delete the only admin');
     }
     }
 
 

@@ -94,7 +94,7 @@ class LdapTest extends \TestCase
 
 
     public function test_create_user_form()
     public function test_create_user_form()
     {
     {
-        $this->asAdmin()->visit('/users/create')
+        $this->asAdmin()->visit('/settings/users/create')
             ->dontSee('Password')
             ->dontSee('Password')
             ->type($this->mockUser->name, '#name')
             ->type($this->mockUser->name, '#name')
             ->type($this->mockUser->email, '#email')
             ->type($this->mockUser->email, '#email')
@@ -102,19 +102,19 @@ class LdapTest extends \TestCase
             ->see('The external auth id field is required.')
             ->see('The external auth id field is required.')
             ->type($this->mockUser->name, '#external_auth_id')
             ->type($this->mockUser->name, '#external_auth_id')
             ->press('Save')
             ->press('Save')
-            ->seePageIs('/users')
+            ->seePageIs('/settings/users')
             ->seeInDatabase('users', ['email' => $this->mockUser->email, 'external_auth_id' => $this->mockUser->name, 'email_confirmed' => true]);
             ->seeInDatabase('users', ['email' => $this->mockUser->email, 'external_auth_id' => $this->mockUser->name, 'email_confirmed' => true]);
     }
     }
 
 
     public function test_user_edit_form()
     public function test_user_edit_form()
     {
     {
         $editUser = User::all()->last();
         $editUser = User::all()->last();
-        $this->asAdmin()->visit('/users/' . $editUser->id)
+        $this->asAdmin()->visit('/settings/users/' . $editUser->id)
             ->see('Edit User')
             ->see('Edit User')
             ->dontSee('Password')
             ->dontSee('Password')
             ->type('test_auth_id', '#external_auth_id')
             ->type('test_auth_id', '#external_auth_id')
             ->press('Save')
             ->press('Save')
-            ->seePageIs('/users')
+            ->seePageIs('/settings/users')
             ->seeInDatabase('users', ['email' => $editUser->email, 'external_auth_id' => 'test_auth_id']);
             ->seeInDatabase('users', ['email' => $editUser->email, 'external_auth_id' => 'test_auth_id']);
     }
     }
 
 
@@ -127,7 +127,7 @@ class LdapTest extends \TestCase
     public function test_non_admins_cannot_change_auth_id()
     public function test_non_admins_cannot_change_auth_id()
     {
     {
         $testUser = User::all()->last();
         $testUser = User::all()->last();
-        $this->actingAs($testUser)->visit('/users/' . $testUser->id)
+        $this->actingAs($testUser)->visit('/settings/users/' . $testUser->id)
             ->dontSee('External Authentication');
             ->dontSee('External Authentication');
     }
     }