diff --git a/app/Http/Controllers/Admin/UserDetail.php b/app/Http/Controllers/Admin/UserDetail.php index e7ffc736..48ccecff 100644 --- a/app/Http/Controllers/Admin/UserDetail.php +++ b/app/Http/Controllers/Admin/UserDetail.php @@ -4,7 +4,16 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; use App\Http\Requests; +use App\Models\User; +use Illuminate\Support\Facades\Auth; class UserDetail extends Controller { + public function getDetail($id = null) { + if (!$id) $id = Auth::user()->id; + + $user = User::findOrFail($id); + + return view('admin.userManagement.detail', ['user' => $user]); + } } \ No newline at end of file diff --git a/resources/assets/css/admin.css b/resources/assets/css/admin.css index b3f8b298..0da2cbb4 100644 --- a/resources/assets/css/admin.css +++ b/resources/assets/css/admin.css @@ -26,6 +26,10 @@ left: 43%; } +.user-detail ul { + list-style-type: none; +} + /** Footer */ diff --git a/resources/lang/en/admin/userManagement.php b/resources/lang/en/admin/userManagement.php index 102ab5a5..5af2975b 100644 --- a/resources/lang/en/admin/userManagement.php +++ b/resources/lang/en/admin/userManagement.php @@ -14,6 +14,8 @@ return [ 'profile' => 'Your profile', 'overview' => 'List of all users', 'noUsers' => 'No users avialable.', - 'detail' => 'User\'s detail' + 'detail' => 'Details of user :name (:email)', + 'editUser' => 'Editing user :name (:email)', + 'usersActions' => 'User\'s actions' ]; \ No newline at end of file diff --git a/resources/views/admin/userManagement/detail.blade.php b/resources/views/admin/userManagement/detail.blade.php index dcf91b97..01ff6ebc 100644 --- a/resources/views/admin/userManagement/detail.blade.php +++ b/resources/views/admin/userManagement/detail.blade.php @@ -1,7 +1,40 @@ @extends('admin.layout') -@section('pageName', @trans('admin/userManagement.detail')) +@section('pageName', @trans('admin/userManagement.detail', ['name' => $user->name, 'email' => $user->email])) @section('content') +
+

@lang('admin/userManagement.detail', ['name' => str_limit($user->name, 20), 'email' => $user->email])

+ +
+
+
+ +
+
+
    +
  • {{$user->name}}
  • +
  • {{$user->email}}
  • + + {{--todo: add custom fields--}} +
+
+
+ +
+

@lang('admin/userManagement.usersActions')

+ + comming soon +
+ +
+
+
+

@lang('admin/userManagement.editUser', ['name' => str_limit($user->name, 20), 'email' => $user->email])

+ @include('admin.userManagement.editForm', ['roles' => []]) +
+
+
+ @stop \ No newline at end of file diff --git a/resources/views/admin/userManagement/edit.blade.php b/resources/views/admin/userManagement/edit.blade.php new file mode 100644 index 00000000..e69de29b diff --git a/resources/views/admin/userManagement/editForm.blade.php b/resources/views/admin/userManagement/editForm.blade.php new file mode 100644 index 00000000..b4e01cda --- /dev/null +++ b/resources/views/admin/userManagement/editForm.blade.php @@ -0,0 +1,54 @@ +
+ {!! csrf_field() !!} + + + + + + + + + + + + @if (isset($errors) && $errors->has('role')) +
+ {{ $errors->first('role') }} +
+ @endif + + +
\ No newline at end of file diff --git a/resources/views/admin/userManagement/new.blade.php b/resources/views/admin/userManagement/new.blade.php index c707ec8d..57355b48 100644 --- a/resources/views/admin/userManagement/new.blade.php +++ b/resources/views/admin/userManagement/new.blade.php @@ -18,58 +18,5 @@ @endif -
- {!! csrf_field() !!} - - - - - - - - - - - - @if (isset($errors) && $errors->has('role')) -
- {{ $errors->first('role') }} -
- @endif - - -
+ @include('admin.userManagement.newForm', ['roles' => $roles]) @stop \ No newline at end of file diff --git a/resources/views/admin/userManagement/newForm.blade.php b/resources/views/admin/userManagement/newForm.blade.php new file mode 100644 index 00000000..b4e01cda --- /dev/null +++ b/resources/views/admin/userManagement/newForm.blade.php @@ -0,0 +1,54 @@ +
+ {!! csrf_field() !!} + + + + + + + + + + + + @if (isset($errors) && $errors->has('role')) +
+ {{ $errors->first('role') }} +
+ @endif + + +
\ No newline at end of file