idevelopment / RingMe

app/Http/routes.php

Doc Comments -27 removed lines

@@ -25,30 +25,3 @@
 Route::get('/home', 'HomeController@index');
 
 <<<<<<< HEAD
-Route::get('/callbacks', 'CallbackController@index')->name('callbacks.index');
-Route::get('/callbacks/register', 'CallbackController@register')->name('callbacks.register');
-Route::get('/callbacks/display/{id}', 'CallbackController@edit')->name('callbacks.display');
-Route::post('/callbacks', 'CallbackController@store')->name('callbacks.store');
-
-=======
-// Costumers routes
->>>>>>> b65ccccd988a46329b5b01893711e0fcc8cb0b01
-Route::get('/customers', 'CustomersController@index')->name('customers.index');
-Route::get('/customers/register', 'CustomersController@register')->name('customers.register');
-Route::get('/customers/display/{id}', 'CustomersController@edit')->name('customers.display');
-Route::post('/customers', 'CustomersController@store')->name('customers.store');
-
-// Status routes
-Route::get('/status/available', 'StaffController@setAvailable')->name('status.available');
-Route::get('/status/unavailable', 'StaffController@setUnavailable')->name('status.unavailable');
-
-// Profile routes
-Route::get('/profile', 'StaffController@profile')->name('staff.index');
-
-// Staff routes
-Route::get('/staff', 'StaffController@index')->name('profile');
-Route::get('/staff/edit/{id}', 'StaffController@edit')->name('staff.edit');
-Route::post('/staff/edit/{id}', 'StaffController@update')->name('staff.update');
-Route::get('/staff/create', 'StaffController@create')->name('staff.create');
-Route::post('/staff/create', 'StaffController@store')->name('staff.store');
-Route::get('/staff/delete/{id}', 'StaffController@destroy')->name('staff.delete');
\ No newline at end of file

Unused Use Statements -27 removed lines

@@ -25,30 +25,3 @@
 Route::get('/home', 'HomeController@index');
 
 <<<<<<< HEAD
-Route::get('/callbacks', 'CallbackController@index')->name('callbacks.index');
-Route::get('/callbacks/register', 'CallbackController@register')->name('callbacks.register');
-Route::get('/callbacks/display/{id}', 'CallbackController@edit')->name('callbacks.display');
-Route::post('/callbacks', 'CallbackController@store')->name('callbacks.store');
-
-=======
-// Costumers routes
->>>>>>> b65ccccd988a46329b5b01893711e0fcc8cb0b01
-Route::get('/customers', 'CustomersController@index')->name('customers.index');
-Route::get('/customers/register', 'CustomersController@register')->name('customers.register');
-Route::get('/customers/display/{id}', 'CustomersController@edit')->name('customers.display');
-Route::post('/customers', 'CustomersController@store')->name('customers.store');
-
-// Status routes
-Route::get('/status/available', 'StaffController@setAvailable')->name('status.available');
-Route::get('/status/unavailable', 'StaffController@setUnavailable')->name('status.unavailable');
-
-// Profile routes
-Route::get('/profile', 'StaffController@profile')->name('staff.index');
-
-// Staff routes
-Route::get('/staff', 'StaffController@index')->name('profile');
-Route::get('/staff/edit/{id}', 'StaffController@edit')->name('staff.edit');
-Route::post('/staff/edit/{id}', 'StaffController@update')->name('staff.update');
-Route::get('/staff/create', 'StaffController@create')->name('staff.create');
-Route::post('/staff/create', 'StaffController@store')->name('staff.store');
-Route::get('/staff/delete/{id}', 'StaffController@destroy')->name('staff.delete');
\ No newline at end of file

Indentation -27 removed lines

@@ -25,30 +25,3 @@
 Route::get('/home', 'HomeController@index');
 
 <<<<<<< HEAD
