diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 6f7eb53..1479dd5 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -17,7 +17,7 @@ class AdminController extends Controller */ public function __construct(){ - // $this->middleware('auth', ['except'=>['index', 'create']]); + $this->middleware('guest'); } public function index() { diff --git a/app/Http/Controllers/PermissionController.php b/app/Http/Controllers/PermissionController.php new file mode 100644 index 0000000..2115649 --- /dev/null +++ b/app/Http/Controllers/PermissionController.php @@ -0,0 +1,92 @@ +with("permissions", $permissions); + } + + /** + * Show the form for creating a new resource. + * + * @return \Illuminate\Http\Response + */ + public function create(){ + return view("permission.add"); + } + + + + /** + * Store a newly created resource in storage. + * + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\Response + */ + public function store(PermissionRequest $request) + { + $permission = Permission::create(Request::all()); + $this->index(); + } + + /** + * Display the specified resource. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function show($id) + { + // + } + + /** + * Show the form for editing the specified resource. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function edit($id) + { + // + } + + /** + * Update the specified resource in storage. + * + * @param \Illuminate\Http\Request $request + * @param int $id + * @return \Illuminate\Http\Response + */ + public function update(Request $request, $id) + { + // + } + + /** + * Remove the specified resource from storage. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function destroy($id) + { + // + } +} diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 9a017cd..57f8d95 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -6,7 +6,13 @@ use App\Http\Requests; use App\Http\Requests\ProfileRequest; use App\Profile; -use App\Profile_Permission; +use App\Permission_Profile; +use App\Permission; +use Auth; +use App\User; +use App\Client; +use App\Organisation; +use App\Vendor; class ProfileController extends Controller { @@ -15,8 +21,14 @@ class ProfileController extends Controller { * * @return \Illuminate\Http\Response */ + public function __construct() { + $this->middleware('auth'); + } + public function index() { - return view("profile.index"); + $user = User::find(Auth::user()->id); + //$ordid = $user->org_id; + return view("profile.index")->with("user", $user); } /** @@ -25,8 +37,19 @@ public function index() { * @return \Illuminate\Http\Response */ public function create() { - $permissions = Permission::where('user_type', Auth::user()->user_type); - return view("profile.add")->with('permissions', $permissions); + $orgs = array(); + $permissions = Permission::where('user_type', Auth::user()->user_type)->get(); +// + + if (Auth::user()->user_type == 'client') { + $orgs = Client::all(); + } else if (Auth::user()->user_type == 'organisation') { + $orgs = Organisation::all(); + } else if (Auth::user()->user_type == 'vendor') { + $orgs = Vendor::all(); + } + + return view("profile.add")->with('permissions', $permissions)->with('orgs', $orgs); } /** @@ -36,34 +59,31 @@ public function create() { * @return \Illuminate\Http\Response */ public function store(ProfileRequest $request) { - $profile_id = ''; - if (Auth::check) { - $user_id = Auth::user()->id; - $org_id = Request::get('org_id'); - - $designation = Request::get('designation'); - $sex = Request::get('sex'); - - $file = Request::file('photo'); - $random_name = str_random(8); - $destinationPath = '/profiles/'; - $extension = $file->getClientOriginalExtension(); - $filename = $random_name . '_' . $user_id . '.' . $extension; - $uploadSuccess = Request::file('photo') - ->move($destinationPath, $filename); - + //return route("profile.index"); + $user_id = Auth::user()->id; + $orgs_id = Request::get('org_id'); + $designation = Request::get('designation'); + $sex = Request::get('sex'); + $file = Request::file('photo'); + $random_name = str_random(8); + $destinationPath = 'profiles/'; + $extension = $file->getClientOriginalExtension(); + $filename = $random_name . '_' . $user_id . '_' .Auth::user()->firstname. '_' .Auth::user()->lastname .'.' . $extension; + $uploadSuccess = Request::file('photo')->move($destinationPath, $filename); + if ($uploadSuccess) { $profile = Profile::create(array( "user_id" => $user_id, - "org_id" => $org_id, + "org_id" => $orgs_id, "designation" => $designation, "sex" => $sex, "photo" => $filename )); - $perm = $this->createPermissions($profile); - if($perm){ - $this->index(); - }// + + $perm = $this->createPermissions($profile); + if ($perm) { + return view('profile.index'); + }// } } @@ -84,7 +104,7 @@ public function show($id) { * @return \Illuminate\Http\Response */ public function edit($id) { - // + } /** @@ -108,23 +128,24 @@ public function destroy($id) { // } - - public function createPermissions($profile){ + public function createPermissions($profile) { + $permission_entry = null; if (!empty($profile)) { - $permissions = Request::get('permissions'); - $profile_id = $profile->id; - foreach($permissions as $permission){ - $permission_entry = Profile_Permission::create(array( - 'profile_id' => $profile_id, - 'permission_id' => $permission + $permissions = Request::get('permissions'); + $profile_id = $profile->id; + foreach ($permissions as $permission) { + $permission_entry = Permission_Profile::create(array( + 'profile_id' => $profile_id, + 'permission_id' => $permission )); - } - - if(!empty($permission_entry)){ - return true; - } - - return false; } + + if (!empty($permission_entry)) { + return true; + } + + return false; + } } + } diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php new file mode 100644 index 0000000..9b5dc59 --- /dev/null +++ b/app/Http/Controllers/UserController.php @@ -0,0 +1,32 @@ +getClientOriginalExtension(); + $filename = $random_name . '_' . Auth::user()->id . '_' .Auth::user()->firstname. '_' .Auth::user()->lastname .'.' . $extension; + $uploadSuccess = Request::file('photo')->move($destinationPath, $filename); + if ($uploadSuccess) { + $profile = Profile::find($id); + $update = $profile->update(array('photo' => $filename)); + + + return view("profile.index")->with("user", Auth::user()); + } + } + +} diff --git a/app/Http/Requests/PermissionRequest.php b/app/Http/Requests/PermissionRequest.php new file mode 100644 index 0000000..c1b0028 --- /dev/null +++ b/app/Http/Requests/PermissionRequest.php @@ -0,0 +1,37 @@ + 'required', + 'permission_group' => 'required', + 'permission_name' => 'required', + 'auth_level' => 'required' + ]; + } +} diff --git a/app/Http/Requests/ProfileRequest.php b/app/Http/Requests/ProfileRequest.php index da28a17..b89ea64 100644 --- a/app/Http/Requests/ProfileRequest.php +++ b/app/Http/Requests/ProfileRequest.php @@ -3,6 +3,7 @@ namespace App\Http\Requests; use Illuminate\Foundation\Http\FormRequest; +use Auth; class ProfileRequest extends FormRequest { @@ -13,7 +14,7 @@ class ProfileRequest extends FormRequest */ public function authorize() { - if(Auth::check){ + if(Auth::check()){ return true; } return false; @@ -27,10 +28,11 @@ public function authorize() public function rules() { return [ - 'user_id' => 'required', + // 'user_id' => 'required', 'org_id' => 'required', - 'Designation' => 'required', - 'sex' => 'required' + 'designation' => 'required', + 'sex' => 'required', + 'photo' => 'required|image' ]; } diff --git a/app/Permission.php b/app/Permission.php index 31e16e9..92ce83d 100644 --- a/app/Permission.php +++ b/app/Permission.php @@ -4,9 +4,15 @@ use Illuminate\Database\Eloquent\Model; use App\Profile; -class Permission extends Model -{ +class Permission extends Model{ + +protected $fillable = [ + 'user_type', 'auth_level', 'permission_group', 'permission_name' +]; + public function Profile(){ - return $this->belongsToMany("Profile")->withTimestamps(); + return $this->belongsToMany("App\Profile")->withTimestamps(); } + + } diff --git a/app/Permission_Profile.php b/app/Permission_Profile.php new file mode 100644 index 0000000..e2b6f7c --- /dev/null +++ b/app/Permission_Profile.php @@ -0,0 +1,16 @@ +belongsTo("User"); } - public function userPermission(){ - return $this->belongsToMany("Permission")->withTimestamps(); + public function permission(){ + return $this->belongsToMany("App\Permission")->withTimestamps(); + } + + public function organisation(){ + $this->belongsTo("Organisation", "org_id"); } - public static function getOrganisationbyUserId(User $user){ - $profile = Profile::where('user_id', $user->getKey())->first(); - - if($profile != null){ - return $profile->get("org_id"); - }else{ - return 0; - } + public function client(){ + $this->belongsTo("Client", "org_id"); } + public function vendor(){ + $this->belongsTo("Vendor", "org_id"); + } + + + } diff --git a/app/Profile_Permission.php b/app/Profile_Permission.php deleted file mode 100644 index e5cfd23..0000000 --- a/app/Profile_Permission.php +++ /dev/null @@ -1,14 +0,0 @@ -hasOne("Profile"); + return $this->hasOne("App\Profile"); } public function log(){ diff --git a/database/migrations/2016_09_24_120044_profiles.php b/database/migrations/2016_09_24_120044_profiles.php index 0fafaca..4e63ff1 100644 --- a/database/migrations/2016_09_24_120044_profiles.php +++ b/database/migrations/2016_09_24_120044_profiles.php @@ -15,13 +15,12 @@ public function up() { Schema::create('Profiles', function (Blueprint $table) { $table->increments('id'); - $table->integer('user_id'); - $table->integer('org_id')->null; - $table->string('photo' )->null; - $table->string('designation')->null; - $table->string('phone_number')->null; - $table->string('email')->null; - $table->string('sex', 6)->null; + $table->integer('user_id')->unique(); + $table->integer('org_id')->nullable(); + $table->string('photo')->nullable(); + $table->string('designation')->nullable(); + + $table->string('sex', 6)->nullable(); $table->timestamps(); }); } diff --git a/database/migrations/2016_09_25_223721_profile_permissions.php b/database/migrations/2016_09_25_223721_profile_permissions.php index 35b722a..7ac6bb6 100644 --- a/database/migrations/2016_09_25_223721_profile_permissions.php +++ b/database/migrations/2016_09_25_223721_profile_permissions.php @@ -13,7 +13,7 @@ class ProfilePermissions extends Migration */ public function up() { - Schema::create('Profile_Permission', function (Blueprint $table) { + Schema::create('Permission_Profile', function (Blueprint $table) { $table->increments('id'); $table->integer('profile_id'); $table->string('permission_id'); @@ -28,6 +28,6 @@ public function up() */ public function down() { - Schema::dropIfExists('User_Permissions'); + Schema::dropIfExists('Permission_Profile'); } } diff --git a/public/css/app.css b/public/css/app.css index b6a2c47..3da7554 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -94,3 +94,31 @@ html { height: 150px; } +.permissions{ + border: 1px black solid; + border-radius: 5px; + +} + +.rounded{ + position: relative; + top:-10px; + border: 2px solid gray; + border-radius: 10px; + margin: 0; + padding: 0; + height: 100%; +} + +.btn-edit{ + width:20px; + height: 20px; + font-size: 15px; + padding: 0px; + margin: 0px; + float: right; +} + +.clearfix{ + clear: both; +} \ No newline at end of file diff --git a/public/fonts/glyphicons-halflings-regular.eot b/public/fonts/glyphicons-halflings-regular.eot new file mode 100644 index 0000000..b93a495 Binary files /dev/null and b/public/fonts/glyphicons-halflings-regular.eot differ diff --git a/public/fonts/glyphicons-halflings-regular.svg b/public/fonts/glyphicons-halflings-regular.svg new file mode 100644 index 0000000..94fb549 --- /dev/null +++ b/public/fonts/glyphicons-halflings-regular.svg @@ -0,0 +1,288 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/fonts/glyphicons-halflings-regular.ttf b/public/fonts/glyphicons-halflings-regular.ttf new file mode 100644 index 0000000..1413fc6 Binary files /dev/null and b/public/fonts/glyphicons-halflings-regular.ttf differ diff --git a/public/fonts/glyphicons-halflings-regular.woff b/public/fonts/glyphicons-halflings-regular.woff new file mode 100644 index 0000000..9e61285 Binary files /dev/null and b/public/fonts/glyphicons-halflings-regular.woff differ diff --git a/public/fonts/glyphicons-halflings-regular.woff2 b/public/fonts/glyphicons-halflings-regular.woff2 new file mode 100644 index 0000000..64539b5 Binary files /dev/null and b/public/fonts/glyphicons-halflings-regular.woff2 differ diff --git a/public/profiles/1ixXPi37_1_Everistus_Olumese.jpg b/public/profiles/1ixXPi37_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/1ixXPi37_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/1zHt6g6s_1_Everistus_Olumese.jpg b/public/profiles/1zHt6g6s_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/1zHt6g6s_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/24ICziAj_1_Everistus_Olumese.jpg b/public/profiles/24ICziAj_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/24ICziAj_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/2C3w9Awk_1_Everistus_Olumese.jpg b/public/profiles/2C3w9Awk_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..ecea2f9 Binary files /dev/null and b/public/profiles/2C3w9Awk_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/2uf8kkqW_1_Everistus_Olumese.jpg b/public/profiles/2uf8kkqW_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..cd1cd3a Binary files /dev/null and b/public/profiles/2uf8kkqW_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/39XcpJki_1_Everistus_Olumese.jpg b/public/profiles/39XcpJki_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/39XcpJki_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/5AdY28a2_1_Everistus_Olumese.jpg b/public/profiles/5AdY28a2_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..ecea2f9 Binary files /dev/null and b/public/profiles/5AdY28a2_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/5ch5H6XF_1_Everistus_Olumese.jpg b/public/profiles/5ch5H6XF_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/5ch5H6XF_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/6GwBvpgz_1_Everistus_Olumese.jpg b/public/profiles/6GwBvpgz_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/6GwBvpgz_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/7MT84xXy_1_Everistus_Olumese.jpg b/public/profiles/7MT84xXy_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/7MT84xXy_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/7wM7yxl3_1_Everistus_Olumese.jpg b/public/profiles/7wM7yxl3_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..cd1cd3a Binary files /dev/null and b/public/profiles/7wM7yxl3_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/8CdVEGyM_1_Everistus_Olumese.jpg b/public/profiles/8CdVEGyM_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/8CdVEGyM_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/8Td4gqEO_1_Everistus_Olumese.jpg b/public/profiles/8Td4gqEO_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..cd1cd3a Binary files /dev/null and b/public/profiles/8Td4gqEO_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/By2CMoU3_1_Everistus_Olumese.jpg b/public/profiles/By2CMoU3_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/By2CMoU3_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/F1k7xgwl_1_Everistus_Olumese.jpg b/public/profiles/F1k7xgwl_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/F1k7xgwl_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/F6c7bbqi_1_Everistus_Olumese.jpg b/public/profiles/F6c7bbqi_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/F6c7bbqi_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/FJCMy9wr_1_Everistus_Olumese.jpg b/public/profiles/FJCMy9wr_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/FJCMy9wr_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/GXZAAlwk_1_Everistus_Olumese.jpg b/public/profiles/GXZAAlwk_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/GXZAAlwk_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/GcGmhZsK_1_Everistus_Olumese.jpg b/public/profiles/GcGmhZsK_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..cd1cd3a Binary files /dev/null and b/public/profiles/GcGmhZsK_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/HUHeTDcq_1_Everistus_Olumese.jpg b/public/profiles/HUHeTDcq_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/HUHeTDcq_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/KEw0eweE_1_Everistus_Olumese.jpg b/public/profiles/KEw0eweE_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/KEw0eweE_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/LJotOuSs_1_Everistus_Olumese.jpg b/public/profiles/LJotOuSs_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/LJotOuSs_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/LgMyM2hJ_1_Everistus_Olumese.jpg b/public/profiles/LgMyM2hJ_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/LgMyM2hJ_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/MJwzwPTb_1_Everistus_Olumese.jpg b/public/profiles/MJwzwPTb_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/MJwzwPTb_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/MgYd6p3V_1_Everistus_Olumese.jpg b/public/profiles/MgYd6p3V_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/MgYd6p3V_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/MptgNN4h_1_Everistus_Olumese.jpg b/public/profiles/MptgNN4h_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..cd1cd3a Binary files /dev/null and b/public/profiles/MptgNN4h_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/OvOubRKH_1_Everistus_Olumese.jpg b/public/profiles/OvOubRKH_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/OvOubRKH_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/QD3iPrkr_1_Everistus_Olumese.jpg b/public/profiles/QD3iPrkr_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/QD3iPrkr_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/QzxMsU0v_1_Everistus_Olumese.jpg b/public/profiles/QzxMsU0v_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/QzxMsU0v_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/R2X20TBU_1_Everistus_Olumese.jpg b/public/profiles/R2X20TBU_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..ecea2f9 Binary files /dev/null and b/public/profiles/R2X20TBU_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/RXvsfntD_1_Everistus_Olumese.jpg b/public/profiles/RXvsfntD_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..d284c61 Binary files /dev/null and b/public/profiles/RXvsfntD_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/Tymohj3n_1_Everistus_Olumese.jpg b/public/profiles/Tymohj3n_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/Tymohj3n_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/UI2GHBQN_1_Everistus_Olumese.jpg b/public/profiles/UI2GHBQN_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/UI2GHBQN_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/ZJtvxuel_1_Everistus_Olumese.jpg b/public/profiles/ZJtvxuel_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..cd1cd3a Binary files /dev/null and b/public/profiles/ZJtvxuel_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/ZpA7UGD7_1_Everistus_Olumese.jpg b/public/profiles/ZpA7UGD7_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/ZpA7UGD7_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/a0tZZarZ_1_Everistus_Olumese.jpg b/public/profiles/a0tZZarZ_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/a0tZZarZ_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/aGroFRfM_1_Everistus_Olumese.jpg b/public/profiles/aGroFRfM_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/aGroFRfM_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/bkTXM8R4_1_Everistus_Olumese.jpg b/public/profiles/bkTXM8R4_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/bkTXM8R4_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/cdCmyWen_1_Everistus_Olumese.jpg b/public/profiles/cdCmyWen_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/cdCmyWen_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/cocAsWd0_1_Everistus_Olumese.jpg b/public/profiles/cocAsWd0_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..ecea2f9 Binary files /dev/null and b/public/profiles/cocAsWd0_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/cweM2fND_1_Everistus_Olumese.jpg b/public/profiles/cweM2fND_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/cweM2fND_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/czvuC6O4_1_Everistus_Olumese.jpg b/public/profiles/czvuC6O4_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/czvuC6O4_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/dF8bdLcA_1_Everistus_Olumese.jpg b/public/profiles/dF8bdLcA_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/dF8bdLcA_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/gz2OPXCx_1_Everistus_Olumese.jpg b/public/profiles/gz2OPXCx_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/gz2OPXCx_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/i7pMFuxj_1_Everistus_Olumese.jpg b/public/profiles/i7pMFuxj_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/i7pMFuxj_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/igP9HC4j_1_Everistus_Olumese.jpg b/public/profiles/igP9HC4j_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/igP9HC4j_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/izTDGSjM_1_Everistus_Olumese.jpg b/public/profiles/izTDGSjM_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/izTDGSjM_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/jKO6tc6U_1_Everistus_Olumese.jpg b/public/profiles/jKO6tc6U_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/jKO6tc6U_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/jfUwuYrk_1_Everistus_Olumese.jpg b/public/profiles/jfUwuYrk_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..cd1cd3a Binary files /dev/null and b/public/profiles/jfUwuYrk_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/kBwxLxeI_1_Everistus_Olumese.jpg b/public/profiles/kBwxLxeI_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/kBwxLxeI_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/lSiabqei_1_Everistus_Olumese.jpg b/public/profiles/lSiabqei_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/lSiabqei_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/lx520Gxh_1_Everistus_Olumese.jpg b/public/profiles/lx520Gxh_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/lx520Gxh_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/mXfMIC4E_1_Everistus_Olumese.jpg b/public/profiles/mXfMIC4E_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/mXfMIC4E_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/ml0VrJcK_1_Everistus_Olumese.jpg b/public/profiles/ml0VrJcK_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..ecea2f9 Binary files /dev/null and b/public/profiles/ml0VrJcK_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/nNTZ8f8R_1_Everistus_Olumese.jpg b/public/profiles/nNTZ8f8R_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/nNTZ8f8R_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/oIzxzsxi_1_Everistus_Olumese.jpg b/public/profiles/oIzxzsxi_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/oIzxzsxi_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/qGtyCUsR_1_Everistus_Olumese.jpg b/public/profiles/qGtyCUsR_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..d284c61 Binary files /dev/null and b/public/profiles/qGtyCUsR_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/qIVp4ijc_1_Everistus_Olumese.jpg b/public/profiles/qIVp4ijc_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..cd1cd3a Binary files /dev/null and b/public/profiles/qIVp4ijc_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/qdfl6M8M_1_Everistus_Olumese.jpg b/public/profiles/qdfl6M8M_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/qdfl6M8M_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/rtCuFpcl_1_Everistus_Olumese.jpg b/public/profiles/rtCuFpcl_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/rtCuFpcl_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/rxJOr9KR_1_Everistus_Olumese.jpg b/public/profiles/rxJOr9KR_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/rxJOr9KR_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/sAw9EE3W_1_Everistus_Olumese.jpg b/public/profiles/sAw9EE3W_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..cd1cd3a Binary files /dev/null and b/public/profiles/sAw9EE3W_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/scMGZC65_1_Everistus_Olumese.jpg b/public/profiles/scMGZC65_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/scMGZC65_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/szOe8WfG_1_Everistus_Olumese.jpg b/public/profiles/szOe8WfG_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/szOe8WfG_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/t4nYBJTZ_1_Everistus_Olumese.jpg b/public/profiles/t4nYBJTZ_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/t4nYBJTZ_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/tE5dpy0s_1_Everistus_Olumese.jpg b/public/profiles/tE5dpy0s_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/tE5dpy0s_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/tQG656mK_1_Everistus_Olumese.jpg b/public/profiles/tQG656mK_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..ecea2f9 Binary files /dev/null and b/public/profiles/tQG656mK_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/uQa6GIwR_1_Everistus_Olumese.jpg b/public/profiles/uQa6GIwR_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..cd1cd3a Binary files /dev/null and b/public/profiles/uQa6GIwR_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/vWjC7ADJ_1_Everistus_Olumese.jpg b/public/profiles/vWjC7ADJ_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/vWjC7ADJ_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/wcyEjPNd_1_Everistus_Olumese.jpg b/public/profiles/wcyEjPNd_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..d493886 Binary files /dev/null and b/public/profiles/wcyEjPNd_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/xPybrufo_1_Everistus_Olumese.jpg b/public/profiles/xPybrufo_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/xPybrufo_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/yxB1xd4K_1_Everistus_Olumese.jpg b/public/profiles/yxB1xd4K_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/yxB1xd4K_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/z713GnE8_1_Everistus_Olumese.jpg b/public/profiles/z713GnE8_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/z713GnE8_1_Everistus_Olumese.jpg differ diff --git a/public/profiles/zp2BAwJl_1_Everistus_Olumese.jpg b/public/profiles/zp2BAwJl_1_Everistus_Olumese.jpg new file mode 100644 index 0000000..78d6cc9 Binary files /dev/null and b/public/profiles/zp2BAwJl_1_Everistus_Olumese.jpg differ diff --git a/resources/views/admin/index.blade.php b/resources/views/admin/index.blade.php index 03c1000..35b7864 100644 --- a/resources/views/admin/index.blade.php +++ b/resources/views/admin/index.blade.php @@ -14,7 +14,7 @@

Current Administrators

@foreach($admins as $admin)
{{$admin->Firstname }}, {{$admin->Lastname}}
diff --git a/resources/views/permission/add.blade.php b/resources/views/permission/add.blade.php new file mode 100644 index 0000000..a46621d --- /dev/null +++ b/resources/views/permission/add.blade.php @@ -0,0 +1,102 @@ +@extends('layouts.admin.master') + + +@section('content') +
+
+
+
+
Add Permissions
+
+
+ {{ csrf_field() }} + +
+ + +
+ + @if ($errors->has('user_type')) + + {{ $errors->first('user_type') }} + + @endif +
+
+ +
+ + +
+ + @if ($errors->has('permission_group')) + + {{ $errors->first('permission_group') }} + + @endif +
+
+ +
+ + +
+ + + @if ($errors->has('permission_name')) + + {{ $errors->first('permission_name') }} + + @endif +
+
+ +
+ + +
+ + @if ($errors->has('auth_level')) + + {{ $errors->first('auth_level') }} + + @endif +
+
+ +
+
+ +
+
+
+
+
+
+
+
+@endsection + diff --git a/resources/views/permission/index.blade.php b/resources/views/permission/index.blade.php new file mode 100644 index 0000000..6820480 --- /dev/null +++ b/resources/views/permission/index.blade.php @@ -0,0 +1,36 @@ +@extends('layouts.admin.master') +@section('title') +Administration +@endsection +@section('content') +
+
+

+ Permissions +

+
+

Create new Permission

+ + +

Current Administrators

+ + @foreach($permissions as $permission) +
{{$permission->permission_name }}
+ @endforeach + + No permission has been created, use the button above to create one + + +
+
+ + +
+ +@endsection \ No newline at end of file diff --git a/resources/views/profile/add.blade.php b/resources/views/profile/add.blade.php index 5ee9bd7..b3a3b6f 100644 --- a/resources/views/profile/add.blade.php +++ b/resources/views/profile/add.blade.php @@ -1,4 +1,4 @@ -@extends("layout.{{Auth::user()->user_type}}.master") +@extends('layouts.admin.master') @section('content') @@ -6,121 +6,121 @@
-
Register
+
Update your profile
-
+ + @if(!empty($errors)) + @foreach ($errors as $error) + {{$error}}
+ @endforeach + @endif + + {{Auth::user()->firstname}}, {{Auth::user()->lastname}} + {{Form::open(array('method'=>'POST','route' => 'profile.store', 'files' => true, 'class' => 'form-horizontal'))}} + +
+
- - @if ($errors->has('firstname')) - - {{ $errors->first('firstname') }} - - @endif -
-
- -
- -
- - @if ($errors->has('lastname')) - - {{ $errors->first('lastname') }} - - @endif -
-
- -
- + + @if(!empty($orgs)) + @foreach($orgs as $org) + + @endforeach + @else + + @endif + - @if ($errors->has('email')) - - {{ $errors->first('email') }} - + @if ($errors->has('org_id')) + + {{ $errors->first('org_id') }} + @endif -
-
- -
- -
- - - @if ($errors->has('phone_number')) - - {{ $errors->first('phone_number') }} - - @endif
-
- +
+
- + - @if ($errors->has('password')) - - {{ $errors->first('password') }} - + @if ($errors->has('designation')) + + {{ $errors->first('designation') }} + @endif
-
- - +
+
- + + @if ($errors->has('sex')) + + {{ $errors->first('sex') }} + @endif +
-
- - + +
+
- - - @if ($errors->has('phone_number')) - - {{ $errors->first('phone_number') }} - + + @if ($errors->has('photo')) + + {{ $errors->first('photo') }} + @endif +
+ + +
+ Permissions +
+ @foreach($permissions as $permission) +
+ +
+ @endforeach +
+
+
-
+
- + {{Form::close()}}
+ +
diff --git a/resources/views/profile/index.blade.php b/resources/views/profile/index.blade.php new file mode 100644 index 0000000..fa05a62 --- /dev/null +++ b/resources/views/profile/index.blade.php @@ -0,0 +1,179 @@ +@extends('layouts.admin.master') +@section('title') +Administration +@endsection + + + +@section('content') +
+
+

+ User Profile +

+
+
+
+
+
+   +
+ +
+

{{Auth::user()->firstname}} {{Auth::user()->lastname}}

+ +
+ + +
+

{{ $user->email}}

+

{{ $user->phone_number}}

+ +

{{ $user->profile->sex}}

+
+ +
 
+ +
+

{{ $user->profile->designation}} at:

+ @if(Auth::user()->user_type == 'admin') +

Hero Administration

+ @elseif(Auth::user()->user_type == 'organisation') +

{{$user->profile->organisation->name}}

+ @elseif(Auth::user()->user_type == 'client') + {{$user->profile->client->name}} + @elseif(Auth::user()->user_type == 'vendor') + {{$user->profile->vendor->name}} + @endif + +
 
+
+ +
+ + +
+ Permissions; +
    + @foreach($user->profile->permission as $permission) + +

    +
  1. {{$permission->permission_name}}
    2. +
      +
    • User Type => {{$permission->user_type}}
      • +
    • Permission Group => {{$permission->permission_group}}
      • +
    • Authentication Level => {{$permission->auth_level}}
      • +
    • Assigned at => {{$permission->pivot->created_at}}
      • +
    +

    + + @endforeach + + +
+ + + + +
+ +
+ +
+
+
 
+
+ + + +
+ + +
+
+ +
+ + +@endsection \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 8439db0..f059635 100644 --- a/routes/web.php +++ b/routes/web.php @@ -54,12 +54,17 @@ ]]); Route::resource('beneficiary', 'BeneficiaryController'); +Route::resource('permission', 'PermissionController'); + //Route::get('admin/create', 'AdminController@create'); //Route::post('admin/register', 'AdminController@post_register_admin'); //Route::get('auth/login', ['as' => 'login', 'uses'=> 'Auth\LoginController@getLogin']); //Route::post('auth/login', 'Auth\LoginController@postLogin'); //Route::get('auth/logout', ['as' => 'logout', 'uses'=> 'Auth\LoginController@getLogout']); - +Route::resource('profile', 'ProfileController'); +Route::post('profile', ['as' =>'profile.store', 'uses'=>'ProfileController@store']); Auth::routes(); Route::get('/home', 'HomeController@index'); +Route::get('profile/name/{userid}', ['as' =>'profile.edit.name', 'uses'=>'UserController@editName']); +Route::post('profile/photo/{profileid}', ['as' =>'profile.edit.photo', 'uses'=>'UserController@editPhoto']); \ No newline at end of file