diff --git a/app/Http/Controllers/LiveClassController.php b/app/Http/Controllers/LiveClassController.php index a684a0b..c8950d4 100644 --- a/app/Http/Controllers/LiveClassController.php +++ b/app/Http/Controllers/LiveClassController.php @@ -37,20 +37,21 @@ class LiveClassController extends Controller ]); $data['class_topic'] = $request->class_topic; + $data['link'] = $request->link; $data['course_id'] = $request->course_id; $data['user_id'] = $request->user_id; $data['provider'] = $request->provider; $data['class_date_and_time'] = date('Y-m-d\TH:i:s', strtotime($request->class_date_and_time)); $data['note'] = $request->note; - if ($request->provider == 'zoom') { - $meeting_info = $this->create_zoom_live_class($request->class_topic, $request->class_date_and_time); - $meeting_info_arr = json_decode($meeting_info, true); - if (array_key_exists('code', $meeting_info_arr) && $meeting_info_arr) { - return redirect(route('admin.course.edit', ['id' => $course_id, 'tab' => 'live-class']))->with('error', get_phrase($meeting_info_arr['message'])); - } - $data['additional_info'] = $meeting_info; - } + // if ($request->provider == 'zoom') { + // $meeting_info = $this->create_zoom_live_class($request->class_topic, $request->class_date_and_time); + // $meeting_info_arr = json_decode($meeting_info, true); + // if (array_key_exists('code', $meeting_info_arr) && $meeting_info_arr) { + // return redirect(route('admin.course.edit', ['id' => $course_id, 'tab' => 'live-class']))->with('error', get_phrase($meeting_info_arr['message'])); + // } + // $data['additional_info'] = $meeting_info; + // } Live_class::insert($data); return redirect(route('admin.course.edit', ['id' => $course_id, 'tab' => 'live-class']))->with('success', get_phrase('Live class added successfully')); @@ -67,17 +68,18 @@ class LiveClassController extends Controller ]); $data['class_topic'] = $request->class_topic; + $data['link'] = $request->link; $data['user_id'] = $request->user_id; $data['class_date_and_time'] = date('Y-m-d\TH:i:s', strtotime($request->class_date_and_time)); $data['note'] = $request->note; - if ($previous_meeting_data->provider == 'zoom') { - $previous_meeting_info = json_decode($previous_meeting_data->additional_info, true); - $this->update_zoom_live_class($request->class_topic, $request->class_date_and_time, $previous_meeting_info['id']); - $previous_meeting_info["start_time"] = date('Y-m-d\TH:i:s', strtotime($request->class_date_and_time)); - $previous_meeting_info["topic"] = $request->class_topic; - $data['additional_info'] = json_encode($previous_meeting_info); - } + // if ($previous_meeting_data->provider == 'zoom') { + // $previous_meeting_info = json_decode($previous_meeting_data->additional_info, true); + // $this->update_zoom_live_class($request->class_topic, $request->class_date_and_time, $previous_meeting_info['id']); + // $previous_meeting_info["start_time"] = date('Y-m-d\TH:i:s', strtotime($request->class_date_and_time)); + // $previous_meeting_info["topic"] = $request->class_topic; + // $data['additional_info'] = json_encode($previous_meeting_info); + // } Live_class::where('id', $id)->update($data); return redirect(route('admin.course.edit', ['id' => $previous_meeting_data->course_id, 'tab' => 'live-class']))->with('success', get_phrase('Live class updated successfully')); diff --git a/app/Http/Controllers/instructor/LiveClassController.php b/app/Http/Controllers/instructor/LiveClassController.php index a353065..766a85d 100644 --- a/app/Http/Controllers/instructor/LiveClassController.php +++ b/app/Http/Controllers/instructor/LiveClassController.php @@ -37,20 +37,21 @@ class LiveClassController extends Controller ]); $data['class_topic'] = $request->class_topic; + $data['link'] = $request->link; $data['course_id'] = $request->course_id; $data['user_id'] = $request->user_id; $data['provider'] = $request->provider; $data['class_date_and_time'] = date('Y-m-d\TH:i:s', strtotime($request->class_date_and_time)); $data['note'] = $request->note; - if ($request->provider == 'zoom') { - $meeting_info = $this->create_zoom_live_class($request->class_topic, $request->class_date_and_time); - $meeting_info_arr = json_decode($meeting_info, true); - if (array_key_exists('code', $meeting_info_arr) && $meeting_info_arr) { - return redirect(route('instructor.course.edit', ['id' => $course_id, 'tab' => 'live-class']))->with('error', get_phrase($meeting_info_arr['message'])); - } - $data['additional_info'] = $meeting_info; - } + // if ($request->provider == 'zoom') { + // $meeting_info = $this->create_zoom_live_class($request->class_topic, $request->class_date_and_time); + // $meeting_info_arr = json_decode($meeting_info, true); + // if (array_key_exists('code', $meeting_info_arr) && $meeting_info_arr) { + // return redirect(route('instructor.course.edit', ['id' => $course_id, 'tab' => 'live-class']))->with('error', get_phrase($meeting_info_arr['message'])); + // } + // $data['additional_info'] = $meeting_info; + // } Live_class::insert($data); return redirect(route('instructor.course.edit', ['id' => $course_id, 'tab' => 'live-class']))->with('success', get_phrase('Live class added successfully')); @@ -67,17 +68,18 @@ class LiveClassController extends Controller ]); $data['class_topic'] = $request->class_topic; + $data['link'] = $request->link; $data['user_id'] = $request->user_id; $data['class_date_and_time'] = date('Y-m-d\TH:i:s', strtotime($request->class_date_and_time)); $data['note'] = $request->note; - if ($previous_meeting_data->provider == 'zoom') { - $previous_meeting_info = json_decode($previous_meeting_data->additional_info, true); - $this->update_zoom_live_class($request->class_topic, $request->class_date_and_time, $previous_meeting_info['id']); - $previous_meeting_info["start_time"] = date('Y-m-d\TH:i:s', strtotime($request->class_date_and_time)); - $previous_meeting_info["topic"] = $request->class_topic; - $data['additional_info'] = json_encode($previous_meeting_info); - } + // if ($previous_meeting_data->provider == 'zoom') { + // $previous_meeting_info = json_decode($previous_meeting_data->additional_info, true); + // $this->update_zoom_live_class($request->class_topic, $request->class_date_and_time, $previous_meeting_info['id']); + // $previous_meeting_info["start_time"] = date('Y-m-d\TH:i:s', strtotime($request->class_date_and_time)); + // $previous_meeting_info["topic"] = $request->class_topic; + // $data['additional_info'] = json_encode($previous_meeting_info); + // } Live_class::where('id', $id)->update($data); return redirect(route('instructor.course.edit', ['id' => $previous_meeting_data->course_id, 'tab' => 'live-class']))->with('success', get_phrase('Live class updated successfully')); diff --git a/app/Notifications/CustomEmailVerificationNotification.php b/app/Notifications/CustomEmailVerificationNotification.php index 0754bf5..bd0a589 100644 --- a/app/Notifications/CustomEmailVerificationNotification.php +++ b/app/Notifications/CustomEmailVerificationNotification.php @@ -10,7 +10,7 @@ class CustomEmailVerificationNotification extends Notification { public function __construct() { - // + } public function via($notifiable) @@ -23,7 +23,7 @@ class CustomEmailVerificationNotification extends Notification $verificationUrl = $this->verificationUrl($notifiable); return (new MailMessage) - ->subject(get_phrase('Custom Email Verification Subject')) + ->subject(get_phrase('Email Verification Notification')) ->action('Verify Email Address', $verificationUrl); } diff --git a/resources/views/admin/blog/create.blade.php b/resources/views/admin/blog/create.blade.php index ca24718..fdd40d3 100644 --- a/resources/views/admin/blog/create.blade.php +++ b/resources/views/admin/blog/create.blade.php @@ -96,12 +96,12 @@
- +
- +
diff --git a/resources/views/admin/course/create_live_class.blade.php b/resources/views/admin/course/create_live_class.blade.php index 7162694..faa27be 100644 --- a/resources/views/admin/course/create_live_class.blade.php +++ b/resources/views/admin/course/create_live_class.blade.php @@ -16,6 +16,11 @@ +
+ + +
+
diff --git a/resources/views/admin/course/edit_live_class.blade.php b/resources/views/admin/course/edit_live_class.blade.php index 3eba2f6..69571c3 100644 --- a/resources/views/admin/course/edit_live_class.blade.php +++ b/resources/views/admin/course/edit_live_class.blade.php @@ -17,6 +17,11 @@
+
+ + +
+
diff --git a/resources/views/admin/course/live_class.blade.php b/resources/views/admin/course/live_class.blade.php index 32d0537..3a94d75 100644 --- a/resources/views/admin/course/live_class.blade.php +++ b/resources/views/admin/course/live_class.blade.php @@ -35,8 +35,8 @@

