diff --git a/app/Http/Controllers/Backend/Instructors/InstructorController.php b/app/Http/Controllers/Backend/Instructors/InstructorController.php index 227f5a6..2f487ba 100644 --- a/app/Http/Controllers/Backend/Instructors/InstructorController.php +++ b/app/Http/Controllers/Backend/Instructors/InstructorController.php @@ -70,11 +70,6 @@ public function store(AddNewRequest $request) $user->role_id = $request->roleId; $user->status = $request->status; $user->password = Hash::make($request->password); - // if ($request->hasFile('image')) { - // $imageName = rand(111, 999) . time() . '.' . $request->image->extension(); - // $request->image->move(public_path('uploads/users'), $imageName); - // $user->image = $imageName; - // } if ($user->save()) { DB::commit(); $this->notice::success('Successfully saved'); @@ -148,11 +143,6 @@ public function update(UpdateRequest $request, $id) $user->role_id = $request->roleId; $user->status = $request->status; $user->password = Hash::make($request->password); - if ($request->hasFile('image')) { - $imageName = rand(111, 999) . time() . '.' . $request->image->extension(); - $request->image->move(public_path('uploads/users'), $imageName); - $user->image = $imageName; - } if ($user->save()) { DB::commit(); $this->notice::success('Successfully saved'); diff --git a/app/Http/Controllers/Backend/Setting/DashboardController.php b/app/Http/Controllers/Backend/Setting/DashboardController.php index b42b841..d50fa30 100644 --- a/app/Http/Controllers/Backend/Setting/DashboardController.php +++ b/app/Http/Controllers/Backend/Setting/DashboardController.php @@ -10,13 +10,18 @@ class DashboardController extends Controller { public function index() { + $user = User::get(); + if (fullAccess()) return view('backend.adminDashboard'); + else + if ($user->role = 'instructor') + return view('backend.instructorDashboard'); else return view('backend.dashboard'); - // $user = User::get(); - // if($user->role = 'instructor') - // return view('backend.instructorDashboard'); + // $user = User::get(); + // if($user->role = 'instructor') + // return view('backend.instructorDashboard'); } } diff --git a/app/Http/Controllers/Students/ProfileController.php b/app/Http/Controllers/Students/ProfileController.php index d0fdf39..39361f0 100644 --- a/app/Http/Controllers/Students/ProfileController.php +++ b/app/Http/Controllers/Students/ProfileController.php @@ -5,6 +5,7 @@ use App\Http\Controllers\Controller; use Illuminate\Http\Request; use App\Models\Student; +use App\Models\Enrollment; use Illuminate\Support\Facades\Hash; class ProfileController extends Controller @@ -12,7 +13,8 @@ class ProfileController extends Controller public function index() { $student_info = Student::find(currentUserId()); - return view('students.profile', compact('student_info')); + $enrollment = Enrollment::where('student_id', currentUserId())->get(); + return view('students.profile', compact('student_info', 'enrollment')); } public function save_profile(Request $request) @@ -92,7 +94,7 @@ public function changeImage(Request $request) $user->image = $imageName; $user->save(); - return rredirect()->back()->with('success', 'Image changed successfully.'); + return redirect()->back()->with('success', 'Image changed successfully.'); } else { return redirect()->back()->with('error', 'Please select a valid image file.'); } diff --git a/public/frontend/dist/images/courses/1vthumb.jpg b/public/frontend/dist/images/courses/1vthumb.jpg new file mode 100644 index 0000000..479a28c Binary files /dev/null and b/public/frontend/dist/images/courses/1vthumb.jpg differ diff --git a/public/frontend/dist/images/courses/vthumb.jpg b/public/frontend/dist/images/courses/vthumb.jpg index 479a28c..ab23a00 100644 Binary files a/public/frontend/dist/images/courses/vthumb.jpg and b/public/frontend/dist/images/courses/vthumb.jpg differ diff --git a/public/uploads/courses/5951703912765.jpg b/public/uploads/courses/1401704126972.jpg similarity index 100% rename from public/uploads/courses/5951703912765.jpg rename to public/uploads/courses/1401704126972.jpg diff --git a/public/uploads/courses/9991703912786.jpg b/public/uploads/courses/4091704127086.jpg similarity index 100% rename from public/uploads/courses/9991703912786.jpg rename to public/uploads/courses/4091704127086.jpg diff --git a/public/uploads/courses/9871703912846.jpg b/public/uploads/courses/4341704127229.jpg similarity index 100% rename from public/uploads/courses/9871703912846.jpg rename to public/uploads/courses/4341704127229.jpg diff --git a/public/uploads/courses/3471703912830.jpg b/public/uploads/courses/6781704127193.jpg similarity index 100% rename from public/uploads/courses/3471703912830.jpg rename to public/uploads/courses/6781704127193.jpg diff --git a/public/uploads/courses/3931703912804.jpg b/public/uploads/courses/6891704127114.jpg similarity index 100% rename from public/uploads/courses/3931703912804.jpg rename to public/uploads/courses/6891704127114.jpg diff --git a/public/uploads/courses/thumbnails/2621703912786.jpg b/public/uploads/courses/thumbnails/3521704127086.jpg similarity index 100% rename from public/uploads/courses/thumbnails/2621703912786.jpg rename to public/uploads/courses/thumbnails/3521704127086.jpg diff --git a/public/uploads/courses/thumbnails/1241703912846.jpg b/public/uploads/courses/thumbnails/6681704127229.jpg similarity index 100% rename from public/uploads/courses/thumbnails/1241703912846.jpg rename to public/uploads/courses/thumbnails/6681704127229.jpg diff --git a/public/uploads/courses/thumbnails/2031703912830.jpg b/public/uploads/courses/thumbnails/7821704127193.jpg similarity index 100% rename from public/uploads/courses/thumbnails/2031703912830.jpg rename to public/uploads/courses/thumbnails/7821704127193.jpg diff --git a/public/uploads/courses/thumbnails/2541703912765.jpg b/public/uploads/courses/thumbnails/8191704126972.jpg similarity index 100% rename from public/uploads/courses/thumbnails/2541703912765.jpg rename to public/uploads/courses/thumbnails/8191704126972.jpg diff --git a/public/uploads/courses/thumbnails/2151703912804.jpg b/public/uploads/courses/thumbnails/8491704127114.jpg similarity index 100% rename from public/uploads/courses/thumbnails/2151703912804.jpg rename to public/uploads/courses/thumbnails/8491704127114.jpg diff --git a/public/uploads/students/2301704130710.jpg b/public/uploads/students/2301704130710.jpg new file mode 100644 index 0000000..bd96c13 Binary files /dev/null and b/public/uploads/students/2301704130710.jpg differ diff --git a/public/uploads/students/3291704130747.jpg b/public/uploads/students/3291704130747.jpg new file mode 100644 index 0000000..bd96c13 Binary files /dev/null and b/public/uploads/students/3291704130747.jpg differ diff --git a/resources/views/backend/instructorDashboard.blade.php b/resources/views/backend/instructorDashboard.blade.php index 2007f50..96a32ae 100644 --- a/resources/views/backend/instructorDashboard.blade.php +++ b/resources/views/backend/instructorDashboard.blade.php @@ -1,5 +1,5 @@ @extends('backend.layouts.appInstructor') -@section('title', 'Instructor Dashboard') +@section('title', 'Instructor Dashboard') @push('styles') diff --git a/resources/views/backend/layouts/appInstructor.blade.php b/resources/views/backend/layouts/appInstructor.blade.php index b4344f7..c51b90d 100644 --- a/resources/views/backend/layouts/appInstructor.blade.php +++ b/resources/views/backend/layouts/appInstructor.blade.php @@ -189,90 +189,25 @@ class="feather feather-log-out">
Completed Courses