diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 452e6b6..b6e0fe6 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -2,6 +2,7 @@ namespace App\Providers; +use Illuminate\Pagination\Paginator; use Illuminate\Support\ServiceProvider; class AppServiceProvider extends ServiceProvider @@ -19,6 +20,6 @@ class AppServiceProvider extends ServiceProvider */ public function boot(): void { - // + Paginator::useBootstrap(); } } diff --git a/app/Services/TeacherService.php b/app/Services/TeacherService.php index a04609e..46573d1 100644 --- a/app/Services/TeacherService.php +++ b/app/Services/TeacherService.php @@ -11,7 +11,7 @@ class TeacherService implements ServiceInterface { public function getAll(): LengthAwarePaginator { - return Teacher::filter()->paginate(10)->withQueryString(); + return Teacher::filter()->paginate(2)->withQueryString(); } public function create(array $data): Teacher diff --git a/resources/views/grades/index.blade.php b/resources/views/grades/index.blade.php index 67e3a08..ddff5cc 100644 --- a/resources/views/grades/index.blade.php +++ b/resources/views/grades/index.blade.php @@ -1,7 +1,7 @@ @extends('layouts.app') @section('content') -
+
{{__('Новый класс')}}
diff --git a/resources/views/grades/show.blade.php b/resources/views/grades/show.blade.php index 6b2bc9c..cfa51d7 100644 --- a/resources/views/grades/show.blade.php +++ b/resources/views/grades/show.blade.php @@ -1,20 +1,21 @@ @extends('layouts.app') @section('content') -
+
-
-
-
-
-

Название: {{ $grade->name }}

-
- +
+
{{ ('Класс') }}
+
+
+
Название: {{ $grade->name }}
+
+
@endsection + diff --git a/resources/views/includes/footer.blade.php b/resources/views/includes/footer.blade.php index 0c5547d..780e7f8 100644 --- a/resources/views/includes/footer.blade.php +++ b/resources/views/includes/footer.blade.php @@ -1,9 +1,10 @@
diff --git a/resources/views/students/index.blade.php b/resources/views/students/index.blade.php index 1942b51..e1ec961 100644 --- a/resources/views/students/index.blade.php +++ b/resources/views/students/index.blade.php @@ -29,7 +29,7 @@
- + diff --git a/resources/views/subjects/show.blade.php b/resources/views/subjects/show.blade.php index bf3212f..1b114ef 100644 --- a/resources/views/subjects/show.blade.php +++ b/resources/views/subjects/show.blade.php @@ -1,17 +1,18 @@ @extends('layouts.app') @section('content') -
-
-
+
+
+
+
{{ ('Предмет') }}
-

Название: {{ $subject->name }}

-
-
- Редактировать +
Название: {{ $subject->name }}
+
diff --git a/resources/views/teachers/index.blade.php b/resources/views/teachers/index.blade.php index 11278eb..3c3f89c 100644 --- a/resources/views/teachers/index.blade.php +++ b/resources/views/teachers/index.blade.php @@ -29,7 +29,7 @@
УченикФИО  
- +
УченикФИО