mirror of
https://gitlab.com/TheGamecraft/c-cms.git
synced 2026-04-21 02:39:10 -04:00
Merge remote-tracking branch 'origin/3.2.5' into 3.2.5
This commit is contained in:
@@ -16,12 +16,15 @@ Route::get('/schedule/events','ScheduleController@apiIndex');
|
||||
Route::get('/schedule/events/modal/{id}/{db_type}','ScheduleController@loadModal');
|
||||
|
||||
Route::middleware('auth:api')->group(function () {
|
||||
Route::get('/user', function (Request $request) {
|
||||
return $request->user();
|
||||
});
|
||||
|
||||
Route::get('/schedule/events/modal/full/{id}/{db_type}','ScheduleController@loadModalFull')->middleware('perm:schedule_see');
|
||||
Route::get('/schedule/events/add/modal/{type}/{date}','ScheduleController@loadModalDefautType')->middleware('perm:schedule_add');
|
||||
Route::get('/schedule/editor/init/{id}','ScheduleEditorController@getTemplate')->middleware('perm:schedule_edit');
|
||||
Route::get('/schedule/editor/course/{niveau}/{periode}','ScheduleEditorController@getCourseEmpty')->middleware('perm:schedule_edit');
|
||||
Route::get('/schedule/editor/template/{id}','ScheduleEditorController@getEventTemplate')->middleware('perm:schedule_add');
|
||||
Route::get('/schedule/editor/emptyperiode/{id}','ScheduleEditorController@getEmptyPeriode')->middleware('perm:schedule_add');
|
||||
Route::get('/schedule/editor/emptylevel/{id}','ScheduleEditorController@getEmptyLevel')->middleware('perm:schedule_add');
|
||||
Route::get('/schedule/editor/levelHeader/{id}','ScheduleEditorController@getLevelHeader')->middleware('perm:schedule_add');
|
||||
Route::post('/schedule/event/delete/{id}','ScheduleController@delete')->middleware('perm:schedule_delete');
|
||||
|
||||
/** Booking */
|
||||
@@ -41,6 +44,10 @@ Route::middleware('auth:api')->group(function () {
|
||||
Route::post('/user/delete', 'UserController@destroy')->middleware('perm:user_delete');
|
||||
Route::get('/user/list', 'UserController@apiList')->middleware('perm:user_see');
|
||||
|
||||
/** OCOM Route */
|
||||
Route::get('/ocom/list', 'OCOMController@jsonList')->middleware('perm:schedule_see');
|
||||
Route::get('/ocom/{id}/name','OCOMController@getName')->middleware('perm:schedule_see');
|
||||
|
||||
/** Inventory Route */
|
||||
Route::post('/item/delete', 'ItemController@destroy')->middleware('perm:inventory_delete');
|
||||
|
||||
|
||||
@@ -15,6 +15,9 @@ use Illuminate\Support\Facades\Storage;
|
||||
/* Basic Auth Route */
|
||||
Auth::routes();
|
||||
Route::get('logout', 'Auth\LoginController@logout')->name('logout');
|
||||
Route::get("/test/{id}",'ScheduleEditorController@getEventTemplate');
|
||||
Route::get("/test/{id}",'ScheduleEditorController@getEventTemplate');
|
||||
Route::get('/ocom/create','OCOMController@create');
|
||||
|
||||
|
||||
|
||||
@@ -27,10 +30,6 @@ Route::get('/activity/{id}', 'ComplementaryActivityController@show');
|
||||
Route::get('/picture/{id}', 'PictureController@show');
|
||||
Route::get('/pictures', 'PictureController@index');
|
||||
|
||||
Route::get('/test',function(){
|
||||
clog('add','success','Test');
|
||||
});
|
||||
|
||||
Route::middleware(['auth'])->group(function () {
|
||||
|
||||
/* Espace Administration Route */
|
||||
|
||||
Reference in New Issue
Block a user