diff --git a/app/Http/Controllers/Backend/Courses/MaterialController.php b/app/Http/Controllers/Backend/Courses/MaterialController.php index 35ea06d..3f90b09 100644 --- a/app/Http/Controllers/Backend/Courses/MaterialController.php +++ b/app/Http/Controllers/Backend/Courses/MaterialController.php @@ -7,7 +7,7 @@ use Illuminate\Http\Request; use App\Http\Requests\Backend\Course\Materials\AddNewRequest; use App\Http\Requests\Backend\Course\Materials\UpdateRequest; -use App\Models\Course; +use App\Models\Lesson; use Exception; class MaterialController extends Controller @@ -26,8 +26,8 @@ public function index() */ public function create() { - $course = Course::get(); - return view('backend.course.material.create', compact('course')); + $lesson= Lesson::get(); + return view('backend.course.material.create', compact('lesson')); } /** @@ -75,9 +75,9 @@ public function show(Material $material) */ public function edit($id) { - $course = Course::get(); + $lesson= Course::get(); $material = Material::findOrFail(encryptor('decrypt', $id)); - return view('backend.course.material.edit', compact('course', 'material')); + return view('backend.course.material.edit', compact('lesson', 'material')); } /** diff --git a/app/Http/Controllers/LessonController.php b/app/Http/Controllers/LessonController.php index c81479d..12565bf 100644 --- a/app/Http/Controllers/LessonController.php +++ b/app/Http/Controllers/LessonController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\Models\Lesson; +use App\Models\Course; use App\Http\Controllers\Controller; use Illuminate\Http\Request; @@ -61,7 +62,7 @@ public function show(Lesson $lesson) /** * Show the form for editing the specified resource. */ - public function edit(Lesson $lesson) + public function edit($id) { $course = Course::get(); $lesson = Lesson::findOrFail(encryptor('decrypt', $id)); @@ -71,20 +72,13 @@ public function edit(Lesson $lesson) /** * Update the specified resource in storage. */ - public function update(Request $request, Lesson $lesson) + public function update(Request $request, $id) { try { $lesson = Lesson::findOrFail(encryptor('decrypt', $id)); $lesson->title = $request->lessonTitle; - $lesson->lesson_id = $request->lessonId; - $lesson->type = $request->materialType; - $lesson->content_url = $request->contentURL; + $lesson->course_id = $request->courseId; - if ($request->hasFile('content')) { - $contentName = rand(111, 999) . time() . '.' . $request->content->extension(); - $request->content->move(public_path('uploads/courses/contents'), $contentName); - $lesson->content = $contentName; - } if ($lesson->save()) { $this->notice::success('Data Saved'); return redirect()->route('lesson.index'); @@ -102,7 +96,7 @@ public function update(Request $request, Lesson $lesson) /** * Remove the specified resource from storage. */ - public function destroy(Lesson $lesson) + public function destroy($id) { $data = Lesson::findOrFail(encryptor('decrypt', $id)); if ($data->delete()) { diff --git a/resources/views/backend/course/lesson/create.blade.php b/resources/views/backend/course/lesson/create.blade.php index a3b8aed..ec9aaf9 100644 --- a/resources/views/backend/course/lesson/create.blade.php +++ b/resources/views/backend/course/lesson/create.blade.php @@ -1,5 +1,5 @@ @extends('backend.layouts.app') -@section('title', 'Add Course Material') +@section('title', 'Add Course Lesson') @push('styles') @@ -16,14 +16,14 @@
-

Add Course Material

+

Add Course Lesson

@@ -36,17 +36,17 @@
Basic Info
-
+ @csrf
- +
- @if($errors->has('materialTitle')) - {{ $errors->first('materialTitle') }} + @if($errors->has('lessonTitle')) + {{ $errors->first('lessonTitle') }} @endif
@@ -65,40 +65,9 @@ {{ $errors->first('courseId') }} @endif
-
-
- - -
-
-
-
- - -
-
-
-
- - -
- @if($errors->has('contentURL')) - {{ $errors->first('contentURL') }} - @endif -
- +
diff --git a/resources/views/backend/course/lesson/edit.blade.php b/resources/views/backend/course/lesson/edit.blade.php index 5a4bfe0..855c4e7 100644 --- a/resources/views/backend/course/lesson/edit.blade.php +++ b/resources/views/backend/course/lesson/edit.blade.php @@ -1,5 +1,5 @@ @extends('backend.layouts.app') -@section('title', 'Edit Course Material Material') +@section('title', 'Edit Course Lesson') @push('styles') @@ -16,14 +16,14 @@
-

Edit Course Material

+

Edit Course Lesson

@@ -35,20 +35,20 @@
Basic Info
-
@csrf @method('PATCH') - +
- +
- @if($errors->has('materialTitle')) - {{ $errors->first('materialTitle') }} + @if($errors->has('lessonTitle')) + {{ $errors->first('lessonTitle') }} @endif
@@ -56,11 +56,11 @@
@@ -68,44 +68,9 @@ {{ $errors->first('courseId') }} @endif
-
-
- - -
- @if($errors->has('materialType')) - {{ $errors->first('materialType') }} - @endif -
-
-
- - -
-
-
-
- - -
- @if($errors->has('contentURL')) - {{ $errors->first('contentURL') }} - @endif -
- +
diff --git a/resources/views/backend/course/lesson/index.blade.php b/resources/views/backend/course/lesson/index.blade.php index 5914420..0cf039d 100644 --- a/resources/views/backend/course/lesson/index.blade.php +++ b/resources/views/backend/course/lesson/index.blade.php @@ -1,5 +1,5 @@ @extends('backend.layouts.app') -@section('title', 'Course Material List') +@section('title', 'Course Lesson List') @push('styles') @@ -15,14 +15,14 @@
-

Course Material List

+

Course Lesson List

@@ -43,8 +43,8 @@ class="nav-link btn-primary">Grid
-

All Course Materials List

- + Add new +

All Course Lessons List

+ + Add new
@@ -54,37 +54,24 @@ class="nav-link btn-primary">Grid {{__('#')}} {{__('Title')}} {{__('Course')}} - {{__('Material Type')}} - {{__('Content')}} - {{__('Content Url')}} {{__('Action')}} - @forelse ($material as $m) + @forelse ($lesson as $l) - {{$m->id}} - {{$m->title}} - {{$m->course?->title_en}} + {{$l->id}} + {{$l->title}} + {{$l->course?->title_en}} - {{ $m->type == 'video' ? __('Video') : ($m->type == 'document' ? - __('Document') : __('Quiz')) }} - - - - - {{$m->content_url}} - - -
@csrf @method('DELETE') @@ -93,7 +80,7 @@ class="la la-trash-o"> @empty - No Course Material Found + No Course Lesson Found @endforelse diff --git a/resources/views/backend/layouts/app.blade.php b/resources/views/backend/layouts/app.blade.php index 76834af..e2afd09 100644 --- a/resources/views/backend/layouts/app.blade.php +++ b/resources/views/backend/layouts/app.blade.php @@ -227,9 +227,8 @@ class="las la-chalkboard-teacher">Instructors Category
  • All Courses
  • -
  • Course - Materials -
  • +
  • Lessons
  • +
  • Materials