diff --git a/app/Http/Controllers/Students/DashboardController.php b/app/Http/Controllers/Students/DashboardController.php index 9472040..4d1eb1d 100644 --- a/app/Http/Controllers/Students/DashboardController.php +++ b/app/Http/Controllers/Students/DashboardController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\Students; use App\Http\Controllers\Controller; +use App\Models\Student; use App\Models\Enrollment; use App\Models\Course; use App\Models\Checkout; @@ -12,10 +13,11 @@ class DashboardController extends Controller { public function index() { + $student_info = Student::find(currentUserId()); $enrollment = Enrollment::get(); $course = Course::get(); $checkout = Checkout::get(); // $purchaseHistory = Enrollment::with(['course', 'checkout'])->orderBy('enrollment_date', 'desc')->get(); - return view('students.dashboard', compact('enrollment', 'course')); + return view('students.dashboard', compact('student_info','enrollment', 'course')); } } diff --git a/app/Http/Controllers/Students/ProfileController.php b/app/Http/Controllers/Students/ProfileController.php index 7697460..5ccf535 100644 --- a/app/Http/Controllers/Students/ProfileController.php +++ b/app/Http/Controllers/Students/ProfileController.php @@ -10,7 +10,7 @@ class ProfileController extends Controller { public function index() { - $student_info=Student::find(currentUserId()); + $student_info=Student::find(currentUserId()); return view('students.profile',compact('student_info')); } diff --git a/public/uploads/students/3061702363456.jpg b/public/uploads/students/3061702363456.jpg new file mode 100644 index 0000000..f808a9a Binary files /dev/null and b/public/uploads/students/3061702363456.jpg differ diff --git a/public/uploads/students/3531702363336.jpg b/public/uploads/students/3531702363336.jpg new file mode 100644 index 0000000..a45ae41 Binary files /dev/null and b/public/uploads/students/3531702363336.jpg differ diff --git a/public/uploads/students/5171702362351.png b/public/uploads/students/5171702362351.png new file mode 100644 index 0000000..d2029bf Binary files /dev/null and b/public/uploads/students/5171702362351.png differ diff --git a/resources/views/frontend/layouts/app.blade.php b/resources/views/frontend/layouts/app.blade.php index 324f2fa..54454a4 100644 --- a/resources/views/frontend/layouts/app.blade.php +++ b/resources/views/frontend/layouts/app.blade.php @@ -130,8 +130,8 @@ class="feather feather-search"> @if(request()->session()->get('studentLogin')) - Watch Course + Watch + Course
@@ -403,8 +396,8 @@ class="contentCard-user d-flex align-items-center">

Finish

- Watch Course + Watch + Course
@@ -435,8 +428,8 @@ class="contentCard-user d-flex align-items-center">

Finish

- Watch Course + Watch + Course
@@ -467,8 +460,8 @@ class="contentCard-user d-flex align-items-center">

Finish

- Watch Course + Watch + Course
@@ -534,7 +527,9 @@ class="purchase-area-items-start d-flex align-items-lg-center flex-column flex-l
{{$e->course?->title_en}}
-

By {{$e->course?->instructor?->name_en}}

+

By {{$e->course?->instructor?->name_en}} +

${{$e->course?->price}}

@@ -741,150 +736,8 @@ class="purchase-area-items-start mb-0 d-flex align-items-lg-center flex-column f

- - - {{-- Setting --}} - - + diff --git a/resources/views/students/profile.blade.php b/resources/views/students/profile.blade.php index 999630b..885074e 100644 --- a/resources/views/students/profile.blade.php +++ b/resources/views/students/profile.blade.php @@ -25,11 +25,11 @@
- Student + Student
{{$student_info->name_en}}
-

{{$student_info->profession}}

+

{{$student_info->profession?$student_info->profession:'Student'}}

@@ -81,29 +81,12 @@ data-bs-target="#nav-profile" type="button" role="tab" aria-controls="nav-profile" aria-selected="true">My Profile - - - - - - - - + + @@ -119,13 +102,13 @@
About Me

- {{$student_info->bio}} + {{$student_info->bio?$student_info->bio:"Student's Bio"}}

-
Philip Information
+
{{$student_info->name_en}}'s Information
Name @@ -147,7 +130,7 @@ What do you do
-

{{$student_info->profession}}

+

{{$student_info->profession?$student_info->profession:'Student'}}

@@ -155,7 +138,7 @@ Phone Number
-

{{$student_info->contact_en}}

+

{{$student_info->contact_en?$student_info->contact_en:'+880'}}

@@ -171,626 +154,6 @@
- {{-- All Courses --}} - - - {{-- Active Courses --}} - - - {{-- Completed Courses --}} - - - {{-- Purchase History --}} - - {{-- Setting --}}