profile page added

Author: Ivan Li

app/Http/Controllers/User/ProfileController.php

@@ -0,0 +1,86 @@
+<?php
+namespace App\Http\Controllers\User;
+
+use App\Http\Controllers\Controller;
+
+use App\User;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+/**
+ * Created by PhpStorm.
+ * User: Ivan
+ * Date: 19/06/2016
+ * Time: 2:58 PM
+ */
+class ProfileController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    public function index(Request $request)
+    {
+        $user = Auth::user();
+        if ($request->ajax()) {
+            if ($request->wantsJson()) {
+                return new JsonResponse($user);
+            } else {
+                return $user;
+            }
+        } else {
+            return view('user.profile.index')->with(array(
+                "user" => $user
+            ));
+        }
+    }
+
+    public function show(Request $request, $id)
+    {
+        try {
+            $user = User::findOrFail($id);
+            /* TODO need to handle private permission settings here*/
+            if ($request->ajax()) {
+                if ($request->wantsJson()) {
+                    return new JsonResponse($user);
+                } else {
+                    return $user;
+                }
+            } else {
+                return view('user.profile.index')->with(array(
+                    "user" => $user
+                ));
+            }
+        } catch (ModelNotFoundException $e) {
+            $output = new \stdClass();
+            $output->status = false;
+            $output->error = "User not found";
+            if ($request->ajax()) {
+                if ($request->wantsJson()) {
+                    return new JsonResponse($output);
+                } else {
+                    return $output;
+                }
+            } else {
+                abort(404, "Page not found");
+                return false;
+            }
+        }
+    }
+
+    public function edit()
+    {
+        $user = Auth::user();
+        return view('user.profile.edit')->with(array(
+            "user" => $user
+        ));
+    }
+
+    public function update()
+    {
+
+    }
+}

app/Http/routes.php

