butcherman / Tech_Bench

routes/web.php

Spacing +36 added lines, -36 removed lines

@@ -8,58 +8,58 @@ 
 /*
 *   Non user Routes
 */
-Route::get('/',         'Auth\LoginController@showLoginForm')->name('index');
-Route::get('logout',    'Auth\LoginController@logout')       ->name('logout');
+Route::get('/', 'Auth\LoginController@showLoginForm')->name('index');
+Route::get('logout', 'Auth\LoginController@logout')       ->name('logout');
 Route::get('no-script', 'Controller@noScript')               ->name('noscript');
 
 
 /*
 *   Download File Routes
 */
-Route::get('download/{id}/{filename}',    'DownloadController@index')          ->name('download');
+Route::get('download/{id}/{filename}', 'DownloadController@index')          ->name('download');
 Route::get('download-archive/{filename}', 'DownloadController@downloadArchive')->name('downloadArchive');
-Route::put('download-archive',            'DownloadController@archiveFiles')   ->name('archiveFiles');
+Route::put('download-archive', 'DownloadController@archiveFiles')   ->name('archiveFiles');
 
 
 /*
 *   User Settings Routes
 */
-Route::get('account',                   'AccountController@index')         ->name('account');
-Route::post('account',                  'AccountController@submit')        ->name('account');
-Route::put('account',                   'AccountController@notifications') ->name('account');
-Route::get('/account/change-password',  'AccountController@changePassword')->name('changePassword');
+Route::get('account', 'AccountController@index')         ->name('account');
+Route::post('account', 'AccountController@submit')        ->name('account');
+Route::put('account', 'AccountController@notifications') ->name('account');
+Route::get('/account/change-password', 'AccountController@changePassword')->name('changePassword');
 Route::post('/account/change-password', 'AccountController@submitPassword')->name('changePassword');
 
 /*
 *   Basic Logged In Routes
 */
-Route::get('about',     'DashboardController@about')->name('about');
+Route::get('about', 'DashboardController@about')->name('about');
 Route::get('dashboard', 'DashboardController@index')->name('dashboard');
 
 /*
 *   File Link Routes
 */