-Route::get('/callbacks', 'CallbackController@index')->name('callbacks.index');
-Route::get('/callbacks/register', 'CallbackController@register')->name('callbacks.register');
-Route::get('/callbacks/display/{id}', 'CallbackController@edit')->name('callbacks.display');
-Route::post('/callbacks', 'CallbackController@store')->name('callbacks.store');
-
-=======
-// Costumers routes
->>>>>>> b65ccccd988a46329b5b01893711e0fcc8cb0b01
-Route::get('/customers', 'CustomersController@index')->name('customers.index');
-Route::get('/customers/register', 'CustomersController@register')->name('customers.register');
-Route::get('/customers/display/{id}', 'CustomersController@edit')->name('customers.display');
-Route::post('/customers', 'CustomersController@store')->name('customers.store');
-
-// Status routes
-Route::get('/status/available', 'StaffController@setAvailable')->name('status.available');
-Route::get('/status/unavailable', 'StaffController@setUnavailable')->name('status.unavailable');
-
-// Profile routes
-Route::get('/profile', 'StaffController@profile')->name('staff.index');
-
-// Staff routes
-Route::get('/staff', 'StaffController@index')->name('profile');
-Route::get('/staff/edit/{id}', 'StaffController@edit')->name('staff.edit');
-Route::post('/staff/edit/{id}', 'StaffController@update')->name('staff.update');
-Route::get('/staff/create', 'StaffController@create')->name('staff.create');
-Route::post('/staff/create', 'StaffController@store')->name('staff.store');
-Route::get('/staff/delete/{id}', 'StaffController@destroy')->name('staff.delete');
\ No newline at end of file

Switch Indentation -27 removed lines

@@ -25,30 +25,3 @@
 Route::get('/home', 'HomeController@index');
 
 <<<<<<< HEAD
-Route::get('/callbacks', 'CallbackController@index')->name('callbacks.index');
-Route::get('/callbacks/register', 'CallbackController@register')->name('callbacks.register');
-Route::get('/callbacks/display/{id}', 'CallbackController@edit')->name('callbacks.display');
-Route::post('/callbacks', 'CallbackController@store')->name('callbacks.store');
-
-=======
-// Costumers routes
->>>>>>> b65ccccd988a46329b5b01893711e0fcc8cb0b01
-Route::get('/customers', 'CustomersController@index')->name('customers.index');
-Route::get('/customers/register', 'CustomersController@register')->name('customers.register');
-Route::get('/customers/display/{id}', 'CustomersController@edit')->name('customers.display');
-Route::post('/customers', 'CustomersController@store')->name('customers.store');
-
-// Status routes
-Route::get('/status/available', 'StaffController@setAvailable')->name('status.available');
-Route::get('/status/unavailable', 'StaffController@setUnavailable')->name('status.unavailable');
-
-// Profile routes
-Route::get('/profile', 'StaffController@profile')->name('staff.index');
-
-// Staff routes
-Route::get('/staff', 'StaffController@index')->name('profile');
-Route::get('/staff/edit/{id}', 'StaffController@edit')->name('staff.edit');
-Route::post('/staff/edit/{id}', 'StaffController@update')->name('staff.update');
-Route::get('/staff/create', 'StaffController@create')->name('staff.create');
-Route::post('/staff/create', 'StaffController@store')->name('staff.store');
-Route::get('/staff/delete/{id}', 'StaffController@destroy')->name('staff.delete');
\ No newline at end of file

Spacing +2 added lines, -29 removed lines

@@ -11,7 +11,7 @@ 
 |
 */
 
