diff --git a/app/Http/Controllers/Backend/Setting/DashboardController.php b/app/Http/Controllers/Backend/Setting/DashboardController.php index 910deeb..61afc4e 100644 --- a/app/Http/Controllers/Backend/Setting/DashboardController.php +++ b/app/Http/Controllers/Backend/Setting/DashboardController.php @@ -13,7 +13,7 @@ public function index() $user = User::get(); if (fullAccess()) - return view('backend.adminDashboard'); + return view('backend.adminDashboard'); else if ($user->role = 'instructor') return view('backend.instructorDashboard'); diff --git a/app/Http/Controllers/Backend/Setting/PermissionController.php b/app/Http/Controllers/Backend/Setting/PermissionController.php index 8088924..5a275a4 100644 --- a/app/Http/Controllers/Backend/Setting/PermissionController.php +++ b/app/Http/Controllers/Backend/Setting/PermissionController.php @@ -38,8 +38,8 @@ public function store(Request $request) } public function save(SaveRequest $request, $role) - { - try { + { + try { // delete permission before saved Permission::where('role_id', encryptor('decrypt', $role))->delete(); foreach ($request->permission as $permission) { diff --git a/app/Http/Controllers/Backend/Setting/UserController.php b/app/Http/Controllers/Backend/Setting/UserController.php index d55da13..68415d2 100644 --- a/app/Http/Controllers/Backend/Setting/UserController.php +++ b/app/Http/Controllers/Backend/Setting/UserController.php @@ -122,7 +122,7 @@ public function update(UpdateRequest $request, $id) * Remove the specified resource from storage. */ public function destroy($id) - { + { $data = User::findOrFail(encryptor('decrypt', $id)); $image_path = public_path('uploads/users/') . $data->image; @@ -131,6 +131,6 @@ public function destroy($id) File::delete($image_path); return redirect()->back(); - } + } } } diff --git a/app/Http/Middleware/checkAuth.php b/app/Http/Middleware/checkAuth.php index 62016c2..e5d6689 100644 --- a/app/Http/Middleware/checkAuth.php +++ b/app/Http/Middleware/checkAuth.php @@ -22,7 +22,7 @@ public function handle(Request $request, Closure $next) } else { $user = User::where('status', 1)->where('id', currentUserId())->first(); if (!$user) - return redirect()->route('logOut'); + return redirect()->route('logOut'); else return $next($request); } diff --git a/app/Http/Requests/Backend/Permission/SaveRequest.php b/app/Http/Requests/Backend/Permission/SaveRequest.php index e5bec7c..a3e582a 100644 --- a/app/Http/Requests/Backend/Permission/SaveRequest.php +++ b/app/Http/Requests/Backend/Permission/SaveRequest.php @@ -22,7 +22,7 @@ public function authorize(): bool public function rules(): array { return [ - 'permission'=>'required' + 'permission'=>'required' ]; } } diff --git a/app/Http/Requests/Backend/User/AddNewRequest.php b/app/Http/Requests/Backend/User/AddNewRequest.php index 00d0e0b..3f632c7 100644 --- a/app/Http/Requests/Backend/User/AddNewRequest.php +++ b/app/Http/Requests/Backend/User/AddNewRequest.php @@ -13,7 +13,7 @@ public function authorize(): bool { return true; } - + /** * Get the validation rules that apply to the request. * diff --git a/app/Http/Requests/Backend/User/UpdateRequest.php b/app/Http/Requests/Backend/User/UpdateRequest.php index a3c6097..e08000b 100644 --- a/app/Http/Requests/Backend/User/UpdateRequest.php +++ b/app/Http/Requests/Backend/User/UpdateRequest.php @@ -14,7 +14,7 @@ public function authorize(): bool { return true; } - + /** * Get the validation rules that apply to the request. * @@ -23,7 +23,7 @@ public function authorize(): bool public function rules(Request $r): array { $id = encryptor('decrypt', $r->uptoken); - return [ + return [ 'userName_en' => 'required', 'contactNumber_en' => 'required|unique:users,contact_en,' . $id, 'emailAddress' => 'required|unique:users,email,' . $id, diff --git a/app/Models/Permission.php b/app/Models/Permission.php index 800839a..bac56e6 100644 --- a/app/Models/Permission.php +++ b/app/Models/Permission.php @@ -10,6 +10,6 @@ class Permission extends Model use HasFactory; public function role(){ - return $this->belongsToMany(Role::class,'role_permission'); + return $this->belongsToMany(Role::class,'role_permission'); } } diff --git a/database/migrations/2023_11_22_143059_create_permissions_table.php b/database/migrations/2023_11_22_143059_create_permissions_table.php index 763f422..8dd4f4d 100644 --- a/database/migrations/2023_11_22_143059_create_permissions_table.php +++ b/database/migrations/2023_11_22_143059_create_permissions_table.php @@ -16,7 +16,7 @@ public function up(): void $table->unsignedBigInteger('role_id')->index(); $table->foreign('role_id')->references('id')->on('roles')->onDelete('cascade'); $table->string('name'); - $table->timestamps(); + $table->timestamps(); }); } diff --git a/resources/views/backend/permission/index.blade.php b/resources/views/backend/permission/index.blade.php index 8fea0d5..8d624e6 100644 --- a/resources/views/backend/permission/index.blade.php +++ b/resources/views/backend/permission/index.blade.php @@ -38,7 +38,7 @@
  • All Permission
    • - +
    diff --git a/resources/views/backend/role/index.blade.php b/resources/views/backend/role/index.blade.php index 9d6a736..0e9c7b3 100644 --- a/resources/views/backend/role/index.blade.php +++ b/resources/views/backend/role/index.blade.php @@ -28,14 +28,6 @@
    -
    - -
    @@ -90,69 +82,6 @@ class="la la-trash-o">
    -
    -
    - @forelse ($data as $d) -
    -
    -
    -
    - -
    -
    - Edit - Delete -
    -
    -
    -
    -
    -
    -
    - -
    -

    {{$d->name_en}}

    -

    {{$d->role?->type}}

    -
      -
    • - #Sl.{{$d->id}} -
      • -
    • - Phone No. - :{{$d->contact_en}} -
      • -
    • - Email:{{$d->email}} -
      • -
    • - Created At. - :{{$d->created_at}} -
      • -
    - Read More -
    -
    -
    -
    - @empty -
    -
    -
    -
    -

    User Not Found

    -
    -
    -
    -
    - @endforelse -
    -
    diff --git a/resources/views/backend/user/index.blade.php b/resources/views/backend/user/index.blade.php index f5eefd0..afcb18f 100644 --- a/resources/views/backend/user/index.blade.php +++ b/resources/views/backend/user/index.blade.php @@ -86,7 +86,7 @@ class="la la-pencil"> title="Delete" onclick="$('#form{{$d->id}}').submit()">
    @csrf @method('DELETE') diff --git a/routes/web.php b/routes/web.php index ced57f5..22f86b7 100644 --- a/routes/web.php +++ b/routes/web.php @@ -57,7 +57,7 @@ }); Route::middleware(['checkrole'])->prefix('admin')->group(function () { - Route::resource('user', user::class); + Route::resource('user', user::class); Route::resource('role', role::class); Route::resource('student', student::class); Route::resource('instructor', instructor::class); @@ -72,7 +72,7 @@ Route::resource('question', question::class); Route::resource('option', option::class); Route::resource('answer', answer::class); - Route::resource('review', review::class); + Route::resource('review', review::class); Route::resource('discussion', discussion::class); Route::resource('message', message::class); Route::resource('coupon', coupon::class);