From c9b4427d99c86321d77c7defd031b5a970be1d42 Mon Sep 17 00:00:00 2001
From: ashen-1-dev <alen2014@gmail.com>
Date: Tue, 15 Dec 2020 16:35:50 +0700
Subject: [PATCH 1/5] =?UTF-8?q?=D0=9D=D0=BE=D0=B2=D0=BE=D1=81=D1=82=D0=B8(?=
 =?UTF-8?q?CRUD=20+=20PhotoStorage)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/News/NewsController.php  | 56 +++++++++++++
 .../Controllers/News/NewsFileController.php   | 81 +++++++++++++++++++
 app/Models/News.php                           | 14 ++++
 app/Models/NewsFile.php                       | 12 +++
 .../2020_12_14_170701_create_news_table.php   | 37 +++++++++
 ...0_12_15_092036_create_news_files_table.php | 39 +++++++++
 routes/api.php                                | 10 +++
 7 files changed, 249 insertions(+)
 create mode 100644 app/Http/Controllers/News/NewsController.php
 create mode 100644 app/Http/Controllers/News/NewsFileController.php
 create mode 100644 app/Models/News.php
 create mode 100644 app/Models/NewsFile.php
 create mode 100644 database/migrations/2020_12_14_170701_create_news_table.php
 create mode 100644 database/migrations/2020_12_15_092036_create_news_files_table.php

