Skip to content

Commit c32ab72

Browse files
committed
Refactored sass files to follow sass guidelines
1 parent 0a3e6a7 commit c32ab72

38 files changed

+413
-282
lines changed

.scss-lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
exclude: 'resources/assets/sass/vendor/**'
2+
exclude: 'resources/assets/sass/vendors/**'
33

44
linters:
55
ColorKeyword:

app/Http/Controllers/CoursesController.php

+5
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ public function store(Request $request)
4040

4141
}
4242

43+
public function update(Request $request, Course $course)
44+
{
45+
# code...
46+
}
47+
4348
public function destroy(Request $request, Course $course)
4449
{
4550
$course->delete();

app/Http/Controllers/LessonsController.php

+24-11
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
use App\Http\Requests;
88
use App\Lesson;
9+
use App\Course;
910

1011
class LessonsController extends Controller
1112
{
@@ -14,22 +15,34 @@ class LessonsController extends Controller
1415
'body' => 'required'
1516
];
1617

17-
public function create()
18+
public function create(Request $request)
1819
{
19-
return view('lessons.create');
20+
if (!$request->course_id) {
21+
flash('Course id not found. Please try again.');
22+
return back();
23+
}
24+
25+
return view('lessons.create', [
26+
'course_id' => $request->course_id
27+
]);
2028
}
2129

22-
public function store(Request $request, Course $course)
30+
public function store(Request $request)
2331
{
24-
$this->validate($request, $this->validationRules);
32+
if ($request->save) {
33+
$this->validate($request, $this->validationRules);
2534

26-
$lesson = new Lesson;
27-
$lesson->title = $request->title;
28-
$lesson->body = $request->body;
35+
$lesson = new Lesson;
36+
$lesson->title = $request->title;
37+
$lesson->body = $request->body;
2938

30-
$course->addLesson($lesson);
39+
$course = Course::findOrFail($request->course_id);
40+
$course->addLesson($lesson);
3141

32-
return back();
42+
flash('Lesson added');
43+
}
44+
45+
return redirect()->route('course', [$request->course_id]);
3346
}
3447

3548
/**
@@ -54,13 +67,13 @@ public function update(Request $request, Lesson $lesson)
5467
$lesson->save();
5568

5669
if ($request->ajax()) {
57-
return response()->json(['response' => 'Lesson Updated']);
70+
return response()->json(['response' => 'Lesson Updated']);
5871
}
5972

6073
return back();
6174
}
6275

63-
public function delete(Request $request, Lesson $lesson)
76+
public function destroy(Request $request, Lesson $lesson)
6477
{
6578
$lesson->delete();
6679

app/Http/routes.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,17 @@
2222
Route::get('/courses', 'CoursesController@index');
2323
Route::post('/courses', 'CoursesController@store');
2424
Route::get('/courses/{course}', ['as' => 'course', 'uses' => 'CoursesController@show']);
25+
Route::patch('/courses/{course}', 'CoursesController@update');
2526
Route::delete('/courses/{course}', 'CoursesController@destroy');
2627

2728
// Route::resource('courses', 'CoursesController', ['names' => [
2829
// 'show' => 'course'
2930
// ]]);
30-
Route::post('/lessons', 'LessonController@store');
31+
Route::post('/lessons', 'LessonsController@store');
3132
Route::get('/lessons/create', 'LessonsController@create');
3233
Route::get('/lessons/{lesson}', ['as' => 'lesson', 'uses' => 'LessonsController@show']);
3334
Route::patch('/lessons/{lesson}', 'LessonsController@update');
34-
Route::delete('/lessons/{lesson}', 'LessonsController@delete');
35+
Route::delete('/lessons/{lesson}', 'LessonsController@destroy');
3536

3637
Route::post('/lessons/{lesson}/files', 'LessonFilesController@store');
3738
// Route::resource('files', 'LessonFilesController', ['except' => [
@@ -44,4 +45,3 @@
4445

4546
// Medium editor image upload path
4647
Route::any('upload', 'LessonsController@upload');
47-

app/helpers.php

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?php
2+
3+
/**
4+
* Flashes a message to the alert status, with a default level of 'info'
5+
* @param string $message
6+
* @param string $level can be 'info', 'success', 'warning'
7+
*/
8+
function flash($message, $level = 'info')
9+
{
10+
session()->flash('flash_message', $message);
11+
session()->flash('flash_message_level', $level);
12+
}

composer.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@
2222
],
2323
"psr-4": {
2424
"App\\": "app/"
25-
}
25+
},
26+
"files": [
27+
"app/helpers.php"
28+
]
2629
},
2730
"autoload-dev": {
2831
"classmap": [

0 commit comments

Comments
 (0)