-Route::prefix('links')->name('links.')->group(function () {
+Route::prefix('links')->name('links.')->group(function() {
     //  Resource controllers for base access
-    Route::resource('data',           'FileLinks\FileLinksController');
-    Route::get('new',                 'FileLinks\FileLinksController@create')     ->name('new');
-    Route::get('find/{id}',           'FileLinks\FileLinksController@find')       ->name('user');
+    Route::resource('data', 'FileLinks\FileLinksController');
+    Route::get('new', 'FileLinks\FileLinksController@create')     ->name('new');
+    Route::get('find/{id}', 'FileLinks\FileLinksController@find')       ->name('user');
     Route::get('details/{id}/{name}', 'FileLinks\FileLinksController@details')    ->name('details');
-    Route::get('disable/{id}',        'FileLinks\FileLinksController@disableLink')->name('disable');
+    Route::get('disable/{id}', 'FileLinks\FileLinksController@disableLink')->name('disable');
     //  File Link Files
-    Route::resource('files',          'FileLinks\LinkFilesController');
+    Route::resource('files', 'FileLinks\LinkFilesController');
     //  Index landing page
-    Route::get('/',                   'FileLinks\FileLinksController@index')      ->name('index');
+    Route::get('/', 'FileLinks\FileLinksController@index')      ->name('index');
 });
 
 /*
 *   Guest File Link Routes
 */
 Route::get('file-links/{id}/get-files', 'FileLinks\GuestLinksController@getFiles')->name('file-links.getFiles');
-Route::put('file-links/{id}',           'FileLinks\GuestLinksController@notify')  ->name('file-links.show');
-Route::post('file-links/{id}',          'FileLinks\GuestLinksController@update')  ->name('file-links.show');
-Route::get('file-links/{id}',           'FileLinks\GuestLinksController@show')    ->name('file-links.show');
-Route::get('file-links',                'FileLinks\GuestLinksController@index')   ->name('file-links.index');
+Route::put('file-links/{id}', 'FileLinks\GuestLinksController@notify')  ->name('file-links.show');
+Route::post('file-links/{id}', 'FileLinks\GuestLinksController@update')  ->name('file-links.show');
+Route::get('file-links/{id}', 'FileLinks\GuestLinksController@show')    ->name('file-links.show');
+Route::get('file-links', 'FileLinks\GuestLinksController@index')   ->name('file-links.index');
 
 /*
 *   Customer Routes
@@ -67,38 +67,38 @@ 
 Route::prefix('customer')->name('customer.')->group(function()
 {
     //  Customer Files
-    Route::resource('files',                   'Customers\CustomerFilesController');
+    Route::resource('files', 'Customers\CustomerFilesController');
     //  Custome Notes
-    Route::get('download-note/{id}',           'DownloadController@downloadCustNote')        ->name('download-note');
-    Route::resource('notes',                   'Customers\CustomerNotesController');
+    Route::get('download-note/{id}', 'DownloadController@downloadCustNote')        ->name('download-note');
+    Route::resource('notes', 'Customers\CustomerNotesController');
     //  Customer Contacts
-    Route::resource('contacts',                'Customers\CustomerContactsController');
+    Route::resource('contacts', 'Customers\CustomerContactsController');
     //  Customer Systems
-    Route::resource('systems',                 'Customers\CustomerSystemsController');
+    Route::resource('systems', 'Customers\CustomerSystemsController');
     //  Customer Details
-    Route::get('id/{id}/{name}',               'Customers\CustomerDetailsController@details')->name('details');
-    Route::resource('id',                      'Customers\CustomerDetailsController');
+    Route::get('id/{id}/{name}', 'Customers\CustomerDetailsController@details')->name('details');
+    Route::resource('id', 'Customers\CustomerDetailsController');
     //  check Id and bookmark customer
     Route::get('toggle-fav/{action}/{custID}', 'Customers\CustomerController@toggleFav')     ->name('toggle-fav');
-    Route::get('check-id/{id}',                'Customers\CustomerController@checkID')       ->name('check-id');
+    Route::get('check-id/{id}', 'Customers\CustomerController@checkID')       ->name('check-id');
     //  Index landing/search page
-    Route::get('search',                       'Customers\CustomerController@search')        ->name('search');
-    Route::get('/',                            'Customers\CustomerController@index')         ->name('index');
+    Route::get('search', 'Customers\CustomerController@search')        ->name('search');
+    Route::get('/', 'Customers\CustomerController@index')         ->name('index');
 });
 
 
 /*
 *   Tech Tip Routes
 */
-Route::resource('tips',                       'TechTips\TechTipsController');
+Route::resource('tips', 'TechTips\TechTipsController');
 Route::prefix('tip')->name('tip.')->group(function()
 {
-    Route::resource('comments',               'TechTips\TechTipCommentsController');
-    Route::get('search',                      'TechTips\TechTipsController@search')      ->name('search');
-    Route::get('details/{id}/{name}',         'TechTips\TechTipsController@details')     ->name('details');
-    Route::post('process-image',              'TechTips\TechTipsController@processImage')->name('processImage');
+    Route::resource('comments', 'TechTips\TechTipCommentsController');
+    Route::get('search', 'TechTips\TechTipsController@search')      ->name('search');
+    Route::get('details/{id}/{name}', 'TechTips\TechTipsController@details')     ->name('details');
+    Route::post('process-image', 'TechTips\TechTipsController@processImage')->name('processImage');
     Route::get('toggle-fav/{action}/{tipID}', 'TechTips\TechTipsController@toggleFav')   ->name('toggle-fav');
-    Route::get('download-tip/{id}',           'DownloadController@downloadTechTip')      ->name('downloadTip');
+    Route::get('download-tip/{id}', 'DownloadController@downloadTechTip')      ->name('downloadTip');
 });
 
 

Braces +2 added lines, -4 removed lines

@@ -64,8 +64,7 @@ 
 /*
 *   Customer Routes
 */
-Route::prefix('customer')->name('customer.')->group(function()
-{
+Route::prefix('customer')->name('customer.')->group(function() {
     //  Customer Files
     Route::resource('files',                   'Customers\CustomerFilesController');
     //  Custome Notes
@@ -91,8 +90,7 @@ 
 *   Tech Tip Routes
 */
 Route::resource('tips',                       'TechTips\TechTipsController');
-Route::prefix('tip')->name('tip.')->group(function()
-{
+Route::prefix('tip')->name('tip.')->group(function() {
     Route::resource('comments',               'TechTips\TechTipCommentsController');
     Route::get('search',                      'TechTips\TechTipsController@search')      ->name('search');
     Route::get('details/{id}/{name}',         'TechTips\TechTipsController@details')     ->name('details');

database/factories/TechTipComments.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 use App\TechTipComments;
 use Faker\Generator as Faker;
 
-$factory->define(TechTipComments::class, function (Faker $faker) {
+$factory->define(TechTipComments::class, function(Faker $faker) {
     return [
         //
         'tip_id'  => factory(App\TechTips::class)->create()->tip_id,

database/factories/TechTipSystems.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 use App\TechTipSystems;
 use Faker\Generator as Faker;
 
-$factory->define(TechTipSystems::class, function () {
+$factory->define(TechTipSystems::class, function() {
     return [
         //
         'tip_id' => factory(App\TechTips::class)->create()->tip_id,

database/migrations/2019_11_25_175206_updates_for_version_5_0.php

Spacing +2 added lines, -2 removed lines

@@ -360,8 +360,8 @@
     //  Add soft deletes to tech tips table to prevent accidental deletes
     private function addSoftDeleteToTechTips()
     {
-        if (!Schema::hasColumn('tech_tips', 'deleted_at')) {
-            Schema::table('tech_tips', function (Blueprint $table) {
+        if(!Schema::hasColumn('tech_tips', 'deleted_at')) {
+            Schema::table('tech_tips', function(Blueprint $table) {
                 $table->softDeletes()->after('description');
             });
         }

Braces +22 added lines, -11 removed lines

@@ -82,7 +82,8 @@ 
     //  Added the ability to set an expiration date for user passwords - will force them to change after this expires
     private function addPasswordExpiresColumn()
     {
-        if(!Schema::hasColumn('users', 'password_expires')) {
+        if(!Schema::hasColumn('users', 'password_expires'))
+        {
             Schema::table('users', function(Blueprint $table) {
                 $table->timestamp('password_expires')
                     ->nullable()
@@ -153,7 +154,8 @@ 
     //  Added a 'hidden' attribute to system customer data types to allow passwords to not be viewed unless clicked or focus
     private function addHiddenColumn()
     {
-        if(!Schema::hasColumn('system_data_field_types', 'hidden')) {
+        if(!Schema::hasColumn('system_data_field_types', 'hidden'))
+        {
             Schema::table('system_cust_data_types', function(Blueprint $table) {
                 $table->boolean('hidden')
                     ->default(0)
@@ -165,7 +167,8 @@ 
     //  Update the File links table - add cust_id and note column
     private function addColumnsToFileLinksTable()
     {
-        if(!Schema::hasColumn('file_links', 'cust_id')) {
+        if(!Schema::hasColumn('file_links', 'cust_id'))
+        {
             Schema::table('file_links', function(Blueprint $table) {
                 $table->integer('cust_id')
                     ->unsigned()
@@ -174,7 +177,8 @@ 
                 $table->foreign('cust_id')->references('cust_id')->on('customers')->onUpdate('cascade')->onDelete('cascade');
             });
         }
-        if(!Schema::hasColumn('file_links', 'note')) {
+        if(!Schema::hasColumn('file_links', 'note'))
+        {
             Schema::table('file_links', function(Blueprint $table) {
                 $table->longText('note')
                     ->nullable()
@@ -182,7 +186,8 @@ 
             });
             //  Migrate the instructions from the old table to the new column
             $instructions = DB::select('SELECT * FROM `file_link_instructions`');
-            foreach($instructions as $ins) {
+            foreach($instructions as $ins)
+            {
                 FileLinks::find($ins->link_id)->update([
                     'note' => $ins->instruction
                 ]);
@@ -193,7 +198,8 @@ 
     //  Add Notes column to the file links files table
     private function addNotesColumnToFileLinkFiles()
     {
-        if(!Schema::hasColumn('file_link_files', 'note')) {
+        if(!Schema::hasColumn('file_link_files', 'note'))
+        {
             Schema::table('file_link_files', function(Blueprint $table) {
                 $table->longText('note')
                     ->nullable()
@@ -201,7 +207,8 @@ 
             });
             //  Migrate the existing notes to the new table
             $notes = DB::select('SELECT * FROM `file_link_notes`');
-            foreach($notes as $note) {
+            foreach($notes as $note)
+            {
                 FileLinkFiles::where('file_id', $note->file_id)->update([
                     'note' => $note->note
                 ]);
@@ -212,7 +219,8 @@ 
     //  Add the documentation column to the tech tips table
     private function migrateSystemDocumentation()
     {
-        if(!Schema::hasColumn('tech_tips', 'tip_type_id')) {
+        if(!Schema::hasColumn('tech_tips', 'tip_type_id'))
+        {
             Schema::table('tech_tips', function(Blueprint $table) {
                 $table->bigInteger('tip_type_id')->unsigned()->after('public')->default(1);
                 $table->foreign('tip_type_id')->references('tip_type_id')->on('tech_tip_types')->onUpdate('cascade');
@@ -220,7 +228,8 @@ 
 
             //  Move all of the system files over to the tech tips table
             $sysFiles = DB::select('SELECT * FROM `system_files`');
-            foreach($sysFiles as $sysFile) {
+            foreach($sysFiles as $sysFile)
+            {
                 $newTip = TechTips::create([
                     'user_id'       => $sysFile->user_id,
                     'public'        => 0,
@@ -314,7 +323,8 @@ 
     //  Remove the system files and system file types table
     private function removeSystemFilesTables()
     {
-        if(Schema::hasTable('system_files')) {
+        if(Schema::hasTable('system_files'))
+        {
             Schema::table('system_files', function(Blueprint $table) {
                 $table->dropForeign(['sys_id']);
                 $table->dropForeign(['type_id']);
@@ -360,7 +370,8 @@ 
     //  Add soft deletes to tech tips table to prevent accidental deletes
     private function addSoftDeleteToTechTips()
     {
-        if (!Schema::hasColumn('tech_tips', 'deleted_at')) {
+        if (!Schema::hasColumn('tech_tips', 'deleted_at'))
+        {
             Schema::table('tech_tips', function (Blueprint $table) {
                 $table->softDeletes()->after('description');
             });

app/Http/Controllers/TechTips/TechTipsController.php

Spacing +16 added lines, -16 removed lines

@@ -62,7 +62,7 @@ 
         Log::debug('request Data -> ', $request->toArray());
 
         //  See if there are any search paramaters entered
-        if (!$request->search['searchText'] && !isset($request->search['articleType']) && !isset($request->search['systemType'])) {
+        if(!$request->search['searchText'] && !isset($request->search['articleType']) && !isset($request->search['systemType'])) {
             //  No search paramaters, send all tech tips
             $tips = new TechTipsCollection(
                 TechTips::orderBy('created_at', 'DESC')
@@ -71,21 +71,21 @@ 
             );
         } else {
             $article = isset($request->search['articleType']) ? true : false;
-            $system  = isset($request->search['systemType'])  ? true : false;
+            $system  = isset($request->search['systemType']) ? true : false;
             //  Search paramaters, filter results
             $tips = new TechTipsCollection(
                 TechTips::orderBy('created_at', 'DESC')
                     //  Search by id or a phrase in the title or description
-                    ->where(function ($query) use ($request) {
-                        $query->where('subject', 'like', '%' . $request->search['searchText'] . '%')
-                            ->orWhere('tip_id', 'like', '%' . $request->search['searchText'] . '%')
-                            ->orWhere('description', 'like', '%' . $request->search['searchText'] . '%');
+                    ->where(function($query) use ($request) {
+                        $query->where('subject', 'like', '%'.$request->search['searchText'].'%')
+                            ->orWhere('tip_id', 'like', '%'.$request->search['searchText'].'%')
+                            ->orWhere('description', 'like', '%'.$request->search['searchText'].'%');
                     })
-                    ->when($article, function ($query) use ($request) {
+                    ->when($article, function($query) use ($request) {
                         $query->whereIn('tip_type_id', $request->search['articleType']);
                     })
-                    ->when($system, function ($query) use ($request) {
-                        $query->whereHas('SystemTypes', function ($query) use ($request) {
+                    ->when($system, function($query) use ($request) {
+                        $query->whereHas('SystemTypes', function($query) use ($request) {
                             $query->whereIn('system_types.sys_id', $request->search['systemType']);
                         });
                     })
@@ -157,7 +157,7 @@ 
         $save = $receiver->receive();
 
         //  See if the uploade has finished
-        if ($save->isFinished()) {
+        if($save->isFinished()) {
             $this->saveFile($save->getFile());
 
             return 'uploaded successfully';
@@ -166,8 +166,8 @@ 
         //  Get the current progress
         $handler = $save->handler();
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
-        Log::debug('File being uploaded.  Percentage done - ' . $handler->getPercentageDone());
+        Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
+        Log::debug('File being uploaded.  Percentage done - '.$handler->getPercentageDone());
         return response()->json([
             'done'   => $handler->getPercentageDone(),
             'status' => true
@@ -196,7 +196,7 @@ 
         session(['newTipFile' => $fileArr]);
 
         //  Log stored file
-        Log::info('File Stored', ['file_id' => $fileID, 'file_path' => $filePath . DIRECTORY_SEPARATOR . $fileName]);
+        Log::info('File Stored', ['file_id' => $fileID, 'file_path' => $filePath.DIRECTORY_SEPARATOR.$fileName]);
         return $fileID;
     }
 
@@ -266,7 +266,7 @@ 
     //  Details controller - will move to the show controller with just the tech tip id
     public function details($id, $subject)
     {
-        if (session()->has('newTipFile')) {
+        if(session()->has('newTipFile')) {
             session()->forget('newTipFile');
         }
 
@@ -300,7 +300,7 @@ 
     public function toggleFav($action, $id)
     {
         //
-        switch ($action) {
+        switch($action) {
             case 'add':
                 TechTipFavs::create([
                     'user_id' => Auth::user()->user_id,
@@ -313,7 +313,7 @@ 
                 break;
         }
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
+        Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
         Log::debug('Tech Tip Bookmark Updated.', [
             'user_id' => Auth::user()->user_id,
             'tip_id' => $id,

Braces +12 added lines, -7 removed lines

@@ -62,14 +62,17 @@ 
         Log::debug('request Data -> ', $request->toArray());
 
         //  See if there are any search paramaters entered
-        if (!$request->search['searchText'] && !isset($request->search['articleType']) && !isset($request->search['systemType'])) {
+        if (!$request->search['searchText'] && !isset($request->search['articleType']) && !isset($request->search['systemType']))
+        {
             //  No search paramaters, send all tech tips
             $tips = new TechTipsCollection(
                 TechTips::orderBy('created_at', 'DESC')
                     ->with('SystemTypes')
                     ->paginate($request->pagination['perPage'])
             );
-        } else {
+        }
+        else
+        {
             $article = isset($request->search['articleType']) ? true : false;
             $system  = isset($request->search['systemType'])  ? true : false;
             //  Search paramaters, filter results
@@ -157,7 +160,8 @@ 
         $save = $receiver->receive();
 
         //  See if the uploade has finished
-        if ($save->isFinished()) {
+        if ($save->isFinished())
+        {
             $this->saveFile($save->getFile());
 
             return 'uploaded successfully';
@@ -251,8 +255,7 @@ 
         if(!$tipData->supressEmail)
         {
             $details = TechTips::find($tipID);
-            $users = User::where('active', 1)->whereHas('UserSettings', function($query)
-            {
+            $users = User::where('active', 1)->whereHas('UserSettings', function($query) {
                 $query->where('em_tech_tip', 1);
             })->get();
 
@@ -266,7 +269,8 @@ 
     //  Details controller - will move to the show controller with just the tech tip id
     public function details($id, $subject)
     {
-        if (session()->has('newTipFile')) {
+        if (session()->has('newTipFile'))
+        {
             session()->forget('newTipFile');
         }
 
@@ -300,7 +304,8 @@ 
     public function toggleFav($action, $id)
     {
         //
-        switch ($action) {
+        switch ($action)
+        {
             case 'add':
                 TechTipFavs::create([
                     'user_id' => Auth::user()->user_id,

app/Http/Controllers/Customers/CustomerFilesController.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
         //  Verify that the upload is valid and being processed
         if($receiver->isUploaded() === false)
         {
-            Log::error('Upload File Missing - ' .
+            Log::error('Upload File Missing - '.
             /** @scrutinizer ignore-type */
             $request->toArray());
             throw new UploadMissingFileException();

app/TechTips.php

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
     use SoftDeletes;
 
     protected $primaryKey = 'tip_id';
-    protected $fillable = ['user_id', 'subject', 'tip_type_id', 'description', 'created_at'];  // ToDo:  Remove Created_at - future build
+    protected $fillable = ['user_id', 'subject', 'tip_type_id', 'description', 'created_at']; // ToDo:  Remove Created_at - future build
     protected $hidden = ['public', 'user_id', 'tip_type_id'];
     protected $casts = [
         'created_at' => 'datetime:M d, Y',
@@ -19,7 +19,7 @@ 
 
     public function systemTypes()
     {
-        return $this->hasManyThrough('App\SystemTypes', 'App\TechTipSystems',  'tip_id', 'sys_id', 'tip_id', 'sys_id');
+        return $this->hasManyThrough('App\SystemTypes', 'App\TechTipSystems', 'tip_id', 'sys_id', 'tip_id', 'sys_id');
     }
 
     public function user()