Merge branch 'journal' into timetable

# Conflicts:
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/Auth/RegisterController.php
#	app/Http/Controllers/TimetableController.php
#	app/Models/SchoolClass.php
#	app/Models/User.php
#	composer.lock

app/Http/Requests/Auth/LoginRequest.php

@@ -14,6 +14,8 @@ class LoginRequest extends UserRequest
      */
     public function specific()
     {
-        return [];
+        return [
+            'remember_me' => 'integer'
+        ];
     }
 }

app/Http/Requests/JournalRequest.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class JournalRequest extends ApiFormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'student_id' => 'required|integer',
+            'teacher_id' => 'required|integer',
+            'subject_id' => 'required|integer',
+            'score' => 'required|integer',
+            'comment' => 'string|nullable',
+            'date' => 'integer',
+        ];
+    }
+}

app/Http/Requests/TaskRequest.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Requests;
+
+
+class TaskRequest extends ApiFormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'banktask_id' => 'required|exists:bank_tasks,id',
+            'deadline' => 'required'
+
+        ];
+    }
+}