diff --git a/app/Http/Controllers/News/NewsController.php b/app/Http/Controllers/News/NewsController.php
new file mode 100644
index 0000000..c8e419c
--- /dev/null
+++ b/app/Http/Controllers/News/NewsController.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Http\Controllers\News;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use App\Models\News;
+
+class NewsController extends Controller
+{
+    public function index(Request $request) {
+        $count = 5;
+        $news = new News;
+        if ($request->has('count')) {
+            $temp = (int)$request->count;
+            if ($temp>0 && $temp<= 100) {
+                $count = $temp;
+            }
+        }
+
+        return response()->json($news->orderByDesc('created_at')->paginate($count), 200);
+
+    }
+
+    public function store(Request $request) {
+        // Добавить проверку, после добавление авторизации
+        $request->validate([
+            'title' => 'required|min:5',
+            'description' => 'required',
+                           ]);
+        $news = News::create($request->all());
+
+        return response()->json($news, 201);
+    }
+
+    public function show(News $news) {
+
+        return response()->json($news, 200);
+    }
+
+    public function edit(News $news, Request $request) {
+        $request->validate([
+            'title' => 'required|min:5',
+            'description' => 'required'
+                           ]);
+        $news->update($request->all());
+
+        return response()->json($news, 200);
+
+    }
+
+    public function delete(News $news) {
+        $news->delete();
+
+        return response()->json(true, 204);
+    }
+}
diff --git a/app/Http/Controllers/News/NewsFileController.php b/app/Http/Controllers/News/NewsFileController.php
new file mode 100644
index 0000000..299545e
--- /dev/null
+++ b/app/Http/Controllers/News/NewsFileController.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Http\Controllers\News;
+
+use App\Models\NewsFile;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Storage;
+use App\Models\News;
+
+
+class NewsFileController extends Controller
+
+{
+    private $image_ext = ['jpg', 'jpeg', 'png', 'gif'];
+    private $file_ext = ['doc', 'docx', 'pdf', 'odt', 'mp3', 'ogg', 'mpga', 'mp4', 'mpeg', 'ppt', 'pptx'];
+
+    public function store(News $news, Request $request)
+    {
+        $newsId = $news->id;
+        $max_size = (int)ini_get('upload_max_filesize') * 1000;
+        $all_ext = implode(',', $this->allExtensions());
+
+        $this->validate($request, [
+            'name' => 'required',
+            'file' => 'required|file|mimes:' . $all_ext . '|max:' . $max_size
+        ]);
+
+        $file = $request->file('file');
+        $ext = $file->getClientOriginalExtension();
+        $type = $this->getType($ext);
+
+        if (Storage::putFileAs('public/news/' . $newsId . '/' . $type . '/', $file, $request->name)) {
+            NewsFile::create([
+                                     'name' => $request->name,
+                                     'type' => $type,
+                                     'extension' => $ext,
+                                     'news_id' => $newsId,
+                                      $file,
+                                      $request->name . $ext
+                                 ]);
+            $news->photo_uri = '/storage/news' . '/' . $newsId . '/' . $type . '/' . $request->name;
+            return true;
+        }
+        return false;
+    }
+
+
+
+
+
+    public function delete(NewsFile $file) {
+
+        if (Storage::disk('local')->exists('/public/news/' . $file->news_id . '/' . $file->type . '/' . $file->name )) {
+            if (Storage::disk('local')->delete('/public/news/' . $file->news_id . '/' . $file->type . '/' . $file->name)) {
+                return response()->json($file->delete(), 204);
+            }
+        }
+        return response()->json(['News not found'], 404);
+    }
+
+
+    private function getType($ext)
+    {
+        if (in_array(strtolower($ext), $this->image_ext)) {
+            return 'image';
+        }
+
+        if (in_array(strtolower($ext), $this->file_ext)) {
+            return 'file';
+        }
+    }
+
+    private function allExtensions()
+    {
+        return array_merge($this->image_ext, $this->file_ext);
+    }
+
+
+
+}
diff --git a/app/Models/News.php b/app/Models/News.php
new file mode 100644
index 0000000..c37f70b
--- /dev/null
+++ b/app/Models/News.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class News extends Model
+{
+    use HasFactory;
+    protected $fillable = ['title', 'description', 'headteacher_id']; // убрать headteacher_id после добавления авторизации
+
+}
+
diff --git a/app/Models/NewsFile.php b/app/Models/NewsFile.php
new file mode 100644
index 0000000..955b9de
--- /dev/null
+++ b/app/Models/NewsFile.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class NewsFile extends Model
+{
+    use HasFactory;
+    protected $table = 'news_files';
+}
diff --git a/database/migrations/2020_12_14_170701_create_news_table.php b/database/migrations/2020_12_14_170701_create_news_table.php
new file mode 100644
index 0000000..69457cb
--- /dev/null
+++ b/database/migrations/2020_12_14_170701_create_news_table.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateNewsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('news', function (Blueprint $table) {
+            $table->id();
+            $table->string('title');
+            $table->text('description');
+            $table->string('photo_uri')->nullable();
+            $table->unsignedInteger('headteacher_id');
+
+            $table->foreign('headteacher_id')->references('id')->on('head_teachers');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('news');
+    }
+}
diff --git a/database/migrations/2020_12_15_092036_create_news_files_table.php b/database/migrations/2020_12_15_092036_create_news_files_table.php
new file mode 100644
index 0000000..faf08a0
--- /dev/null
+++ b/database/migrations/2020_12_15_092036_create_news_files_table.php
@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateNewsFilesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('news_files', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('name');
+            $table->string('type');
+            $table->string('extension');
+            $table->timestamps();
+            $table->unsignedInteger('news_id');
+            $table->foreign('news_id')
+                ->references('id')->on('news')
+                ->onDelete('no action');
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('news');
+    }
+}
diff --git a/routes/api.php b/routes/api.php
index 94e2235..4f6a33d 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -42,3 +42,13 @@ Route::group(['prefix' => 'banktask'], function () {
 Route::get('/file/{file}/download', 'BankTaskFileController@download');
 Route::delete('/file/{file}/delete', 'BankTaskFileController@delete');
 Route::put('/file/{file}/update', 'BankTaskFileController@update');
+
+Route::group(['prefix' => 'news'], function () {
+   Route::post('', 'News\NewsController@store');
+   Route::get('', 'News\NewsController@index');
+   Route::get('/{news}', 'News\NewsController@show');
+   Route::put('/{news}', 'News\NewsController@edit');
+   Route::delete('/{news}', 'News\NewsController@delete');
+   Route::post('/{news}/addphoto', 'News\NewsFileController@store');
+   Route::delete('/{file}', 'News\NewsFileController@delete');
+});
\ No newline at end of file

From 459fd1c37d45f6c7b7aa78ff6eec787b20835021 Mon Sep 17 00:00:00 2001
From: ashen-1-dev <alen2014@gmail.com>
Date: Tue, 15 Dec 2020 19:46:13 +0700
Subject: [PATCH 2/5] =?UTF-8?q?=D0=9D=D0=BE=D0=B2=D0=BE=D1=81=D1=82=D0=B8(?=
 =?UTF-8?q?CRUD=20+=20PhotoStorage)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/News/NewsController.php                | 6 +++++-
 app/Http/Controllers/News/NewsFileController.php            | 3 ++-
 app/Models/BankTaskFile.php                                 | 2 +-
 app/Models/NewsFile.php                                     | 1 +
 app/Providers/RouteServiceProvider.php                      | 2 +-
 .../2020_12_03_104028_create_bank_task_files_table.php      | 6 +++---
 .../2020_12_15_092036_create_news_files_table.php           | 2 +-
 routes/api.php                                              | 2 +-
 8 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/News/NewsController.php b/app/Http/Controllers/News/NewsController.php
index c8e419c..61b9583 100644
--- a/app/Http/Controllers/News/NewsController.php
+++ b/app/Http/Controllers/News/NewsController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\News;
 use App\Http\Controllers\Controller;
+use App\Models\NewsFile;
 use Illuminate\Http\Request;
 use App\Models\News;
 
@@ -34,7 +35,10 @@ class NewsController extends Controller
 
     public function show(News $news) {
 
-        return response()->json($news, 200);
+        return response()->json([
+            $news,
+            'photo_id' => NewsFile::where('news_id', '=', $news->id)->get(['id'])
+                                    ], 200);
     }
 
     public function edit(News $news, Request $request) {
diff --git a/app/Http/Controllers/News/NewsFileController.php b/app/Http/Controllers/News/NewsFileController.php
index 299545e..1ba8439 100644
--- a/app/Http/Controllers/News/NewsFileController.php
+++ b/app/Http/Controllers/News/NewsFileController.php
@@ -40,6 +40,7 @@ class NewsFileController extends Controller
                                       $request->name . $ext
                                  ]);
             $news->photo_uri = '/storage/news' . '/' . $newsId . '/' . $type . '/' . $request->name;
+            $news->save();
             return true;
         }
         return false;
