pull develop
このコミットが含まれているのは:
コミット
b3d221ba11
ファイル差分が大きすぎるため省略します
差分を読み込み
|
@ -142,21 +142,12 @@ Route::group(['prefix' => 'children'], function () {
|
|||
Route::post('/requestPassword', '\App\Http\Controllers\Api\ChildrenController@requestPassword')->name('childrenrequestpassword');
|
||||
Route::post('/login', '\App\Http\Controllers\Api\ChildrenController@login')->name('childrenlogin');
|
||||
|
||||
<<<<<<< HEAD
|
||||
// Route::group(['middleware' => 'auth:children'], function () {
|
||||
Route::get('/detail/{child_id}', '\App\Http\Controllers\Api\ChildrenController@detail');
|
||||
Route::put('/updateImage/{child_id}', '\App\Http\Controllers\Api\ChildrenController@updateImage');
|
||||
Route::put('/updateProfile/{child_id}', '\App\Http\Controllers\Api\ChildrenController@updateProfile');
|
||||
Route::put('/updatePassword/{child_id}', '\App\Http\Controllers\Api\ChildrenController@updatePassword');
|
||||
Route::delete('/withdrawal', '\App\Http\Controllers\Api\ChildrenController@withdrawal');
|
||||
=======
|
||||
Route::group(['middleware' => 'auth:children'], function () {
|
||||
Route::get('/detail/{child_id}', '\App\Http\Controllers\Api\ChildrenController@detail');
|
||||
Route::put('/updateImage/{child_id}', '\App\Http\Controllers\Api\ChildrenController@updateImage');
|
||||
Route::put('/updateProfile/{child_id}', '\App\Http\Controllers\Api\ChildrenController@updateProfile');
|
||||
Route::put('/updatePassword/{child_id}', '\App\Http\Controllers\Api\ChildrenController@updatePassword');
|
||||
Route::delete('/withdrawal', '\App\Http\Controllers\Api\ChildrenController@withdrawal');
|
||||
>>>>>>> 1a38a7c002559d124608de85e4602c71ec4ead2f
|
||||
|
||||
// FathersController
|
||||
Route::group(['prefix' => 'fathers'], function () {
|
||||
|
@ -178,6 +169,6 @@ Route::group(['prefix' => 'children'], function () {
|
|||
Route::group(['prefix' => 'approvals'], function () {
|
||||
Route::post('/registerApproval', '\App\Http\Controllers\Api\MeetingApprovalsController@registerApproval');
|
||||
});
|
||||
// });
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
新しいイシューから参照