@@ -51,9 +51,9 @@ discard block |
||
| 51 | 51 | * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View |
| 52 | 52 | */ |
| 53 | 53 | public function index() |
| 54 | - { |
|
| 55 | - $data['users'] = User::paginate(15); |
|
| 56 | - return view('users/index', $data); |
|
| 54 | + { |
|
| 55 | + $data['users'] = User::paginate(15); |
|
| 56 | + return view('users/index', $data); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | /** |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | */ |
| 92 | 92 | public function profile() |
| 93 | 93 | { |
| 94 | - return view('users/profile'); |
|
| 94 | + return view('users/profile'); |
|
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | /** |
@@ -25,30 +25,3 @@ |
||
| 25 | 25 | Route::get('/home', 'HomeController@index'); |
| 26 | 26 | |
| 27 | 27 | <<<<<<< HEAD |
| 28 | -Route::get('/callbacks', 'CallbackController@index')->name('callbacks.index'); |
|
| 29 | -Route::get('/callbacks/register', 'CallbackController@register')->name('callbacks.register'); |
|
| 30 | -Route::get('/callbacks/display/{id}', 'CallbackController@edit')->name('callbacks.display'); |
|
| 31 | -Route::post('/callbacks', 'CallbackController@store')->name('callbacks.store'); |
|
| 32 | - |
|
| 33 | -======= |
|
| 34 | -// Costumers routes |
|
| 35 | ->>>>>>> b65ccccd988a46329b5b01893711e0fcc8cb0b01 |
|
| 36 | -Route::get('/customers', 'CustomersController@index')->name('customers.index'); |
|
| 37 | -Route::get('/customers/register', 'CustomersController@register')->name('customers.register'); |
|
| 38 | -Route::get('/customers/display/{id}', 'CustomersController@edit')->name('customers.display'); |
|
| 39 | -Route::post('/customers', 'CustomersController@store')->name('customers.store'); |
|
| 40 | - |
|
| 41 | -// Status routes |
|
| 42 | -Route::get('/status/available', 'StaffController@setAvailable')->name('status.available'); |
|
| 43 | -Route::get('/status/unavailable', 'StaffController@setUnavailable')->name('status.unavailable'); |
|
| 44 | - |
|
| 45 | -// Profile routes |
|
| 46 | -Route::get('/profile', 'StaffController@profile')->name('staff.index'); |
|
| 47 | - |
|
| 48 | -// Staff routes |
|
| 49 | -Route::get('/staff', 'StaffController@index')->name('profile'); |
|
| 50 | -Route::get('/staff/edit/{id}', 'StaffController@edit')->name('staff.edit'); |
|
| 51 | -Route::post('/staff/edit/{id}', 'StaffController@update')->name('staff.update'); |
|
| 52 | -Route::get('/staff/create', 'StaffController@create')->name('staff.create'); |
|
| 53 | -Route::post('/staff/create', 'StaffController@store')->name('staff.store'); |
|
| 54 | -Route::get('/staff/delete/{id}', 'StaffController@destroy')->name('staff.delete'); |
|
| 55 | 28 | \ No newline at end of file |
@@ -10,6 +10,6 @@ |
||
| 10 | 10 | { |
| 11 | 11 | public function index() |
| 12 | 12 | { |
| 13 | - return view('callbacks/list'); |
|
| 13 | + return view('callbacks/list'); |
|
| 14 | 14 | } |
| 15 | 15 | } |