@@ -51,7 +52,7 @@ class NewsFileController extends Controller
 
     public function delete(NewsFile $file) {
 
-        if (Storage::disk('local')->exists('/public/news/' . $file->news_id . '/' . $file->type . '/' . $file->name )) {
+        if (Storage::disk('local')->exists('/public/news/' . $file->news_id . '/' . $file->type . '/' . $file->name)) {
             if (Storage::disk('local')->delete('/public/news/' . $file->news_id . '/' . $file->type . '/' . $file->name)) {
                 return response()->json($file->delete(), 204);
             }
diff --git a/app/Models/BankTaskFile.php b/app/Models/BankTaskFile.php
index 7e47209..78f5a3b 100644
--- a/app/Models/BankTaskFile.php
+++ b/app/Models/BankTaskFile.php
@@ -8,6 +8,6 @@ use Illuminate\Database\Eloquent\Model;
 class BankTaskFile extends Model
 {
     use HasFactory;
-    protected $table = 'bank_tasks_files';
+    protected $table = 'bank_task_files';
     protected $fillable = ['name', 'type', 'extension', 'url', 'banktask_id'];
 }
diff --git a/app/Models/NewsFile.php b/app/Models/NewsFile.php
index 955b9de..30c6d14 100644
--- a/app/Models/NewsFile.php
+++ b/app/Models/NewsFile.php
@@ -9,4 +9,5 @@ class NewsFile extends Model
 {
     use HasFactory;
     protected $table = 'news_files';
+    protected $fillable = ['name', 'type', 'extension', 'url', 'news_id'];
 }
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 4283423..a77527c 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -57,7 +57,7 @@ class RouteServiceProvider extends ServiceProvider
     protected function configureRateLimiting()
     {
         RateLimiter::for('api', function (Request $request) {
-            return Limit::perMinute(60)->by(optional($request->user())->id ?: $request->ip());
+            return Limit::perMinute(100)->by(optional($request->user())->id ?: $request->ip());
         });
     }
 }
diff --git a/database/migrations/2020_12_03_104028_create_bank_task_files_table.php b/database/migrations/2020_12_03_104028_create_bank_task_files_table.php
index a87b324..82b8c38 100644
--- a/database/migrations/2020_12_03_104028_create_bank_task_files_table.php
+++ b/database/migrations/2020_12_03_104028_create_bank_task_files_table.php
@@ -13,7 +13,7 @@ class CreateBankTaskFilesTable extends Migration
      */
     public function up()
     {
-        Schema::create('bank_tasks_files', function (Blueprint $table) {
+        Schema::create('bank_task_files', function (Blueprint $table) {
             $table->bigIncrements('id');
             $table->string('name');
             $table->string('type');
@@ -23,7 +23,7 @@ class CreateBankTaskFilesTable extends Migration
             $table->unsignedInteger('banktask_id');
             $table->foreign('banktask_id')
                 ->references('id')->on('bank_tasks')
-                ->onDelete('no action');
+                ->onDelete('cascade');
 
         });
     }
@@ -35,6 +35,6 @@ class CreateBankTaskFilesTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('bank_tasks_files');
+        Schema::dropIfExists('bank_task_files');
     }
 }
diff --git a/database/migrations/2020_12_15_092036_create_news_files_table.php b/database/migrations/2020_12_15_092036_create_news_files_table.php
index faf08a0..0b2e63d 100644
--- a/database/migrations/2020_12_15_092036_create_news_files_table.php
+++ b/database/migrations/2020_12_15_092036_create_news_files_table.php
@@ -22,7 +22,7 @@ class CreateNewsFilesTable extends Migration
             $table->unsignedInteger('news_id');
             $table->foreign('news_id')
                 ->references('id')->on('news')
-                ->onDelete('no action');
+                ->onDelete('cascade');
 
         });
     }
diff --git a/routes/api.php b/routes/api.php
index 4f6a33d..cd965d1 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -50,5 +50,5 @@ Route::group(['prefix' => 'news'], function () {
    Route::put('/{news}', 'News\NewsController@edit');
    Route::delete('/{news}', 'News\NewsController@delete');
    Route::post('/{news}/addphoto', 'News\NewsFileController@store');
-   Route::delete('/{file}', 'News\NewsFileController@delete');
+   Route::delete('/photo/{file}', 'News\NewsFileController@delete');
 });
\ No newline at end of file

From be8af67c6181d3f45cfcca05dd817dc8af360773 Mon Sep 17 00:00:00 2001
From: Robonen Andrew <robonenandrew@gmail.com>
Date: Wed, 16 Dec 2020 05:22:28 +0700
Subject: [PATCH 3/5] =?UTF-8?q?=D0=9C=D0=BE=D0=B4=D1=83=D0=BB=D1=8C=20?=
 =?UTF-8?q?=D0=B6=D1=83=D1=80=D0=BD=D0=B0=D0=BB=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Filters/JournalFilter.php                 |  38 ++
 app/Http/Controllers/Auth/LoginController.php |   9 +-
 .../Controllers/Auth/RegisterController.php   |   2 +-
 app/Http/Controllers/JournalController.php    | 111 ++++
 .../Controllers/SchoolClassController.php     |  19 +-
 app/Http/Requests/Auth/LoginRequest.php       |   4 +-
 app/Http/Requests/JournalRequest.php          |  25 +
 app/Models/HeadTeacher.php                    |   2 +-
 app/Models/Journal.php                        |  22 +
 app/Models/Parentt.php                        |   2 +-
 app/Models/SchoolClass.php                    |   1 -
 app/Models/Student.php                        |  12 +-
 app/Models/Teacher.php                        |   2 +-
 app/Models/User.php                           |  15 +-
 app/Providers/AuthServiceProvider.php         |   2 +-
 app/Providers/RouteServiceProvider.php        |   2 +-
 composer.json                                 |   1 +
 composer.lock                                 | 569 +++++++++++++++++-
 ...020_12_13_200032_create_journals_table.php |  47 ++
 routes/api.php                                |   3 +
 routes/web.php                                |   2 +
 21 files changed, 868 insertions(+), 22 deletions(-)
 create mode 100644 app/Filters/JournalFilter.php
 create mode 100644 app/Http/Controllers/JournalController.php
 create mode 100644 app/Http/Requests/JournalRequest.php
 create mode 100644 app/Models/Journal.php
 create mode 100644 database/migrations/2020_12_13_200032_create_journals_table.php

