Merge branch 'news' into journal

# Conflicts:
#	app/Http/Controllers/Users/TeacherController.php

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'];
 }

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 после добавления авторизации
+
+}
+

app/Models/NewsFile.php

@@ -0,0 +1,13 @@
+<?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';
+    protected $fillable = ['name', 'type', 'extension', 'url', 'news_id'];
+}

app/Models/Parentt.php

@@ -14,4 +14,9 @@ class Parentt extends Model
         'user_id',
     ];
 
+    public function user()
+    {
+        return $this->belongsTo(User::class);
+    }
+
 }

app/Models/Student.php

@@ -28,4 +28,9 @@ class Student extends Model
         return $this->hasMany(Journal::class, 'student_id');
     }
 
+    public function user()
+    {
+        return $this->belongsTo(User::class);
+    }
+
 }

app/Models/Teacher.php

@@ -24,4 +24,9 @@ class Teacher extends Model
         return $this->hasMany(Timetable::class);
     }
 
+    public function user()
+    {
+        return $this->belongsTo(User::class);
+    }
+
 }