robonen/education-project
1
0
Fork 0
mirror of https://github.com/robonen/education-project.git synced 2026-03-19 18:34:31 +00:00
Code Activity

Исправил конфликты после локального слияния

Browse Source
This commit is contained in:
ashen-1-dev
2020-12-16 22:03:46 +07:00
parent 74565e78e3
commit 9dd2ed1a67
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/app.php
View File

@@ -160,6 +160,7 @@ return [
Illuminate\Session\SessionServiceProvider::class,
Illuminate\Translation\TranslationServiceProvider::class,
Illuminate\Validation\ValidationServiceProvider::class,
\Laravel\Passport\PassportServiceProvider::class,
Illuminate\View\ViewServiceProvider::class,

4
routes/api.php
View File

@@ -22,14 +22,14 @@ Route::apiResource('students', 'Users\StudentController');
Route::apiResource('parents', 'Users\ParenttController');
Route::apiResource('subjects', 'SubjectController');
Route::apiResource('subjects', 'BankTask\SubjectController');
Route::apiResource('classes', 'SchoolClassController');
Route::post('classes/{class}/teacher', 'SchoolClassController@addTeacher');
Route::get('classes/{class}/students', 'SchoolClassController@getStudents'); //все ученики класса
Route::get('classes/{class}/subjects', 'SchoolClassController@getSubjects'); //все предметы класса
Route::apiResource('themes', 'ThemeController');
Route::apiResource('themes', 'BankTask\ThemeController');
Route::apiResource('timetables', 'TimetableController');