diff --git a/app/Filters/JournalFilter.php b/app/Filters/JournalFilter.php
new file mode 100644
index 0000000..07413e7
--- /dev/null
+++ b/app/Filters/JournalFilter.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Filters;
+
+
+use Carbon\Carbon;
+
+class JournalFilter extends QueryFilter
+{
+
+    protected function student($value)
+    {
+        $this->builder = $this->builder->where('student_id', $value);
+    }
+
+    protected function teacher($value)
+    {
+        $this->builder = $this->builder->where('teacher_id', $value);
+    }
+
+    protected function subject($value)
+    {
+        $this->builder = $this->builder->where('subject_id', $value);
+    }
+
+    protected function date($value)
+    {
+        $value = Carbon::createFromTimestamp($value/1000)->floorDays();
+        $this->builder = $this->builder->where('updated_at', $value);
+    }
+
+    protected function last($value)
+    {
+        $date = Carbon::now()->subDays($value);
+        $this->builder = $this->builder->where('updated_at', '>=', $date);
+    }
+
+}
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 4567da3..f74163e 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Auth\LoginRequest;
+use Carbon\Carbon;
 
 class LoginController extends Controller
 {
@@ -11,10 +12,14 @@ class LoginController extends Controller
     {
         $credentials = $request->only('login', 'password');
 
-        if (auth()->attempt($credentials))
+        if (!auth()->attempt($credentials))
             return response()->json('You cannot sign with those credentials!', 401);
 
-        $token = auth()->user()->makeToken($request->get('remember_me'));
+        $remember = (bool)$request->get('remember_me');
+        $token = auth()->user()->createToken(config('app.name'));
+
+        $token->token->expires_at = $remember ? Carbon::now()->addMonth() : Carbon::now()->addDay();
+        $token->token->save();
 
         return response()->json([
             'token_type' => 'Bearer',
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 732a46c..3db652c 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -18,7 +18,7 @@ class RegisterController extends Controller
     {
         $role = Role::where('name', $request->get('role'));
 
-        if ($role->isEmpty())
+        if ($role->get()->isEmpty())
             return response()->json('Role not found', 404);
 
         $user = User::create(array_merge(
diff --git a/app/Http/Controllers/JournalController.php b/app/Http/Controllers/JournalController.php
new file mode 100644
index 0000000..25f9bc4
--- /dev/null
+++ b/app/Http/Controllers/JournalController.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Filters\JournalFilter;
+use App\Http\Requests\JournalRequest;
+use App\Models\Journal;
+use Carbon\Carbon;
+use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Response;
+
+class JournalController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function index(Request $request)
+    {
+        $journal = (new JournalFilter(Journal::all(), $request))->apply()->values();
+        return response()->json($journal, 200);
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return Response
+     */
+//    public function create()
+//    {
+//        //
+//    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param JournalRequest $request
+     * @return JsonResponse
+     */
+    public function store(JournalRequest $request)
+    {
+        if ($request->has('date'))
+            $date = Carbon::createFromTimestamp($request->get('date')/1000)->floorDays();
+        else
+            $date = Carbon::now()->floorDays();
+
+
+        $exist = Journal::where('updated_at', $date)
+            ->where('student_id', $request->get('student_id'))
+            ->where('subject_id', $request->get('subject_id'))
+            ->get();
+
+        if ($exist->isNotEmpty())
+            return response()->json('Оценка на эту дату уже выставлена', 200);
+
+        $data = array_merge(['updated_at' => $date], $request->all());
+
+        $journal = Journal::create($data);
+        return response()->json(['id' => $journal->id], 200);
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param int $journal
+     * @return JsonResponse
+     */
+    public function show(int $journal)
+    {
+        return response()->json(Journal::find($journal), 200);
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param Journal $journal
+     * @return Response
+     */
+//    public function edit(Journal $journal)
+//    {
+//        //
+//    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param JournalRequest $request
+     * @param Journal $journal
+     * @return JsonResponse
+     */
+    public function update(JournalRequest $request, Journal $journal)
+    {
+        $journal->update($request->all());
+        return response()->json(['id' => $journal->id], 200);
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param Journal $journal
+     * @return JsonResponse
+     */
+    public function destroy(Journal $journal)
+    {
+        $journal->delete();
+        return response()->json(null, 200);
+    }
+}
diff --git a/app/Http/Controllers/SchoolClassController.php b/app/Http/Controllers/SchoolClassController.php
index 574eadc..5940e90 100644
--- a/app/Http/Controllers/SchoolClassController.php
+++ b/app/Http/Controllers/SchoolClassController.php
@@ -2,9 +2,11 @@
 
 namespace App\Http\Controllers;
 
+use App\Filters\JournalFilter;
 use App\Http\Requests\SchoolClassRequest;
 use App\Models\SchoolClass;
 use App\Models\Teacher;
+use Carbon\Carbon;
 use Illuminate\Database\QueryException;
 use Illuminate\Http\Request;
 
@@ -65,11 +67,26 @@ class SchoolClassController extends Controller
         $students = $class->students;
         $studentsOnlyFIO = [];
         foreach ($students as $student) {
-             array_push($studentsOnlyFIO, $student->only('id', 'name', 'surname', 'patronymic'));
+            array_push($studentsOnlyFIO, $student->only('id', 'name', 'surname', 'patronymic'));
         }
         return response()->json($studentsOnlyFIO, 200);
     }
 
+    public function getStudentsJournal(SchoolClass $class, Request $request)
+    {
+        $students = $class->students;
+        $allStudents = [];
+
+        foreach ($students as $student)
+        {
+            $cpys = clone $student;
+            $cpys->scores = (new JournalFilter($student->scores, $request))->apply()->values();
+            $allStudents[] = $cpys;
+        }
+
+        return response()->json($allStudents, 200);
+    }
+
     //получение всех предметов для класса
     public function getSubjects(SchoolClass $class)
     {
diff --git a/app/Http/Requests/Auth/LoginRequest.php b/app/Http/Requests/Auth/LoginRequest.php
index 5103286..78aa16e 100644
--- a/app/Http/Requests/Auth/LoginRequest.php
+++ b/app/Http/Requests/Auth/LoginRequest.php
@@ -14,6 +14,8 @@ class LoginRequest extends UserRequest
      */
     public function specific()
     {
-        return [];
+        return [
+            'remember_me' => 'integer'
+        ];
     }
 }
diff --git a/app/Http/Requests/JournalRequest.php b/app/Http/Requests/JournalRequest.php
new file mode 100644
index 0000000..bfc95f3
--- /dev/null
+++ b/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',
+            'date' => 'integer',
+        ];
+    }
+}
diff --git a/app/Models/HeadTeacher.php b/app/Models/HeadTeacher.php
index 013c51b..67d09ba 100644
--- a/app/Models/HeadTeacher.php
+++ b/app/Models/HeadTeacher.php
@@ -9,7 +9,7 @@ class HeadTeacher extends Model
 {
     use HasFactory;
 
-    protected $guarded = [
+    protected $fillable = [
         'user_id',
     ];
 
diff --git a/app/Models/Journal.php b/app/Models/Journal.php
new file mode 100644
index 0000000..66258c0
--- /dev/null
+++ b/app/Models/Journal.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Models;
+
+use App\Filters\QueryFilter;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Journal extends Model
+{
+    use HasFactory;
+
+    protected $fillable = [
+        'teacher_id',
+        'student_id',
+        'subject_id',
+        'score',
+        'comment',
+        'updated_at',
+    ];
+}
diff --git a/app/Models/Parentt.php b/app/Models/Parentt.php
index d195e82..09bda0b 100644
--- a/app/Models/Parentt.php
+++ b/app/Models/Parentt.php
@@ -10,7 +10,7 @@ class Parentt extends Model
 {
     use HasFactory;
 
-    protected $guarded = [
+    protected $fillable = [
         'user_id',
     ];
 
diff --git a/app/Models/SchoolClass.php b/app/Models/SchoolClass.php
index 4944ec6..04c91bd 100644
--- a/app/Models/SchoolClass.php
+++ b/app/Models/SchoolClass.php
@@ -25,5 +25,4 @@ class SchoolClass extends Model
         return $this->belongsToMany(Subject::class, 'academic_plans', 'class_id')
             ->withPivot('hours_per_week', 'hours_per_year');
     }
-
 }
diff --git a/app/Models/Student.php b/app/Models/Student.php
index c17be35..e774c79 100644
--- a/app/Models/Student.php
+++ b/app/Models/Student.php
@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Validator;
@@ -10,14 +11,21 @@ class Student extends Model
 {
     use HasFactory;
 
-    protected $guarded = [
+    protected $fillable = [
         'user_id',
+    ];
+
+    protected $guarded = [
         'updated_at',
     ];
 
     public function schoolClass()
     {
-        return $this->belongsTo(SchoolClass::class, 'class_id');
+        return $this->belongsTo(SchoolClass::class, 'class_id')->where('');
+    }
+    public function scores()
+    {
+        return $this->hasMany(Journal::class, 'student_id');
     }
 
 }
diff --git a/app/Models/Teacher.php b/app/Models/Teacher.php
index e04358f..adf2c42 100644
--- a/app/Models/Teacher.php
+++ b/app/Models/Teacher.php
@@ -10,7 +10,7 @@ class Teacher extends Model
 {
     use HasFactory;
 
-    protected $guarded = [
+    protected $fillable = [
         'user_id',
     ];
 
diff --git a/app/Models/User.php b/app/Models/User.php
index cb3c6d9..62d5606 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -5,7 +5,6 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
-use Carbon\Carbon;
 
 class User extends Authenticatable
 {
@@ -58,11 +57,11 @@ class User extends Authenticatable
         return $this->hasOne(HeadTeacher::class);
     }
 
-    public function makeToken(bool $remember)
-    {
-        $token = $this->createToken(config('app.name'));
-        $token->token->expires_at = $remember ? Carbon::now()->addMonth() : Carbon::now()->addDay();
-        $token->token->save();
-        return $token;
-    }
+//    public function makeToken(bool $remember)
+//    {
+//        $token = $this->createToken(config('app.name'));
+//        $token->token->expires_at = $remember ? Carbon::now()->addMonth() : Carbon::now()->addDay();
+//        $token->token->save();
+//        return $token;
+//    }
 }
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index f31a7fb..8952634 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -26,6 +26,6 @@ class AuthServiceProvider extends ServiceProvider
     {
         $this->registerPolicies();
 
-        Passport::routes();
+//        Passport::routes();
     }
 }
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 4283423..927be5d 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -38,7 +38,7 @@ class RouteServiceProvider extends ServiceProvider
         $this->configureRateLimiting();
 
         $this->routes(function () {
-            Route::prefix('/api')
+            Route::prefix('api')
                 ->middleware('api')
                 ->namespace($this->namespace)
                 ->group(base_path('routes/api.php'));
diff --git a/composer.json b/composer.json
index 9e62841..b25eb7a 100644
--- a/composer.json
+++ b/composer.json
@@ -9,6 +9,7 @@
     "license": "MIT",
     "require": {
         "php": "^7.3|^8.0",
+        "cboden/ratchet": "^0.4.3",
         "fideloper/proxy": "^4.4",
         "fruitcake/laravel-cors": "^2.0",
         "guzzlehttp/guzzle": "^7.0.1",
diff --git a/composer.lock b/composer.lock
index f88e116..5f6811a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d29a824fe1ba5e1a371425931ce19f0b",
+    "content-hash": "b864dde6a95522044afee456c400fb07",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -110,6 +110,63 @@
             ],
             "time": "2020-08-18T23:57:15+00:00"
         },
+        {
+            "name": "cboden/ratchet",
+            "version": "v0.4.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ratchetphp/Ratchet.git",
+                "reference": "466a0ecc83209c75b76645eb823401b5c52e5f21"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ratchetphp/Ratchet/zipball/466a0ecc83209c75b76645eb823401b5c52e5f21",
+                "reference": "466a0ecc83209c75b76645eb823401b5c52e5f21",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/psr7": "^1.0",
+                "php": ">=5.4.2",
+                "ratchet/rfc6455": "^0.3",
+                "react/socket": "^1.0 || ^0.8 || ^0.7 || ^0.6 || ^0.5",
+                "symfony/http-foundation": "^2.6|^3.0|^4.0|^5.0",
+                "symfony/routing": "^2.6|^3.0|^4.0|^5.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.8"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Ratchet\\": "src/Ratchet"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Matt Bonneau",
+                    "role": "Developer"
+                }
+            ],
+            "description": "PHP WebSocket library",
+            "homepage": "http://socketo.me",
+            "keywords": [
+                "Ratchet",
+                "WebSockets",
+                "server",
+                "sockets",
+                "websocket"
+            ],
+            "time": "2020-07-07T15:50:14+00:00"
+        },
         {
             "name": "defuse/php-encryption",
             "version": "v2.2.1",
@@ -491,6 +548,49 @@
             ],
             "time": "2020-11-14T15:56:27+00:00"
         },
+        {
+            "name": "evenement/evenement",
+            "version": "v3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/igorw/evenement.git",
+                "reference": "531bfb9d15f8aa57454f5f0285b18bec903b8fb7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/igorw/evenement/zipball/531bfb9d15f8aa57454f5f0285b18bec903b8fb7",
+                "reference": "531bfb9d15f8aa57454f5f0285b18bec903b8fb7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Evenement": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Igor Wiedler",
+                    "email": "igor@wiedler.ch"
+                }
+            ],
+            "description": "Événement is a very simple event dispatching library for PHP",
+            "keywords": [
+                "event-dispatcher",
+                "event-emitter"
+            ],
+            "time": "2017-07-23T21:35:13+00:00"
+        },
         {
             "name": "fideloper/proxy",
             "version": "4.4.1",
@@ -2932,6 +3032,473 @@
             ],
             "time": "2020-08-18T17:17:46+00:00"
         },
+        {
+            "name": "ratchet/rfc6455",
+            "version": "v0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ratchetphp/RFC6455.git",
+                "reference": "c8651c7938651c2d55f5d8c2422ac5e57a183341"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ratchetphp/RFC6455/zipball/c8651c7938651c2d55f5d8c2422ac5e57a183341",
+                "reference": "c8651c7938651c2d55f5d8c2422ac5e57a183341",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/psr7": "^1.0",
+                "php": ">=5.4.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "5.7.*",
+                "react/socket": "^1.3"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Ratchet\\RFC6455\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Matt Bonneau",
+                    "role": "Developer"
+                }
+            ],
+            "description": "RFC6455 WebSocket protocol handler",
+            "homepage": "http://socketo.me",
+            "keywords": [
+                "WebSockets",
+                "rfc6455",
+                "websocket"
+            ],
+            "time": "2020-05-15T18:31:24+00:00"
+        },
+        {
+            "name": "react/cache",
+            "version": "v1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/cache.git",
+                "reference": "44a568925556b0bd8cacc7b49fb0f1cf0d706a0c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/cache/zipball/44a568925556b0bd8cacc7b49fb0f1cf0d706a0c",
+                "reference": "44a568925556b0bd8cacc7b49fb0f1cf0d706a0c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "react/promise": "^3.0 || ^2.0 || ^1.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\Cache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "Async, Promise-based cache interface for ReactPHP",
+            "keywords": [
+                "cache",
+                "caching",
+                "promise",
+                "reactphp"
+            ],
+            "funding": [
+                {
+                    "url": "https://github.com/WyriHaximus",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/clue",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-18T12:12:35+00:00"
+        },
+        {
+            "name": "react/dns",
+            "version": "v1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/dns.git",
+                "reference": "665260757171e2ab17485b44e7ffffa7acb6ca1f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/dns/zipball/665260757171e2ab17485b44e7ffffa7acb6ca1f",
+                "reference": "665260757171e2ab17485b44e7ffffa7acb6ca1f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "react/cache": "^1.0 || ^0.6 || ^0.5",
+                "react/event-loop": "^1.0 || ^0.5",
+                "react/promise": "^3.0 || ^2.7 || ^1.2.1",
+                "react/promise-timer": "^1.2"
+            },
+            "require-dev": {
+                "clue/block-react": "^1.2",
+                "phpunit/phpunit": "^9.3 || ^4.8.35"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\Dns\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "Async DNS resolver for ReactPHP",
+            "keywords": [
+                "async",
+                "dns",
+                "dns-resolver",
+                "reactphp"
+            ],
+            "funding": [
+                {
+                    "url": "https://github.com/WyriHaximus",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/clue",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-18T12:12:55+00:00"
+        },
+        {
+            "name": "react/event-loop",
+            "version": "v1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/event-loop.git",
+                "reference": "6d24de090cd59cfc830263cfba965be77b563c13"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/event-loop/zipball/6d24de090cd59cfc830263cfba965be77b563c13",
+                "reference": "6d24de090cd59cfc830263cfba965be77b563c13",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7.0 || ^6.4 || ^5.7 || ^4.8.35"
+            },
+            "suggest": {
+                "ext-event": "~1.0 for ExtEventLoop",
+                "ext-pcntl": "For signal handling support when using the StreamSelectLoop",
+                "ext-uv": "* for ExtUvLoop"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\EventLoop\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "ReactPHP's core reactor event loop that libraries can use for evented I/O.",
+            "keywords": [
+                "asynchronous",
+                "event-loop"
+            ],
+            "time": "2020-01-01T18:39:52+00:00"
+        },
+        {
+            "name": "react/promise",
+            "version": "v2.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/promise.git",
+                "reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/promise/zipball/f3cff96a19736714524ca0dd1d4130de73dbbbc4",
+                "reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7.0 || ^6.5 || ^5.7 || ^4.8.36"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\Promise\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com"
+                }
+            ],
+            "description": "A lightweight implementation of CommonJS Promises/A for PHP",
+            "keywords": [
+                "promise",
+                "promises"
+            ],
+            "time": "2020-05-12T15:16:56+00:00"
+        },
+        {
+            "name": "react/promise-timer",
+            "version": "v1.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/promise-timer.git",
+                "reference": "daee9baf6ef30c43ea4c86399f828bb5f558f6e6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/promise-timer/zipball/daee9baf6ef30c43ea4c86399f828bb5f558f6e6",
+                "reference": "daee9baf6ef30c43ea4c86399f828bb5f558f6e6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3",
+                "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3.5",
+                "react/promise": "^3.0 || ^2.7.0 || ^1.2.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0 || ^5.7 || ^4.8.35"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\Promise\\Timer\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@lueck.tv"
+                }
+            ],
+            "description": "A trivial implementation of timeouts for Promises, built on top of ReactPHP.",
+            "homepage": "https://github.com/reactphp/promise-timer",
+            "keywords": [
+                "async",
+                "event-loop",
+                "promise",
+                "reactphp",
+                "timeout",
+                "timer"
+            ],
+            "time": "2020-07-10T12:18:06+00:00"
+        },
+        {
+            "name": "react/socket",
+            "version": "v1.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/socket.git",
+                "reference": "e2b96b23a13ca9b41ab343268dbce3f8ef4d524a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/socket/zipball/e2b96b23a13ca9b41ab343268dbce3f8ef4d524a",
+                "reference": "e2b96b23a13ca9b41ab343268dbce3f8ef4d524a",
+                "shasum": ""
+            },
+            "require": {
+                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+                "php": ">=5.3.0",
+                "react/dns": "^1.1",
+                "react/event-loop": "^1.0 || ^0.5",
+                "react/promise": "^2.6.0 || ^1.2.1",
+                "react/promise-timer": "^1.4.0",
+                "react/stream": "^1.1"
+            },
+            "require-dev": {
+                "clue/block-react": "^1.2",
+                "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35",
+                "react/promise-stream": "^1.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\Socket\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "Async, streaming plaintext TCP/IP and secure TLS socket server and client connections for ReactPHP",
+            "keywords": [
+                "Connection",
+                "Socket",
+                "async",
+                "reactphp",
+                "stream"
+            ],
+            "funding": [
+                {
+                    "url": "https://github.com/WyriHaximus",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/clue",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-08-28T12:49:05+00:00"
+        },
+        {
+            "name": "react/stream",
+            "version": "v1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/stream.git",
+                "reference": "7c02b510ee3f582c810aeccd3a197b9c2f52ff1a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/stream/zipball/7c02b510ee3f582c810aeccd3a197b9c2f52ff1a",
+                "reference": "7c02b510ee3f582c810aeccd3a197b9c2f52ff1a",
+                "shasum": ""
+            },
+            "require": {
+                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+                "php": ">=5.3.8",
+                "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3.5"
+            },
+            "require-dev": {
+                "clue/stream-filter": "~1.2",
+                "phpunit/phpunit": "^7.0 || ^6.4 || ^5.7 || ^4.8.35"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\Stream\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Event-driven readable and writable streams for non-blocking I/O in ReactPHP",
+            "keywords": [
+                "event-driven",
+                "io",
+                "non-blocking",
+                "pipe",
+                "reactphp",
+                "readable",
+                "stream",
+                "writable"
+            ],
+            "time": "2020-05-04T10:17:57+00:00"
+        },
         {
             "name": "swiftmailer/swiftmailer",
             "version": "v6.2.3",
diff --git a/database/migrations/2020_12_13_200032_create_journals_table.php b/database/migrations/2020_12_13_200032_create_journals_table.php
new file mode 100644
index 0000000..93f215c
--- /dev/null
+++ b/database/migrations/2020_12_13_200032_create_journals_table.php
@@ -0,0 +1,47 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateJournalsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('journals', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('teacher_id');
+            $table->unsignedBigInteger('student_id');
+            $table->unsignedBigInteger('subject_id');
+            $table->unsignedBigInteger('score');
+            $table->string('comment')->nullable();
+            $table->timestamps();
+
+            $table->foreign('subject_id')
+                ->references('id')->on('subjects');
+
+            $table->foreign('teacher_id')
+                ->references('id')->on('teachers')
+                ->onDelete('cascade');
+
+            $table->foreign('student_id')
+                ->references('id')->on('students')
+                ->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('journals');
+    }
+}
diff --git a/routes/api.php b/routes/api.php
index 94e2235..aaea0a2 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -23,8 +23,11 @@ Route::apiResource('subjects', 'SubjectController');
 Route::apiResource('classes', 'SchoolClassController');
 Route::post('classes/{class}/teacher', 'SchoolClassController@addTeacher');
 Route::get('classes/{class}/students', 'SchoolClassController@getStudents'); //все ученики класса
+Route::get('classes/{class}/journal', 'SchoolClassController@getStudentsJournal'); //все ученики класса с оценками
 Route::get('classes/{class}/subjects', 'SchoolClassController@getSubjects'); //все предметы класса
 
+Route::apiResource('journal', 'JournalController');
+
 Route::apiResource('themes', 'ThemeController');
 
 Route::apiResource('timetables', 'TimetableController');
diff --git a/routes/web.php b/routes/web.php
index 84fc59a..60b14a6 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -12,3 +12,5 @@
 | contains the "web" middleware group. Now create something great!
 |
 */
+
+Route::view('/', 'auth');

From 622170c6475bff2a09aa42d44752b43491005173 Mon Sep 17 00:00:00 2001
From: ashen-1-dev <alen2014@gmail.com>
Date: Wed, 16 Dec 2020 20:38:32 +0700
Subject: [PATCH 4/5] =?UTF-8?q?=D0=96=D1=83=D1=80=D0=BD=D0=B0=D0=BB(fixed?=
 =?UTF-8?q?=20some=20issues)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/JournalController.php    | 12 ++++++----
 app/Http/Controllers/SubjectController.php    |  2 +-
 .../Controllers/Users/TeacherController.php   | 23 ++++++++++++++++---
 app/Http/Requests/JournalRequest.php          |  2 +-
 4 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/JournalController.php b/app/Http/Controllers/JournalController.php
index 25f9bc4..284210a 100644
--- a/app/Http/Controllers/JournalController.php
+++ b/app/Http/Controllers/JournalController.php
@@ -59,7 +59,7 @@ class JournalController extends Controller
         $data = array_merge(['updated_at' => $date], $request->all());
 
         $journal = Journal::create($data);
-        return response()->json(['id' => $journal->id], 200);
+        return response()->json($journal, 200);
     }
 
     /**
@@ -91,10 +91,14 @@ class JournalController extends Controller
      * @param Journal $journal
      * @return JsonResponse
      */
-    public function update(JournalRequest $request, Journal $journal)
+    public function update(Request  $request, int $journal)
     {
-        $journal->update($request->all());
-        return response()->json(['id' => $journal->id], 200);
+        $j = Journal::find($journal);
+        $j->score = $request->get('score');
+        $j->comment = $request->get('comment');
+        $j->timestamps = false;
+        $j->save();
+        return response()->json(['id' => $j->id], 200);
     }
 
     /**
diff --git a/app/Http/Controllers/SubjectController.php b/app/Http/Controllers/SubjectController.php
index e0e4ae0..51d6592 100644
--- a/app/Http/Controllers/SubjectController.php
+++ b/app/Http/Controllers/SubjectController.php
@@ -17,7 +17,7 @@ class SubjectController extends Controller
      */
     public function index()
     {
-        return response()->json(Subject::all()->sortBy('name'), 200);
+        return response()->json(Subject::all(), 200);
     }
 
     /**
diff --git a/app/Http/Controllers/Users/TeacherController.php b/app/Http/Controllers/Users/TeacherController.php
index 1b0f8d0..2b9ef93 100644
--- a/app/Http/Controllers/Users/TeacherController.php
+++ b/app/Http/Controllers/Users/TeacherController.php
@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
 use App\Models\Teacher;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use App\Models\Subject;
 
 class TeacherController extends Controller
 {
@@ -48,10 +49,26 @@ class TeacherController extends Controller
     public function getClasses(Teacher $teacher)
     {
         $timetables = $teacher->timetables;
-        $classes = [];
+        $classes = collect([]);
         foreach ($timetables as $timetable) {
-            array_push($classes, $timetable->schoolClass->only('id','number','letter'));
+            $subjects = collect([]);
+            $class = $timetable->schoolClass->only('id','number','letter');
+            $forClassTimetables = $timetables->where('class_id', $class['id']);
+
+            foreach ($forClassTimetables as $forClassTimetable) {
+                $subjects->push(Subject::find($forClassTimetable['subject_id']));
+            }
+            $subjects = $subjects->unique()->values();
+
+            $classes->push([
+                               'id' => $class['id'],
+                               'number' => $class['number'],
+                               'letter' => $class['letter'],
+                               'subjects' => $subjects,
+                           ]);
+
         }
-        return response()->json(collect($classes)->unique(), 200);
+
+        return response()->json($classes->unique()->values(), 200);
     }
 }
diff --git a/app/Http/Requests/JournalRequest.php b/app/Http/Requests/JournalRequest.php
index bfc95f3..035e2d0 100644
--- a/app/Http/Requests/JournalRequest.php
+++ b/app/Http/Requests/JournalRequest.php
@@ -18,7 +18,7 @@ class JournalRequest extends ApiFormRequest
             'teacher_id' => 'required|integer',
             'subject_id' => 'required|integer',
             'score' => 'required|integer',
-            'comment' => 'string',
+            'comment' => 'string|nullable',
             'date' => 'integer',
         ];
     }

From 37bc147ba4d540fc658a9670d816c6be198155f3 Mon Sep 17 00:00:00 2001
From: ashen-1-dev <alen2014@gmail.com>
Date: Wed, 16 Dec 2020 20:39:54 +0700
Subject: [PATCH 5/5] =?UTF-8?q?=D0=9D=D0=BE=D0=B2=D0=BE=D1=81=D1=82=D0=B8(?=
 =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BE=D1=88?=
 =?UTF-8?q?=D0=B8=D0=B1=D0=BA=D1=83=20=D1=81=20=D0=B2=D1=8B=D0=B2=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=BC)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/SubjectController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/SubjectController.php b/app/Http/Controllers/SubjectController.php
index e0e4ae0..51d6592 100644
--- a/app/Http/Controllers/SubjectController.php
+++ b/app/Http/Controllers/SubjectController.php
@@ -17,7 +17,7 @@ class SubjectController extends Controller
      */
     public function index()
     {
-        return response()->json(Subject::all()->sortBy('name'), 200);
+        return response()->json(Subject::all(), 200);
     }
 
     /**