-Route::get('/', function () {
+Route::get('/', function() {
     return view('welcome');
 });
 
@@ -24,31 +24,4 @@ 
 // Home routes
 Route::get('/home', 'HomeController@index');
 
-<<<<<<< HEAD
-Route::get('/callbacks', 'CallbackController@index')->name('callbacks.index');
-Route::get('/callbacks/register', 'CallbackController@register')->name('callbacks.register');
-Route::get('/callbacks/display/{id}', 'CallbackController@edit')->name('callbacks.display');
-Route::post('/callbacks', 'CallbackController@store')->name('callbacks.store');
-
-=======
-// Costumers routes
->>>>>>> b65ccccd988a46329b5b01893711e0fcc8cb0b01
-Route::get('/customers', 'CustomersController@index')->name('customers.index');
-Route::get('/customers/register', 'CustomersController@register')->name('customers.register');
-Route::get('/customers/display/{id}', 'CustomersController@edit')->name('customers.display');
-Route::post('/customers', 'CustomersController@store')->name('customers.store');
-
-// Status routes
-Route::get('/status/available', 'StaffController@setAvailable')->name('status.available');
-Route::get('/status/unavailable', 'StaffController@setUnavailable')->name('status.unavailable');
-
-// Profile routes
-Route::get('/profile', 'StaffController@profile')->name('staff.index');
-
-// Staff routes
-Route::get('/staff', 'StaffController@index')->name('profile');
-Route::get('/staff/edit/{id}', 'StaffController@edit')->name('staff.edit');
-Route::post('/staff/edit/{id}', 'StaffController@update')->name('staff.update');
-Route::get('/staff/create', 'StaffController@create')->name('staff.create');
-Route::post('/staff/create', 'StaffController@store')->name('staff.store');
-Route::get('/staff/delete/{id}', 'StaffController@destroy')->name('staff.delete');
\ No newline at end of file
+<< << <<< HEAD

Braces -27 removed lines

@@ -25,30 +25,3 @@
 Route::get('/home', 'HomeController@index');
 
 <<<<<<< HEAD
-Route::get('/callbacks', 'CallbackController@index')->name('callbacks.index');
-Route::get('/callbacks/register', 'CallbackController@register')->name('callbacks.register');
-Route::get('/callbacks/display/{id}', 'CallbackController@edit')->name('callbacks.display');
-Route::post('/callbacks', 'CallbackController@store')->name('callbacks.store');
-
-=======
-// Costumers routes
->>>>>>> b65ccccd988a46329b5b01893711e0fcc8cb0b01
-Route::get('/customers', 'CustomersController@index')->name('customers.index');
-Route::get('/customers/register', 'CustomersController@register')->name('customers.register');
-Route::get('/customers/display/{id}', 'CustomersController@edit')->name('customers.display');
-Route::post('/customers', 'CustomersController@store')->name('customers.store');
-
-// Status routes
-Route::get('/status/available', 'StaffController@setAvailable')->name('status.available');
-Route::get('/status/unavailable', 'StaffController@setUnavailable')->name('status.unavailable');
-
-// Profile routes
-Route::get('/profile', 'StaffController@profile')->name('staff.index');
-
-// Staff routes
-Route::get('/staff', 'StaffController@index')->name('profile');
-Route::get('/staff/edit/{id}', 'StaffController@edit')->name('staff.edit');
-Route::post('/staff/edit/{id}', 'StaffController@update')->name('staff.update');
-Route::get('/staff/create', 'StaffController@create')->name('staff.create');
-Route::post('/staff/create', 'StaffController@store')->name('staff.store');
-Route::get('/staff/delete/{id}', 'StaffController@destroy')->name('staff.delete');
\ No newline at end of file

Upper-Lower-Casing -27 removed lines

@@ -25,30 +25,3 @@
 Route::get('/home', 'HomeController@index');
 
 <<<<<<< HEAD
-Route::get('/callbacks', 'CallbackController@index')->name('callbacks.index');
-Route::get('/callbacks/register', 'CallbackController@register')->name('callbacks.register');
-Route::get('/callbacks/display/{id}', 'CallbackController@edit')->name('callbacks.display');
-Route::post('/callbacks', 'CallbackController@store')->name('callbacks.store');
-
-=======
-// Costumers routes
->>>>>>> b65ccccd988a46329b5b01893711e0fcc8cb0b01
-Route::get('/customers', 'CustomersController@index')->name('customers.index');
-Route::get('/customers/register', 'CustomersController@register')->name('customers.register');
-Route::get('/customers/display/{id}', 'CustomersController@edit')->name('customers.display');
-Route::post('/customers', 'CustomersController@store')->name('customers.store');
-
-// Status routes
-Route::get('/status/available', 'StaffController@setAvailable')->name('status.available');
-Route::get('/status/unavailable', 'StaffController@setUnavailable')->name('status.unavailable');
-
-// Profile routes
-Route::get('/profile', 'StaffController@profile')->name('staff.index');
-
-// Staff routes
-Route::get('/staff', 'StaffController@index')->name('profile');
-Route::get('/staff/edit/{id}', 'StaffController@edit')->name('staff.edit');
-Route::post('/staff/edit/{id}', 'StaffController@update')->name('staff.update');
-Route::get('/staff/create', 'StaffController@create')->name('staff.create');
-Route::post('/staff/create', 'StaffController@store')->name('staff.store');
-Route::get('/staff/delete/{id}', 'StaffController@destroy')->name('staff.delete');
\ No newline at end of file

app/Http/Controllers/CallbackController.php

Indentation +1 added lines, -1 removed lines

@@ -10,6 +10,6 @@
 {
     public function index()
     {
-    	return view('callbacks/list');
+        return view('callbacks/list');
     }
 }