{{ date('d M Y - h:i A', strtotime($live_class->class_date_and_time)) }}

- + diff --git a/resources/views/course_player/live_class/index.blade.php b/resources/views/course_player/live_class/index.blade.php index 49607b0..5e27c13 100644 --- a/resources/views/course_player/live_class/index.blade.php +++ b/resources/views/course_player/live_class/index.blade.php @@ -22,10 +22,12 @@ {{ date('d M Y - h:i A', strtotime($live_class->class_date_and_time)) }} - + + + @endforeach diff --git a/resources/views/instructor/blog/create.blade.php b/resources/views/instructor/blog/create.blade.php index 3cd1d5b..ccb1b4e 100644 --- a/resources/views/instructor/blog/create.blade.php +++ b/resources/views/instructor/blog/create.blade.php @@ -100,14 +100,13 @@
- - -
- -
- +
+
+ + +
diff --git a/resources/views/instructor/blog/edit.blade.php b/resources/views/instructor/blog/edit.blade.php index 488798b..89bc76f 100644 --- a/resources/views/instructor/blog/edit.blade.php +++ b/resources/views/instructor/blog/edit.blade.php @@ -157,10 +157,10 @@ -
+
diff --git a/resources/views/instructor/course/create_live_class.blade.php b/resources/views/instructor/course/create_live_class.blade.php index 5d5f239..4380266 100644 --- a/resources/views/instructor/course/create_live_class.blade.php +++ b/resources/views/instructor/course/create_live_class.blade.php @@ -19,6 +19,11 @@
+
+ + +
+
diff --git a/resources/views/instructor/course/edit_live_class.blade.php b/resources/views/instructor/course/edit_live_class.blade.php index c02e8a9..af15bde 100644 --- a/resources/views/instructor/course/edit_live_class.blade.php +++ b/resources/views/instructor/course/edit_live_class.blade.php @@ -18,6 +18,11 @@
+
+ + +
+
diff --git a/resources/views/instructor/course/edit_seo.blade.php b/resources/views/instructor/course/edit_seo.blade.php index 146fc80..4b5c7a3 100644 --- a/resources/views/instructor/course/edit_seo.blade.php +++ b/resources/views/instructor/course/edit_seo.blade.php @@ -51,7 +51,7 @@
-
+ diff --git a/resources/views/instructor/course/live_class.blade.php b/resources/views/instructor/course/live_class.blade.php index 41d8c87..fbe77dc 100644 --- a/resources/views/instructor/course/live_class.blade.php +++ b/resources/views/instructor/course/live_class.blade.php @@ -22,7 +22,7 @@ {{ date('d M Y - h:i A', strtotime($live_class->class_date_and_time)) }} - + diff --git a/resources/views/instructor/navigation.blade.php b/resources/views/instructor/navigation.blade.php index 3af8b72..c762e0a 100644 --- a/resources/views/instructor/navigation.blade.php +++ b/resources/views/instructor/navigation.blade.php @@ -98,7 +98,7 @@ - - @endif