@@ -11,6 +11,10 @@
 |
 */
 Route::group(['middleware' => ['web']], function () {
+
+    /**
+     * @start KB Authentication Routes
+     */
     Route::get('/', 'RoutingController@home');
     Route::group(['prefix' => 'login'], function () {
         Route::get('/', ['middleware' => ['guest'], 'uses' => 'RoutingController@login']);
@@ -23,7 +27,29 @@
     Route::get('reset/{encrypted_email}/{confirmation_code}', 'Auth\ForgotController@viewReset');
     Route::post('reset', 'Auth\ForgotController@postReset');
     Route::get('logout', 'Auth\AuthController@logout');
+    /**
+     * @end KB Authentication Routes
+     */
+
+
+    /**
+     * @start User Routes
+     */
+    Route::group(['prefix' => 'user', 'middleware' => ['auth']], function () {
+        Route::group(['prefix' => 'profile'], function(){
+            Route::get('/', ['uses' => 'User\ProfileController@index']);
+            Route::get('edit', ['uses' => 'User\ProfileController@edit']);
+            Route::get('{id}', ['uses' => 'User\ProfileController@show']);
+            Route::put('/', ['uses' => 'User\ProfileController@update']);
+        });
+    });
+    /**
+     * @end User Routes
+     */
 
+    /**
+     * @start CHAMS Routes
+     */
     /*QBE CHAMS*/
     Route::group([
         'prefix' => 'chams',
@@ -32,16 +58,18 @@
         Route::get('/', ['uses' => 'CHAMS\RoutingController@home']);
         Route::get('users', ['middleware' => ['auth', 'role:chams_admin'], 'uses' => 'CHAMS\RoutingController@users']);
     });
+    /**
+     * @end CHAMS Routes
+     */
 
-//    Route::group([
-//        'prefix' => 'user',
-//        'middleware' => ['auth', 'role:kb_admin']
-//    ],function(){
-//        Route::get('/', ['uses' => 'UserController@users']);
-//        Route::get('{user_id}', ['uses' => 'UserController@user']);
-//    });
-
-    /*we need to have separated url for ajax and html page calls because chrome cache*/
-    Route::resource('admin/user', 'UserController');
-    Route::put('admin/user/{user_id}/revive', 'UserController@revive');
+    /**
+     * @start Admin Routes
+     */
+    Route::group(['prefix' => 'admin', 'middleware' => ['auth']], function () {
+        Route::resource('user', 'UserController');
+        Route::put('user/{user_id}/revive', 'UserController@revive');
+    });
+    /**
+     * @end Admin Routes
+     */
 });

public/assets/internal/css/app.css

@@ -85,4 +85,8 @@ table th.shrink, table td.shrink {
 
 .form-group{
     margin-bottom: 10px;
+}
+
+.cover .profile-pic{
+    background-color: #dddddd;
 }

public/assets/internal/img/default-profile-cover.jpg

@@ -14,7 +14,7 @@
 @section('link')
 @stop
 @section('content')
-
+    <h4 class="page-title">Edit User: {{$user->name}}</h4>
     <div class="block-area">
         <div class="row">
             <div class="col-sm-12">

resources/views/admin/user/edit.blade.php

@@ -14,7 +14,7 @@
     <link rel="stylesheet" href="{{asset('assets/external/package/DataTables-1.10.12/media/css/dataTables.bootstrap.min.css')}}">
 @stop
 @section('content')
-
+    <h4 class="page-title">Manage Users</h4>
     <div class="block-area">
         <div class="row">
             <div class="col-sm-12">

resources/views/admin/user/index.blade.php

@@ -11,5 +11,5 @@
     ICL KB - CHAMS
 @stop
 @section('content')
-    CHAMS home page
+    <h4 class="page-title">Manage Users</h4>
 @stop

resources/views/chams/home.blade.php

@@ -100,7 +100,7 @@
                         <img class="profile-pic animated" src="{{asset('assets/internal/img/blue-user-icon.png')}}" alt="">
                     </a>
                     <ul class="dropdown-menu profile-menu">
-                        <li><a href="#">My Profile</a>
+                        <li><a href="{{url('user/profile')}}">My Profile</a>
                             <i class="icon left">&#61903;</i><i class="icon right">&#61815;</i></li>
                         <li><a href="#">Messages</a> <i class="icon left">&#61903;</i><i class="icon right">&#61815;</i>
                         </li>

resources/views/layouts/neat.blade.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Ivan
+ * Date: 19/06/2016
+ * Time: 3:11 PM
+ */
+?>
+
+@extends('layouts.neat')
+@section('title')
+    ICL KB - Edit Profile
+@stop
+@section('link')
+@stop
+@section('content')
+    Edit Profile
+    <br>
+    {{$user}}
+@stop
+@section('script')
+@stop

resources/views/user/profile/edit.blade.php

@@ -0,0 +1,56 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Ivan
+ * Date: 19/06/2016
+ * Time: 3:11 PM
+ */
+?>
+
+@extends('layouts.neat')
+@section('title')
+    ICL KB - Edit Profile
+@stop
+@section('link')
+@stop
+@section('content')
+    <h4 class="page-title">
+        @if(Auth::user() == $user)
+            My Profile
+        @else
+            Profile - {{$user->name}}
+        @endif
+    </h4>
+
+    <div class="block-area">
+        <div class="row">
+            <div class="col-sm-6">
+                <div class="tile-light p-10 m-b-15">
+                    <div class="cover p-relative">
+                        <img alt="" class="w-100" src="{{asset('assets/internal/img/default-profile-cover.jpg')}}">
+                        <img alt="" src="{{asset('assets/internal/img/blue-user-icon.png')}}" class="profile-pic">
+                        <div class="profile-btn">
+                            <button class="btn btn-alt btn-sm"><i class="icon-bubble"></i> <span>Edit Profile</span></button>
+                        </div>
+                    </div>
+                    <div class="p-5 m-t-15">
+                        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis eget risus rhoncus, cursus purus vitae, venenatis eros. Phasellus at tincidunt risus. Integer sed massa fermentum, feugiat arcu quis, ultrices nisi. Quisque commodo nisi scelerisque, tempus diam ac, dignissim tellus. Mauris adipiscing elit tortor, dignissim auctor diam mollis sed. Nulla eu dui non velit accumsan scelerisque eget et felis.
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-8">
+
+            </div>
+        </div>
+    </div>
+    View Profile
+    {!! $user !!}
+    <br>
+    Is Auth User {{Auth::user() == $user}}
+
+
+
+@stop
+@section('script')
+@stop
+